From c0f461382959c1037bf12735ce2c7c71cd22562b Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Thu, 24 Apr 2025 13:21:46 +0800
Subject: [PATCH] dev

---
 src/components/common/Mask.vue                | 47 ++++++++++++-------
 .../{PanmentDetail.vue => PaymentDetails.vue} |  0
 .../member/memberProfile/Exchange.vue         |  3 --
 .../member/memberProfile/FlowingWater.vue     |  4 --
 src/components/member/memberProfile/Grant.vue |  3 --
 .../member/memberProfile/VipEdit.vue          |  3 +-
 .../member/memberProfile/VipLevelEdit.vue     |  2 +-
 src/components/retail/OrderDetail.vue         |  2 +-
 src/components/settings/AddProject.vue        |  5 +-
 src/components/settings/SetMenu.vue           |  3 +-
 src/views/home/index.vue                      |  5 +-
 src/views/inventory/apply.vue                 |  4 +-
 src/views/inventory/check.vue                 |  4 +-
 src/views/member/index.vue                    |  8 ++--
 src/views/settings/item.vue                   |  2 +-
 src/views/social/directory.vue                |  2 +-
 src/views/social/inventoryUp.vue              |  2 +-
 17 files changed, 48 insertions(+), 51 deletions(-)
 rename src/components/home/index/{PanmentDetail.vue => PaymentDetails.vue} (100%)

diff --git a/src/components/common/Mask.vue b/src/components/common/Mask.vue
index c429978..cee509c 100644
--- a/src/components/common/Mask.vue
+++ b/src/components/common/Mask.vue
@@ -1,41 +1,48 @@
 <script setup lang="ts">
-import { ref, watch,defineEmits } from "vue";
-import { CloseBold } from '@element-plus/icons-vue'
+import {ref, watch, defineEmits} from "vue";
+import {CloseBold} from '@element-plus/icons-vue'
 
 let _width = ref(0);
 let _height = ref(0);
 let _isShow = ref(false);
-const { width, height, isShow,title } = defineProps(['width', 'height', 'isShow','title']);
+let _close = ref(true);
+const {width, height, isShow, title, close} = defineProps(['width', 'height', 'isShow', 'title', 'close']);
 
 _isShow.value = isShow == null ? false : isShow;
 _width.value = width == null ? 1200 : width;
 _height.value = height == null ? 800 : height;
+_close.value = close == null ? true : close;
+
 console.log(_width, _height, _isShow);
 
 watch(() => isShow, (newVal) => {
   _isShow.value = newVal == null ? false : newVal;
 });
