From e6d901a82c66b13bda0f76f3c1939a8e464e18fe Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期二, 05 九月 2023 11:28:25 +0800
Subject: [PATCH] bug修复

---
 src/views/experiment/inspectionApplication/Viewdetails/index.vue |   23 +++++++++++++----------
 1 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/views/experiment/inspectionApplication/Viewdetails/index.vue b/src/views/experiment/inspectionApplication/Viewdetails/index.vue
index 02d495a..4799074 100644
--- a/src/views/experiment/inspectionApplication/Viewdetails/index.vue
+++ b/src/views/experiment/inspectionApplication/Viewdetails/index.vue
@@ -86,18 +86,20 @@
 						</el-table-column>
 						<el-table-column prop="required" label="鍐呮帶鍊�">
 						</el-table-column>
-						<el-table-column prop="userName" label="璐d换浜�" width="220px">
+						<el-table-column prop="userId" label="璐d换浜�" width="220px">
 							<template slot-scope="scope">
-								<el-select v-model="scope.row.username" size="small" slot="append"
+								<el-select v-model="scope.row.userId" slot="append"
 									@change="(val)=>chooseUseProId(val, scope.row)">
 									<el-option v-for="(item,indxe) in ZERENren" :key="indxe" :label="item.name"
 										:value="item.id"></el-option>
 								</el-select>
 							</template>
 						</el-table-column>
-						<el-table-column prop="inspectionMaterialId" label="瀹為獙璁惧" width="220px">
+						<el-table-column prop="instrumentId" label="瀹為獙璁惧" width="300px">
 							<template slot-scope="scope">
-								<el-cascader v-model="scope.row.instrumentName" :options="devices" @change="(val)=>chooseEquipment(val, scope.row)"></el-cascader>
+								<el-cascader v-model="scope.row.instrumentId" :options="devices"
+									:props="{label: 'Name',value: 'Id',children: 'childrenList'}"
+									@change="(val)=>chooseEquipment(val, scope.row)" style="width: 100%;"></el-cascader>
 							</template>
 						</el-table-column>
 					</el-table>
@@ -156,7 +158,8 @@
 			},
 			async selectEquipment() {
 				const res = await selectEquipment()
-				this.getDevices = res.data
+				this.devices = JSON.parse(JSON.stringify(res.data).replaceAll('father', '').replaceAll('ins', '').replaceAll(
+					'son', '').replaceAll('name', 'Name'))
 			},
 			//妫�楠屽崟琛�
 			async selectInspectsListById() {
@@ -171,15 +174,15 @@
 					id: row.id,
 					userProId: val
 				}).then(res => {
-					this.$message.success('璐d换浜哄垎閰嶆垚鍔�')
+					if (res.data) this.$message.success('璐d换浜哄垎閰嶆垚鍔�')
 				})
 			},
-			chooseEquipment(val, row){
-				chooseUseProId({
+			chooseEquipment(val, row) {
+				chooseEquipment({
 					id: row.id,
-					equipmentId: val
+					equipmentId: val[2]
 				}).then(res => {
-					this.$message.success('璁惧鍒嗛厤鎴愬姛')
+					if (res.data) this.$message.success('璁惧鍒嗛厤鎴愬姛')
 				})
 			}
 		}

--
Gitblit v1.9.3