From ea0659c109fa54cfad9cb0ee3645ec4e9d7c4943 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 28 八月 2023 09:26:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/laboratory/measure/index.vue | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/views/laboratory/measure/index.vue b/src/views/laboratory/measure/index.vue
index 0e01e41..18e0146 100644
--- a/src/views/laboratory/measure/index.vue
+++ b/src/views/laboratory/measure/index.vue
@@ -117,6 +117,13 @@
</div>
</div>
</div>
+ <div>
+ <el-button v-if="selectInfoBtn" @click="combackLookPlan" style="position: fixed;top: 43px;right: 14px; z-index: 1000;" type="primary" icon="el-icon-refresh-left" 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 size="mini" @click="measureAdd" style="width: 60px;" type="primary">淇濆瓨</el-button>
+ </div>
+ </div>
<div
:style="`position: absolute;top:${addTop}vh;left: 9px;transition: 1s;width: 99%;height: 82vh;background-color: #fff;z-index: 21;`">
<Add ref="add" />
@@ -276,6 +283,8 @@
return {
dialogVisible: false,
tableIndex: null,
+ selectInfoBtn: false,
+ addBtn: false,
measureUpInfo: {
id: null,
code: null,
@@ -370,15 +379,12 @@
this.measureUpInfo.termValidity = scope.row.termValidity
},
measureAdd() {
- let add = this.$refs.add.add()
- if (add) {
- this.addTop = -82
+ this.addTop = -82
this.$message({
message: '鎿嶄綔鎴愬姛锛�',
type: 'success'
});
this.lookVisible = false
- }
},
async handleSizeChangePlan(num) {
this.pageSizePlan = num
@@ -392,6 +398,7 @@
this.addTop = 2
this.lookVisible = true
this.$parent.mainShowAdd()
+ this.addBtn=true
},
async limitGetPlanMeasureInstrument() {
let param = {
@@ -408,6 +415,7 @@
this.getPlanAndInfoAndIns(id)
this.lookVisible = true
this.mymodelTop = 2
+ this.selectInfoBtn=true
this.$parent.triggerMainBtnPlan()
},
async getPlanAndInfoAndIns(id) {
@@ -429,6 +437,7 @@
combackLookPlan() {
this.lookVisible = false
this.mymodelTop = -85
+ this.selectInfoBtn=false
},
blurSearch() {
if (this.radioValue === 1) {
--
Gitblit v1.9.3