feat(字典组件): 添加DictSelect组件并替换多处muti-select

添加DictSelect组件作为全局组件，并在多个报表模板中替换原有的muti-select组件
优化字典项筛选逻辑，调整样式和提示文本

klp-ui/src/components/DictSelect/index.vue

@@ -20,7 +20,7 @@
     <div 
       v-if="editable" 
       @click="openDictDialog"
-      style="cursor: pointer; height: 24px; width: 24px; margin-top: 4px; display: flex; align-items: center; justify-content: center; border: 1px solid #828991; margin-left: 8px; border-radius: 2px;"
+      style="cursor: pointer; min-height: 24px; min-width: 24px; margin-top: 4px; display: flex; align-items: center; justify-content: center; border: 1px solid #828991; margin-left: 8px; border-radius: 2px;"
     >
       <i class="el-icon-setting"></i>
     </div>
@@ -28,7 +28,7 @@
     <div 
       v-if="refresh" 
       @click="handleRefresh"
-      style="cursor: pointer; height: 24px; width: 24px; margin-top: 4px; display: flex; align-items: center; justify-content: center; border: 1px solid #828991; margin-left: 8px; border-radius: 2px;"
+      style="cursor: pointer; min-height: 24px; min-width: 24px; margin-top: 4px; display: flex; align-items: center; justify-content: center; border: 1px solid #828991; margin-left: 8px; border-radius: 2px;"
     >
       <i class="el-icon-refresh"></i>
     </div>
@@ -52,7 +52,7 @@
         <el-row :gutter="15">
           <el-col :span="kisv ? 24 : 12">
             <el-form-item label="值/标签" prop="dictValue" v-if="kisv">
-              <el-input v-model="form.dictValue" placeholder="请输入字典值(标签自动同步)" />
+              <el-input v-model="form.dictValue" placeholder="请输入字典值，在此处输入用于新增字典项" />
             </el-form-item>
             <el-form-item label="字典标签" prop="dictLabel" v-else>
               <el-input v-model="form.dictLabel" placeholder="请输入字典标签" />

klp-ui/src/main.js

@@ -47,6 +47,7 @@ import DictData from '@/components/DictData'
 import KLPTable from '@/components/KLPUI/KLPTable/index.vue'
 import MemoInput from '@/components/MemoInput/index.vue'
 import CurrentCoilNo from '@/components/KLPService/Renderer/CurrentCoilNo.vue'
+import DictSelect from '@/components/DictSelect'
 
 // 初始化所有列
 import { initAllColumns } from '@/views/wms/report/js/column.js'
@@ -76,6 +77,7 @@ Vue.component('ImageUpload', ImageUpload)
 Vue.component('ImagePreview', ImagePreview)
 Vue.component('KLPTable', KLPTable)
 Vue.component('MemoInput', MemoInput)
+Vue.component('DictSelect', DictSelect)
 
 Vue.component('CurrentCoilNo', CurrentCoilNo)
 

klp-ui/src/views/wms/report/js/calc.js

