提交产品列表

bms-front/src/views/price/basic/product/index.vue

@@ -20,10 +20,10 @@
           <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['price:product:add']">新建产品</el-button>
         </el-col>
         <el-col :span="1.5">
-          <el-button type="success" plain icon="Edit" :disabled="selection.length !== 1" @click="handleUpdate(selection[0])" v-hasPermi="['price:product:edit']">修改</el-button>
+          <el-button type="success" plain icon="Edit" :disabled="selection.length !== 1 || (selection[0] && isProductActive(selection[0]))" @click="handleUpdate(selection[0])" v-hasPermi="['price:product:edit']">修改</el-button>
         </el-col>
         <el-col :span="1.5">
-          <el-button type="danger" plain icon="Delete" :disabled="!selection.length" @click="handleDelete(ids)" v-hasPermi="['price:product:remove']">删除</el-button>
+          <el-button type="danger" plain icon="Delete" :disabled="!selection.length || selection.some(isProductActive)" @click="handleDelete(ids)" v-hasPermi="['price:product:remove']">删除</el-button>
         </el-col>
         <el-col :span="1.5">
           <el-button type="info" plain icon="Upload" @click="handleImport" v-hasPermi="['price:product:import']">导入 Excel</el-button>
@@ -48,8 +48,8 @@
 
       <template #col-action="{ row }">
         <el-button link type="primary" icon="View" @click="openCountries(row)" v-hasPermi="['price:product:query']">产品明细</el-button>
-        <el-button link type="primary" icon="Edit" @click="handleUpdate(row)" v-hasPermi="['price:product:edit']">编辑</el-button>
-        <el-button link type="primary" icon="Delete" @click="handleDelete(row.productId)" v-hasPermi="['price:product:remove']">删除</el-button>
+        <el-button :disabled="isProductActive(row)" :title="isProductActive(row) ? '生效中不可编辑' : ''" link type="primary" icon="Edit" @click="handleUpdate(row)" v-hasPermi="['price:product:edit']">编辑</el-button>
+        <el-button :disabled="isProductActive(row)" :title="isProductActive(row) ? '生效中不可删除' : ''" link type="primary" icon="Delete" @click="handleDelete(row.productId)" v-hasPermi="['price:product:remove']">删除</el-button>
       </template>
     </basic-table>
 
@@ -123,7 +123,8 @@
     </el-dialog>
 
     <el-drawer v-model="countryOpen" size="920px" :title="countryTitle" append-to-body>
-      <el-table v-loading="countryLoading" :data="countryList" border empty-text="暂无国家明细">
+      <el-input v-model="countryKeyword" placeholder="搜索国家（中文名 / ISO2）" clearable class="mb8" style="width: 260px" />
+      <el-table v-loading="countryLoading" :data="filteredCountryList" border :span-method="countrySpanMethod" max-height="calc(100vh - 120px)" empty-text="暂无国家明细">
         <el-table-column label="国家" prop="countryName" width="90" show-overflow-tooltip />
         <el-table-column label="ISO2" prop="countryCode" width="60" align="center" />
         <el-table-column label="重量段(KG)" width="120" align="center">
@@ -173,6 +174,15 @@ const countryOpen = ref(false)
 const countryTitle = ref('')
 const countryLoading = ref(false)
 const countryList = ref([])
+const countryKeyword = ref('')
+const filteredCountryList = computed(() => {
+  const kw = countryKeyword.value.trim().toLowerCase()
+  if (!kw) return countryList.value
+  return countryList.value.filter(r =>
+    String(r.countryName || '').toLowerCase().includes(kw) ||
+    String(r.countryCode || '').toLowerCase().includes(kw)
+  )
+})
 
 const columns = [
   { prop: 'productCode', label: '产品代码', minWidth: 110 },
@@ -225,6 +235,15 @@ function queryList(params) {
   return listProduct(params)
 }
 
+// 判断产品是否"生效中"：status='0'（未停用）且 effectiveDate <= 今天
+function isProductActive(row) {
+  if (!row) return false
+  if (row.status !== '0') return false
+  if (!row.effectiveDate) return false
+  const today = new Date().toISOString().slice(0, 10)
+  return String(row.effectiveDate).slice(0, 10) <= today
+}
+
 function reset() {
   form.value = {
     productId: undefined,
@@ -249,6 +268,10 @@ function handleAdd() {
 }
 
 function handleUpdate(row) {
+  if (isProductActive(row)) {
+    proxy.$modal.msgError('生效中的产品不可编辑')
+    return
+  }
   reset()
   getProduct(row.productId).then(res => {
     form.value = res.data
@@ -288,12 +311,31 @@ function openCountries(row) {
   countryOpen.value = true
   countryLoading.value = true
   countryList.value = []
+  countryKeyword.value = ''
   listProductCountries(row.productCode).then(res => {
-    countryList.value = res.data || []
+    // 按 ISO2 排序，保证相同国家相邻，便于合并单元格
+    const list = (res.data || []).slice().sort((a, b) => {
+      return String(a.countryCode || '').localeCompare(String(b.countryCode || ''))
+    })
+    countryList.value = list
   }).finally(() => {
     countryLoading.value = false
   })
 }
+
+// 弹窗表格合并：相同 countryCode 的连续行合并「国家」「ISO2」列
+function countrySpanMethod({ column, rowIndex }) {
+  if (column.property !== 'countryName' && column.property !== 'countryCode') return
+  const list = filteredCountryList.value
+  if (!list.length) return
+  const cur = list[rowIndex]?.countryCode
+  if (rowIndex > 0 && list[rowIndex - 1]?.countryCode === cur) {
+    return { rowspan: 0, colspan: 0 }
+  }
+  let count = 1
+  while (rowIndex + count < list.length && list[rowIndex + count]?.countryCode === cur) count++
+  return { rowspan: count, colspan: 1 }
+}
 </script>
 
 <style scoped>