From da9e5a67fbdb03561d9359379867c760f4fd8981 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期三, 23 八月 2023 13:42:01 +0800
Subject: [PATCH] 更新检验计划

---
 src/views/experiment/planAssignments/plan.vue |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/views/experiment/planAssignments/plan.vue b/src/views/experiment/planAssignments/plan.vue
index c616156..0907cbc 100644
--- a/src/views/experiment/planAssignments/plan.vue
+++ b/src/views/experiment/planAssignments/plan.vue
@@ -60,7 +60,7 @@
 				:tree-props="{children: 'children', hasChildren: 'hasChildren'}" :key="upIndex">
 				<el-table-column type="index" width="50" label="搴忓彿">
 				</el-table-column>
-				<el-table-column prop="code" label="鐢宠鍗曞彿" width="200px">
+				<el-table-column prop="code" label="鐢宠鍗曞彿" width="250px">
 					<template slot-scope="scope">
 						<div style="display: flex;">
 							<div v-if="scope.row.orderNum=='01'" style="color: #3caaff;background-color: #eff5ff;" class="order_num">
@@ -76,7 +76,7 @@
 						</div>
 					</template>
 				</el-table-column>
-				<el-table-column prop="name" label="鍚嶇О">
+				<el-table-column prop="name" label="鍚嶇О" width="200px">
 				</el-table-column>
 				<el-table-column prop="unit" label="鍗曚綅">
 				</el-table-column>
@@ -88,9 +88,9 @@
 				</el-table-column>
 				<el-table-column prop="checker" label="鎵ц浜�">
 				</el-table-column>
-				<el-table-column prop="instrumentname" label="妫�楠屾棩鏈�">
+				<el-table-column prop="instrumentname" label="妫�楠岃澶�">
 				</el-table-column>
-				<el-table-column prop="testState" label="妫�楠岀姸鎬�">
+				<el-table-column prop="testState" label="妫�楠岀姸鎬�" width="100px">
 					<template slot-scope="scope">
 						<el-tag type="success" v-if="scope.row.testState==1">鍚堟牸</el-tag>
 						<el-tag type="danger" v-else-if="scope.row.testState==0">涓嶅悎鏍�</el-tag>
@@ -331,15 +331,24 @@
 			submitUpData2() {
 				var data = []
 				this.upData.testValue.forEach(a => {
-					data.push(a.number)
+					if(a.number!=''&&a.number!=null){
+						data.push(a.number)
+					}
 				})
 				wpost(this.$url.check, {
 					id: this.upData.code,
 					value: data.toString()
 				}).then(res => {
-					this.$message.success('鎻愪氦鎴愬姛')
 					this.upInsDia = false
 					this.selectDataList()
+					this.$confirm(`<p style="line-height: 80px">鎮ㄧ殑椤圭洰(${this.upData.name})妫�楠岀粨鏋滀负锛�<span class="${res.data==1?'ins_state_success':'ins_state_error'}">${res.data==1?'鍚堟牸':'涓嶅悎鏍�'}</span></p>`, '鎻愪氦鎴愬姛', {
+						confirmButtonText: '纭畾',
+						cancelButtonText: '鍏抽棴',
+						dangerouslyUseHTMLString:true,
+						type: `${res.data==1?'success':'error'}`
+					}).then(() => {
+					}).catch(() => {
+					})
 				})
 			}
 		}

--
Gitblit v1.9.3