From 36653c98622c8a74cb850575b2001457121b794c Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期四, 25 一月 2024 16:16:22 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/product/producttraceability/index.vue | 40 ++++++++++++++++++++++++++--------------
1 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/src/views/product/producttraceability/index.vue b/src/views/product/producttraceability/index.vue
index 9bcd856..a86a177 100644
--- a/src/views/product/producttraceability/index.vue
+++ b/src/views/product/producttraceability/index.vue
@@ -94,7 +94,7 @@
</div>
</el-col>
</el-row>
- </el-col>
+ </el-col>changePart
<el-col
:span="10"
:offset="1"
@@ -1001,19 +1001,31 @@
selectLoading: false,
systemNo: null,
selectedProductSystemNo: null,
- valueColumn: 'systemNo',
+ valueColumn: 'customerOrderId',
partColumn: [
{
- prop: 'batchNo',
- label: '鎵规鍙�'
+ prop: 'customerOrderNo',
+ label: '閿�鍞鍗曞彿'
},
{
- prop: 'systemNo',
- label: '绯荤粺鍙�'
+ prop: 'entityName',
+ label: '椤圭洰鍚嶇О'
+ },
+ {
+ prop: 'partNo',
+ label: '浜у搧缂栧彿'
+ },
+ {
+ prop: 'productName',
+ label: '浜у搧鍚嶇О'
},
{
- prop: 'partName',
- label: '闆朵欢鍚嶇О'
+ prop: 'specs',
+ label: '浜у搧鍨嬪彿'
+ },
+ {
+ prop: 'productType',
+ label: '浜у搧绫诲瀷'
}
],
partList: [],
@@ -1182,14 +1194,14 @@
const part = this.partList.find((item) => ele.systemNo === item.systemNo)
if (part !== undefined) {
partLabel =
- '绯荤粺鍙凤細' +
- part.systemNo +
+ '閿�鍞鍗曞彿锛�' +
+ part.customerOrderNo +
' ' +
- '闆朵欢鍚嶇О锛�' +
- part.partName +
+ '浜у搧鍚嶇О锛�' +
+ part.productName +
' ' +
- '鎵规鍙凤細' +
- part.batchNo
+ '浜у搧缂栧彿锛�' +
+ part.partNo
}
return partLabel
},
--
Gitblit v1.9.3