From 33b49a7e95796e4bce64cc18cb406c33c0b63810 Mon Sep 17 00:00:00 2001
From: 朱佳吉 <1527963051@qq.com>
Date: 星期四, 09 五月 2024 14:13:16 +0800
Subject: [PATCH] 查询不合格样品数据

---
 src/components/view/a6-device-management.vue |   22 +++++++++-------------
 1 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/components/view/a6-device-management.vue b/src/components/view/a6-device-management.vue
index 2cd3435..813729c 100644
--- a/src/components/view/a6-device-management.vue
+++ b/src/components/view/a6-device-management.vue
@@ -55,13 +55,14 @@
 			<el-row class="title">
 				<el-col :span="12" style="padding-left: 20px;">璁惧宸ュ叿鏄庣粏</el-col>
 				<el-col :span="12" style="text-align: right;">
+					<el-button size="medium" type="primary" @click="dialogVisible2 = true">鏂板</el-button>
 				</el-col>
 			</el-row>
 		</div>
 		<div class="search">
 			<div class="search_thing">
 				<div class="search_label">鐘舵�侊細</div>
-				<el-select v-model="componentData.entity.deviceStatus" placeholder="鍏ㄩ儴">
+				<el-select v-model="componentData.entity.deviceStatus" placeholder="鍏ㄩ儴" size="small">
 					<el-option v-for="item in deviceStatusList" :key="item.value" :label="item.label" :value="item.value">
 					</el-option>
 				</el-select>
@@ -76,19 +77,9 @@
 				<div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
 						v-model="componentData.entity.specificationModel" @keyup.enter.native="refreshTable()"></el-input></div>
 			</div>
-			<div class="search_thing">
-				<div class="search_label">璁惧鍒嗙被锛�</div>
-				<el-select v-model="componentData.entity.largeCategory" placeholder="璇烽�夋嫨">
-					<el-option v-for="item in equipmentList" :key="item.value" :label="item.label" :value="item.value">
-					</el-option>
-				</el-select>
-			</div>
 			<div class="search_thing" style="padding-left: 30px;">
 				<el-button size="small" @click="refresh()">閲� 缃�</el-button>
 				<el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
-				<el-col :span="12" style="text-align: right;">
-					<el-button size="medium" type="primary" @click="dialogVisible2 = true">鏂板</el-button>
-				</el-col>
 			</div>
 		</div>
 		<div class="table">
@@ -359,7 +350,7 @@
             </el-form-item>
             <el-form-item label="褰撳墠鐘舵��:">
 							<el-select v-model="formData2.deviceStatus" placeholder="璇烽�夋嫨" size="small" style="width:100%">
-								<el-option v-for="item in deviceStatusList" :key="item.value" :label="item.label" :value="item.value">
+								<el-option v-for="item in deviceStatusList" :key="item.id" :label="item.label" :value="item.value">
 								</el-option>
 							</el-select>
 						</el-form-item>
@@ -561,6 +552,11 @@
 					category: "璁惧鐘舵��"
 				}).then(res => {
 					this.deviceStatusList = res.data
+          this.deviceStatusList.forEach(a=>{
+            if(!isNaN(a.value)){
+              a.value = parseInt(a.value)
+            }
+          })
 					this.componentData.tagField.deviceStatus.select = res.data
 				})
 				this.$axios.post(this.$api.enums.selectEnumByCategory, {
@@ -590,7 +586,7 @@
           this.componentData.tagField.insProductIds.select = []
           this.componentData.selectField.insProductIds.select = []
           this.options = res.data.map((m,i)=>{
-            m.id = i;
+            m.id = m.name;
             let children = m.children.map(n=>{
               n.label = n.name;
               n.value = n.id;

--
Gitblit v1.9.3