From 8e85533ae6269e2a224b5fcf593ad12a9ccf9aaf Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期二, 29 八月 2023 13:20:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/experiment/inspectionApplication/index.vue | 39 +++++++++++++++++++++++++++------------
1 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/src/views/experiment/inspectionApplication/index.vue b/src/views/experiment/inspectionApplication/index.vue
index 7b3dca7..5941633 100644
--- a/src/views/experiment/inspectionApplication/index.vue
+++ b/src/views/experiment/inspectionApplication/index.vue
@@ -194,19 +194,21 @@
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="鏉ユ枡鏃ユ湡锛�">
- <el-input style="width: 300px" type="text" :value="infoForm.startTime" placeholder="璇疯緭鍏ユ潵鏂欐棩鏈�" autocomplete="off" />
- </el-form-item>
+ <!-- <el-input style="width: 300px" type="text" :value="infoForm.startTime" placeholder="璇疯緭鍏ユ潵鏂欐棩鏈�" autocomplete="off" /> -->
+ <el-date-picker style="width: 300px"
+ v-model="infoForm.startTime" type="date" placeholder="閫夋嫨鏃ユ湡"> </el-date-picker>
+ </el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="渚涘簲鍟嗗悕绉帮細">
- <el-input style="width: 300px" type="text" :value="infoForm.supplierName" placeholder="璇疯緭鍏ヤ緵搴斿晢鍚嶇О" autocomplete="off" />
+ <el-input style="width: 300px" type="text" :value="infoForm.supplier" placeholder="璇疯緭鍏ヤ緵搴斿晢鍚嶇О" autocomplete="off" />
</el-form-item>
</el-col>
</el-row>
<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 +382,7 @@
title="鏍囧噯搴�"
:visible.sync="Standardframe"
width="49%"
- height="">
+ >
<el-card>
<template slot-scope="scope" >
<span>鐗堟湰閫夋嫨锛�</span>
@@ -396,7 +398,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' }"
@@ -485,7 +487,7 @@
min-width="8%"
/>
<el-table-column
- prop="supplierName"
+ prop="supplier"
label="渚涘簲鍟嗗悕绉�"
min-width="12%"
/>
@@ -520,7 +522,7 @@
min-width="8%"
/>
<el-table-column
- prop="supplier"
+ prop="surveyor"
label="妫�楠屼汉"
min-width="8%"
/>
@@ -530,12 +532,12 @@
min-width="8%"
/>
<el-table-column
- prop="condition"
+ prop="type"
label="鐘舵��"
min-width="8%"
>
<template slot-scope="scope">
- <span :style="{ color: scope.row.state === 1 ? 'green' : 'red' }">
+ <span :style="{ color: scope.row.state === type ? 'green' : 'red' }">
{{ scope.row.state===1 ? '宸叉娴�':'寰呮娴�' }}
</span>
</template>
@@ -606,6 +608,7 @@
import { selectInspectsList, selectAll, addInspect,chooseVer,lookProByVer} from '@/api/experiment/planAssignments'
export default {
data() {
+
return {
showDetail: false,
searchData: {
@@ -614,6 +617,7 @@
state: '',
},
valu:{},
+ inputValue: '',
icode:'',
inspectionTable: [],
rawMaterialTable: [],
@@ -706,7 +710,7 @@
},
async selectAll(){
const res = selectAll({type:2})
- console.log(res);
+ // console.log(res);
this.commisionTable = res.data
},
async handleClick(row){
@@ -715,6 +719,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);
@@ -738,7 +749,7 @@
specifications:this.tmp.specifications,
version:this.aa
})
- console.log(res);
+ // console.log(res);
this.tableData = res.data
},
ccc(val){
@@ -819,6 +830,8 @@
},
handleRawMaterialSelection(){
this.infoForm = this.tmp
+ // console.log( this.infoForm );
+ this.infoForm.endTime=[this.infoForm.startTime,this.infoForm.endTime]
// console.log(this.infoForm);
this.rawmaterialVisible = false
@@ -916,7 +929,9 @@
//纭畾璺宠浆
QUEding(){
// this.tableRow = a
+
this.Standardframe = true
+
this.chooseVer()
},
--
Gitblit v1.9.3