From d1c9ed2f38da64dc3e8ecc9507a2c1db668891a4 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 22 五月 2024 17:18:41 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before into master
---
src/views/product/producttraceability/index.vue | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/views/product/producttraceability/index.vue b/src/views/product/producttraceability/index.vue
index a4b1dd2..8685e96 100644
--- a/src/views/product/producttraceability/index.vue
+++ b/src/views/product/producttraceability/index.vue
@@ -10,6 +10,7 @@
:data="partList"
:formatter="labelFormatter"
:selectLoading="selectLoading"
+ ref="systemSelect"
:valueColumn="valueColumn"
@selectChange="queryBatchNoData"
@remoteSearch="queryPart"
@@ -343,7 +344,7 @@
</div>
</el-tab-pane> -->
<el-tab-pane label="妫�娴嬩俊鎭�" name="妫�娴嬩俊鎭�">
- <div style="margin-top:10px;">
+ <div style="margin-top:10px;height: 80vh;overflow-y: scroll;">
<div class="process" v-if="process">
<el-divider
class="pane-divider"
@@ -381,9 +382,9 @@
>
<template slot-scope="scope">
{{
- scope.row.isQualified == 0
+ scope.row.result == 0
? '涓嶅悎鏍�'
- : '鍚堟牸'
+ : (scope.row.result==1?'鍚堟牸':'')
}}
</template>
</el-table-column>
@@ -432,9 +433,9 @@
>
<template slot-scope="scope">
{{
- scope.row.isQualified == 0
+ scope.row.result == 0
? '涓嶅悎鏍�'
- : '鍚堟牸'
+ : (scope.row.result==1?'鍚堟牸':'')
}}
</template>
</el-table-column>
@@ -531,7 +532,7 @@
</el-tab-pane>
<el-tab-pane label="鐢熶骇璁板綍" name="鐢熶骇璁板綍">
<div style="margin-top:10px;">
- <div style="padding:0px 14px;height: 100%;overflow: auto;">
+ <div style="padding:0px 14px;height: 80vh !important;overflow: auto;">
<div class="product-record-div">
<div class="product-record-div-left">
<div class="product-record-list-header">
@@ -1305,7 +1306,7 @@
},
labelFormatter(ele) {
let partLabel
- const part = this.partList.find((item) => ele.systemNo === item.systemNo)
+ const part = this.partList.find((item) => ele.customerOrderId === item.customerOrderId)
if (part !== undefined) {
partLabel =
'閿�鍞鍗曞彿锛�' +
--
Gitblit v1.9.3