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/index.vue | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
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