From 2e2fe994aa53c7c2f389bc32d0933995389963be Mon Sep 17 00:00:00 2001
From: zzq <a13193816592@163.com>
Date: 星期三, 27 九月 2023 11:32:20 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/web/WMS
---
src/components/makepager/SearchCommonView.vue | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/src/components/makepager/SearchCommonView.vue b/src/components/makepager/SearchCommonView.vue
index 16b2170..66c8f07 100644
--- a/src/components/makepager/SearchCommonView.vue
+++ b/src/components/makepager/SearchCommonView.vue
@@ -3,9 +3,13 @@
<div class="search-top">
<div class="left">
<el-button v-if="showAdd" type="primary" size="mini" @click="addBtn">{{ addTitle }}</el-button>
+ <el-button v-if="showDiscard" size="mini" @click="discardBtn" style="margin-left: 0px">{{ "鍙栨秷" }}</el-button>
<div class="download" @click="downloadClick" :style="{ cursor: showDownload ? 'pointer' : 'no-drop' }">
<img src="@/assets/img/xiazai.png" style="width: 13px" />
</div>
+ <el-button v-if="showApply" type="text" size="mini" @click="addBtn" style="margin-left: 10px">{{
+ "搴旂敤鍏ㄩ儴"
+ }}</el-button>
<slot name="leftButton" />
</div>
<div v-if="amountView" class="amount">
@@ -79,7 +83,14 @@
type: Boolean,
default: true
},
+ showDiscard: {
+ default: false
+ },
showDownload: {
+ type: Boolean,
+ default: false
+ },
+ showApply: {
type: Boolean,
default: false
},
@@ -188,9 +199,17 @@
addBtn() {
this.$emit("addCommonClick")
},
+ // 涓㈠純
+ discardBtn() {
+ this.$emit("discardBtnClick")
+ },
// 涓嬭浇
downloadClick() {
this.$emit("downloadClick")
+ },
+ // 涓㈠純
+ applyBtn() {
+ this.$emit("applyBtnClick")
},
// 妯″叿-妫�鏌ラ厤缃�
inspectionConfigClick() {
@@ -212,7 +231,7 @@
align-items: center;
.left {
display: flex;
- width: 150px;
+ width: 210px;
margin-left: 20px;
.download {
width: 30px;
--
Gitblit v1.8.0