From 06206329d0c2a7d806d70f3b8c9f7840d82200e2 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 21 八月 2024 15:10:06 +0800
Subject: [PATCH] 修改下单逻辑

---
 src/components/view/b1-inspection-order.vue |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index 442b29e..d866587 100644
--- a/src/components/view/b1-inspection-order.vue
+++ b/src/components/view/b1-inspection-order.vue
@@ -321,7 +321,7 @@
 			</el-dialog>
 			<el-dialog title="鏁版嵁鏌ョ湅" :visible.sync="dataDialogVisible" width="80%">
 				<div style="height: 70vh;overflow-y: auto;" v-if="dataDialogVisible">
-					<ValueTable ref="ValueTableDataLook" :url="$api.insOrder.selectSampleAndProductByOrderId"
+					<ValueTable ref="ValueTableDataLook" :rowKey="'insProductId'" :url="$api.insOrder.selectSampleAndProductByOrderId"
 						:componentData="componentDataDataLook"/>
 				</div>
 			</el-dialog>
@@ -339,7 +339,7 @@
 			</el-dialog>
 		</div>
 		<div style="width: 100%;height: 100%;" v-if="active >0">
-			<Add :active="active" :currentId="currentId" v-if="active<4" />
+			<Add :active="active" :currentId="currentId" v-if="active<4" :examine = "examine" />
 		</div>
     <el-dialog title="鏍囩鎵撳嵃" :visible.sync="printDialogVisible" width="40%" top="5vh">
       <div style="width:100%;height: 400px;overflow-y: auto;" v-loading="loadPint">
@@ -460,6 +460,7 @@
 		data() {
 			return {
         deleteTilte:'鎾ら攢',
+        examine: null,
         deleteList:[],
         loadPint:false,
         checkAll: false,
@@ -643,6 +644,10 @@
 								value: 0,
 								label: '涓嶅悎鏍�',
 								type: 'danger'
+							},{
+								value: 3,
+								label: '涓嶅垽瀹�',
+								type: ''
 							}]
 						}
 					},
@@ -928,6 +933,7 @@
 				// //澶嶅埗缁檉ormData
 				// this.formData = this.HaveJson(row);
 				this.currentId = row.id
+        this.examine = 1
 			},
 			// 鏁版嵁鏌ョ湅
 			handleDataLook(row) {
@@ -951,6 +957,7 @@
 				// this.verifyDialogVisible = true;
 				this.active = 3;
 				this.currentId = row.id
+        this.examine = 1
 			},
 			// 鎾ら攢
 			handlEquash(row) {
@@ -1111,6 +1118,7 @@
 			// 涓嬪崟
 			playOrder(num) {
 				this.active = num
+        this.examine = 0
         this.refreshTable('page')
 			},
 			handleTab(m, i) {

--
Gitblit v1.9.3