From a6a7b0bbf6f67fb1a2a1619296202c9e29915325 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期三, 15 十一月 2023 10:24:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/quality/rawMaterial/rawMaterial-form.vue | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index 39f55c5..17494d7 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -164,13 +164,20 @@
: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 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-select>
</el-tooltip>
</div>
</template>
</el-table-column>
+
+
+
+
<el-table-column prop="deviceName" label="璇曢獙璁惧" min-width="260">
<template slot-scope="scope">
<div v-if="!scope.row.children">
@@ -276,6 +283,13 @@
},
data(){
return{
+ dataVal: [{
+ label: '1',
+ value: '1'
+ }, {
+ label: '0',
+ value: '0'
+ }],
userdata:[],
currentRow:[],
userlist:[],
--
Gitblit v1.9.3