From 2c38eea08bc6060c3371885e9f7fe79473968223 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 08 九月 2023 17:28:57 +0800
Subject: [PATCH] 	modified:   .env.development 	modified:   src/api/experiment/planAssignments.js 	deleted:    src/styles/fonts/element-icons.ttf 	deleted:    src/styles/fonts/element-icons.woff 	deleted:    src/styles/icon.css 	modified:   src/views/experiment/checkTheReport/index.vue 	modified:   src/views/experiment/inspectionApplication/index.vue 	modified:   src/views/experiment/reportAuditing/index.vue 	modified:   src/views/inspectionManagement/commissionInspection/addCommision.vue 	modified:   src/views/laboratory/ledger/index.vue

---
 src/views/inspectionManagement/commissionInspection/index.vue |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/views/inspectionManagement/commissionInspection/index.vue b/src/views/inspectionManagement/commissionInspection/index.vue
index 357ef13..707c3b1 100644
--- a/src/views/inspectionManagement/commissionInspection/index.vue
+++ b/src/views/inspectionManagement/commissionInspection/index.vue
@@ -5,22 +5,22 @@
 				<div class="top-bar">
 					<el-form ref="form" :inline="true" :model="searchData">
 						<el-form-item label="濮旀墭缂栧彿:" class="sermargin">
-							<el-input v-model="searchData.code" class="input-form" placeholder="璇疯緭鍏�">
+							<el-input size="small" v-model="searchData.code" class="input-form" placeholder="璇疯緭鍏�">
 							</el-input>
 						</el-form-item>
 						<el-form-item label="鏍峰搧鍚嶇О:" class="sermargin">
-							<el-input v-model="searchData.name" class="input-form" placeholder="璇疯緭鍏�">
+							<el-input size="small" v-model="searchData.name" class="input-form" placeholder="璇疯緭鍏�">
 							</el-input>
 						</el-form-item>
 						<el-form-item label="濮旀墭鍗曚綅:" style="margin-right: 20px;">
-							<el-select v-model="searchData.department" placeholder="鍏ㄩ儴">
+							<el-select v-model="searchData.department" placeholder="鍏ㄩ儴" size="small">
 								<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
 								</el-option>
 							</el-select>
 						</el-form-item>
 						<el-form-item>
-							<el-button type="primary" @click="search">鏌ヨ</el-button>
-							<el-button type="primary" plain @click="reset">閲嶇疆</el-button>
+							<el-button type="primary" size="small" @click="search">鏌ヨ</el-button>
+							<el-button type="primary" size="small" plain @click="reset">閲嶇疆</el-button>
 						</el-form-item>
 					</el-form>
 					<el-form>
@@ -39,7 +39,7 @@
 										v-else-if="viewId!=null">褰撳墠閾炬帴灏嗗湪{{(parseInt(viewTime2)/60/60)>1?(parseInt(viewTime2)/60/60).toFixed(1)+'灏忔椂':Math.round(parseInt(viewTime2)/60)+'鍒嗛挓'}}鍚庤繃鏈�</el-col>
 								</el-row>
 							</div>
-							<el-button slot="reference" class="rightBtn" type="primary" @click="goToaddCommision">鏂板濮旀墭</el-button>
+							<el-button size="small" slot="reference" class="rightBtn" type="primary" @click="goToaddCommision">鏂板濮旀墭</el-button>
 						</el-popover>
 					</el-form>
 				</div>
@@ -251,7 +251,7 @@
 				this.addReportDialog = false
 			},
 			checkSelect(row) {
-				if (row.type === 1) {
+				if (row.inspection_status === 2) {
 					return false;
 				} else {
 					return true;

--
Gitblit v1.9.3