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/quality/processInspect/index.vue | 7 ++++++-
src/views/product/producttraceability/index.vue | 2 +-
src/views/quality/processInspect/processInspect-form.vue | 5 ++++-
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/views/product/producttraceability/index.vue b/src/views/product/producttraceability/index.vue
index 1d3402b..8685e96 100644
--- a/src/views/product/producttraceability/index.vue
+++ b/src/views/product/producttraceability/index.vue
@@ -1306,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 =
'閿�鍞鍗曞彿锛�' +
diff --git a/src/views/quality/processInspect/index.vue b/src/views/quality/processInspect/index.vue
index 210b8f1..a109bf1 100644
--- a/src/views/quality/processInspect/index.vue
+++ b/src/views/quality/processInspect/index.vue
@@ -223,10 +223,15 @@
this.$message.error("璇ヨ鑹叉病鏈夋搷浣滄潈闄�")
return
}
+ let isAdd = true
+ if(!row) {
+ isAdd = false
+ }
this.$router.push({
name: 'processInspectForm',
query: { id: row == null ? null : row.id },
- params: { resultVal : row == null ? null : row.result }
+ params: { resultVal : row == null ? null : row.result },
+ isAdd: isAdd
})
},
formatResult(row, column, cellValue){
diff --git a/src/views/quality/processInspect/processInspect-form.vue b/src/views/quality/processInspect/processInspect-form.vue
index b2dc4c5..5ee1239 100644
--- a/src/views/quality/processInspect/processInspect-form.vue
+++ b/src/views/quality/processInspect/processInspect-form.vue
@@ -554,8 +554,11 @@
let val = sessionStorage.getItem("process-resultVal-" + this.processInspectVo.id);
val == undefined ? this.resultVal = null : this.resultVal = val
}
+ const isAdd = this.$route.query.isAdd
this.init()
- this.selOutBatchNo()
+ if(isAdd) {
+ this.selOutBatchNo()
+ }
},
methods: {
selOutBatchNo(){
--
Gitblit v1.9.3