From 173166a3d1c9f5171b20fca9c5336005d6c9d0bc Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期三, 08 十一月 2023 19:38:12 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/quality/finishedProductInspection/finishedProduct-form.vue | 38 +++++++++++++++++++++++++++++++++++++-
1 files changed, 37 insertions(+), 1 deletions(-)
diff --git a/src/views/quality/finishedProductInspection/finishedProduct-form.vue b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
index 477d844..03d109d 100644
--- a/src/views/quality/finishedProductInspection/finishedProduct-form.vue
+++ b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
@@ -139,6 +139,36 @@
</div>
</template>
</el-table-column>
+ <el-table-column prop="inspectionValue" v-for="(item, index) in empiricalValueAdd" :key="index"
+ label="妫�楠屾弿杩�" width="240" style="text-align: center;">
+ <template slot-scope="scope">
+ <el-col v-if="scope.row.itype === '1'">
+ <el-tooltip v-if="scope.row.iname != null" :disabled="scope.row.eId != null"
+ class="item" effect="dark" content="璇峰厛閫夋嫨璁惧锛�" placement="top-start">
+ <el-input :disabled="scope.row.eId == null"
+ v-model="scope.row.inote"
+ @blur="changeState(scope.row, index)" placeholder="璇疯緭鍏ユ楠屾弿杩�"></el-input>
+ <span v-if="resultVal != null && processInspectVo.id != null"
+ v-text="scope.row.inote"></span>
+ </el-tooltip>
+ </el-col>
+ <el-col v-else>
+ <el-tooltip v-if="scope.row.iname != null" :disabled="scope.row.eId != null"
+ class="item" effect="dark" content="璇峰厛閫夋嫨璁惧锛�" placement="top-start">
+ <!-- <el-input :disabled="scope.row.eId == null"
+ v-model="scope.row.empiricalValueAddss[index]"
+ @blur="changeState(scope.row, index)" placeholder="璇疯緭鍏ユ娴嬪��"></el-input> -->
+ <el-select style="width: 100%;" @change="changeState(scope.row, index)" :disabled="scope.row.eId == null" v-model="scope.row.inote" placeholder="璇烽�夋嫨">
+ <el-option v-for="item in dataVal" :key="item.value" :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ <span v-if="resultVal != null && processInspectVo.id != null"
+ v-text="scope.row.inote"></span>
+ </el-tooltip>
+ </el-col>
+ </template>
+ </el-table-column>
<el-table-column label="缁撹" fixed="right" min-width="100">
<template slot-scope="scope">
<div v-if="scope.row.iname!=null">
@@ -366,6 +396,9 @@
arr = obj.inspectionValue.split(",")
}
obj.empiricalValueAddss = arr
+ if(obj.note){
+ snote=obj.inote
+ }
if(arr.length > this.empiricalValueAdd){
this.empiricalValueAdd = arr.length
}
@@ -397,6 +430,8 @@
obj.children[index-1].inspectionValue = ''
obj.children[index-1].iresult = null
obj.children[index-1].empiricalValueAddss = []
+ obj.children[index-1].inote=''
+
}
})
}).catch(error=>{
@@ -426,7 +461,8 @@
let obj = {
equiomentId: row.eId,
fpid: row.iid,
- inspectionValue: str
+ inspectionValue: str,
+ note : row.inote
}
updateFinishedInsProduct(obj).then(res=>{
if(res.data.code == 0){
--
Gitblit v1.9.3