From 7d9cfe6dae6f3bc1016cdacb497e4724e22ca3db Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 28 八月 2023 14:30:37 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.110.209:9001/r/lims-before
---
src/views/experiment/inspectionApplication/Viewdetails/index.vue | 44 ++++++++++++++++++++++++++++++++++----------
1 files changed, 34 insertions(+), 10 deletions(-)
diff --git a/src/views/experiment/inspectionApplication/Viewdetails/index.vue b/src/views/experiment/inspectionApplication/Viewdetails/index.vue
index e61c489..8e0fb3c 100644
--- a/src/views/experiment/inspectionApplication/Viewdetails/index.vue
+++ b/src/views/experiment/inspectionApplication/Viewdetails/index.vue
@@ -87,6 +87,7 @@
<el-card style="margin: 10px;">
<el-table
:data="insProducts"
+ height="calc(80vh - 250px)"
border
style="width: 100%">
<el-table-column
@@ -122,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>
@@ -136,20 +137,32 @@
</div>
</template>
<script>
- import { selectInspectsListById,selectUser} from '@/api/experiment/planAssignments'
+ import { selectInspectsListById,selectUser,chooseinstum} from '@/api/experiment/planAssignments'
export default {
data(){
return {
searchData:{ },
insProducts:[],
- uu:'',
- value:''
+ value:'',
+ SHEbei:'',
+ aaa:{},
+ ZERENren:[],
+ // getDevices:[]
}
},
created(){
- this.uu = this.$route.query.id;
+ // if(this.$route.query){
+ // this.uu = this.$route.query.id;
+ // }
+ this.aaa = this.$route.query
+ // if(this.$route.query){
+ // this.aaa = this.$router.query.data1
+ // console.log(this.aaa);
+ // }
+ console.log(this.aaa);
this.selectInspectsListById()
this.selectUser()
+ this.chooseinstum()
},
methods: {
//杩斿洖
@@ -160,11 +173,22 @@
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.uu})
+ const res = await selectInspectsListById({id:this.aaa.id})
this.searchData = res.data
this.insProducts = res.data.insProducts
}
--
Gitblit v1.9.3