From 66c41f42e1d90b7c1448b3e629abe1537a60a2ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= Date: Tue, 3 Mar 2026 17:36:18 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E9=92=A2=E5=8D=B7?= =?UTF-8?q?=E9=95=80=E5=B1=82=E7=A7=8D=E7=B1=BB=E6=9E=9A=E4=B8=BE=E5=B9=B6?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8E=9F=E6=9D=90=E6=96=99=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在stepSplit.vue表格中添加净重列 - 全局注册MemoInput组件 - 在CoilNo.vue中显示净重和厂家卷号 - 将RawMaterialSelect和ProductSelect中的输入框替换为MemoInput组件 - 为原材料和产品添加默认计量单位"卷" --- .../KLPService/ProductSelect/index.vue | 18 +++++++++--------- .../KLPService/RawMaterialSelect/index.vue | 18 ++++++++---------- .../components/KLPService/Renderer/CoilNo.vue | 14 ++++++++++++++ klp-ui/src/main.js | 4 ++++ klp-ui/src/views/wms/coil/panels/stepSplit.vue | 1 + 5 files changed, 36 insertions(+), 19 deletions(-) diff --git a/klp-ui/src/components/KLPService/ProductSelect/index.vue b/klp-ui/src/components/KLPService/ProductSelect/index.vue index 0f689dd2..20191806 100644 --- a/klp-ui/src/components/KLPService/ProductSelect/index.vue +++ b/klp-ui/src/components/KLPService/ProductSelect/index.vue @@ -103,35 +103,34 @@ --> - + - + - + - - + - + - + - + @@ -359,6 +358,7 @@ export default { } else { addProduct({ ...this.form, + unit: '卷', productCode: this.form.material || '' + (this.form.zincLayer || '') + new Date().getTime(), }).then(response => { this.$modal.msgSuccess("新增成功"); diff --git a/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue b/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue index 52f4c0aa..0275d466 100644 --- a/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue +++ b/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue @@ -98,28 +98,25 @@ --> - + - + - - - - - + + - + - + - + +
+ 净重: + {{ netWeight }} +
+
+ 厂家卷号: + {{ supplierCoilNo }} +
{{ currentCoilNo }} @@ -73,6 +81,12 @@ export default { }, currentCoilNo() { return this.coilNo || this.coilInfo?.currentCoilNo || '-' + }, + netWeight() { + return this.coilInfo.netWeight || '-' + }, + supplierCoilNo() { + return this.coilInfo.supplierCoilNo || '-' } }, methods: { diff --git a/klp-ui/src/main.js b/klp-ui/src/main.js index 483672b2..23674f04 100644 --- a/klp-ui/src/main.js +++ b/klp-ui/src/main.js @@ -45,6 +45,9 @@ import VueMeta from 'vue-meta' // 字典数据组件 import DictData from '@/components/DictData' import KLPTable from '@/components/KLPUI/KLPTable/index.vue' +import MemoInput from '@/components/MemoInput/index.vue' + + // 全局方法挂载 Vue.prototype.getDicts = getDicts @@ -68,6 +71,7 @@ Vue.component('FileUpload', FileUpload) Vue.component('ImageUpload', ImageUpload) Vue.component('ImagePreview', ImagePreview) Vue.component('KLPTable', KLPTable) +Vue.component('MemoInput', MemoInput) Vue.use(vueFlvPlayer) Vue.use(directive) diff --git a/klp-ui/src/views/wms/coil/panels/stepSplit.vue b/klp-ui/src/views/wms/coil/panels/stepSplit.vue index 42136332..a38f68e0 100644 --- a/klp-ui/src/views/wms/coil/panels/stepSplit.vue +++ b/klp-ui/src/views/wms/coil/panels/stepSplit.vue @@ -38,6 +38,7 @@ highlight-current-row border stripe> +