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 | 17 ++---------------
src/components/view/b1-inspection-order.vue | 6 +++---
2 files changed, 5 insertions(+), 18 deletions(-)
diff --git a/src/components/view/b1-inspect-order-plan.vue b/src/components/view/b1-inspect-order-plan.vue
index def16ef..49f53db 100644
--- a/src/components/view/b1-inspect-order-plan.vue
+++ b/src/components/view/b1-inspect-order-plan.vue
@@ -166,7 +166,7 @@
entity: {
viewSelf: false,
state: 1,
- childrenLaboratory: null,
+ sonLaboratory: null,
insState: null,
sampleName: null,
orderBy: {
@@ -229,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() {
@@ -309,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,9 +347,6 @@
label: ele.label,
value: ele.value
}
- })
- this.$nextTick(() => {
- this.componentData.entity.childrenLaboratory = this.tabList[0].value
})
})
}
diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index 0200bd6..1ee114e 100644
--- a/src/components/view/b1-inspection-order.vue
+++ b/src/components/view/b1-inspection-order.vue
@@ -86,9 +86,9 @@
v-model="componentData.entity.entrustCode" @keyup.enter.native="refreshTable()"></el-input></div>
</div>
<div class="search_thing">
- <div class="search_label">鏍峰搧鍚嶇О锛�</div>
+ <div class="search_label">鏍峰搧绫诲瀷锛�</div>
<div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
- v-model="componentData.entity.sample" @keyup.enter.native="refreshTable()"></el-input></div>
+ v-model="componentData.entity.sampleType" @keyup.enter.native="refreshTable()"></el-input></div>
</div>
<div class="search_thing" style="padding-left: 30px;">
<el-button size="small" @click="refresh()">閲� 缃�</el-button>
@@ -217,7 +217,7 @@
componentData: {
entity: {
entrustCode: null,
- sample: null,
+ sampleType: null,
state: 0,
orderBy: {
field: 'id',
--
Gitblit v1.9.3