From 9b26870265cbbc75bcd32529e46b229a49ec30a0 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期二, 05 九月 2023 11:29:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/experiment/inspectionApplication/Viewdetails/index.vue | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/views/experiment/inspectionApplication/Viewdetails/index.vue b/src/views/experiment/inspectionApplication/Viewdetails/index.vue
index a1d8f27..9be8f3f 100644
--- a/src/views/experiment/inspectionApplication/Viewdetails/index.vue
+++ b/src/views/experiment/inspectionApplication/Viewdetails/index.vue
@@ -86,20 +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" 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"
+ <el-cascader v-model="scope.row.instrumentId" :options="devices"
:props="{label: 'Name',value: 'Id',children: 'childrenList'}"
- @change="(val)=>chooseEquipment(val, scope.row)"></el-cascader>
+ @change="(val)=>chooseEquipment(val, scope.row)" style="width: 100%;"></el-cascader>
</template>
</el-table-column>
</el-table>
@@ -174,7 +174,7 @@
id: row.id,
userProId: val
}).then(res => {
- if (res.data) this.$message.success('璐ｄ换浜哄垎閰嶆垚鍔�')
+ this.$message.success('璐ｄ换浜哄垎閰嶆垚鍔�')
})
},
chooseEquipment(val, row) {
@@ -182,7 +182,7 @@
id: row.id,
equipmentId: val[2]
}).then(res => {
- if (res.data) this.$message.success('璁惧鍒嗛厤鎴愬姛')
+ this.$message.success('璁惧鍒嗛厤鎴愬姛')
})
}
}
--
Gitblit v1.9.3