From c618c4d0a067c555b98ca06997dd085bb3d5cada Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 29 一月 2024 17:09:16 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/product/producttraceability/index.vue | 40 +++++++++++++-------
src/views/quality/Packaging_ledger/index.vue | 2
src/views/common/ztt-remote-select.vue | 29 ++++++++++----
3 files changed, 48 insertions(+), 23 deletions(-)
diff --git a/src/views/common/ztt-remote-select.vue b/src/views/common/ztt-remote-select.vue
index 72a4002..4eaed0b 100644
--- a/src/views/common/ztt-remote-select.vue
+++ b/src/views/common/ztt-remote-select.vue
@@ -20,7 +20,7 @@
value="title"
disabled
>
- <span v-for="(col, j) in columns" :key="col.prop">{{ col.label }}</span>
+ <span v-for="(col, j) in columns" :key="col.prop"><span>{{ col.label }}</span></span>
</el-option>
<el-option
class="lmes-select-body"
@@ -29,13 +29,23 @@
:label="formatter(item)"
:value="item[valueColumn]"
>
- <span v-for="(col, j) in columns" :key="col.prop + i">{{
- col.formatter
- ? col.formatter(item[col.prop])
- : item[col.prop]
- ? item[col.prop]
- : '--'
- }}</span>
+ <span v-for="(col, j) in columns" :key="col.prop + i">
+ <el-tooltip :content="col.formatter
+ ? col.formatter(item[col.prop])
+ : item[col.prop]
+ ? item[col.prop]
+ : '--'">
+ <span style="overflow: hidden;">
+ {{
+ col.formatter
+ ? col.formatter(item[col.prop])
+ : item[col.prop]
+ ? item[col.prop]
+ : '--'
+ }}
+ </span>
+ </el-tooltip>
+ </span>
</el-option>
</el-select>
</div>
@@ -111,6 +121,7 @@
text-align: center;
font-size: 13px;
line-height: 44px;
+
}
.lmes-select-head span,
@@ -121,6 +132,8 @@
padding: 0 10px !important;
}
+
+
.lmes-select-head,
.lmes-select-body,
.lmes-select-nodata {
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
},
diff --git a/src/views/quality/Packaging_ledger/index.vue b/src/views/quality/Packaging_ledger/index.vue
index 6c357ae..19433f0 100644
--- a/src/views/quality/Packaging_ledger/index.vue
+++ b/src/views/quality/Packaging_ledger/index.vue
@@ -145,7 +145,7 @@
<table border="2px" class="x1111116">
<tr class="x1111113">
<td class="x1111114" colspan=6>
- <div style="height: 60px;display: flex;margin-top: 2px;">
+ <div style="height: 60px;display: flex;margin-top: 4px;">
<div style="margin-top: 5px;">
<img width="150" height="48" src="../../../../public/img/image001.jpg" alt="IMG_256">
</div>
--
Gitblit v1.9.3