From 1f9c32908a68eef81f549b6986a9bc1f05056108 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期四, 16 十一月 2023 16:30:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/quality/finishedProductInspection/finishedProduct-form.vue | 19 +++++++------------
1 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/src/views/quality/finishedProductInspection/finishedProduct-form.vue b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
index 90fec3b..a09ed00 100644
--- a/src/views/quality/finishedProductInspection/finishedProduct-form.vue
+++ b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
@@ -111,12 +111,9 @@
<el-tooltip v-if="scope.row.iname != null" :disabled="scope.row.eId != null"
class="item" effect="dark" content="璇峰厛閫夋嫨璁惧锛�" placement="top-start">
<el-select style="width: 100%;" @change="changeState(scope.row, index)" :disabled="scope.row.eId == null" v-model="scope.row.empiricalValueAddss[index]" placeholder="璇烽�夋嫨">
- <!-- <el-option v-for="item in dataVal" :key="item.value" :label="item.label"
+ <el-option v-for="item in dataVal" :key="item.value" :label="item.label"
:value="item.value">
- </el-option> -->
- <el-option v-for="item in dataVal" :key="item.value" :label="(item.value === '1' ? '鏄�' : '鍚�')" :value="item.value"></el-option>
-
-
+ </el-option>
</el-select>
<span v-if="resultVal != null && processInspectVo.id != null"
v-text="scope.row.empiricalValueAddss[index]"></span>
@@ -227,13 +224,12 @@
export default {
data() {
return {
- // 1 鏄� 0鍚�
dataVal: [{
- label: '1',
- value: '1'
+ label: '鏄�',
+ value: '鏄�'
}, {
- label: '0',
- value: '0'
+ label: '鍚�',
+ value: '鍚�'
}],
resultVal: null,
deviceList: [],
@@ -280,7 +276,7 @@
this.init()
},
methods: {
-
+
submitSave(){
let pro = 0
this.inspectionItems.forEach(item => {
@@ -379,7 +375,6 @@
material: result.material,
userName: Array.from(new Set(userList)).join(","),
result: this.resultVal==null ? '' : this.resultVal,
-
}]
}).catch(error=>{
console.log(error)
--
Gitblit v1.9.3