From a5d01d5503750b6c95f9393d7cd4da880de6024c Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 28 八月 2023 15:50:51 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.110.209:9001/r/lims-before
---
src/views/experiment/inspectionApplication/Viewdetails/index.vue | 34 +++++++++++++++++++++++-----------
1 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/src/views/experiment/inspectionApplication/Viewdetails/index.vue b/src/views/experiment/inspectionApplication/Viewdetails/index.vue
index 3bd61b2..8e0fb3c 100644
--- a/src/views/experiment/inspectionApplication/Viewdetails/index.vue
+++ b/src/views/experiment/inspectionApplication/Viewdetails/index.vue
@@ -123,10 +123,10 @@
<el-table-column
prop="inspectionMaterialId"
label="瀹為獙璁惧">
- <template>
- <!-- <el-select v-model="scope.row.checker" size="small" slot="append" style="width: 260px;">
- <el-option v-for="item in checkeroptions" :key="item.value" :label="item.label">{{ item.label }}</el-option>
- </el-select> -->
+ <template slot-scope="scope">
+ <el-select v-model="SHEbei" size="small" slot="append" style="width: 220px;">
+ <el-option v-for="item in getDevices" :key="item.id" :label="item.name"></el-option>
+ </el-select>
</template>
</el-table-column>
</el-table>
@@ -137,15 +137,17 @@
</div>
</template>
<script>
- import { selectInspectsListById} from '@/api/experiment/planAssignments'
+ import { selectInspectsListById,selectUser,chooseinstum} from '@/api/experiment/planAssignments'
export default {
data(){
return {
searchData:{ },
insProducts:[],
- uu:'',
value:'',
- aaa:{}
+ SHEbei:'',
+ aaa:{},
+ ZERENren:[],
+ // getDevices:[]
}
},
created(){
@@ -159,8 +161,8 @@
// }
console.log(this.aaa);
this.selectInspectsListById()
- // this.selectUser()
-
+ this.selectUser()
+ this.chooseinstum()
},
methods: {
//杩斿洖
@@ -171,9 +173,19 @@
async selectUser(){
const res = await selectUser()
this.ZERENren = res.data
- // console.log(this.ZERENren);
+ console.log(this.ZERENren);
},
- //妯欐簴搴�
+ //璁惧
+ // getDevices() {
+ // get(this.$url.chooseinstum).then(res => {
+ // this.devices = res.data
+ // })
+ // },
+ async chooseinstum(){
+ const res = await chooseinstum()
+ this.getDevices = res.data
+ console.log(this.getDevices);
+ },
//妫�楠屽崟琛�
async selectInspectsListById() {
const res = await selectInspectsListById({id:this.aaa.id})
--
Gitblit v1.9.3