From a48d89e9821e7bfeed78fa5185433facf13ca003 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期五, 01 九月 2023 08:23:27 +0800
Subject: [PATCH] bug修复

---
 src/views/experiment/inspectionApplication/index.vue |   23 +++++++++++------------
 1 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/views/experiment/inspectionApplication/index.vue b/src/views/experiment/inspectionApplication/index.vue
index 841c940..7fcd26e 100644
--- a/src/views/experiment/inspectionApplication/index.vue
+++ b/src/views/experiment/inspectionApplication/index.vue
@@ -55,7 +55,7 @@
 							:header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}"
 							:data="inspectionTable">
 							<el-table-column type="selection" min-width="30px" />
-							<el-table-column prop="icode" label="鐢宠鍗曞彿" min-width="150px" />
+							<el-table-column prop="icode" label="鐢宠鍗曞彿" min-width="160px" />
 							<el-table-column prop="type" label="妫�楠岀被鍨�" min-width="100px">
 								<template slot-scope="scope">
 									<div v-if="scope.row.type === 0"><el-tag type="success">鍘熸潗鏂欐楠�</el-tag></div>
@@ -66,22 +66,22 @@
 							<el-table-column prop="formTime" label="鏉ユ枡鏃ユ湡" min-width="90px" />
 							<el-table-column prop="supplier" label="渚涘簲鍟嗗悕绉�" min-width="150px" show-overflow-tooltip />
 							<el-table-column prop="mcode" label="鍘熸潗鏂欑紪鐮�" min-width="170px" />
-							<el-table-column prop="name" label="鍘熸潗鏂欏悕绉�" min-width="80px" />
+							<el-table-column prop="name" label="鍘熸潗鏂欏悕绉�" min-width="90px" />
 							<el-table-column prop="specifications" label="瑙勬牸鍨嬪彿" min-width="160px" />
 							<el-table-column prop="unit" label="鍗曚綅" min-width="50px" />
 							<el-table-column prop="num" label="鏁伴噺" min-width="50px" />
-							<el-table-column prop="createTime" label="鐧昏鏃ユ湡" min-width="80px" />
-							<el-table-column prop="inspection_status" label="妫�楠岀粨鏋�" min-width="80px">
+							<el-table-column prop="createTime" label="鐧昏鏃ユ湡" min-width="90px" />
+							<el-table-column prop="inspection_status" label="妫�楠岀粨鏋�" min-width="95px">
 								<template slot-scope="scope">
-									<el-tag class="tag" type="danger" disable-transitions
+									<el-tag class="tag" effect="dark" type="danger" disable-transitions
 										v-if="scope.row.inspection_status == 0">涓嶅悎鏍�</el-tag>
-									<el-tag class="tag" type="success" disable-transitions
+									<el-tag class="tag" effect="dark" type="success" disable-transitions
 										v-else-if="scope.row.inspection_status == 1">鍚堟牸</el-tag>
 								</template>
 							</el-table-column>
 							<el-table-column prop="userName" label="鐧昏浜�" min-width="80px" />
-							<el-table-column prop="checkdate" label="妫�楠屾棩鏈�" min-width="160px" />
-							<el-table-column label="鎿嶄綔" min-width="150" fixed="right">
+							<el-table-column prop="checkdate" label="妫�楠屾棩鏈�" min-width="170px" />
+							<el-table-column label="鎿嶄綔" min-width="120" fixed="right">
 								<template slot-scope="scope">
 									<el-button type="text" size="small" @click="handleClick(scope.row)">鏌ョ湅</el-button>
 									<el-button type="text" size="small" @click="delInspect(scope.row)">浣滃簾</el-button>
@@ -298,7 +298,6 @@
 						</div>
 						<span slot="footer" class="dialog-footer">
 							<el-button @click="checkTypeVisible = false">鍙� 娑�</el-button>
-							<!-- <el-button type="primary" @click="addInspection">纭� 瀹�</el-button> -->
 							<el-button type="primary" @click="QUEding">纭� 瀹�</el-button>
 						</span>
 					</el-dialog>
@@ -314,7 +313,7 @@
 						</el-select>
 					</template>
 				</el-card>
-				<el-table :data="tableData" style="width: 100%; margin-bottom: 20px" row-key="id" border height="calc(40vh)"
+				<el-table :data="tableData" style="width: 100%; margin-bottom: 20px;overflow-y: auto;" row-key="id" border height="40vh"
 					default-expand-all ref="multipleTable" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
 					<el-table-column type="index" width="50px" label="搴忓彿"></el-table-column>
 					<el-table-column prop="name" label="椤圭洰鍚嶇О" sortable>
@@ -331,9 +330,9 @@
 				</span>
 			</el-dialog>
 			<!-- 鍘熸潗鏂欐楠屾ā鎬佹 -->
-			<el-dialog title="鍘熸潗鏂欐楠�" :visible.sync="rawmaterialVisible" width="60%">
+			<el-dialog title="鍘熸潗鏂欐楠�" :visible.sync="rawmaterialVisible" width="60%" top="100px">
 				<div class="table-box">
-					<el-table ref="multipleTable" :max-height="800" :cell-style="{textAlign: 'center'}"
+					<el-table ref="multipleTable" :max-height="600" :cell-style="{textAlign: 'center'}"
 						:header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}"
 						:data="rawMaterialTable" style="width: 100%" @selection-change="handleSelectionChange">
 						<el-table-column type="selection" min-width="10%" />

--
Gitblit v1.9.3