From 093d3ef2cbf1162bacb20698a5f44d8dabd858a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= Date: Sat, 28 Feb 2026 13:59:52 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat(=E9=92=A2=E5=8D=B7=E7=AE=A1=E7=90=86):?= =?UTF-8?q?=20=E6=B7=BB=E5=8A=A0=E9=92=A2=E5=8D=B7=E9=80=80=E8=B4=A7?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=8A=E7=9B=B8=E5=85=B3=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在coil.js中新增returnCoil接口用于处理钢卷退货 - 添加exit.vue作为退货钢卷管理页面 - 在base.vue中添加退货按钮及相关处理逻辑 - 新增仓库图标资源 - 调整报表页面日期选择器的时间格式 --- klp-ui/src/api/wms/coil.js | 15 ++++++++ klp-ui/src/assets/icons/svg/warehouse.svg | 1 + klp-ui/src/views/wms/coil/panels/base.vue | 20 ++++++++++- klp-ui/src/views/wms/coil/views/exit.vue | 44 +++++++++++++++++++++++ klp-ui/src/views/wms/report/zha/team.vue | 4 +-- 5 files changed, 81 insertions(+), 3 deletions(-) create mode 100644 klp-ui/src/assets/icons/svg/warehouse.svg create mode 100644 klp-ui/src/views/wms/coil/views/exit.vue diff --git a/klp-ui/src/api/wms/coil.js b/klp-ui/src/api/wms/coil.js index a140934c..82d278a7 100644 --- a/klp-ui/src/api/wms/coil.js +++ b/klp-ui/src/api/wms/coil.js @@ -305,3 +305,18 @@ export function cancelSpecialSplit(pendingActionId) { }) } +/** + * 钢卷被退货，发给客户的钢卷被退货 + */ +export function returnCoil(coilId) { + if (!coilId) { + return Promise.reject(new Error('coilId is required')) + } + return request({ + url: '/wms/materialCoil/return', + method: 'post', + params: { + coilId + } + }) +} diff --git a/klp-ui/src/assets/icons/svg/warehouse.svg b/klp-ui/src/assets/icons/svg/warehouse.svg new file mode 100644 index 00000000..69755c97 --- /dev/null +++ b/klp-ui/src/assets/icons/svg/warehouse.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue index 4ab14ebe..5e56c867 100644 --- a/klp-ui/src/views/wms/coil/panels/base.vue +++ b/klp-ui/src/views/wms/coil/panels/base.vue @@ -173,6 +173,10 @@ 撤回发货 + + + 退货钢卷 查看异常 @@ -325,7 +329,8 @@ import { getMaterialCoilTrace, exportCoil, cancelExportCoil, - checkCoilNo + checkCoilNo, + returnCoil } from "@/api/wms/coil"; import WarehouseSelect from "@/components/KLPService/WarehouseSelect"; import QRCode from "../../print/components/QRCode.vue"; @@ -943,6 +948,19 @@ export default { }).catch(() => { }); }, + handleReturnCoil(row) { + this.$modal.confirm('是否确认退货钢卷编号为"' + row.currentCoilNo + '"的退货操作？').then(() => { + this.buttonLoading = true; + returnCoil(row.coilId).then(response => { + this.$modal.msgSuccess("退货成功"); + this.getList(); + }).catch(error => { + this.$modal.msgError("退货失败"); + }).finally(() => { + this.buttonLoading = false; + }); + }) + }, handleExportTimeChange(row) { if (row.exportTime) { row.exportTime = row.exportTime.replace('T', ' '); diff --git a/klp-ui/src/views/wms/coil/views/exit.vue b/klp-ui/src/views/wms/coil/views/exit.vue new file mode 100644 index 00000000..949c624e --- /dev/null +++ b/klp-ui/src/views/wms/coil/views/exit.vue @@ -0,0 +1,44 @@ + + + \ No newline at end of file diff --git a/klp-ui/src/views/wms/report/zha/team.vue b/klp-ui/src/views/wms/report/zha/team.vue index 4890d803..8771cc09 100644 --- a/klp-ui/src/views/wms/report/zha/team.vue +++ b/klp-ui/src/views/wms/report/zha/team.vue @@ -4,11 +4,11 @@ + value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期"> + value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期"> From 2aeb19a68552537998626cbea7ecc16ee81c3d41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= Date: Sat, 28 Feb 2026 17:02:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat(=E5=8D=B7=E7=AE=A1=E7=90=86):=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=80=BB=E8=BE=91=E5=BA=93=E4=BD=8D=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在BasePage组件中新增editWarehouse属性，控制是否显示逻辑库位列。当editWarehouse为true时，显示仓库选择器并支持库位修改，修改后自动刷新列表数据。同时在jishu.vue中启用该功能。 --- klp-ui/src/views/wms/coil/panels/base.vue | 19 +++++++++++++++++++ klp-ui/src/views/wms/coil/views/jishu.vue | 5 +++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue index 5e56c867..2c2256b7 100644 --- a/klp-ui/src/views/wms/coil/panels/base.vue +++ b/klp-ui/src/views/wms/coil/panels/base.vue @@ -138,6 +138,7 @@ — + + + + @@ -435,6 +441,10 @@ export default { type: String, required: false, }, + editWarehouse: { + type: Boolean, + default: false, + }, }, data() { return { @@ -719,6 +729,15 @@ export default { this.getList(); // 刷新列表 }) }, + handleWarehouseChange(row) { + if (!this.editWarehouse) { + return; + } + updateMaterialCoilSimple(row).then(res => { + this.$message.success('库位更新成功'); + this.getList(); // 刷新列表 + }) + }, /** 预览标签 */ handlePreviewLabel(row) { this.labelRender.visible = true; diff --git a/klp-ui/src/views/wms/coil/views/jishu.vue b/klp-ui/src/views/wms/coil/views/jishu.vue index ea80ef7c..5a877416 100644 --- a/klp-ui/src/views/wms/coil/views/jishu.vue +++ b/klp-ui/src/views/wms/coil/views/jishu.vue @@ -2,11 +2,11 @@ + :hideType="hideType" :editWarehouse="editWarehouse" /> + :hideType="hideType" :editWarehouse="editWarehouse" /> @@ -38,6 +38,7 @@ export default { showAbnormal: true, labelType: '2', hideType: false, + editWarehouse: true, } } }