From d31bd14692ffd64647b99c6f6171feb265545644 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= Date: Thu, 2 Apr 2026 09:10:58 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E5=AD=97=E5=85=B8=E7=BB=84=E4=BB=B6):=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0DictSelect=E7=BB=84=E4=BB=B6=E5=B9=B6?= =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E5=A4=9A=E5=A4=84muti-select?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 添加DictSelect组件作为全局组件，并在多个报表模板中替换原有的muti-select组件 优化字典项筛选逻辑，调整样式和提示文本 --- klp-ui/src/components/DictSelect/index.vue | 6 +++--- klp-ui/src/main.js | 2 ++ klp-ui/src/views/wms/report/js/calc.js | 9 ++++++--- klp-ui/src/views/wms/report/template/comprehensive.vue | 7 +++---- klp-ui/src/views/wms/report/template/day.vue | 10 +++++----- klp-ui/src/views/wms/report/template/loss.vue | 8 ++++---- klp-ui/src/views/wms/report/template/merge.vue | 8 ++++---- klp-ui/src/views/wms/report/template/month.vue | 8 ++++---- klp-ui/src/views/wms/report/template/out.vue | 8 ++++---- klp-ui/src/views/wms/report/template/team.vue | 8 ++++---- klp-ui/src/views/wms/report/template/year.vue | 8 ++++---- 11 files changed, 43 insertions(+), 39 deletions(-) diff --git a/klp-ui/src/components/DictSelect/index.vue b/klp-ui/src/components/DictSelect/index.vue index cb48fef6..63e2b1c4 100644 --- a/klp-ui/src/components/DictSelect/index.vue +++ b/klp-ui/src/components/DictSelect/index.vue @@ -20,7 +20,7 @@
@@ -28,7 +28,7 @@
@@ -52,7 +52,7 @@ - + diff --git a/klp-ui/src/main.js b/klp-ui/src/main.js index c767d1d2..645b632c 100644 --- a/klp-ui/src/main.js +++ b/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) diff --git a/klp-ui/src/views/wms/report/js/calc.js b/klp-ui/src/views/wms/report/js/calc.js index 4152a0bc..44805707 100644 --- a/klp-ui/src/views/wms/report/js/calc.js +++ b/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 diff --git a/klp-ui/src/views/wms/report/template/comprehensive.vue b/klp-ui/src/views/wms/report/template/comprehensive.vue index 5ee2bdc1..aff93573 100644 --- a/klp-ui/src/views/wms/report/template/comprehensive.vue +++ b/klp-ui/src/views/wms/report/template/comprehensive.vue @@ -32,12 +32,11 @@ placeholder="请选择规格" clearable @keyup.enter.native="handleQuery" /> - + - + 查询 diff --git a/klp-ui/src/views/wms/report/template/day.vue b/klp-ui/src/views/wms/report/template/day.vue index 7ebb70b5..ee653e39 100644 --- a/klp-ui/src/views/wms/report/template/day.vue +++ b/klp-ui/src/views/wms/report/template/day.vue @@ -28,12 +28,12 @@ placeholder="请选择规格" clearable @keyup.enter.native="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') diff --git a/klp-ui/src/views/wms/report/template/loss.vue b/klp-ui/src/views/wms/report/template/loss.vue index b688a635..d0237e21 100644 --- a/klp-ui/src/views/wms/report/template/loss.vue +++ b/klp-ui/src/views/wms/report/template/loss.vue @@ -31,12 +31,12 @@ placeholder="请选择规格" clearable @keyup.enter.native="handleQuery" /> - + - + 查询 diff --git a/klp-ui/src/views/wms/report/template/merge.vue b/klp-ui/src/views/wms/report/template/merge.vue index 45e14e6f..8c3aabe5 100644 --- a/klp-ui/src/views/wms/report/template/merge.vue +++ b/klp-ui/src/views/wms/report/template/merge.vue @@ -27,12 +27,12 @@ placeholder="请选择规格" clearable @keyup.enter.native="handleQuery" /> - + - + 查询 diff --git a/klp-ui/src/views/wms/report/template/month.vue b/klp-ui/src/views/wms/report/template/month.vue index 2e058452..0b2f513e 100644 --- a/klp-ui/src/views/wms/report/template/month.vue +++ b/klp-ui/src/views/wms/report/template/month.vue @@ -28,12 +28,12 @@ placeholder="请选择规格" clearable @keyup.enter.native="handleQuery" /> - + - + 查询 diff --git a/klp-ui/src/views/wms/report/template/out.vue b/klp-ui/src/views/wms/report/template/out.vue index abc8b795..4e890df7 100644 --- a/klp-ui/src/views/wms/report/template/out.vue +++ b/klp-ui/src/views/wms/report/template/out.vue @@ -32,12 +32,12 @@ placeholder="请选择规格" clearable @keyup.enter.native="handleQuery" /> - + - + 查询 diff --git a/klp-ui/src/views/wms/report/template/team.vue b/klp-ui/src/views/wms/report/template/team.vue index d9d2bf4d..87808ea3 100644 --- a/klp-ui/src/views/wms/report/template/team.vue +++ b/klp-ui/src/views/wms/report/template/team.vue @@ -38,12 +38,12 @@ placeholder="请选择规格" clearable @keyup.enter.native="handleQuery" /> - + - + 查询 diff --git a/klp-ui/src/views/wms/report/template/year.vue b/klp-ui/src/views/wms/report/template/year.vue index adfacf88..a7f0189e 100644 --- a/klp-ui/src/views/wms/report/template/year.vue +++ b/klp-ui/src/views/wms/report/template/year.vue @@ -28,12 +28,12 @@ placeholder="请选择规格" clearable @keyup.enter.native="handleQuery" /> - + - + 查询