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 | 382 ++++++++++++++++++++++++++---------------------------
1 files changed, 187 insertions(+), 195 deletions(-)
diff --git a/src/views/experiment/inspectionApplication/Viewdetails/index.vue b/src/views/experiment/inspectionApplication/Viewdetails/index.vue
index 8e0fb3c..9be8f3f 100644
--- a/src/views/experiment/inspectionApplication/Viewdetails/index.vue
+++ b/src/views/experiment/inspectionApplication/Viewdetails/index.vue
@@ -1,201 +1,193 @@
<template>
-<div>
- <div style="overflow: hidden;">
- <el-card style="margin: 10px;" v-model="searchData" >
- <div slot="header" class="clearfix">
- <span>
- <i slot="prefix" class="el-icon-s-home" />
- 瀹為獙绠＄悊/鍘熸潗鏂欐楠屽崟</span>
- </div>
- <div class="card-content">
- <el-row :gutter="80">
- <el-form ref="form" :model="searchData" label-width="80px">
- <el-col :span="6">
- <el-form-item label="鏉ユ枡鏃ユ湡:" >
- <el-input :disabled="true" v-model="searchData.formTime"></el-input>
-
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="渚涘簲鍟嗗悕绉�:" >
- <el-input :disabled="true" v-model="searchData.supplier"></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="浜у搧缂栧彿:">
- <el-input :disabled="true" v-model="searchData.code"></el-input>
- </el-form-item>
- </el-col>
- </el-form>
- </el-row>
- <el-row :gutter="80">
- <el-form ref="form" :model="searchData" label-width="80px">
- <el-col :span="6">
- <el-form-item label="鍘熸潗鏂欏悕绉�:">
- <el-input :disabled="true" v-model="searchData.name"></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
-
- <el-form-item label="瑙勬牸鍨嬪彿:">
- <el-input :disabled="true" v-model="searchData.specifications"></el-input>
- </el-form-item>
- </el-col>
-
- <el-col :span="6">
-
- <el-form-item label="鍗曚綅:">
- <el-input :disabled="true" v-model="searchData.unit"></el-input>
- </el-form-item>
- </el-col>
- </el-form>
- </el-row>
- <el-row :gutter="80">
- <el-form ref="form" :model="searchData" label-width="80px">
- <el-col :span="6">
- <el-form-item label="鏁伴噺:">
- <el-input :disabled="true" v-model="searchData.num"></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="6">
-
- <el-form-item label="鐧昏鏃ユ湡:">
- <el-input :disabled="true" v-model="searchData.endTime"></el-input>
- </el-form-item>
- </el-col>
-
- <el-col :span="6">
-
- <el-form-item label="鐧昏浜�:">
- <el-input :disabled="true" v-model="searchData.userName"></el-input>
- </el-form-item>
- </el-col>
- </el-form>
- </el-row>
- </div>
- </el-card>
-
-
- <el-row style="margin: 5px;">
- <el-col :span="12" style="line-height: 32px;">妫�楠岄」鐩�</el-col>
- <el-col :span="12" style="text-align: right;">
- <!-- <el-button ic size="medium " @click="()=>{}">淇濆瓨</el-button> -->
- <el-button icon="el-icon-refresh-lef" size="medium " style="background-color: cornflowerblue;" @click="goback">杩斿洖</el-button>
- </el-col>
- </el-row>
- <div>
- <el-card style="margin: 10px;">
- <el-table
- :data="insProducts"
- height="calc(80vh - 250px)"
- border
- style="width: 100%">
- <el-table-column
- label="搴忓彿"
- type="index"
- width="50">
- </el-table-column>
- <el-table-column
- prop="name"
- label="椤圭洰"
- width="180">
- </el-table-column>
- <el-table-column
- prop="unit"
- label="鍗曚綅"
- width="180">
- </el-table-column>
- <el-table-column
- prop="internal"
- label="鏍囧噯鍊�">
- </el-table-column>
- <el-table-column
- prop="required"
- label="鍐呮帶鍊�">
- </el-table-column>
- <el-table-column prop="userName" label="缁忛獙浜�">
- <template slot-scope="scope">
- <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>
- <el-table-column
- prop="inspectionMaterialId"
- label="瀹為獙璁惧">
- <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>
-
- </el-card>
- </div>
- </div>
-</div>
+ <div>
+ <div style="overflow: hidden;">
+ <el-card style="margin: 10px;">
+ <div slot="header" class="clearfix">
+ <span>
+ <i slot="prefix" class="el-icon-s-home" />
+ 瀹為獙绠＄悊/鍘熸潗鏂欐楠屽崟</span>
+ </div>
+ <div class="card-content">
+ <el-row>
+ <el-form ref="form" :model="searchData" label-width="150px">
+ <el-col :span="8">
+ <el-form-item label="鏉ユ枡鏃ユ湡:">
+ <el-input :disabled="true" v-model="searchData.formTime"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="渚涘簲鍟嗗悕绉�:">
+ <el-input :disabled="true" v-model="searchData.supplier"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="浜у搧缂栧彿:">
+ <el-input :disabled="true" v-model="searchData.code"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-form>
+ </el-row>
+ <el-row>
+ <el-form ref="form" :model="searchData" label-width="150px">
+ <el-col :span="8">
+ <el-form-item label="鍘熸潗鏂欏悕绉�:">
+ <el-input :disabled="true" v-model="searchData.name"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="瑙勬牸鍨嬪彿:">
+ <el-input :disabled="true" v-model="searchData.specifications"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="鍗曚綅:">
+ <el-input :disabled="true" v-model="searchData.unit"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-form>
+ </el-row>
+ <el-row>
+ <el-form ref="form" :model="searchData" label-width="150px">
+ <el-col :span="8">
+ <el-form-item label="鏁伴噺:">
+ <el-input :disabled="true" v-model="searchData.num"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="鐧昏鏃ユ湡:">
+ <el-input :disabled="true" v-model="searchData.endTime"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="鐧昏浜�:">
+ <el-input :disabled="true" v-model="searchData.userName"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-form>
+ </el-row>
+ </div>
+ </el-card>
+ <el-row style="margin: 0 20px;">
+ <el-col :span="12" style="line-height: 32px;">妫�楠岄」鐩�</el-col>
+ <el-col :span="12" style="text-align: right;">
+ <el-button icon="el-icon-refresh-lef" size="medium" @click="goback">杩斿洖</el-button>
+ </el-col>
+ </el-row>
+ <div>
+ <el-card style="margin: 10px;">
+ <el-table :data="insProducts" height="calc(80vh - 250px)" border style="width: 100%">
+ <el-table-column label="搴忓彿" type="index" width="50">
+ </el-table-column>
+ <el-table-column prop="name" label="椤圭洰" width="200">
+ </el-table-column>
+ <el-table-column prop="unit" label="鍗曚綅" width="150">
+ </el-table-column>
+ <el-table-column prop="internal" label="鏍囧噯鍊�">
+ </el-table-column>
+ <el-table-column prop="required" label="鍐呮帶鍊�">
+ </el-table-column>
+ <el-table-column prop="userId" label="璐ｄ换浜�" width="220px">
+ <template slot-scope="scope">
+ <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="instrumentId" label="瀹為獙璁惧" width="300px">
+ <template slot-scope="scope">
+ <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>
+ </el-card>
+ </div>
+ </div>
+ </div>
</template>
<script>
- import { selectInspectsListById,selectUser,chooseinstum} from '@/api/experiment/planAssignments'
-export default {
- data(){
- return {
- searchData:{ },
- insProducts:[],
- value:'',
- SHEbei:'',
- aaa:{},
- ZERENren:[],
- // getDevices:[]
- }
- },
- created(){
- // 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: {
- //杩斿洖
- async goback(){
- this.$router.push({name:'inspectionApplication'})
- },
- //妫�楠屽崟璐ｄ换浜�
- async selectUser(){
- const res = await selectUser()
- this.ZERENren = res.data
- 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})
- this.searchData = res.data
- this.insProducts = res.data.insProducts
- }
-}
-}
+ import {
+ selectInspectsListById,
+ selectUser,
+ selectEquipment,
+ chooseUseProId,
+ chooseEquipment
+ } from '@/api/experiment/planAssignments'
+ export default {
+ data() {
+ return {
+ searchData: {
+ formTime: '',
+ supplier: '',
+ code: '',
+ name: '',
+ specifications: '',
+ unit: '',
+ num: '',
+ endTime: '',
+ userName: '',
+ },
+ insProducts: [],
+ value: '',
+ SHEbei: [],
+ id: null,
+ ZERENren: [],
+ devices: []
+ }
+ },
+ created() {
+ this.id = this.$route.params.id
+ this.selectInspectsListById()
+ this.selectUser()
+ this.selectEquipment()
+ },
+ methods: {
+ //杩斿洖
+ async goback() {
+ this.$router.push({
+ name: 'inspectionApplication'
+ })
+ },
+ //妫�楠屽崟璐ｄ换浜�
+ async selectUser() {
+ const res = await selectUser()
+ this.ZERENren = res.data
+ },
+ async selectEquipment() {
+ const res = await selectEquipment()
+ this.devices = JSON.parse(JSON.stringify(res.data).replaceAll('father', '').replaceAll('ins', '').replaceAll(
+ 'son', '').replaceAll('name', 'Name'))
+ },
+ //妫�楠屽崟琛�
+ async selectInspectsListById() {
+ const res = await selectInspectsListById({
+ id: this.id
+ })
+ this.searchData = res.data
+ this.insProducts = res.data.insProducts
+ },
+ chooseUseProId(val, row) {
+ chooseUseProId({
+ id: row.id,
+ userProId: val
+ }).then(res => {
+ this.$message.success('璐ｄ换浜哄垎閰嶆垚鍔�')
+ })
+ },
+ chooseEquipment(val, row) {
+ chooseEquipment({
+ id: row.id,
+ equipmentId: val[2]
+ }).then(res => {
+ this.$message.success('璁惧鍒嗛厤鎴愬姛')
+ })
+ }
+ }
+ }
</script>
<style lang="scss" scoped>
-</style>
-
\ No newline at end of file
+</style>
\ No newline at end of file
--
Gitblit v1.9.3