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> +