@@ -153,12 +153,15 @@ const calcTeamSummary = (list) => {
 }
 
 const calcMSummary = (list, lossList) => {
-  // 统计，需要二外处理M卷，也就是钢卷的currentCoilNo中带有M的钢卷，在统计产出钢卷的数量和重量时需要忽略并记录，并且在统计消耗钢卷的总重量时也需要移除
+  // 统计，需要二外处理M卷，也就是钢卷的currentCoilNo中带有M, 且M不在前五位的钢卷，在统计产出钢卷的数量和重量时需要忽略并记录，并且在统计消耗钢卷的总重量时也需要移除
+  function isMcoil(coil) {
+    return coil.currentCoilNo && coil.currentCoilNo.includes('M') && coil.currentCoilNo.indexOf('M') > 4
+  }
 
   // 筛选出 M 卷
-  const mCoils = list.filter(item => item.currentCoilNo && item.currentCoilNo.includes('M'))
+  const mCoils = list.filter(item => isMcoil(item))
   // 非 M 卷
-  const nonMCoils = list.filter(item => !item.currentCoilNo || !item.currentCoilNo.includes('M'))
+  const nonMCoils = list.filter(item => !item.currentCoilNo || !isMcoil(item))
 
   // 非 M 卷作为产出统计
   const outCount = nonMCoils.length

klp-ui/src/views/wms/report/template/comprehensive.vue

@@ -32,12 +32,11 @@
             placeholder="请选择规格" clearable @keyup.enter.native="handleQuery" />
         </el-form-item>
         <el-form-item label="材质" prop="itemMaterial">
-          <muti-select style="width: 200px;" v-model="queryParams.itemMaterial" :options="dict.type.coil_material"
+          <dict-select style="width: 200px;" v-model="queryParams.itemMaterial" dictType="coil_material"
-            placeholder="请选择材质" clearable @keyup.enter.native="handleQuery" />
+            placeholder="请选择材质" clearable multiple />
         </el-form-item>
         <el-form-item label="厂家" prop="itemManufacturer">
-          <muti-select style="width: 200px;" v-model="queryParams.itemManufacturer"
+          <dict-select style="width: 200px;" v-model="queryParams.itemManufacturer" dictType="coil_manufacturer" placeholder="请选择厂家" clearable multiple />
-            :options="dict.type.coil_manufacturer" placeholder="请选择厂家" clearable @keyup.enter.native="handleQuery" />
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="handleQuery">查询</el-button>

klp-ui/src/views/wms/report/template/day.vue

@@ -28,12 +28,12 @@
             placeholder="请选择规格" clearable @keyup.enter.native="handleQuery" />
         </el-form-item>
         <el-form-item label="材质" prop="itemMaterial">
-          <muti-select style="width: 200px;" v-model="queryParams.itemMaterial" :options="dict.type.coil_material"
+          <dict-select style="width: 200px;" v-model="queryParams.itemMaterial" dict-type="coil_material"
-            placeholder="请选择材质" clearable @keyup.enter.native="handleQuery" />
+            placeholder="请选择材质" clearable  multiple />
         </el-form-item>
         <el-form-item label="厂家" prop="itemManufacturer">
-          <muti-select style="width: 200px;" v-model="queryParams.itemManufacturer"
+          <dict-select style="width: 200px;" v-model="queryParams.itemManufacturer" dict-type="coil_manufacturer" 
-            :options="dict.type.coil_manufacturer" placeholder="请选择厂家" clearable @keyup.enter.native="handleQuery" />
+            placeholder="请选择厂家" clearable multiple />
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="handleQuery">查询</el-button> <!-- 统一改为handleQuery -->
@@ -158,7 +158,7 @@ export default {
       default: () => []
     }
   },
