From f1010aa4cb8c7574b23609356f69a9eb6d795766 Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Mon, 19 May 2025 13:11:28 +0800
Subject: [PATCH] dev

---
 src/components/home/index/Card.vue            | 10 +---
 .../home/index/Dialog/ExpireWarnDetail.vue    |  7 +--
 .../home/index/Dialog/InventoryWarnDetail.vue |  8 +--
 src/components/home/index/InventoryAlert.vue  | 37 +++++++------
 .../member/memberProfile/Exchange.vue         | 22 ++++----
 .../member/memberProfile/FlowingWater.vue     | 53 ++++++++++---------
 src/components/member/memberProfile/Grant.vue | 22 ++++----
 .../member/memberProfile/VipEdit.vue          |  1 +
 src/components/registration/Edit.vue          |  2 +-
 src/components/registration/List.vue          |  2 +-
 src/views/member/index.vue                    | 18 ++++---
 11 files changed, 97 insertions(+), 85 deletions(-)

diff --git a/src/components/home/index/Card.vue b/src/components/home/index/Card.vue
index f2c0049..c6396f0 100644
--- a/src/components/home/index/Card.vue
+++ b/src/components/home/index/Card.vue
@@ -32,16 +32,10 @@ const imageUrl = ref<any>()
     <div class="info-content">
       <img class="image" :src="imageUrl? imageUrl:userMessage.logo" alt="app">
       <div class="app_info-content-text">
-        <el-tooltip
-            effect="dark"
-            :content="userMessage.name"
-            placement="bottom-start"
-        >
-          <div class="app_info-title">{{ userMessage.name }}</div>
-        </el-tooltip>
+        <div class="app_info-title">{{ userMessage.name }}</div>
         <div>软件版本：{{ userMessage.version }}</div>
         <div style="margin: 10px 0">授权到期：{{ formatDate(decryptedText.expiryDate) }}</div>
-        <div>版本类型： {{ decryptedText.rule == 1 ? "禁用医保" : decryptedText.rule == 2 ? "全部开放" : "暂无" }}</div>
+        <div>版本类型：{{ decryptedText.rule == 1 ? "禁用医保" : decryptedText.rule == 2 ? "全部开放" : "暂无" }}</div>
       </div>
     </div>
   </Panel>
diff --git a/src/components/home/index/Dialog/ExpireWarnDetail.vue b/src/components/home/index/Dialog/ExpireWarnDetail.vue
index b113dc5..4da6c08 100644
--- a/src/components/home/index/Dialog/ExpireWarnDetail.vue
+++ b/src/components/home/index/Dialog/ExpireWarnDetail.vue
@@ -2,7 +2,7 @@
   <Mask :width="1100" :height="600" :is-show="show" title="过期商品详情" @close="close" :show-footer="true">
    <template #default>
      <div style="height: 100%;padding: 24px">
-       <el-table :data="tableData"  style="width: 100%" class="table">
+       <el-table border :data="tableData"  style="width: 100%;height: 100%" class="table" :header-cell-style="{ backgroundColor: '#F1F5FB' }">
          <el-table-column label="名称" prop="name" show-overflow-tooltip></el-table-column>
          <el-table-column label="剩余天数" show-overflow-tooltip>
            <template #default="scope">
@@ -33,10 +33,10 @@
         <el-pagination
             background
             layout="prev, pager, next"
-            :page-count="pageNum"
+            :current-page="pageNum"
             :page-size="pageSize"
             :total="total"
-            @current-change="changePage"
+            @change="changePage"
         />
       </div>
     </template>
@@ -66,6 +66,7 @@ const pageSize = ref(20);
 const total = ref(0);
 const changePage = (pageNum: any) => {
   pageNum.value = pageNum
+  console.log(pageNum.value)
   init()
 }
 </script>
diff --git a/src/components/home/index/Dialog/InventoryWarnDetail.vue b/src/components/home/index/Dialog/InventoryWarnDetail.vue
index 86a36b8..63c3d83 100644
--- a/src/components/home/index/Dialog/InventoryWarnDetail.vue
+++ b/src/components/home/index/Dialog/InventoryWarnDetail.vue
@@ -2,7 +2,7 @@
   <Mask :width="1100" :height="600" :is-show="show" title="库存预警详情" @close="close" :show-footer="true">
     <template #default>
       <div style="height: 100%;padding: 24px">
-        <el-table border :data="tableData" style="width: 100%;height: 100%" class="table">
+        <el-table border :data="tableData" style="width: 100%;height: 100%" class="table" :header-cell-style="{ backgroundColor: '#F1F5FB' }">
           <el-table-column label="名称" prop="name" show-overflow-tooltip></el-table-column>
           <el-table-column label="剩余库存">
             <template #default="scope">
