From e9352432fd356691e8322af7a79781983f9932f9 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 19 三月 2024 13:07:28 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master

---
 src/components/view/b1-inspection-order.vue |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index 4ad89cb..d9a4091 100644
--- a/src/components/view/b1-inspection-order.vue
+++ b/src/components/view/b1-inspection-order.vue
@@ -155,7 +155,7 @@
 							</div>
 						</el-col>
 						<el-col class="search_thing" :span="22">
-							<div class="search_label"><span class="required-span">* </span>鎸囨淳浜哄憳锛�</div>
+							<div class="search_label"><span class="required-span" v-show="distributeData.type==2">* </span>鎸囨淳浜哄憳锛�</div>
 							<div class="search_input">
 								<el-select v-model="distributeData.userId" placeholder="璇烽�夋嫨" size="small" style="width: 100%;">
 									<el-option v-for="item in personList" :key="item.value" :label="item.label" :value="item.value">
@@ -241,7 +241,7 @@
 						type: 'text',
 						method: 'download',
 						disabFun: (row, index) => {
-							return row.state != 1
+							return row.state != 1 || row.reportId == null
 						}
 					}, {
 						id: 'verify',
@@ -255,7 +255,10 @@
 						id: 'quash',
 						font: '鎾ら攢',
 						type: 'text',
-						method: 'handlEquash'
+						method: 'handlEquash',
+						disabFun: (row, index) => {
+							return row.state == 2 || row.state == 3
+						}
 					}, {
 						font: '涓嬪彂',
 						type: 'text',
@@ -447,6 +450,7 @@
 					this.distributeData.orderId = row.id
 					this.distributeData.sampleId = row.sampleId
 					this.distributeData.appointed = res.data
+          this.distributeData.type = row.type
 				})
 			},
 			submitForm2() {
@@ -454,6 +458,10 @@
 					this.$message.error('绾﹀畾鏃堕棿鏈~鍐�')
 					return
 				}
+        if(this.distributeData.type==2&&(this.distributeData.userId==null||this.distributeData.userId=='')){
+					this.$message.error('鎸囨淳浜哄憳鏈~鍐�')
+					return
+				}
 				this.upLoad = true;
 				this.$axios.post(this.$api.insOrder.upInsOrder, {
 					orderId: this.distributeData.orderId,

--
Gitblit v1.9.3