From 5fa8dc320c2d2ec68fb0392f7e52cb49874b2bff Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 05 九月 2023 16:47:57 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.65.113:9001/r/lims-before

---
 src/views/laboratory/measure/index.vue |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/views/laboratory/measure/index.vue b/src/views/laboratory/measure/index.vue
index 427e4d7..5c78cf1 100644
--- a/src/views/laboratory/measure/index.vue
+++ b/src/views/laboratory/measure/index.vue
@@ -8,6 +8,7 @@
             </el-input>
           </el-form-item>
           <el-form-item v-if="this.radioValue === 1">
+            <!-- <el-col :span="12"><span  hidden>2121</span></el-col> -->
             <el-button type="primary" @click="searchPlan">鏌ヨ</el-button>
           </el-form-item>
           <el-form-item v-if="this.radioValue === 0" :label="this.radioValue === 0 ? '浠櫒璁惧鍚嶇О:' : '璁惧鍚嶇О'"
@@ -126,7 +127,7 @@
           size="mini" plain>杩斿洖</el-button>
         <div v-if="addBtn"
           style="display: flex;justify-content: center;width: 10%;position: fixed;top: 43px;right: 14px; z-index: 1000;">
-          <el-button @click="addTop = -82; addBtn = false" size="mini" style="width: 60px;">杩斿洖</el-button>
+          <el-button @click="addTop = -82; addBtn = false;lookVisible= false" size="mini" style="width: 60px;">杩斿洖</el-button>
           <el-button size="mini" @click="measureAdd" style="width: 60px;" type="primary">淇濆瓨</el-button>
         </div>
       </div>
@@ -396,7 +397,8 @@
       });
       this.lookVisible = false
       this.addBtn = false
-      this.limitGetPlanMeasureInstrument()
+      // this.limitGetPlanMeasureInstrument()
+      this.getPlanPageList()
     },
     async handleSizeChangePlan(num) {
       this.pageSizePlan = num
@@ -520,7 +522,7 @@
       this.reset()
     },
     async getPlanPageList() {
-      console.log(111);
+      // console.log(111);
       let param = {
         currentPage: this.currentPage,
         pageSize: this.pageSize,

--
Gitblit v1.9.3