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/rawMaterial/rawMaterial-form.vue | 27 +++++++++------------------
1 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index 17494d7..7f01ce0 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -164,11 +164,8 @@
:disabled="scope.row.deviceId == null || (dataForm.id!=null&&resultVal!=null)"
v-model="scope.row.testValueList[index]"
placeholder="璇疯緭鍏ユ垨閫夋嫨妫�娴嬪��" @change="updateTestValue(scope.row,scope.$index)">
- <!-- <el-option label="鏄�" value="鏄�"/>
- <el-option label="鍚�" value="鍚�"/> -->
- <el-option v-for="item in dataVal" :key="item.value" :label="(item.value === '1' ? '鏄�' : '鍚�')" :value="item.value"></el-option>
-
-
+ <el-option label="鏄�" value="鏄�"/>
+ <el-option label="鍚�" value="鍚�"/>
</el-select>
</el-tooltip>
</div>
@@ -283,13 +280,6 @@
},
data(){
return{
- dataVal: [{
- label: '1',
- value: '1'
- }, {
- label: '0',
- value: '0'
- }],
userdata:[],
currentRow:[],
userlist:[],
@@ -590,17 +580,19 @@
}
ele.iid = Math.random()
ele.father = item.rpFather
+ if (item.children != undefined) {
item.children.forEach(obj => {
+ let arr= []
if(obj.userName){
userNameList.push(obj.userName)
}
- let arr= []
-
+
if(obj.testValue){
arr = obj.testValue.split(",")
- console.log(arr);
}
-
+ if (arr.length > this.empiricalValueAdd) {
+ this.empiricalValueAdd = arr.length
+ }
let o = {
deviceId: obj.deviceId,
deviceName: obj.deviceName,
@@ -618,8 +610,7 @@
ele.children.push(o)
})
this.list.push(ele)
- console.log(this.list,111111111111);
- }
+ }}
})
this.conclusionTable = [{
code: data.code,
--
Gitblit v1.9.3