From 191afda78d09d2d685e8f1691339f9726e7afc7a Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期一, 28 八月 2023 11:09:23 +0800
Subject: [PATCH] 新增完善
---
src/views/experiment/inspectionApplication/index.vue | 21 ++++++++--
src/views/experiment/inspectionApplication/Viewdetails/index.vue | 34 +++++++++++-----
src/api/experiment/planAssignments.js | 8 ++++
3 files changed, 47 insertions(+), 16 deletions(-)
diff --git a/src/api/experiment/planAssignments.js b/src/api/experiment/planAssignments.js
index 49dd0af..6930a4e 100644
--- a/src/api/experiment/planAssignments.js
+++ b/src/api/experiment/planAssignments.js
@@ -79,3 +79,11 @@
params
})
}
+//閫夋嫨璐ｄ换浜�
+export function chooseinstum(params) {
+ return request({
+ url: '/plan/chooseinstum',
+ method: 'get',
+ params
+ })
+}
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})
diff --git a/src/views/experiment/inspectionApplication/index.vue b/src/views/experiment/inspectionApplication/index.vue
index 7b3dca7..0ebe171 100644
--- a/src/views/experiment/inspectionApplication/index.vue
+++ b/src/views/experiment/inspectionApplication/index.vue
@@ -206,7 +206,7 @@
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="鍘熸潗鏂欑紪鐮侊細">
- <el-input style="width: 300px" type="text" :value="infoForm.mcode" placeholder="璇疯緭鍏ュ師鏉愭枡缂栫爜" autocomplete="off" />
+ <el-input style="width: 300px" type="text" :value="infoForm.mcode" placeholder="璇疯緭鍏ュ師鏉愭枡缂栫爜" autocomplete="off" />
</el-form-item>
</el-col>
<el-col :span="10">
@@ -380,7 +380,7 @@
title="鏍囧噯搴�"
:visible.sync="Standardframe"
width="49%"
- height="">
+ >
<el-card>
<template slot-scope="scope" >
<span>鐗堟湰閫夋嫨锛�</span>
@@ -396,7 +396,7 @@
style="width: 100%; margin-bottom: 20px"
row-key="id"
border
- height="calc(90vh - 250px)"
+ height="calc(80vh - 250px)"
default-expand-all
ref="multipleTable"
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
@@ -606,6 +606,7 @@
import { selectInspectsList, selectAll, addInspect,chooseVer,lookProByVer} from '@/api/experiment/planAssignments'
export default {
data() {
+
return {
showDetail: false,
searchData: {
@@ -614,6 +615,7 @@
state: '',
},
valu:{},
+ inputValue: '',
icode:'',
inspectionTable: [],
rawMaterialTable: [],
@@ -701,12 +703,12 @@
methods: {
async selectAll(){
const res = selectAll({type:0})
- console.log(res);
+ // console.log(res);
this.rawMaterialTable = res.data
},
async selectAll(){
const res = selectAll({type:2})
- console.log(res);
+ // console.log(res);
this.commisionTable = res.data
},
async handleClick(row){
@@ -715,6 +717,13 @@
this.$router.push({name:'Viewdetails',query: {id:row.id}});
this.selectInspectsList()
},
+ // validateInput() {
+ // if (this.inputValue.trim() === '') {
+ // }
+ // }, // 杈撳叆鍊间负绌猴紝寮瑰嚭鎻愮ず淇℃伅鎴栬繘琛屽叾浠栧鐞�
+ // alert('杈撳叆鍊间笉鑳戒负绌�');
+ // return;
+
//鐗堟湰搴�
async chooseVer() {
console.log(this.tmp.materialCoding);
@@ -916,7 +925,9 @@
//纭畾璺宠浆
QUEding(){
// this.tableRow = a
+
this.Standardframe = true
+
this.chooseVer()
},
--
Gitblit v1.9.3