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/utils/enum.js b/klp-ui/src/utils/enum.js index 09b762c6..f91364f4 100644 --- a/klp-ui/src/utils/enum.js +++ b/klp-ui/src/utils/enum.js @@ -11,4 +11,5 @@ export const MemoInputStorageKey = { packingStatus: 'packingStatus', // 打包状态 packagingRequirement: 'packagingRequirement', // 打包要求 coilSpec: 'coilSpec', // 钢卷规格 + coatingType: 'coatingType', // 钢卷镀层种类 } \ No newline at end of file diff --git a/klp-ui/src/views/wms/coil/do/correct.vue b/klp-ui/src/views/wms/coil/do/correct.vue index cbd8ec48..de049c62 100644 --- a/klp-ui/src/views/wms/coil/do/correct.vue +++ b/klp-ui/src/views/wms/coil/do/correct.vue @@ -335,7 +335,7 @@
- + @@ -592,7 +592,7 @@ export default { methods: { parseTime, getBorderStyle(row) { - console.log(row); + // console.log(row); // 已发货 if (row.status == 1) { return { border: '1.5px solid #007bff' } diff --git a/klp-ui/src/views/wms/coil/do/packing.vue b/klp-ui/src/views/wms/coil/do/packing.vue index 0249a442..c75b328b 100644 --- a/klp-ui/src/views/wms/coil/do/packing.vue +++ b/klp-ui/src/views/wms/coil/do/packing.vue @@ -135,7 +135,7 @@ - + diff --git a/klp-ui/src/views/wms/coil/do/search.vue b/klp-ui/src/views/wms/coil/do/search.vue index d0ef38ac..6ae00714 100644 --- a/klp-ui/src/views/wms/coil/do/search.vue +++ b/klp-ui/src/views/wms/coil/do/search.vue @@ -133,7 +133,7 @@ - + diff --git a/klp-ui/src/views/wms/coil/do/ship.vue b/klp-ui/src/views/wms/coil/do/ship.vue index 92289c63..37620d80 100644 --- a/klp-ui/src/views/wms/coil/do/ship.vue +++ b/klp-ui/src/views/wms/coil/do/ship.vue @@ -124,7 +124,7 @@ - + diff --git a/klp-ui/src/views/wms/coil/do/warehousing.vue b/klp-ui/src/views/wms/coil/do/warehousing.vue index 4f40c36a..6f612b50 100644 --- a/klp-ui/src/views/wms/coil/do/warehousing.vue +++ b/klp-ui/src/views/wms/coil/do/warehousing.vue @@ -115,7 +115,7 @@ - + @@ -326,7 +326,7 @@ - + diff --git a/klp-ui/src/views/wms/coil/merge.vue b/klp-ui/src/views/wms/coil/merge.vue index 9b5b23e6..d809d027 100644 --- a/klp-ui/src/views/wms/coil/merge.vue +++ b/klp-ui/src/views/wms/coil/merge.vue @@ -192,7 +192,7 @@ - + diff --git a/klp-ui/src/views/wms/coil/panels/CoilTraceResult.vue b/klp-ui/src/views/wms/coil/panels/CoilTraceResult.vue index ee45f910..b2f1f4e3 100644 --- a/klp-ui/src/views/wms/coil/panels/CoilTraceResult.vue +++ b/klp-ui/src/views/wms/coil/panels/CoilTraceResult.vue @@ -104,60 +104,6 @@ - - - @@ -303,14 +249,14 @@ export default { } // 2. 操作时间(优先取更新时间/回滚时间) - if (originalStep.update_time) { - standardStep.time = this.formatTime(originalStep.update_time); + if (originalStep.update_time || originalStep.create_time) { + standardStep.time = this.formatTime(originalStep.update_time || originalStep.create_time); } else if (originalStep.rollback_time) { standardStep.time = this.formatTime(originalStep.rollback_time); } // 3. 操作人(优先昵称,其次账号) - standardStep.operation = originalStep.operator_nickname || originalStep.operator || '-'; + standardStep.operation = originalStep.operator_nickname || originalStep.operator || originalStep.create_by || '-'; // 4. 核心ID映射:oldCoilIds(操作前钢卷ID列表) switch (standardStep.action) { diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue index 54bcc940..62c32f47 100644 --- a/klp-ui/src/views/wms/coil/panels/base.vue +++ b/klp-ui/src/views/wms/coil/panels/base.vue @@ -275,7 +275,7 @@ - + diff --git a/klp-ui/src/views/wms/coil/panels/stepSplit.vue b/klp-ui/src/views/wms/coil/panels/stepSplit.vue index 42136332..23f8d2c0 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> +