-  dicts: ['product_coil_status', 'coil_material', 'coil_itemname', 'coil_manufacturer'],
+  dicts: ['product_coil_status', 'coil_itemname'],
   data() {
     // 工具函数：个位数补零
     const addZero = (num) => num.toString().padStart(2, '0')

klp-ui/src/views/wms/report/template/loss.vue

@@ -31,12 +31,12 @@
             placeholder="请选择规格" clearable @keyup.enter.native="handleQuery" />
         </el-form-item>
         <el-form-item label="材质" prop="endTime">
-          <muti-select style="width: 200px;" v-model="queryParams.itemMaterial" :options="dict.type.coil_material"
+          <dict-select style="width: 200px;" v-model="queryParams.itemMaterial" dict-type="coil_material"
-            placeholder="请选择材质" clearable @keyup.enter.native="handleQuery" />
+            placeholder="请选择材质" clearable @keyup.enter.native="handleQuery" multiple />
         </el-form-item>
         <el-form-item label="厂家" prop="endTime">
-          <muti-select style="width: 200px;" v-model="queryParams.itemManufacturer"
+          <dict-select style="width: 200px;" v-model="queryParams.itemManufacturer" dict-type="coil_manufacturer" 
-            :options="dict.type.coil_manufacturer" placeholder="请选择厂家" clearable @keyup.enter.native="handleQuery" />
+          placeholder="请选择厂家" clearable @keyup.enter.native="handleQuery" multiple />
         </el-form-item>
         <el-form-item prop="endTime">
           <el-button type="primary" @click="getList">查询</el-button>

klp-ui/src/views/wms/report/template/merge.vue

@@ -27,12 +27,12 @@
             placeholder="请选择规格" clearable @keyup.enter.native="handleQuery" />
         </el-form-item>
         <el-form-item label="材质" prop="itemMaterial">
-          <muti-select style="width: 200px;" v-model="queryParams.itemMaterial" :options="dict.type.coil_material"
+          <dict-select style="width: 200px;" v-model="queryParams.itemMaterial" dict-type="coil_material"
-            placeholder="请选择材质" clearable @keyup.enter.native="handleQuery" />
+            placeholder="请选择材质" clearable @keyup.enter.native="handleQuery" multiple />
         </el-form-item>
         <el-form-item label="厂家" prop="itemManufacturer">
-          <muti-select style="width: 200px;" v-model="queryParams.itemManufacturer"
+          <dict-select style="width: 200px;" v-model="queryParams.itemManufacturer" dict-type="coil_manufacturer" 
-            :options="dict.type.coil_manufacturer" placeholder="请选择厂家" clearable @keyup.enter.native="handleQuery" />
+            placeholder="请选择厂家" clearable @keyup.enter.native="handleQuery" multiple />
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="getList">查询</el-button>

klp-ui/src/views/wms/report/template/month.vue

@@ -28,12 +28,12 @@
             placeholder="请选择规格" clearable @keyup.enter.native="handleQuery" />
         </el-form-item>
         <el-form-item label="材质" prop="itemMaterial">
-          <muti-select style="width: 200px;" v-model="queryParams.itemMaterial" :options="dict.type.coil_material"
+          <dict-select style="width: 200px;" v-model="queryParams.itemMaterial" dict-type="coil_material"
-            placeholder="请选择材质" clearable @keyup.enter.native="handleQuery" />
+            placeholder="请选择材质" clearable @keyup.enter.native="handleQuery" multiple />
         </el-form-item>
         <el-form-item label="厂家" prop="itemManufacturer">
-          <muti-select style="width: 200px;" v-model="queryParams.itemManufacturer"
+          <dict-select style="width: 200px;" v-model="queryParams.itemManufacturer" dict-type="coil_manufacturer" 
-            :options="dict.type.coil_manufacturer" placeholder="请选择厂家" clearable @keyup.enter.native="handleQuery" />
+            placeholder="请选择厂家" clearable @keyup.enter.native="handleQuery" multiple />
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="handleQuery">查询</el-button>

klp-ui/src/views/wms/report/template/out.vue

@@ -32,12 +32,12 @@
             placeholder="请选择规格" clearable @keyup.enter.native="handleQuery" />
         </el-form-item>
         <el-form-item label="材质" prop="endTime">
-          <muti-select style="width: 200px;" v-model="queryParams.itemMaterial" :options="dict.type.coil_material"
+          <dict-select style="width: 200px;" v-model="queryParams.itemMaterial" dict-type="coil_material"
-            placeholder="请选择材质" clearable @keyup.enter.native="handleQuery" />
+            placeholder="请选择材质" clearable @keyup.enter.native="handleQuery" multiple />
         </el-form-item>
         <el-form-item label="厂家" prop="endTime">
-          <muti-select style="width: 200px;" v-model="queryParams.itemManufacturer"
+          <dict-select style="width: 200px;" v-model="queryParams.itemManufacturer" dict-type="coil_manufacturer" 
-            :options="dict.type.coil_manufacturer" placeholder="请选择厂家" clearable @keyup.enter.native="handleQuery" />
+            placeholder="请选择厂家" clearable @keyup.enter.native="handleQuery" multiple />
         </el-form-item>
         <el-form-item prop="endTime">
           <el-button type="primary" @click="handleQuery">查询</el-button>

klp-ui/src/views/wms/report/template/team.vue

@@ -38,12 +38,12 @@
             placeholder="请选择规格" clearable @keyup.enter.native="handleQuery" />
         </el-form-item>
         <el-form-item label="材质">
-          <muti-select style="width: 200px;" v-model="queryParams.itemMaterial" :options="dict.type.coil_material"
+          <dict-select style="width: 200px;" v-model="queryParams.itemMaterial" dict-type="coil_material"
-            placeholder="请选择材质" clearable @keyup.enter.native="handleQuery" />
+            placeholder="请选择材质" clearable @keyup.enter.native="handleQuery" multiple />
         </el-form-item>
         <el-form-item label="厂家">
-          <muti-select style="width: 200px;" v-model="queryParams.itemManufacturer"
+          <dict-select style="width: 200px;" v-model="queryParams.itemManufacturer" dict-type="coil_manufacturer" 
-            :options="dict.type.coil_manufacturer" placeholder="请选择厂家" clearable @keyup.enter.native="handleQuery" />
+            placeholder="请选择厂家" clearable @keyup.enter.native="handleQuery" multiple />
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="handleQuery">查询</el-button>

klp-ui/src/views/wms/report/template/year.vue

@@ -28,12 +28,12 @@
             placeholder="请选择规格" clearable @keyup.enter.native="handleQuery" />
         </el-form-item>
         <el-form-item label="材质" prop="itemMaterial">
-          <muti-select style="width: 200px;" v-model="queryParams.itemMaterial" :options="dict.type.coil_material"
+          <dict-select style="width: 200px;" v-model="queryParams.itemMaterial" dict-type="coil_material"
-            placeholder="请选择材质" clearable @keyup.enter.native="handleQuery" />
+            placeholder="请选择材质" clearable @keyup.enter.native="handleQuery" multiple />
         </el-form-item>
         <el-form-item label="厂家" prop="itemManufacturer">
-          <muti-select style="width: 200px;" v-model="queryParams.itemManufacturer"
+          <dict-select style="width: 200px;" v-model="queryParams.itemManufacturer" dict-type="coil_manufacturer" 
-            :options="dict.type.coil_manufacturer" placeholder="请选择厂家" clearable @keyup.enter.native="handleQuery" />
+            placeholder="请选择厂家" clearable @keyup.enter.native="handleQuery" multiple />
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="handleQuery">查询</el-button>