From 062bcd0b713a4f63f65d2dcb9b65fe680dc2da84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= Date: Tue, 24 Mar 2026 14:52:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat(=E6=A0=87=E7=AD=BE=E6=89=93=E5=8D=B0):?= =?UTF-8?q?=20=E6=B7=BB=E5=8A=A0=E5=88=86=E6=9D=A1=E6=88=90=E5=93=81?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=B1=BB=E5=9E=8B=E5=8F=8A=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 新增分条成品标签类型,支持在特定仓库中自动识别并打印分条成品标签。添加SplitTag.vue组件用于分条成品标签的渲染,并更新相关逻辑以支持新的标签类型。 --- klp-ui/src/views/wms/coil/js/coilPrint.js | 8 +- .../wms/coil/panels/LabelRender/SplitTag.vue | 287 ++++++++++++++++++ .../wms/coil/panels/LabelRender/index.vue | 19 +- 3 files changed, 310 insertions(+), 4 deletions(-) create mode 100644 klp-ui/src/views/wms/coil/panels/LabelRender/SplitTag.vue diff --git a/klp-ui/src/views/wms/coil/js/coilPrint.js b/klp-ui/src/views/wms/coil/js/coilPrint.js index f8e43296..f91e64ed 100644 --- a/klp-ui/src/views/wms/coil/js/coilPrint.js +++ b/klp-ui/src/views/wms/coil/js/coilPrint.js @@ -4,7 +4,8 @@ const ECoilPrintType = { '镀锌成品': '4', '镀铬成品': 'ge', '镀锌原料': '5', - '脱脂原料': '6' + '脱脂原料': '6', + '分条成品': 'split', } /** @@ -26,6 +27,11 @@ export const getCoilTagPrintType = (coil) => { else if (itemType == 'raw_material' && (warehouseId == '1988150545175736322')) { type = ECoilPrintType['脱脂原料']; } + // 分条成品库 + else if (itemType == 'product' && (warehouseId == '1988150210872930306' || warehouseId == '1988150800092950529' || warehouseId == '1988150380649967617' || warehouseId == '1988151027466170370')) { + type = ECoilPrintType['分条成品']; + } + // 其他卷使用成品标签 else if (itemType == 'raw_material') { type = ECoilPrintType['原料标签']; } else if (itemType == 'product' && itemName == '冷硬卷') { diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/SplitTag.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/SplitTag.vue new file mode 100644 index 00000000..6ec1f3dc --- /dev/null +++ b/klp-ui/src/views/wms/coil/panels/LabelRender/SplitTag.vue @@ -0,0 +1,287 @@ + + + + + \ No newline at end of file diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/index.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/index.vue index 48ac7a80..34f58f43 100644 --- a/klp-ui/src/views/wms/coil/panels/LabelRender/index.vue +++ b/klp-ui/src/views/wms/coil/panels/LabelRender/index.vue @@ -44,6 +44,12 @@ :paperWidthMm="180" :paperHeightMm="100" /> +
下载标签图片 @@ -65,7 +71,7 @@ import WhereTag from './WhereTag.vue'; import ZincRawTag from './ZincRawTag.vue'; import DuGeTag from './DuGeTag.vue'; import TuoZhiTag from './TuoZhiTag.vue'; - +import SplitTag from './SplitTag.vue'; export default { name: 'LabelRender', @@ -77,6 +83,7 @@ export default { ZincRawTag, DuGeTag, TuoZhiTag, + SplitTag, // SampleTagPreview, // ForgeTagPreview, // SaltSprayTagPreview, @@ -113,6 +120,10 @@ export default { width: 180, height: 100, }, + 'split': { + width: 180, + height: 100, + }, } } }, @@ -151,8 +162,10 @@ export default { this.labelType = '6'; } else if (itemType == 'raw_material') { this.labelType = '2'; - } else if (itemType == 'product') { - this.labelType = 'where'; + } + // 分条成品 + else if (itemType == 'product' && (warehouseId == '1988150210872930306' || warehouseId == '1988150800092950529' || warehouseId == '1988150380649967617' || warehouseId == '1988151027466170370')) { + this.labelType = 'split'; } else if (itemType == 'product' && itemName == '冷硬卷') { this.labelType = '3'; } else if (itemType == 'product' && itemName == '热轧卷板') { From 602b10b68921e48a3711a4e95eaa47e02b5e3bcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= Date: Tue, 24 Mar 2026 15:38:30 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat(wms):=20=E9=87=8D=E6=9E=84=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E9=85=8D=E7=BD=AE=E5=B9=B6=E6=B7=BB=E5=8A=A0=E9=94=80?= =?UTF-8?q?=E5=94=AE=E5=91=98=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 重构各报表模块配置,将重复配置提取到config.js统一管理 在打包记录和打包页面添加销售员选择和显示功能 新增销售员管理页面,支持销售员标签的增删改查 --- klp-ui/src/views/crm/saleman/index.vue | 453 +++++++++++++++++++ klp-ui/src/views/wms/packing/packing.vue | 27 +- klp-ui/src/views/wms/packing/record.vue | 13 +- klp-ui/src/views/wms/report/duge/day.vue | 16 +- klp-ui/src/views/wms/report/duge/month.vue | 16 +- klp-ui/src/views/wms/report/duge/team.vue | 16 +- klp-ui/src/views/wms/report/duge/year.vue | 16 +- klp-ui/src/views/wms/report/lajiao/day.vue | 18 +- klp-ui/src/views/wms/report/lajiao/month.vue | 16 +- klp-ui/src/views/wms/report/lajiao/team.vue | 16 +- klp-ui/src/views/wms/report/lajiao/year.vue | 16 +- klp-ui/src/views/wms/report/shuang/day.vue | 16 +- klp-ui/src/views/wms/report/shuang/month.vue | 16 +- klp-ui/src/views/wms/report/shuang/team.vue | 16 +- klp-ui/src/views/wms/report/shuang/year.vue | 16 +- klp-ui/src/views/wms/report/tuozhi/day.vue | 17 +- klp-ui/src/views/wms/report/tuozhi/month.vue | 16 +- klp-ui/src/views/wms/report/tuozhi/out.vue | 12 +- klp-ui/src/views/wms/report/tuozhi/team.vue | 16 +- klp-ui/src/views/wms/report/tuozhi/year.vue | 16 +- klp-ui/src/views/wms/report/zha/day.vue | 19 +- klp-ui/src/views/wms/report/zha/month.vue | 19 +- klp-ui/src/views/wms/report/zha/team.vue | 19 +- klp-ui/src/views/wms/report/zha/year.vue | 19 +- klp-ui/src/views/wms/report/zha_.vue | 2 +- klp-ui/src/views/wms/report/zinc/day.vue | 19 +- klp-ui/src/views/wms/report/zinc/month.vue | 17 +- klp-ui/src/views/wms/report/zinc/team.vue | 17 +- klp-ui/src/views/wms/report/zinc/year.vue | 18 +- 29 files changed, 532 insertions(+), 381 deletions(-) create mode 100644 klp-ui/src/views/crm/saleman/index.vue diff --git a/klp-ui/src/views/crm/saleman/index.vue b/klp-ui/src/views/crm/saleman/index.vue new file mode 100644 index 00000000..0de48720 --- /dev/null +++ b/klp-ui/src/views/crm/saleman/index.vue @@ -0,0 +1,453 @@ + + + + + diff --git a/klp-ui/src/views/wms/packing/packing.vue b/klp-ui/src/views/wms/packing/packing.vue index 794be6ea..a253d350 100644 --- a/klp-ui/src/views/wms/packing/packing.vue +++ b/klp-ui/src/views/wms/packing/packing.vue @@ -25,6 +25,12 @@ + + + + + @@ -34,8 +40,6 @@ - - @@ -66,19 +70,15 @@ - + + @@ -142,6 +141,7 @@ export default { ProductInfo, RawMaterialInfo }, + dicts: ['wip_pack_saleman'], data() { return { // 表单参数 @@ -237,7 +237,6 @@ export default { }; createPacking(data).then(response => { this.$modal.msgSuccess('创建成功'); - this.form.packingNo = response.data.packingNo; this.getRecentList(); this.resetForm(); }).finally(() => { diff --git a/klp-ui/src/views/wms/packing/record.vue b/klp-ui/src/views/wms/packing/record.vue index 17d20307..3dd7d615 100644 --- a/klp-ui/src/views/wms/packing/record.vue +++ b/klp-ui/src/views/wms/packing/record.vue @@ -41,6 +41,7 @@ + @@ -93,6 +94,11 @@ + + + + + {{ selectedPacking.coilCount }} {{ selectedPacking.totalNetWeight }}t @@ -119,9 +125,11 @@ - + @@ -158,6 +166,7 @@ export default { ProductInfo, RawMaterialInfo }, + dicts: ['wip_pack_saleman'], data() { return { // 遮罩层 diff --git a/klp-ui/src/views/wms/report/duge/day.vue b/klp-ui/src/views/wms/report/duge/day.vue index 945dcdc3..86caeca9 100644 --- a/klp-ui/src/views/wms/report/duge/day.vue +++ b/klp-ui/src/views/wms/report/duge/day.vue @@ -9,6 +9,7 @@