From 5fa8dc320c2d2ec68fb0392f7e52cb49874b2bff Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 05 九月 2023 16:47:57 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.65.113:9001/r/lims-before
---
src/views/experiment/inspectionApplication/Viewdetails/index.vue | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/views/experiment/inspectionApplication/Viewdetails/index.vue b/src/views/experiment/inspectionApplication/Viewdetails/index.vue
index 02d495a..9be8f3f 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="璐ｄ换浜�" width="220px">
+ <el-table-column prop="userId" label="璐ｄ换浜�" 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() {
@@ -174,10 +177,10 @@
this.$message.success('璐ｄ换浜哄垎閰嶆垚鍔�')
})
},
- chooseEquipment(val, row){
- chooseUseProId({
+ chooseEquipment(val, row) {
+ chooseEquipment({
id: row.id,
- equipmentId: val
+ equipmentId: val[2]
}).then(res => {
this.$message.success('璁惧鍒嗛厤鎴愬姛')
})
--
Gitblit v1.9.3