From cc4fd73ca6d3a161cece623b4a08790113d85b71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= Date: Mon, 2 Mar 2026 13:45:40 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(wms):=20=E5=B0=86=E5=88=86=E6=9D=A1?= =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E7=9A=84actionType=E4=BB=8E200=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=BA120?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修改多个报表视图中的actionType值以匹配正确的分条工序编码 --- klp-ui/src/views/wms/report/zha/day.vue | 2 +- klp-ui/src/views/wms/report/zha/month.vue | 2 +- klp-ui/src/views/wms/report/zha/team.vue | 2 +- klp-ui/src/views/wms/report/zha/year.vue | 2 +- klp-ui/src/views/wms/report/zha_.vue | 2 +- klp-ui/src/views/wms/report/zinc/day.vue | 2 +- klp-ui/src/views/wms/report/zinc/month.vue | 2 +- klp-ui/src/views/wms/report/zinc/team.vue | 2 +- klp-ui/src/views/wms/report/zinc/year.vue | 2 +- klp-ui/src/views/wms/report/zinc_.vue | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/klp-ui/src/views/wms/report/zha/day.vue b/klp-ui/src/views/wms/report/zha/day.vue index 946a298a..244e220b 100644 --- a/klp-ui/src/views/wms/report/zha/day.vue +++ b/klp-ui/src/views/wms/report/zha/day.vue @@ -326,7 +326,7 @@ export default { // actionStatus: 2, warehouseId: this.queryParams.planId, // actionType: 401, - actionType: 200, // 分条工序 + actionType: 120, // 分条工序 pageSize: 999, pageNum: 1, startTime: this.queryParams.byCreateTimeStart, diff --git a/klp-ui/src/views/wms/report/zha/month.vue b/klp-ui/src/views/wms/report/zha/month.vue index 8955a84a..2da51625 100644 --- a/klp-ui/src/views/wms/report/zha/month.vue +++ b/klp-ui/src/views/wms/report/zha/month.vue @@ -347,7 +347,7 @@ export default { // actionStatus: 2, warehouseId: this.queryParams.planId, // actionType: 401, - actionType: 200, // 分条工序 + actionType: 120, // 分条工序 pageSize: 999, pageNum: 1, startTime: this.queryParams.byCreateTimeStart, diff --git a/klp-ui/src/views/wms/report/zha/team.vue b/klp-ui/src/views/wms/report/zha/team.vue index bbc28ab6..fbb66efc 100644 --- a/klp-ui/src/views/wms/report/zha/team.vue +++ b/klp-ui/src/views/wms/report/zha/team.vue @@ -402,7 +402,7 @@ export default { // actionStatus: 2, warehouseId: this.queryParams.planId, // actionType: 401, - actionType: 200, // 分条工序 + actionType: 120, // 分条工序 pageSize: 999, pageNum: 1, startTime: this.queryParams.byCreateTimeStart, diff --git a/klp-ui/src/views/wms/report/zha/year.vue b/klp-ui/src/views/wms/report/zha/year.vue index f0fc65b9..b44cef72 100644 --- a/klp-ui/src/views/wms/report/zha/year.vue +++ b/klp-ui/src/views/wms/report/zha/year.vue @@ -331,7 +331,7 @@ export default { // actionStatus: 2, warehouseId: this.queryParams.planId, // actionType: 401, - actionType: 200, // 分条工序 + actionType: 120, // 分条工序 pageSize: 999, pageNum: 1, startTime: this.queryParams.byCreateTimeStart, diff --git a/klp-ui/src/views/wms/report/zha_.vue b/klp-ui/src/views/wms/report/zha_.vue index ae4c6713..da093a03 100644 --- a/klp-ui/src/views/wms/report/zha_.vue +++ b/klp-ui/src/views/wms/report/zha_.vue @@ -195,7 +195,7 @@ export default { // actionStatus: 2, warehouseId: this.queryParams.planId, // actionType: 401, - actionType: 200, // 分条工序 + actionType: 120, // 分条工序 pageSize: 999, pageNum: 1, startTime: this.queryParams.byCreateTimeStart, diff --git a/klp-ui/src/views/wms/report/zinc/day.vue b/klp-ui/src/views/wms/report/zinc/day.vue index 28643833..2b9321cd 100644 --- a/klp-ui/src/views/wms/report/zinc/day.vue +++ b/klp-ui/src/views/wms/report/zinc/day.vue @@ -312,7 +312,7 @@ export default { // actionStatus: 2, warehouseId: this.queryParams.planId, // actionType: 401, - actionType: 200, // 分条工序 + actionType: 120, // 分条工序 pageSize: 999, pageNum: 1, startTime: this.queryParams.byCreateTimeStart, diff --git a/klp-ui/src/views/wms/report/zinc/month.vue b/klp-ui/src/views/wms/report/zinc/month.vue index cf4be4ad..5202efeb 100644 --- a/klp-ui/src/views/wms/report/zinc/month.vue +++ b/klp-ui/src/views/wms/report/zinc/month.vue @@ -333,7 +333,7 @@ export default { // actionStatus: 2, warehouseId: this.queryParams.planId, // actionType: 401, - actionType: 200, // 分条工序 + actionType: 120, // 分条工序 pageSize: 999, pageNum: 1, startTime: this.queryParams.byCreateTimeStart, diff --git a/klp-ui/src/views/wms/report/zinc/team.vue b/klp-ui/src/views/wms/report/zinc/team.vue index d4877d4d..61dcde8c 100644 --- a/klp-ui/src/views/wms/report/zinc/team.vue +++ b/klp-ui/src/views/wms/report/zinc/team.vue @@ -389,7 +389,7 @@ export default { // actionStatus: 2, warehouseId: this.queryParams.planId, // actionType: 401, - actionType: 200, // 分条工序 + actionType: 120, // 分条工序 pageSize: 999, pageNum: 1, startTime: this.queryParams.byCreateTimeStart, diff --git a/klp-ui/src/views/wms/report/zinc/year.vue b/klp-ui/src/views/wms/report/zinc/year.vue index f3469767..7f4ba98c 100644 --- a/klp-ui/src/views/wms/report/zinc/year.vue +++ b/klp-ui/src/views/wms/report/zinc/year.vue @@ -315,7 +315,7 @@ export default { // actionStatus: 2, warehouseId: this.queryParams.planId, // actionType: 401, - actionType: 200, // 分条工序 + actionType: 120, // 分条工序 pageSize: 999, pageNum: 1, startTime: this.queryParams.byCreateTimeStart, diff --git a/klp-ui/src/views/wms/report/zinc_.vue b/klp-ui/src/views/wms/report/zinc_.vue index 39b80183..951d82ac 100644 --- a/klp-ui/src/views/wms/report/zinc_.vue +++ b/klp-ui/src/views/wms/report/zinc_.vue @@ -195,7 +195,7 @@ export default { // actionStatus: 2, warehouseId: this.queryParams.planId, // actionType: 401, - actionType: 200, // 分条工序 + actionType: 120, // 分条工序 pageSize: 999, pageNum: 1, startTime: this.queryParams.byCreateTimeStart, From 8d94cf7555d125460cb2c8fa7e9adb31b7959f65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= Date: Mon, 2 Mar 2026 14:11:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(meal):=20=E4=BF=AE=E5=A4=8D=E5=A0=82?= =?UTF-8?q?=E9=A3=9F=E5=92=8C=E6=89=93=E5=8C=85=E6=88=90=E5=91=98=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E5=99=A8=E4=BA=92=E6=96=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 添加禁用已选成员的逻辑，防止同一成员被同时选为堂食和打包 --- klp-ui/src/components/DictSelect/index.vue | 23 +++++++++++++++++++--- klp-ui/src/views/wms/hrm/records/meal.vue | 4 ++-- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/klp-ui/src/components/DictSelect/index.vue b/klp-ui/src/components/DictSelect/index.vue index eae364f4..cb48fef6 100644 --- a/klp-ui/src/components/DictSelect/index.vue +++ b/klp-ui/src/components/DictSelect/index.vue @@ -8,10 +8,11 @@ style="width: 200px;" :multiple="multiple" collapse-tags> @@ -152,11 +153,12 @@ export default { props: { dictType: { type: String, default: '' }, editable: { type: Boolean, default: true }, - kisv: { type: Boolean, default: false }, + kisv: { type: Boolean, default: true }, value: { type: String, default: '' }, placeholder: { type: String, default: '请选择' }, refresh: { type: Boolean, default: true }, multiple: { type: Boolean, default: false }, + disables: { type: String, default: '' }, }, data() { return { @@ -199,7 +201,15 @@ export default { this.$emit('change', val) } } - } + }, + disabledOptions() { + return this.dictOptions.map(item => { + return { + ...item, + disabled: this.disabledFormat(item.dictValue) + } + }) + }, }, watch: { dictType: { @@ -235,6 +245,13 @@ export default { this.dictId = res.rows[0].dictId return this.dictId }, + disabledFormat(item) { + if (this.disables) { + const list = this.disables.split(',') + return list.includes(item) + } + return false + }, // 新增：刷新字典数据 async handleRefresh() { this.loading = true diff --git a/klp-ui/src/views/wms/hrm/records/meal.vue b/klp-ui/src/views/wms/hrm/records/meal.vue index 22a91760..06d297aa 100644 --- a/klp-ui/src/views/wms/hrm/records/meal.vue +++ b/klp-ui/src/views/wms/hrm/records/meal.vue @@ -163,11 +163,11 @@ - +
（{{ form.dineInPeople || 0 }}人）
 - +
（{{ form.takeoutPeople || 0 }}人）