@@ -37,10 +37,10 @@
         <el-pagination
             background
             layout="prev, pager, next"
-            :page-count="pageNum"
+            :current-page="pageNum"
             :page-size="pageSize"
             :total="total"
-            @current-change="changePage"
+            @change="changePage"
         />
       </div>
     </template>
@@ -67,7 +67,7 @@ const close = () => {
   tableData.value = []
 };
 const pageNum = ref(1);
-const pageSize = ref(20);
+const pageSize = ref(1);
 const total = ref(0);
 const changePage = (pageNum: any) => {
   pageNum.value = pageNum
diff --git a/src/components/home/index/InventoryAlert.vue b/src/components/home/index/InventoryAlert.vue
index ad88f1c..e20be86 100644
--- a/src/components/home/index/InventoryAlert.vue
+++ b/src/components/home/index/InventoryAlert.vue
@@ -16,7 +16,7 @@ const openInventoryWarnDetail = () => {
 
 }
 const getInventoryWarning = () => {
-  post("statistics/numberEarlyWarning",{pageNum: 1, pageSize: 20}).then((res: any) => {
+  post("statistics/numberEarlyWarning", {pageNum: 1, pageSize: 20}).then((res: any) => {
     inventoryWarnList.value = res.list.slice(0, 4)
   })
 }
@@ -29,20 +29,15 @@ const isZeroInventory = (item: any) => {
 <template>
   <Panel title="库存预警" class="kuCun">
     <template #tools>
-      <span  class="small-btn" @click="openInventoryWarnDetail">查看详情</span>
+      <span class="small-btn" @click="openInventoryWarnDetail">查看详情</span>
     </template>
     <div style="padding: 0 24px 24px">
       <div class="box">
-        <div class="item" style="margin-right: 8px" v-for="item in inventoryWarnList" :class="isZeroInventory(item) ? 'item__danger' : 'item__warn'">
-          <div class="image"  />
+        <div class="item" style="margin-right: 8px" v-for="item in inventoryWarnList"
+             :class="isZeroInventory(item) ? 'item__danger' : 'item__warn'">
+          <div class="image"/>
           <div class="item-content">
-            <el-tooltip
-                effect="dark"
-                :content="item.name"
-                placement="bottom-start"
-            >
-              <div class="item-name">{{ item.name }}</div>
-            </el-tooltip>
+            <div class="item-name">{{ item.name }}</div>
             <div class="item-name-font">剩余库存值</div>
           </div>
           <div class="item-right">
@@ -72,26 +67,30 @@ const isZeroInventory = (item: any) => {
   margin-right: 24px;
 
   .box {
-    .item__danger{
-      .image{
-        background-image: url("/static/images/home/1-danger.png") ;
+    .item__danger {
+      .image {
+        background-image: url("/static/images/home/1-danger.png");
 
       }
-      .item-right{
+
+      .item-right {
         color: #FF282E;
       }
     }
-    .item__warn{
-      .image{
-        background-image: url("/static/images/home/1-warn.png") ;
+
+    .item__warn {
+      .image {
+        background-image: url("/static/images/home/1-warn.png");
 
       }
-      .item-right{
+
+      .item-right {
         color: #F69C51;
 
       }
 
     }
+
     .item {
       float: left;
       width: 48%;
diff --git a/src/components/member/memberProfile/Exchange.vue b/src/components/member/memberProfile/Exchange.vue
index ae2bd69..d6e6c0b 100644
--- a/src/components/member/memberProfile/Exchange.vue
+++ b/src/components/member/memberProfile/Exchange.vue
@@ -115,20 +115,24 @@ const reduceIntegral = () => {
     align-items: center;
     margin-bottom: 16px;
 
-    .name {
-      font-weight: bold;
-      font-size: 24px;
-      color: #333333;
-      line-height: 33px;
-      text-align: left;
-      font-style: normal;
-    }
-
     .right {
+      flex: 1;
+      min-width: 0;
       display: flex;
       flex-direction: column;
       justify-content: center;
       margin-left: 16px;
+      .name {
+        font-weight: bold;
+        font-size: 24px;
+        color: #333333;
+        line-height: 33px;
+        text-align: left;
+        font-style: normal;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
 
       .text {
         margin-top: 4px;
diff --git a/src/components/member/memberProfile/FlowingWater.vue b/src/components/member/memberProfile/FlowingWater.vue
index 7790bca..8e46ee7 100644
--- a/src/components/member/memberProfile/FlowingWater.vue
+++ b/src/components/member/memberProfile/FlowingWater.vue
@@ -23,18 +23,20 @@
             </div>
           </div>
         </div>
-        <el-table class="body_list" :data="tableData" style="width: 100%;height: 100%"
-                  :header-cell-style="{ backgroundColor: '#F1F5FB'}">
-          <el-table-column prop="createTime" label="创建时间" show-overflow-tooltip>
-            <template #default="scope">
-              {{ formatDate(scope.row.createTime) }}
-            </template>
-          </el-table-column>
-          <el-table-column prop="beforeIntegral" label="变化前" show-overflow-tooltip/>
-          <el-table-column prop="changeIntegral" label="变化量" show-overflow-tooltip/>
-          <el-table-column prop="afterIntegral" label="变化后" show-overflow-tooltip/>
-          <el-table-column prop="remark" label="备注" show-overflow-tooltip/>
-        </el-table>
+       <div class="body_list">
+         <el-table :data="tableData" style="height: 100%"
+                   :header-cell-style="{ backgroundColor: '#F1F5FB'}">
+           <el-table-column prop="createTime" label="创建时间" show-overflow-tooltip>
+             <template #default="scope">
+               {{ formatDate(scope.row.createTime) }}
+             </template>
+           </el-table-column>
+           <el-table-column prop="beforeIntegral" label="变化前" show-overflow-tooltip/>
+           <el-table-column prop="changeIntegral" label="变化量" show-overflow-tooltip/>
+           <el-table-column prop="afterIntegral" label="变化后" show-overflow-tooltip/>
+           <el-table-column prop="remark" label="备注" show-overflow-tooltip/>
+         </el-table>
+       </div>
       </div>
     </template>
     <template #footer>
@@ -104,7 +106,6 @@ defineExpose({init})
 </script>
 <style scoped lang="scss">
 .content-flowing {
-  width: 100%;
   padding-top: 24px;
   height: 100%;
   display: flex;
@@ -118,21 +119,24 @@ defineExpose({init})
     margin-bottom: 16px;
     padding: 0 24px;
 
-    .name {
-      font-weight: bold;
-      font-size: 24px;
-      color: #333333;
-      line-height: 33px;
-      text-align: left;
-      font-style: normal;
-    }
-
     .right {
+      flex: 1;
+      min-width: 0;
       display: flex;
       flex-direction: column;
       justify-content: center;
       margin-left: 16px;
-
+      .name {
+        font-weight: bold;
+        font-size: 24px;
+        color: #333333;
+        line-height: 33px;
+        text-align: left;
+        font-style: normal;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
       .text {
         margin-top: 4px;
         display: flex;
@@ -159,8 +163,9 @@ defineExpose({init})
   }
 
   .body_list {
-    width: 100%;
     flex: 1;
+    width: 100%;
+    min-height: 0;
     background: #F9FAFC;
     padding: 24px 24px 0;
   }
diff --git a/src/components/member/memberProfile/Grant.vue b/src/components/member/memberProfile/Grant.vue
index 801bbe3..04dc01c 100644
--- a/src/components/member/memberProfile/Grant.vue
+++ b/src/components/member/memberProfile/Grant.vue
@@ -105,20 +105,24 @@ const grant = async () => {
     align-items: center;
     margin-bottom: 16px;
 
-    .name {
-      font-weight: bold;
-      font-size: 24px;
-      color: #333333;
-      line-height: 33px;
-      text-align: left;
-      font-style: normal;
-    }
-
     .right {
+      flex: 1;
+      min-width: 0;
       display: flex;
       flex-direction: column;
       justify-content: center;
       margin-left: 16px;
+      .name {
+        font-weight: bold;
+        font-size: 24px;
+        color: #333333;
+        line-height: 33px;
+        text-align: left;
+        font-style: normal;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
 
       .text {
         margin-top: 4px;
diff --git a/src/components/member/memberProfile/VipEdit.vue b/src/components/member/memberProfile/VipEdit.vue
index 6974e73..b7c3eba 100644
--- a/src/components/member/memberProfile/VipEdit.vue
+++ b/src/components/member/memberProfile/VipEdit.vue
@@ -17,6 +17,7 @@
                       v-model="ruleForm.exp"
                       placeholder="等级"
                       size="default"
+                      :disabled="ruleForm.id"
                       style="width: 100%"
                   >
                     <el-option
diff --git a/src/components/registration/Edit.vue b/src/components/registration/Edit.vue
index bce930b..21c61e3 100644
--- a/src/components/registration/Edit.vue
+++ b/src/components/registration/Edit.vue
@@ -111,7 +111,7 @@
             </el-descriptions-item>
             <el-descriptions-item label="费用类型">
               <el-form-item prop="type">
-                <el-select v-model="edit_data.type">
+                <el-select v-model="edit_data.type" :disabled="edit_data.status==0">
                   <el-option label="普通" :value="1"></el-option>
                   <el-option label="医保" :value="2"></el-option>
                 </el-select>
diff --git a/src/components/registration/List.vue b/src/components/registration/List.vue
index 998939c..cba0d1c 100644
--- a/src/components/registration/List.vue
+++ b/src/components/registration/List.vue
@@ -11,7 +11,7 @@
             <img style="width: 25px;height: 25px;margin-right: 10px"
                  :src="scope.row.gender === 1 ? '/static/images/member/man.png' :scope.row.gender === 2 ? '/static/images/member/women.png':'无'"
                  alt="" srcset="">
-            <span> {{ scope.row.name }}</span>
+            <span>{{ scope.row.name }}</span>
           </div>
         </template>
       </el-table-column>
diff --git a/src/views/member/index.vue b/src/views/member/index.vue
index fb7ed5d..e4e3f80 100644
--- a/src/views/member/index.vue
+++ b/src/views/member/index.vue
@@ -103,7 +103,7 @@
                         @cell-click="openDetail">
                 <el-table-column label="单号" prop="code" show-overflow-tooltip>
                 </el-table-column>
-                <el-table-column label="创建时间" prop="createDatetime">
+                <el-table-column label="创建时间" prop="createDatetime" show-overflow-tooltip>
                   <template #default="scope">
                     {{ formatDate(scope.row.createDatetime) }}
                   </template>
@@ -113,17 +113,17 @@
                 <!--                  {{ scope.row.preTotalPrice }}元-->
                 <!--                </template>-->
                 <!--              </el-table-column>-->
-                <el-table-column label="实收" prop="totalPrice" width="80">
+                <el-table-column label="实收" prop="totalPrice" width="100" show-overflow-tooltip>
                   <template #default="scope">
                     {{ scope.row.totalPrice }}元
                   </template>
                 </el-table-column>
-                <el-table-column label="支付方式" width="100">
+                <el-table-column label="支付方式" width="100" show-overflow-tooltip>
                   <template #default="scope">
                     {{ scope.row.payType ? getPayTypeStr(scope.row.payType) : "" }}
                   </template>
                 </el-table-column>
-                <el-table-column label="状态" width="100">
+                <el-table-column label="状态" width="100" show-overflow-tooltip>
                   <template #default="scope">
                     <el-tag v-if="scope.row.status==0 || scope.row.status==2 " type="info">
                       {{ getStatusStr(scope.row.status) }}
@@ -132,7 +132,7 @@
                     <el-tag v-if="scope.row.status==3" type="danger">{{ getStatusStr(scope.row.status) }}</el-tag>
                   </template>
                 </el-table-column>
-                <el-table-column label="支付时间" prop="payTime">
+                <el-table-column label="支付时间" prop="payTime" show-overflow-tooltip>
                   <template #default="scope">
                     {{ formatDate(scope.row.payTime) }}
                   </template>
@@ -341,6 +341,7 @@ type StatusKey = 0 | 1 | 2 | 3;
 type PayTypeKey = 1 | 2 | 3 | 4 | 5;
 //修改时间格式化
 const formatDate = (isoStr: any) => {
+  if(!isoStr)return ''
   const date = new Date(isoStr);
   return `${date.getFullYear()}-${(date.getMonth() + 1).toString().padStart(2, '0')}-${date.getDate().toString().padStart(2, '0')}`;
 }
@@ -544,10 +545,12 @@ const openFlowingWater = () => {
             }
 
             .detail-top-left-text {
+              flex: 1;
+              min-width: 0;
               display: flex;
               flex-direction: column;
               justify-content: center;
-
+              margin-right: 24px;
               .detail-top-left-text-name {
                 flex: 1;
                 min-width: 0;
@@ -555,6 +558,7 @@ const openFlowingWater = () => {
                 font-size: 24px;
                 color: #333333;
                 font-style: normal;
+                display: flex;
                 .name{
                   white-space: nowrap; /* 防止文本换行 */
                   overflow: hidden; /* 隐藏溢出的文本 */
@@ -569,7 +573,7 @@ const openFlowingWater = () => {
                 color: rgba(34, 42, 57, 0.8);
 
                 .age {
-                  margin: 0 10px;
+                  margin-right: 10px;
                 }
               }
             }