From 487d0c5f399861c98104f3a346a1677a4be61254 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期一, 06 十一月 2023 14:08:39 +0800
Subject: [PATCH] s

---
 src/views/quality/finishedProductInspection/finishedProduct-form.vue |   34 ++++++++++++++++++++++++++++------
 1 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/src/views/quality/finishedProductInspection/finishedProduct-form.vue b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
index 5ba0a5e..c5a4687 100644
--- a/src/views/quality/finishedProductInspection/finishedProduct-form.vue
+++ b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
@@ -97,13 +97,27 @@
                         <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-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>
-                                    <span v-if="resultVal != null" v-text="scope.row.empiricalValueAddss[index]"></span>
+                                <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.empiricalValueAddss[index]"
+                                                @blur="changeState(scope.row, index)" placeholder="璇疯緭鍏ユ娴嬪��"></el-input>
+                                            <span v-if="resultVal != null" v-text="scope.row.empiricalValueAddss[index]"></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-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"
+                                                    :value="item.value">
+                                                </el-option>
+                                            </el-select>
+                                            <span v-if="resultVal != null && processInspectVo.id != null"
+                                                v-text="scope.row.empiricalValueAddss[index]"></span>
+                                        </el-tooltip>
+                                    </el-col>
                             </template>
                         </el-table-column>
                         <el-table-column prop="deviceName" label="璇曢獙璁惧" min-width="250">
@@ -176,6 +190,13 @@
 export default {
     data() {
         return {
+            dataVal: [{
+                label: '鏄�',
+                value: '鏄�'
+            }, {
+                label: '鍚�',
+                value: '鍚�'
+            }],
             resultVal: null,
             deviceList: [],
             hasChildren: true,
@@ -221,6 +242,7 @@
         this.init()
     },
     methods: {
+        
         submitSave(){
             let pro = 0
             this.inspectionItems.forEach(item => {

--
Gitblit v1.9.3