From 34d9ef7433e85485da4c8bc73097df06dde90ae3 Mon Sep 17 00:00:00 2001
From: "DESKTOP-369JRHT\\12997" <9>
Date: Wed, 20 Nov 2024 14:29:02 +0800
Subject: [PATCH] 11.20

---
 .../jiaoyiduizhang/tab/int.vue                 | 13 +++++++++----
 .../jiaoyiduizhang/tab/store.vue               | 13 +++++++++----
 .../jiaoyiduizhang/tab/vip.vue                 | 14 +++++++++++---
 .../financialStatement/yunyingfenxi/list.vue   |  6 +++---
 .../yunyingfenxi/tab/int.vue                   |  2 +-
 .../yunyingfenxi/tab/store.vue                 | 18 ++++++++++--------
 .../yunyingfenxi/tab/vip.vue                   |  2 +-
 7 files changed, 44 insertions(+), 24 deletions(-)

diff --git a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/int.vue b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/int.vue
index b0f506ab6..710ebeb90 100644
--- a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/int.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/int.vue
@@ -1,7 +1,7 @@
 <!-- 收银台订单-->
 <template>
   <div style="background: #f6f8f9;width: 100%;padding: 10px;padding-bottom: 0px">
-    <div class="card-change">
+    <div class="card-changessss">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
         <el-form-item label="" prop="deptId" style="width: 180px">
           <el-select
@@ -282,11 +282,16 @@ import {getDuiZhangIntegralListApi} from "@/api/financialStatement/jiaoyiduizhan
 
 .table-box{
   width: 100%;
-  height: 75vh;
-  min-height: 650px;
+  height: 72vh;
   overflow: auto;
   scrollbar-width: none;
 }
-
+.card-changessss{
+  height: 85vh;
+  background: #fff;
+  box-sizing: border-box;
+  padding: 10px;
+  border-radius: 8px;
+}
 
 </style>
diff --git a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/store.vue b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/store.vue
index ab90aa172..8d50b241d 100644
--- a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/store.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/store.vue
@@ -1,7 +1,7 @@
 <!-- 收银台订单-->
 <template>
   <div style="background: #f6f8f9;width: 100%;padding: 10px;padding-bottom: 0px">
-    <div class="card-change">
+    <div class="card-changessss">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
         <el-form-item label="" prop="deptId" style="width: 180px">
           <el-select
@@ -283,10 +283,15 @@ import {getDuiZhangGoodsListApi} from "@/api/financialStatement/jiaoyiduizhang";
 
 .table-box{
   width: 100%;
-  height: 75vh;
-  min-height: 650px;
+  height: 72vh;
   overflow: auto;
   scrollbar-width: none;
 }
-
+.card-changessss{
+  height: 85vh;
+  background: #fff;
+  box-sizing: border-box;
+  padding: 10px;
+  border-radius: 8px;
+}
 </style>
diff --git a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/vip.vue b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/vip.vue
index 4825e3aed..c91cfa1d8 100644
--- a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/vip.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/vip.vue
@@ -1,7 +1,7 @@
 <!-- 收银台订单-->
 <template>
   <div style="background: #f6f8f9;width: 100%;padding: 10px;padding-bottom: 0px" >
-    <div class="card-change">
+    <div class="card-changessss">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
         <el-form-item label="" prop="deptId" style="width: 180px">
           <el-select
@@ -281,9 +281,17 @@ import {getRunningWaterByTissueApi} from "@/api/allOrder";
 
 .table-box{
   width: 100%;
-  height: 74vh;
-  min-height: 650px;
   overflow: auto;
+  scrollbar-width: none;
+  height: 71vh;
 }
+  .card-changessss{
+    height: 85vh;
+
+    background: #fff;
+    box-sizing: border-box;
+    padding: 10px;
+    border-radius: 8px;
+  }
 
 </style>
diff --git a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/list.vue b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/list.vue
index d29f077d3..5154b9608 100644
--- a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/list.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/list.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="app-center">
     <div class="app-top">
-    <el-card :body-style="{ padding: '0px' }" style="margin-top: 1px;">
-      <div class="box">
+    <div :body-style="{ padding: '0px' }" style="margin-top: 1px; background: #fff;">
+      <div class="box" style="margin-top: 0px;padding-top: 10px">
         <div class="nbox" :class="pointerClass" @click="updateRedio('会员分析')">
           <div class="fount-box" :style="{ color: radio1 === '会员分析' ? '#FF770F' : '#999999' }">会员分析</div>
           <div class="heng-box" v-if="radio1 == '会员分析'"></div>
@@ -37,7 +37,7 @@
 <!--          <div class="heng-box" style="background-color: #FFFFFF" v-else></div>-->
 <!--        </div>-->
       </div>
-    </el-card>
+    </div>
 
 
     </div>
diff --git a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/int.vue b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/int.vue
index 936d913c6..e55e26993 100644
--- a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/int.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/int.vue
@@ -294,7 +294,7 @@ export default {
 }
 .table-box{
   width: 100%;
-  height: 57vh;
+  height: 63vh;
   scrollbar-width: none;
   overflow: auto;
 }
diff --git a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/store.vue b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/store.vue
index 409fccf12..b8df4f6b4 100644
--- a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/store.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/store.vue
@@ -103,14 +103,15 @@
             </el-table-column>
 
           </el-table>
+          <pagination
+            v-show="total>0"
+            :total="total"
+            :page.sync="queryParams.page"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
+          />
         </div>
-        <pagination
-          v-show="total>0"
-          :total="total"
-          :page.sync="queryParams.page"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getList"
-        />
+
 
       </div>
 
@@ -323,7 +324,7 @@ import {parseTime} from "@/utils/fuint";
 }
 .table-box{
   width: 100%;
-  height: 57vh;
+  height: 63vh;
   scrollbar-width: none;
   overflow: auto;
 }
@@ -333,6 +334,7 @@ import {parseTime} from "@/utils/fuint";
   box-sizing: border-box;
   padding: 10px;
   width: 100%;
+
   margin: 5px auto;
 }
 
diff --git a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/vip.vue b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/vip.vue
index e04bac2db..cbcc348fa 100644
--- a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/vip.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/vip.vue
@@ -245,7 +245,7 @@ import {getFenXiUserbalanceDataApi, getFenXiUserbalanceListApi} from "@/api/fina
 }
 .table-box{
   width: 100%;
-  height: 59vh;
+  height: 63vh;
   scrollbar-width: none;
   overflow: auto;
 }