From d3a7b64c6855523c1d4b4978df09eda788c0064c Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期三, 24 四月 2024 18:20:41 +0800
Subject: [PATCH] 检验模板调整

---
 src/components/view/a5-capacity-scope.vue |   29 ++++++-----------------------
 1 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/src/components/view/a5-capacity-scope.vue b/src/components/view/a5-capacity-scope.vue
index bb6e503..476b7a1 100644
--- a/src/components/view/a5-capacity-scope.vue
+++ b/src/components/view/a5-capacity-scope.vue
@@ -66,14 +66,9 @@
 							v-model="itemParameterData.entity.inspectionItem" @keyup.enter.native="refreshTable()"></el-input></div>
 				</div>
 				<div class="search_thing">
-					<div class="search_label">瀹為獙瀹わ細</div>
+					<div class="search_label">妫�楠屽瓙椤癸細</div>
 					<div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
-							v-model="itemParameterData.entity.laboratory" @keyup.enter.native="refreshTable()"></el-input></div>
-				</div>
-				<div class="search_thing">
-					<div class="search_label">璁惧缁勶細</div>
-					<div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
-							v-model="itemParameterData.entity.deviceGroup" @keyup.enter.native="refreshTable()"></el-input></div>
+							v-model="itemParameterData.entity.inspectionItemSubclass" @keyup.enter.native="refreshTable()"></el-input></div>
 				</div>
 				<div class="search_thing" style="padding-left: 30px;">
 					<el-button size="small" @click="refresh()">閲� 缃�</el-button>
@@ -121,8 +116,7 @@
 				itemParameterData: {
 					entity: {
 						inspectionItem: null,
-						laboratory: null,
-						deviceGroup: null,
+						inspectionItemSubclass: null,
 						orderBy: {
 							field: 'id',
 							order: 'asc'
@@ -158,7 +152,6 @@
 							select:[]
 						},
 						method:{select:[]},
-						deviceGroup:{select:[]},
 						templateId:{
 							select:[]
 						},
@@ -184,14 +177,13 @@
 							select:[]
 						},
 						method:{select:[],choose: true},
-						deviceGroup:{select:[]},
 						sample: {select:[]},
 						sonLaboratory: {select:[]},
 						unit: {select:[]},
             dic:{select:[]},
 					},
-					requiredAdd: ['sonLaboratory','inspectionItem', 'manHour', 'inspectionItemType','inspectionItemSubclass','inspectionValueType','laboratory','unit','method','price','manDay','deviceGroup','sample'],
-					requiredUp: ['sonLaboratory','inspectionItem', 'manHour', 'inspectionItemType','inspectionItemSubclass','inspectionValueType','laboratory','unit','method','price','manDay','deviceGroup','sample']
+					requiredAdd: ['sonLaboratory','inspectionItem', 'manHour', 'inspectionItemType','inspectionValueType','laboratory','unit','method','price','manDay','sample'],
+					requiredUp: ['sonLaboratory','inspectionItem', 'manHour', 'inspectionItemType','inspectionValueType','laboratory','unit','method','price','manDay','sample']
 				},
 				testObjectData: {
 					entity: {
@@ -238,7 +230,6 @@
 			this.selectEnumByCategoryForInspectionValueType()
 			this.obtainItemParameterList()
 			this.selectStandardMethods()
-			this.selectEnumByCategoryForDevice()
 			this.selectTestObjectByName()
 			this.getStandardTemplate()
 			this.selectEnumByCategoryForSLaboratory()
@@ -312,14 +303,6 @@
 					this.itemParameterData.tagField.inspectionValueType.select = res.data
 				})
 			},
-			selectEnumByCategoryForDevice() {
-				this.$axios.post(this.$api.enums.selectEnumByCategory, {
-					category: "璁惧鍒嗙被"
-				}).then(res => {
-					this.itemParameterData.selectField.deviceGroup.select = res.data
-					this.itemParameterData.tagField.deviceGroup.select = res.data
-				})
-			},
 			selectEnumByCategoryForSLaboratory() {
 				this.$axios.post(this.$api.enums.selectEnumByCategory, {
 					category: "瀛愬疄楠屽"
@@ -370,7 +353,7 @@
 					let data = []
 					res.data.forEach(a=>{
 						data.push({
-							label: a.name,
+							label: a.code,
 							value: a.code
 						})
 					})

--
Gitblit v1.9.3