From 62b5cdb9d4b5f34f10b517a3476806bec133fb2f Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期一, 28 八月 2023 09:10:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/experiment/inspectionApplication/Viewdetails/index.vue | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/src/views/experiment/inspectionApplication/Viewdetails/index.vue b/src/views/experiment/inspectionApplication/Viewdetails/index.vue
index 11b78d2..3bd61b2 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
@@ -114,8 +115,8 @@
</el-table-column>
<el-table-column prop="userName" label="缁忛獙浜�">
<template slot-scope="scope">
- <el-select v-model="ZERENren" size="small" slot="append" style="width: 220px;">
- <el-option v-for="item in ZERENren" :key="item.id" :label="item.name">{{ item}}</el-option>
+ <el-select v-model="value" size="small" slot="append" style="width: 220px;">
+ <el-option v-for="item in ZERENren" :key="item.id" :label="item.name" :value="item.name"></el-option>
</el-select>
</template>
</el-table-column>
@@ -136,22 +137,30 @@
</div>
</template>
<script>
- import { selectInspectsListById,selectUser} from '@/api/experiment/planAssignments'
+ import { selectInspectsListById} from '@/api/experiment/planAssignments'
export default {
data(){
return {
searchData:{ },
insProducts:[],
- ZERENren:{
- },
- uu:''
+ uu:'',
+ value:'',
+ aaa:{}
}
},
created(){
- console.log(this.$route.query.id);
- 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()
+
},
methods: {
//杩斿洖
@@ -162,10 +171,12 @@
async selectUser(){
const res = await selectUser()
this.ZERENren = res.data
+ // console.log(this.ZERENren);
},
+ //妯欐簴搴�
//妫�楠屽崟琛�
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