修改产品功能

bms-front/src/views/price/basic/product/components/ProductCountryDrawer.vue

@@ -95,7 +95,6 @@ import { formatWeightLabel } from '@/views/price/set/utils/priceSet'
 const { proxy } = getCurrentInstance()
 
 const columns = [
-  { prop: 'versionNo', label: '版本', width: 70, align: 'center', formatter: (row) => row.versionNo || '-' },
   { prop: 'countryName', label: '国家', width: 120, showOverflowTooltip: true },
   // { prop: 'countryCode', label: 'ISO2', width: 60, align: 'center' },
   { prop: 'zoneName', label: '分区名称', width: 140, showOverflowTooltip: true, formatter: (row) => row.zoneName || '-' },

bms-front/src/views/price/basic/product/components/ProductExpiredDrawer.vue

@@ -0,0 +1,137 @@
+<template>
+  <el-drawer v-model="visible" size="960px" :title="title" append-to-body>
+    <el-form :inline="true" @submit.prevent>
+      <el-form-item label="产品代码">
+        <el-input
+          v-model="queryParams.productCode"
+          placeholder="产品代码"
+          clearable
+          style="width: 160px"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="产品名称">
+        <el-input
+          v-model="queryParams.productName"
+          placeholder="产品名称"
+          clearable
+          style="width: 160px"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="失效时间段">
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          value-format="YYYY-MM-DD"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          style="width: 260px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-table v-loading="loading" :data="list" border max-height="calc(100vh - 260px)" empty-text="暂无失效产品">
+      <el-table-column label="产品代码" prop="productCode" min-width="110" show-overflow-tooltip />
+      <el-table-column label="产品名称" prop="productName" min-width="140" show-overflow-tooltip />
+      <el-table-column label="时效等级" prop="serviceLevel" width="90" align="center" />
+      <el-table-column label="走货属性" prop="cargoAttr" min-width="110" show-overflow-tooltip />
+      <el-table-column label="目的区域" prop="destRegion" width="90" align="center" />
+      <el-table-column label="生效日期" prop="effectiveDate" width="120" align="center" />
+      <el-table-column label="失效日期" prop="expireDate" width="120" align="center" />
+      <el-table-column label="国家数" prop="countryCount" width="80" align="center" />
+      <el-table-column label="附加费数" prop="surchargeCount" width="90" align="center" />
+      <el-table-column label="状态" width="90" align="center">
+        <template #default="{ row }">
+          <dict-tag :options="bms_product_effect_status" :value="row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column label="更新内容" prop="updateNote" min-width="140" show-overflow-tooltip />
+      <el-table-column label="操作" width="100" align="center" fixed="right">
+        <template #default="{ row }">
+          <el-button
+            link
+            type="primary"
+            title="产品明细"
+            icon="View"
+            @click="emit('view-country', row)"
+            v-hasPermi="['price:product:query']"
+          ></el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
+      @pagination="loadList"
+    />
+  </el-drawer>
+</template>
+
+<script setup>
+import { listProduct } from '@/api/price/product'
+
+const emit = defineEmits(['view-country'])
+const { proxy } = getCurrentInstance()
+const { bms_product_effect_status } = useDict('bms_product_effect_status')
+
+const title = '失效价格'
+const visible = ref(false)
+const loading = ref(false)
+const list = ref([])
+const total = ref(0)
+const dateRange = ref([])
+const queryParams = ref({
+  pageNum: 1,
+  pageSize: 10,
+  productCode: undefined,
+  productName: undefined,
+  statusGroup: 'expired'
+})
+
+function open() {
+  visible.value = true
+  resetQuery()
+}
+
+function loadList() {
+  loading.value = true
+  const p = { ...queryParams.value }
+  if (dateRange.value && dateRange.value.length === 2) {
+    proxy.addDateRange(p, dateRange.value)
+  }
+  listProduct(p).then(res => {
+    list.value = res.rows || []
+    total.value = res.total || 0
+  }).finally(() => {
+    loading.value = false
+  })
+}
+
+function handleQuery() {
+  queryParams.value.pageNum = 1
+  loadList()
+}
+
+function resetQuery() {
+  dateRange.value = []
+  queryParams.value = {
+    pageNum: 1,
+    pageSize: 10,
+    productCode: undefined,
+    productName: undefined,
+    statusGroup: 'expired'
+  }
+  loadList()
+}
+
+defineExpose({ open })
+</script>

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

@@ -10,6 +10,7 @@
 
     <basic-table
       ref="tableRef"
+      :extra-params="extraParams"
       :columns="columns"
       :search-columns="searchColumns"
       :query="queryList"
@@ -32,6 +33,9 @@
             </template>
           </el-dropdown>
         </el-col>
+        <el-col :span="1.5">
+          <el-button plain icon="Clock" @click="expiredRef.open()" v-hasPermi="['price:product:list']">失效价格</el-button>
+        </el-col>
       </template>
 
       <template #col-cargoAttr="{ row }">
@@ -52,6 +56,7 @@
     <product-form-dialog ref="formRef" @success="() => tableRef.refresh()" />
     <product-country-drawer ref="countryRef" />
     <product-surcharge-drawer ref="surchargeRef" @success="() => tableRef.refresh()" />
+    <product-expired-drawer ref="expiredRef" @view-country="(row) => countryRef.open(row)" />
     <excel-import-dialog
       ref="importRef"
       title="产品 Excel 导入"
@@ -99,16 +104,18 @@ import ExcelImportDialog from '@/components/ExcelImportDialog'
 import ProductFormDialog from './components/ProductFormDialog.vue'
 import ProductCountryDrawer from './components/ProductCountryDrawer.vue'
 import ProductSurchargeDrawer from './components/ProductSurchargeDrawer.vue'
+import ProductExpiredDrawer from './components/ProductExpiredDrawer.vue'
 import { listProduct } from '@/api/price/product'
 import { listRegionOptions } from '@/api/data/region'
 
-const { proxy } = getCurrentInstance()
 const { bms_product_effect_status } = useDict('bms_product_effect_status')
 
+const extraParams = { statusGroup: 'active' }
 const tableRef = ref()
 const formRef = ref()
 const countryRef = ref()
 const surchargeRef = ref()
+const expiredRef = ref()
 const importRef = ref()
 const countryImportRef = ref()
 const importCountryCode = ref('')
@@ -144,24 +151,12 @@ const columns = [
 const searchColumns = [
   { prop: 'productCode', label: '产品代码', component: 'input', placeholder: '产品代码' },
   { prop: 'productName', label: '产品名称', component: 'input', placeholder: '产品名称' }
-  // {
-  //   prop: 'taxMode',
-  //   label: '税模式',
-  //   component: 'select',
-  //   dict: 'bms_tax_mode',
-  //   placeholder: '税模式',
-  //   clearable: true
-  // }
 ]
 
 function queryList(params) {
   return listProduct(params)
 }
 
-function isProductActive(row) {
-  return row && String(row.status) === '1'
-}
-
 function handleAdd() {
   formRef.value.open()
 }