From b42abc4d58940bc6e74a867b67e7566835dbebcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= Date: Mon, 12 Jan 2026 10:43:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(ProductSelect):=20=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E7=A9=BA=E5=AD=97=E7=AC=A6=E4=B8=B2ID=E9=81=BF=E5=85=8D?= =?UTF-8?q?=E6=97=A0=E6=95=88=E8=AF=B7=E6=B1=82=20feat(wms):=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E9=92=A2=E5=8D=B7=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=8F=8A=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../KLPService/ProductSelect/index.vue | 2 +- .../KLPService/RawMaterialSelect/index.vue | 3 +- klp-ui/src/views/wms/coil/do/correct.vue | 1124 +++++++++++++++++ 3 files changed, 1127 insertions(+), 2 deletions(-) create mode 100644 klp-ui/src/views/wms/coil/do/correct.vue diff --git a/klp-ui/src/components/KLPService/ProductSelect/index.vue b/klp-ui/src/components/KLPService/ProductSelect/index.vue index 6f396765..d992b769 100644 --- a/klp-ui/src/components/KLPService/ProductSelect/index.vue +++ b/klp-ui/src/components/KLPService/ProductSelect/index.vue @@ -205,7 +205,7 @@ export default { this.recentLoading = true; // 从localstorage中获取缓存的ids const ids = localStorage.getItem('recentlySelectedProductIds') || ''; - const idsArray = ids.split(','); + const idsArray = ids.split(',').filter(id => id); if (idsArray.length === 0) return; const list = await Promise.all(idsArray.map(async id => { const response = await getProduct(id); diff --git a/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue b/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue index 7b317379..6ed02a98 100644 --- a/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue +++ b/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue @@ -215,7 +215,8 @@ export default { this.recentLoading = true; // 从localstorage中获取缓存的ids const ids = localStorage.getItem('recentlySelectedRawMaterialIds') || ''; - const idsArray = ids.split(','); + const idsArray = ids.split(',').filter(id => id); + console.log('idsArray', idsArray, idsArray.length === 0); if (idsArray.length === 0) return; const list = await Promise.all(idsArray.map(async id => { const response = await getRawMaterial(id); diff --git a/klp-ui/src/views/wms/coil/do/correct.vue b/klp-ui/src/views/wms/coil/do/correct.vue new file mode 100644 index 00000000..56428531 --- /dev/null +++ b/klp-ui/src/views/wms/coil/do/correct.vue @@ -0,0 +1,1124 @@ + + + + + \ No newline at end of file From 4d4521f157735d647cbecbce0bbeb2e6199bb409 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= Date: Mon, 12 Jan 2026 11:33:35 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat(wms):=20=E6=B7=BB=E5=8A=A0=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=E6=97=B6=E9=97=B4=E7=BC=96=E8=BE=91=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=B9=B6=E7=A7=BB=E9=99=A4=E5=8F=AA=E8=AF=BB=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在base.vue中添加可编辑的发货时间列,支持特定用户修改 - 移除表单中多个字段的只读限制,允许编辑班组、质量状态等 - 调整查询逻辑,根据材料类型自动设置selectType --- klp-ui/src/layout/components/AppMain.vue | 1 + klp-ui/src/views/wms/coil/panels/base.vue | 37 ++++++++++++++++++----- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/klp-ui/src/layout/components/AppMain.vue b/klp-ui/src/layout/components/AppMain.vue index a25c5625..d487588f 100644 --- a/klp-ui/src/layout/components/AppMain.vue +++ b/klp-ui/src/layout/components/AppMain.vue @@ -17,6 +17,7 @@ export default { components: { iframeToggle }, computed: { cachedViews() { + console.log(this.$store.state.tagsView.cachedViews) return this.$store.state.tagsView.cachedViews }, key() { diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue index 0c89a006..d5de7a05 100644 --- a/klp-ui/src/views/wms/coil/panels/base.vue +++ b/klp-ui/src/views/wms/coil/panels/base.vue @@ -96,7 +96,12 @@ - + + + @@ -173,7 +178,7 @@ clearable /> - + @@ -193,7 +198,7 @@
请先选择材料类型
- + @@ -207,19 +212,19 @@ - + - + - + @@ -503,6 +508,12 @@ export default { } return '物品类型'; }, + canEditExportTime() { + // 徐梦琪和若依管理员 + const canEdit = ['1988841895986642945', 1]; + const currentUserId = this.$store.getters.id; + return canEdit.includes(currentUserId); + }, }, created() { this.getList(); @@ -529,7 +540,7 @@ export default { endTime: this.queryParams.updateTime?.[1], } // 如果没有设置itemType,则设置为raw_material - query.selectType = 'raw_material'; + query.selectType = this.querys.materialType === '成品' ? 'product' : 'raw_material'; listMaterialCoil(query).then(response => { if (this.querys.warehouseId != 111) { // 排除掉111仓库的 @@ -795,6 +806,18 @@ export default { }).catch(() => { }); }, + handleExportTimeChange(row) { + if (row.exportTime) { + row.exportTime = row.exportTime.replace('T', ' '); + } + console.log(row); + updateMaterialCoilSimple(row).then(_ => { + this.$modal.msgSuccess("发货时间修改成功"); + this.getList(); + }).finally(() => { + this.buttonLoading = false; + }); + }, /** 删除按钮操作 */ handleDelete(row) { const coilIds = row.coilId || this.ids;