-const emit=defineEmits(['close']);
-const close = () => {
-    emit('close',false);
+const emit = defineEmits(['close']);
+const closeBtn = () => {
+  emit('close', false);
 };
 </script>
 
 <template>
   <teleport to="body">
-  <transition name="el-fade-in">
-    <div class="mask" v-if="_isShow">
+    <transition name="el-fade-in">
+      <div class="mask" v-if="_isShow">
         <div class="mask-wrapper" :style="{ width: _width + 'px', height: _height + 'px' }" v-if="_isShow">
           <el-scrollbar height="100%">
             <div class="header">
-              <div class="title">{{title}}</div>
-              <div class="close" @click="close"><el-icon><CloseBold/></el-icon></div>
+              <div class="title">{{ title }}</div>
+              <div class="close" @click="closeBtn" v-if="_close">
+                <el-icon>
+                  <CloseBold/>
+                </el-icon>
+              </div>
             </div>
             <slot></slot>
           </el-scrollbar>
         </div>
-    </div>
-  </transition>
+      </div>
+    </transition>
   </teleport>
 </template>
 
@@ -57,32 +64,36 @@ const close = () => {
     position: relative;
     background-color: #FFF;
     border-radius: 6px;
-    padding:0 20px 20px 20px;
+    padding: 0 20px 20px 20px;
     overflow: hidden;
     max-height: 90vh;
     z-index: 1999;
-    .header{
+
+    .header {
       position: relative;
       height: 72px;
       padding: 0 4px;
-      .title{
+
+      .title {
         position: absolute;
         top: 50%;
-        left:0;
+        left: 0;
         font-weight: 800;
         font-size: 20px;
         color: #333333;
         font-style: normal;
         transform: translateY(-50%);
       }
-      .close{
+
+      .close {
         position: absolute;
         top: 50%;
         right: 0;
         color: #6e6e6e;
         font-size: 32px;
         transform: translateY(-50%);
-        &:hover{
+
+        &:hover {
           color: #409eff;
         }
       }
diff --git a/src/components/home/index/PanmentDetail.vue b/src/components/home/index/PaymentDetails.vue
similarity index 100%
rename from src/components/home/index/PanmentDetail.vue
rename to src/components/home/index/PaymentDetails.vue
diff --git a/src/components/member/memberProfile/Exchange.vue b/src/components/member/memberProfile/Exchange.vue
index 3950751..07f0889 100644
--- a/src/components/member/memberProfile/Exchange.vue
+++ b/src/components/member/memberProfile/Exchange.vue
@@ -1,8 +1,5 @@
 <template>
   <div class="container_grant">
-    <div class="title_grant">
-      积分兑换
-    </div>
     <div class="content_grant">
       <div class="head">
         <div class="name">
diff --git a/src/components/member/memberProfile/FlowingWater.vue b/src/components/member/memberProfile/FlowingWater.vue
index 46c62a6..ec48bd2 100644
--- a/src/components/member/memberProfile/FlowingWater.vue
+++ b/src/components/member/memberProfile/FlowingWater.vue
@@ -1,9 +1,5 @@
 <template>
   <div class="container">
-    <div class="title" style="background-color: #fff">
-      <CloseBtn @click="close"></CloseBtn>
-      <span>积分流水</span>
-    </div>
     <div class="body">
       <div class="body_info">
         <span class="name">{{props.info.realName}}</span>
diff --git a/src/components/member/memberProfile/Grant.vue b/src/components/member/memberProfile/Grant.vue
index 68f7a19..64ce4e0 100644
--- a/src/components/member/memberProfile/Grant.vue
+++ b/src/components/member/memberProfile/Grant.vue
@@ -1,8 +1,5 @@
 <template>
   <div class="container_grant">
-    <div class="title_grant">
-      积分发放
-    </div>
     <div class="content_grant">
       <div class="head">
         <div class="name">
diff --git a/src/components/member/memberProfile/VipEdit.vue b/src/components/member/memberProfile/VipEdit.vue
index da6ed67..e0222be 100644
--- a/src/components/member/memberProfile/VipEdit.vue
+++ b/src/components/member/memberProfile/VipEdit.vue
@@ -1,6 +1,5 @@
 <template>
-  <Mask :width="600" :height="500" :is-show="show">
-    <CloseBtn @click="close"></CloseBtn>
+  <Mask :width="600" :height="500" :is-show="show" @close="show=false" :title="id?'会员编辑':'会员建档'">
     <div class="content">
       <el-form
           :model="ruleForm"
diff --git a/src/components/member/memberProfile/VipLevelEdit.vue b/src/components/member/memberProfile/VipLevelEdit.vue
index d550358..9e242b0 100644
--- a/src/components/member/memberProfile/VipLevelEdit.vue
+++ b/src/components/member/memberProfile/VipLevelEdit.vue
@@ -1,7 +1,7 @@
 
 
 <template>
-<Mask :width="600" :height="500" :is-show="show">
+<Mask :width="600" :height="500" :is-show="show" @close="show=false" :title="levelId?'编辑等级':'添加等级'">
     <el-select v-model="levelId">
       <el-option
         v-for="item in options"
diff --git a/src/components/retail/OrderDetail.vue b/src/components/retail/OrderDetail.vue
index d8a247b..ad3a863 100644
--- a/src/components/retail/OrderDetail.vue
+++ b/src/components/retail/OrderDetail.vue
@@ -1,5 +1,5 @@
 <template>
-  <Mask :width="1000" :height="560" :is-show="show">
+  <Mask :width="1000" :height="560" :is-show="show" @close="show = false">
     <div class="container">
       <div class="title">
         <CloseBtn @click="show = false"></CloseBtn>
diff --git a/src/components/settings/AddProject.vue b/src/components/settings/AddProject.vue
index b0816fe..338aaf5 100644
--- a/src/components/settings/AddProject.vue
+++ b/src/components/settings/AddProject.vue
@@ -1,6 +1,5 @@
 <template>
-  <Mask :is-show="isShow">
-    <CloseBtn @click="isShow = false" style="height: 60px"></CloseBtn>
+  <Mask :is-show="isShow" @close="isShow = false" title="添加子项目">
     <div style="display: flex">
       <el-form
           :model="form"
@@ -37,7 +36,7 @@
       </div>
     </div>
   </Mask>
-  <Mask :is-show="isShowAdd">
+  <Mask :is-show="isShowAdd" @close="isShowAdd = false" title="子项目列表">
     <ListChild @close="isShowAdd=false" @selected="selected"></ListChild>
   </Mask>
 </template>
diff --git a/src/components/settings/SetMenu.vue b/src/components/settings/SetMenu.vue
index 1a0893b..cc7499e 100644
--- a/src/components/settings/SetMenu.vue
+++ b/src/components/settings/SetMenu.vue
@@ -1,6 +1,5 @@
 <template>
-  <Mask :width="800" :height="600" :is-show="show" :top="100">
-    <CloseBtn @click="show=false" style="height: 60px"></CloseBtn>
+  <Mask :width="800" :height="600" :is-show="show" :top="100" @close="show=false" title="项目列表">
     <div class="search_content_wrapper">
       <div class="search_wrapper">
         <span>药品名称:</span>
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 35cfef8..225a245 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -12,7 +12,7 @@
       <div class="business">
         <BusinessOverview></BusinessOverview>
       </div>
-      <PanmentDetail></PanmentDetail>
+      <PaymentDetails></PaymentDetails>
     </div>
     <div class="right">
       <Card></Card>
@@ -26,12 +26,11 @@
 </template>
 <script setup lang="ts">
 import {ref, onMounted, nextTick} from "vue"
-import ExpireWarnDetail from "@/components/home/index/Dialog/ExpireWarnDetail.vue";
 import Card from "@/components/home/index/Card.vue";
 import CustomerService from "@/components/home/index/CustomerService.vue";
 import SystemMessage from "@/components/home/index/SystemMessage.vue";
 import Banner from "@/components/home/index/Banner.vue";
-import PanmentDetail from "@/components/home/index/PanmentDetail.vue";
+import PaymentDetails from "@/components/home/index/PaymentDetails.vue";
 import BusinessOverview from "@/components/home/index/BusinessOverview.vue";
 import InventoryAlert from "@/components/home/index/InventoryAlert.vue";
 import ValidityWarning from "@/components/home/index/ValidityWarning.vue";
diff --git a/src/views/inventory/apply.vue b/src/views/inventory/apply.vue
index 5964151..c249c5a 100644
--- a/src/views/inventory/apply.vue
+++ b/src/views/inventory/apply.vue
@@ -28,10 +28,10 @@
         />
       </div>
     </div>
-    <Mask :width="1200" :height="600" :top="100" :is-show="is_add">
+    <Mask :width="1200" :height="600" :top="100" :is-show="is_add" @close="is_add=false">
       <AddApply @close="closeAddApply"/>
     </Mask>
-    <Mask :width="1200" :height="600" :top="100" :is-show="is_detail">
+    <Mask :width="1200" :height="600" :top="100" :is-show="is_detail" @close="is_detail=false">
       <DetailApply :id="id" @close="closeDetailApply"/>
     </Mask>
   </div>
diff --git a/src/views/inventory/check.vue b/src/views/inventory/check.vue
index 9c30d31..56965ed 100644
--- a/src/views/inventory/check.vue
+++ b/src/views/inventory/check.vue
@@ -31,10 +31,10 @@
       </div>
     </div>
   </div>
-  <Mask :width="1200" :height="500" :is-show="showAdd" :top="100">
+  <Mask :width="1200" :height="500" :is-show="showAdd" :top="100" @close="showAdd = false">
     <Add  @close="showAdd = false"/>
   </Mask>
-  <Mask :width="1200" :height="500" :is-show="showDetail"  :top="100">
+  <Mask :width="1200" :height="500" :is-show="showDetail"  :top="100" @close="showDetail = false">
     <Detail :id="id" @close="showDetail = false"/>
   </Mask>
 </template>
diff --git a/src/views/member/index.vue b/src/views/member/index.vue
index d867d9c..c557de9 100644
--- a/src/views/member/index.vue
+++ b/src/views/member/index.vue
@@ -148,14 +148,14 @@
   </div>
   <VipEdit ref="refEdit" @close="init"></VipEdit>
   <VipLevelEdit ref="levelEditRef" @close="init"></VipLevelEdit>
-  <Mask :width="600" :height="400" :is-show="isGrant">
+  <Mask :width="600" :height="400" :is-show="isGrant" @close="isGrant=false" :title="'发放积分'">
     <Grant :info="listItem" @close="closeGrant()"></Grant>
   </Mask>
-  <Mask :width="600" :height="400" :is-show="isExchange">
+  <Mask :width="600" :height="400" :is-show="isExchange" @close="isExchange=false" title="兑换积分">
     <Exchange :info="listItem" @close="closeExchange()"></Exchange>
   </Mask>
-  <Mask :is-show="isFlowingWater">
-    <FlowingWater :info="listItem" @close="isFlowingWater = false"></FlowingWater>
+  <Mask :is-show="isFlowingWater" @close="isFlowingWater = false" title="流水记录">
+    <FlowingWater :info="listItem"></FlowingWater>
   </Mask>
   <OrderDetail ref="orderDetailRef"></OrderDetail>
 </template>
diff --git a/src/views/settings/item.vue b/src/views/settings/item.vue
index e87f07d..1446ddb 100644
--- a/src/views/settings/item.vue
+++ b/src/views/settings/item.vue
@@ -74,7 +74,7 @@
       </el-table>
     </div>
   </div>
-  <Mask :is-show="isShow">
+  <Mask :is-show="isShow" @close="initData()">
     <ItemEdit :id="id" ref="ItemEditRef" @close="initData()"></ItemEdit>
   </Mask>
   <SetMenu ref="setMenuRef"></SetMenu>
diff --git a/src/views/social/directory.vue b/src/views/social/directory.vue
index 6eb4ecd..5cc7b78 100644
--- a/src/views/social/directory.vue
+++ b/src/views/social/directory.vue
@@ -30,7 +30,7 @@
                        v-model:current-page="current_page" @current-change="change_page"/>
       </div>
     </div>
-    <Mask :is-show="loading" :width="300" height="150">
+    <Mask :is-show="loading" :width="300" height="150" title="更新版本" :close="false">
       {{ uploadMsg }}
       <div class="demo-progress" style="margin-top: 20px">
         <el-progress :percentage="percentage" :format="format"/>
diff --git a/src/views/social/inventoryUp.vue b/src/views/social/inventoryUp.vue
index 5fb40fd..82ae127 100644
--- a/src/views/social/inventoryUp.vue
+++ b/src/views/social/inventoryUp.vue
@@ -29,7 +29,7 @@
       <List_3505 v-if="current_tab == 3505"></List_3505>
     </div>
   </div>
-  <Mask :is-show="loading" :width="300" height="150">
+  <Mask :is-show="loading" :width="300" height="150" title="上传数据" :close="false">
     {{uploadMsg}}
     <div class="demo-progress" style="margin-top: 20px">
       <el-progress :percentage="uploadNumber" />