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

---
 src/components/view/b1-inspect-order-plan.vue |   22 +++++-----------------
 1 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/src/components/view/b1-inspect-order-plan.vue b/src/components/view/b1-inspect-order-plan.vue
index 2c3f8b1..49f53db 100644
--- a/src/components/view/b1-inspect-order-plan.vue
+++ b/src/components/view/b1-inspect-order-plan.vue
@@ -127,7 +127,7 @@
 				:url="$api.insOrderPlan.selectInsOrderPlanList" :upUrl="$api.user.updateUser" :componentData="componentData"
 				:key="upIndex" @upUser="upUser" />
 		</div>
-		<el-dialog title="鎻愮ず" :visible.sync="claimVisible" width="40%">
+		<el-dialog title="鎻愮ず" :visible.sync="claimVisible" width="400px">
 			鏄惁璁ら濮旀墭缂栧彿<span style="color:#33C130">{{sampleUserForm.entrustCode}}</span>鐨勪换鍔�
 			<span slot="footer" class="dialog-footer">
 				<el-button @click="claimVisible = false">鍙� 娑�</el-button>
@@ -166,7 +166,7 @@
 					entity: {
 						viewSelf: false,
 						state: 1,
-						childrenLaboratory: null,
+						sonLaboratory: null,
 						insState: null,
 						sampleName: null,
 						orderBy: {
@@ -177,6 +177,7 @@
 					isIndex: true,
 					showSelect: false,
 					select: false,
+					sort: false,
 					do: [{
 							id: '',
 							font: '妫�楠�',
@@ -228,16 +229,6 @@
 			this.$nextTick(() => {
 				this.refreshTable()
 			})
-		},
-		watch: {
-			tabList(newVal) {
-				if (newVal && newVal.length > 0) {
-					this.componentData.entity.childrenLaboratory = newVal[0].value
-					this.$nextTick(() => {
-						this.refreshTable()
-					})
-				}
-			}
 		},
 		methods: {
 			upUser() {
@@ -308,7 +299,7 @@
 			},
 			handleTab(m, i) {
 				this.tabIndex = i;
-				this.componentData.entity.childrenLaboratory = m.value
+				this.componentData.entity.sonLaboratory = m.value
 				this.refreshTable()
 			},
 			getTypeDicts() {
@@ -357,11 +348,8 @@
 							value: ele.value
 						}
 					})
-					this.$nextTick(() => {
-						this.componentData.entity.childrenLaboratory = this.tabList[0].value
-					})
 				})
 			}
 		}
 	}
-</script>
\ No newline at end of file
+</script>

--
Gitblit v1.9.3