From 5fdfea676b2bc01e7d2066c32fb2453a9284b25e Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期六, 26 八月 2023 13:27:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/experiment/inspectionApplication/index.vue | 125 +++++++++++++++++------------------------
1 files changed, 53 insertions(+), 72 deletions(-)
diff --git a/src/views/experiment/inspectionApplication/index.vue b/src/views/experiment/inspectionApplication/index.vue
index 8fbad77..84990fe 100644
--- a/src/views/experiment/inspectionApplication/index.vue
+++ b/src/views/experiment/inspectionApplication/index.vue
@@ -180,16 +180,17 @@
title="鏂板妫�楠屽崟"
:visible.sync="checkTypeVisible"
width="50%"
+ top="10vh"
>
<div class="check-box">
<el-radio-group v-model="type" @change="handleRadioChange">
- <el-radio style="background-color: rgb(170, 236, 214);border-radius: 10px;" :label="0" border >鍘熸潗鏂欐楠�</el-radio>
- <el-radio style="background-color: rgb(170, 236, 214);border-radius: 10px;" :label="1" border>濮旀墭妫�楠�</el-radio>
- <el-radio style="background-color: rgb(170, 236, 214);border-radius: 10px;" :label="2" border>鎴愬搧妫�楠�</el-radio>
+ <el-radio :style="`background-color: ${type==0?'rgb(170, 236, 214)':'#fff'};border-radius: 10px;`" :label="0" border>鍘熸潗鏂欐楠�</el-radio>
+ <el-radio :style="`background-color: ${type==1?'rgb(170, 236, 214)':'#fff'};border-radius: 10px;`" :label="1" border>濮旀墭妫�楠�</el-radio>
+ <el-radio :style="`background-color: ${type==2?'rgb(170, 236, 214)':'#fff'};border-radius: 10px;`" :label="2" border>鎴愬搧妫�楠�</el-radio>
</el-radio-group>
</div>
- <div v-if="type === 0 || type === ''">
- <el-form :model="infoForm" ref="infoForm" class="checkTypeForm" label-position="top" label-width="200px" size="mini">
+ <div v-if="type === 0">
+ <el-form :model="infoForm" ref="infoForm" class="checkTypeForm" label-position="top" label-width="200px" size="medium">
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="鏉ユ枡鏃ユ湡锛�">
@@ -251,44 +252,44 @@
<el-form :model="commisionSelection" ref="commisionTable" class="checkTypeForm" label-position="top" label-width="200px" size="mini">
<el-row :gutter="100">
<el-col :span="10">
- <el-form-item label="鏉ユ枡鏃ユ湡锛�">
- <el-input style="width: 300px" type="text" :value="commisionSelection.formTime" placeholder="璇疯緭鍏ユ潵鏂欐棩鏈�" autocomplete="off" />
+ <el-form-item label="濮旀墭缂栧彿">
+ <el-input style="width: 300px" type="text" :value="commisionSelection.entrust_coding" placeholder="璇疯緭鍏ユ潵鏂欐棩鏈�" autocomplete="off" />
</el-form-item>
</el-col>
<el-col :span="10">
- <el-form-item label="渚涘簲鍟嗗悕绉帮細">
- <el-input style="width: 300px" type="text" :value="commisionSelection.supplier" placeholder="璇疯緭鍏ュ鎵樺崟浣�" autocomplete="off" />
+ <el-form-item label="濮旀墭鍗曚綅">
+ <el-input style="width: 300px" type="text" :value="commisionSelection.entrusted" 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="commisionSelection.mcode" placeholder="璇疯緭鍏ユ牱鍝佺紪鍙�" autocomplete="off" />
+ <el-form-item label="鏍峰搧缂栧彿">
+ <el-input style="width: 300px" type="text" :value="commisionSelection.samples_number" placeholder="璇疯緭鍏ユ牱鍝佺紪鍙�" autocomplete="off" />
</el-form-item>
</el-col>
<el-col :span="10">
- <el-form-item label="濮旀墭鍚嶇О锛�">
- <el-input style="width: 300px" type="text" :value="commisionSelection.name" placeholder="璇疯緭鍏ユ牱鍝佸悕绉�" autocomplete="off" />
+ <el-form-item label="鏍峰搧鍚嶇О">
+ <el-input style="width: 300px" type="text" :value="commisionSelection.sample_name" 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="commisionSelection.specifications" placeholder="璇疯緭鍏ュ瀷鍙疯鏍�" autocomplete="off" />
+ <el-input style="width: 300px" type="text" :value="commisionSelection.specifications_models" placeholder="璇疯緭鍏ュ瀷鍙疯鏍�" autocomplete="off" />
</el-form-item>
</el-col>
<el-col :span="10">
- <el-form-item label="鍗曚綅锛�">
- <el-input style="width: 300px" type="text" :value="commisionSelection.unit" placeholder="璇疯緭鍏ュ崟浣�" autocomplete="off" />
+ <el-form-item label="閫佽揪鏃堕棿">
+ <el-input style="width: 300px" type="text" :value="commisionSelection.dateSurvey" 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="commisionSelection.num" placeholder="璇疯緭鍏ユ暟閲�" autocomplete="off" />
+ <el-form-item label="瀹屾垚鏈熼檺">
+ <el-input style="width: 300px" type="text" :value="commisionSelection.completionDeadline" placeholder="璇疯緭鍏ユ暟閲�" autocomplete="off" />
</el-form-item>
</el-col>
<el-col :span="10">
@@ -395,8 +396,6 @@
height="calc(100vh - 250px)"
default-expand-all
ref="multipleTable"
- @select="selectTr"
- @select-all="selectAll"
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
>
<el-table-column type="selection" label="搴忓彿"> </el-table-column>
@@ -557,50 +556,32 @@
@selection-change="handleSelectionChange"
style="width: 100%"
>
- <el-table-column
- type="selection"
- min-width="10%"
- />
- <el-table-column
- type="index"
- label="搴忓彿"
- min-width="10%"
- />
- <el-table-column
- prop="formTime"
- label="濮旀墭bian'ha"
- min-width="10%"
- />
- <el-table-column
- prop="supplier"
- label="渚涘簲鍟嗗悕绉�"
- min-width="12%"
- />
- <el-table-column
- prop="mcode"
- label="鏉愭枡缂栫爜"
- min-width="8%"
- />
- <el-table-column
- prop="specifications"
- label="瑙勬牸鍨嬪彿"
- min-width="8%"
- />
- <el-table-column
- prop="unit"
- label="鍗曚綅"
- min-width="12%"
- />
- <el-table-column
- prop="num"
- label="鏁伴噺"
- min-width="8%"
- />
- <el-table-column
- prop="checkdate_"
- label="妫�楠屾棩鏈�"
- min-width="8%"
- />
+ <el-table-column type="selection" min-width="10%" />
+ <el-table-column type="index" label="搴忓彿" min-width="10%" />
+ <el-table-column prop="entrust_coding" label="濮旀墭缂栧彿" min-width="10%" />
+ <el-table-column prop="entrusted" label="濮旀墭鍗曚綅" min-width="12%" />
+ <el-table-column prop="samples_number" label="鏍峰搧缂栧彿" min-width="8%" />
+ <el-table-column prop="sample_name" label="鏍峰搧鍚嶇О" min-width="8%" />
+ <el-table-column prop="specifications_models" label="瑙勬牸鍨嬪彿" min-width="12%" />
+ <el-table-column prop="dateSurvey" label="閫佽揪鏃堕棿" min-width="8%" />
+ <el-table-column prop="completionDeadline" label="瀹屾垚鏈熼檺" min-width="8%" />
+ <el-table-column prop="contacts" label="濮旀墭缂栧埗浜�" min-width="8%" />
+ <el-table-column prop="inspectionTime" label="妫�楠屾棩鏈�" min-width="8%" />
+ <el-table-column prop="inspection_status" label="鐘舵��" min-width="8%">
+ <template slot-scope="scope">
+ <div v-if="scope.row.inspection_status === 1">
+ <span style="color: green;">宸叉娴�</span>
+ </div>
+ <div v-else>
+ <span style="color: red;">寰呮娴�</span>
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column label="鎿嶄綔" min-width="8%">
+ <template slot-scope="scope">
+ <el-button type="text" size="small">鍒犻櫎</el-button>
+ </template>
+ </el-table-column>
</el-table>
<span slot="footer" class="dialog-footer">
<el-button @click="commisionVisible = false">鍙� 娑�</el-button>
@@ -611,7 +592,6 @@
</template>
<template v-else>
<router-view />
-
</template>
</div>
</template>
@@ -665,7 +645,7 @@
amount: '',
checkdate: []
},
- infoForm:'',
+ infoForm:{},
commisionSelection:{
entrust_coding: '',
entrusted: '',
@@ -706,11 +686,12 @@
pageSize: 8, // 姣忛〉鐨勬暟鎹潯鏁�
radioValue: '鍏ㄩ儴',
checkTypeVisible: false,
- type: '', // 榛樿涓嶉�変腑鐨勭姸鎬�
+ type: 0, // 榛樿涓嶉�変腑鐨勭姸鎬�
rawmaterialVisible: false,
commisionVisible: false,
tmp: '',
- Standardframe: false
+ Standardframe: false,
+ tableData: []
}
},
watch: {
@@ -725,6 +706,7 @@
},
created() {
this.selectInspectsList()
+ // this.getCommisionList()
},
updated() {
if (this.$route.name === 'ForInspectionDetail') this.showDetail = true
@@ -828,8 +810,7 @@
},
async handleRadioChange(){
if(this.type === 0){
- 鍘熸潗鏂欐姤妫�
-
+ // 鍘熸潗鏂欐姤妫�
this.rawmaterialVisible = true
const res = await selectAll({type: this.type})
var data = res.data
@@ -897,7 +878,7 @@
type: this.type,
unit: this.finishedTable.unit })
}
- this.type = ''
+ this.type = 0
this.checkTypeVisible = false
this.$message({
message: '娣诲姞鎴愬姛锛�',
@@ -944,7 +925,7 @@
}
height: auto;
font-size: 22px !important;
- padding: 20px 40px !important;
+ padding: 40px 50px !important;
::v-deep .el-radio__label{
font-size: 22px !important;
padding-left: 0px !important;
--
Gitblit v1.9.3