From d9711844e80d816411bd8961d593a78cf464f08d Mon Sep 17 00:00:00 2001
From: "DESKTOP-369JRHT\\12997" <9>
Date: Fri, 15 Nov 2024 18:02:49 +0800
Subject: [PATCH] 11.15

---
 fuintAdmin/src/views/power/linkManage.vue     |  7 ++++--
 fuintAdmin/src/views/power/operateLog.vue     |  4 +--
 .../src/views/cashier/NewComponents/Vip.vue   |  1 +
 .../views/cashier/NewComponents/WriteOff.vue  | 25 +++++++++++++------
 .../views/cashier/NewComponents/credit.vue    |  6 ++---
 .../views/cashier/NewComponents/newHome.vue   |  3 ++-
 .../views/cashier/NewComponents/writeList.vue |  3 ++-
 7 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/fuintAdmin/src/views/power/linkManage.vue b/fuintAdmin/src/views/power/linkManage.vue
index d17441beb..a03cf6c11 100644
--- a/fuintAdmin/src/views/power/linkManage.vue
+++ b/fuintAdmin/src/views/power/linkManage.vue
@@ -35,7 +35,7 @@
         </el-form-item>
       </el-form>
 
-      <div style="height: 76vh;overflow: auto">
+      <div style="height: 77vh;overflow: auto">
         <el-table :data="tableData" style="width: 100%" border>
           <el-table-column type="index" align="center" label="序号"></el-table-column>
           <el-table-column prop="pageName" align="center" label="页面/功能名称"></el-table-column>
@@ -239,5 +239,8 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-
+.app-container{
+  box-sizing: border-box;
+  padding-bottom: 0px;
+}
 </style>
diff --git a/fuintAdmin/src/views/power/operateLog.vue b/fuintAdmin/src/views/power/operateLog.vue
index ae28e6add..913096e93 100644
--- a/fuintAdmin/src/views/power/operateLog.vue
+++ b/fuintAdmin/src/views/power/operateLog.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container" style="padding: 10px">
+  <div class="app-container" style="padding: 10px;padding-bottom: 0px">
     <div class="card-change">
       <div>
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="40px">
@@ -80,7 +80,7 @@
         </el-form>
       </div>
 
-      <div style="height: 76vh;overflow: auto;width: 100%;scrollbar-width: none">
+      <div style="height: 77vh;overflow: auto;width: 100%;scrollbar-width: none">
         <el-table :data="tableData" style="width: 100%" border>
           <el-table-column type="index" label="序号"></el-table-column>
           <el-table-column prop="createAccount" label="登录账号"></el-table-column>
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/Vip.vue b/fuintCashierWeb/src/views/cashier/NewComponents/Vip.vue
index 1c3c6083e..23e234e56 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/Vip.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/Vip.vue
@@ -901,6 +901,7 @@ export default {
       this.resetForm("queryForm");
       this.queryParams.storeId = '';
       this.queryParams.official = "";
+      this.queryParams.userStatus = "";
       this.ifBalance = ""
       this.storeIds = [];
       this.beginTime = ""
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/WriteOff.vue b/fuintCashierWeb/src/views/cashier/NewComponents/WriteOff.vue
index c530d33be..b6e426a5c 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/WriteOff.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/WriteOff.vue
@@ -25,10 +25,10 @@
           <div style="margin-left: 30%;width: 57%">
 <!--         券名称    -->
             <div class="box-hei">{{item.exchangeName}} </div>
-            <div class="box-hui"><span>领取人：</span>     <span>{{item.mobile || '匿名'}}</span>  </div>
-            <div class="box-hui"><span>核销码：</span>   <span>{{item.ticketCode}}</span>  </div>
-            <div class="box-hui"><span>兑换内容：</span>   <span>{{item.exchangeContent}}</span>  </div>
-            <div class="box-hui"><span>有效期：</span> <span>{{item.exchangeFrom}}</span> </div>
+            <div class="box-hui"><span class="bt_">领取人：</span>  <span class="nr_">{{item.mobile || '匿名'}}</span>  </div>
+            <div class="box-hui"><span class="bt_">核销码：</span>  <span class="nr_">{{item.ticketCode}}</span>  </div>
+            <div class="box-hui"><span class="bt_">兑换内容：</span> <span class="nr_">{{item.exchangeContent}}</span>  </div>
+            <div class="box-hui"><span class="bt_">有效期：</span> <span class="nr_">{{item.exchangeFrom}}</span> </div>
           </div>
           <div class="hx_">
             立即核销
@@ -192,16 +192,17 @@ export default {
 }
 
 .w_box{
-  width: 98%;
+  width: 99%;
   background: #fff;
   box-sizing: border-box;
   padding: 15px;
   border-radius: 8px;
-  min-height: 92vh;
+  height: 94vh;
   margin: 10px auto;
+  margin-bottom: 0px;
 }
 .w_boxs{
-  width: 98%;
+  width: 99%;
   box-sizing: border-box;
 
   margin: 10px auto;
@@ -212,7 +213,6 @@ export default {
   background: #fff;
   display: flex;
   box-sizing: border-box;
-  margin-bottom: 15px;
 
 }
 
@@ -258,4 +258,13 @@ export default {
   width: 14px;
   margin-left: 12px;
 }
+.bt_{
+  width: 40%;
+}
+.nr_{
+  width: 60%;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
 </style>
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue b/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue
index 3cb091554..3cd1052a3 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue
@@ -1,4 +1,4 @@
-<!--挂账管理1new-->
+  <!--挂账管理1new-->
 <template>
   <div class="app-centser">
 <!--    查询-->
@@ -594,7 +594,7 @@
     </el-dialog>
 
 <!--      批量挂账归还-->
-    <el-dialog :close-on-click-modal="false" title="批量挂账归还" :visible.sync="open3" append-to-body>
+    <el-dialog  width="60%" :close-on-click-modal="false" title="批量挂账归还" :visible.sync="open3" append-to-body>
       <div>
         <el-table
           ref="multipleTable"
@@ -615,7 +615,7 @@
           <el-table-column
             prop="repaidAmount"
             label="归还金额"
-            width="120">
+            >
             <template slot-scope="scope">
               <el-input-number size="mini" style="width: 100px"
                                v-model="scope.row.repaidAmount"
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue b/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
index 144c0e95b..7e59da2fc 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
@@ -2282,7 +2282,7 @@ input {
   box-sizing: border-box;
   height: 100vh;
   box-sizing: border-box;
-  padding: 20px;
+  padding: 10px;
 
   padding-bottom: 0px;
   display: flex;
@@ -2567,6 +2567,7 @@ input {
   font-size: 14px;
   color: #555555;
   font-weight: bold;
+  margin-bottom: 2px;
 }
 
 .tab-kuang {
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/writeList.vue b/fuintCashierWeb/src/views/cashier/NewComponents/writeList.vue
index a6541ddac..e30225555 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/writeList.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/writeList.vue
@@ -180,8 +180,9 @@ export default {
 }
 .table-box {
   width: 100%;
-  height: 66vh;
+  height: 69vh;
   overflow: auto;
+  scrollbar-width: none;
   background: #FFF;
   box-sizing: border-box;
   padding: 15px;