From cdb9262c12054ce7ab03ee5207ac3d904a10c47b Mon Sep 17 00:00:00 2001
From: "DESKTOP-369JRHT\\12997" <9>
Date: Tue, 22 Oct 2024 10:05:09 +0800
Subject: [PATCH] 10.22

---
 fuintAdmin/src/views/member/index.vue         |  1 +
 .../views/cashier/NewComponents/newHome.vue   | 35 +++++++++----------
 .../cashier/orderComponents/order_Goods.vue   | 34 ++++++++++--------
 .../cashier/orderComponents/order_Oil.vue     |  2 --
 4 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/fuintAdmin/src/views/member/index.vue b/fuintAdmin/src/views/member/index.vue
index 087cbf2d1..8c3e786ea 100644
--- a/fuintAdmin/src/views/member/index.vue
+++ b/fuintAdmin/src/views/member/index.vue
@@ -181,6 +181,7 @@
               <span>{{ scope.row.gradeId ? getName(allUserGrade, scope.row.gradeId) : '--' }}</span>
             </template>
           </el-table-column>
+
           <el-table-column label="会员标签" align="center" prop="userLabelName" >
             <template slot-scope="scope">
               <span>{{ scope.row.userLabelName || '--' }}</span>
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue b/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
index 3c9af5aa0..854669fe6 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
@@ -31,10 +31,6 @@
                 </div>
               </div>
             </div>
-            <!--            <div class="d-s" >-->
-            <!--              <div style="font-size: 12px;margin-right: 5px">储值卡：￥{{chooseVipUser.cardBalance}} </div>-->
-            <!--              <div style="font-size: 12px">囤油卡：￥1000.000</div>-->
-            <!--            </div>-->
           </div>
 
           <div class="d-s" style="width: 50%">
@@ -151,17 +147,18 @@
             <div class="gang" :class="{ 'active_gang' : tabIndex == index }"></div>
           </div>
         </div>
-        <div class="tab-kuang" style="flex-wrap: wrap;justify-content: space-between ">
-          <div :class=item.classStyle v-for="(item,index) in dataList" @click="setRefuelingAmount(item)">
-            <div>{{ item.oilType }}&nbsp;{{ item.oilName }}</div>
-            <div class="card-title">{{ item.gunName }}</div>
-            <div class="c-b-d">
-              <img :src=item.img style="width: 16px;height: 16px">
-              <div>{{ item.tankName }}</div>
+        <div class="tab-kuang" style="flex-wrap: wrap;">
+          <div class="zo_box" v-for="(item,index) in dataList">
+            <div :class=item.classStyle  @click="setRefuelingAmount(item)">
+              <div>{{ item.oilType }}&nbsp;{{ item.oilName }}</div>
+              <div class="card-title">{{ item.gunName }}</div>
+              <div class="c-b-d">
+                <img :src=item.img style="width: 16px;height: 16px">
+                <div>{{ item.tankName }}</div>
+              </div>
             </div>
           </div>
 
-
         </div>
         <div style=" position: absolute;bottom: 0px; width: 100%;">
           <div class="c-bottom">
@@ -2543,15 +2540,17 @@ input {
   padding: 20px;
   margin: 0 auto;
   display: flex;
-  align-content: flex-start;
+  //align-content: flex-start;
   flex-wrap: wrap;
   overflow: auto;
   height: 68vh;
 
 }
-
+.zo_box{
+  width: 33.3%;
+}
 .card92 {
-  width: 31%;
+  width: 95%;
   height: 90px;
   box-sizing: border-box;
   padding: 5px;
@@ -2569,7 +2568,7 @@ input {
 }
 
 .card0 {
-  width: 31%;
+  width: 95%;
   height: 90px;
   box-sizing: border-box;
   padding: 5px;
@@ -2586,7 +2585,7 @@ input {
 }
 
 .card98 {
-  width: 31%;
+  width: 95%;
   height: 90px;
   box-sizing: border-box;
   padding: 5px;
@@ -2603,7 +2602,7 @@ input {
 }
 
 .card95 {
-  width: 31%;
+  width: 95%;
   height: 90px;
   box-sizing: border-box;
   padding: 5px;
diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue
index bd7f5c428..89080d593 100644
--- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue
+++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue
@@ -76,7 +76,7 @@
       <div>
         <div class="box-gang">
           <div class="box2">
-            <div style="font-size: 26px;color: #0DC291;font-weight: bold;margin-top: 5px">
+            <div class="x_size" style="font-size: 26px;color: #0DC291;font-weight: bold;margin-top: 5px;">
               {{ orderStatistics.theTotalAmount || 0 }}/{{ orderStatistics.numberOfProducts || 0 }}
             </div>
             <div class="size-hui">
@@ -85,7 +85,7 @@
             </div>
           </div>
           <div class="box2">
-            <div style="font-size: 26px;color: #00CAFF;font-weight: bold;margin-top: 5px">
+            <div class="x_size" style="font-size: 26px;color: #00CAFF;font-weight: bold;margin-top: 5px">
               {{ orderStatistics.theTotalAmount || 0 }}
             </div>
             <div class="size-hui">
@@ -94,7 +94,7 @@
             </div>
           </div>
           <div class="box2">
-            <div style="font-size: 26px;color: #F44522;font-weight: bold;margin-top: 5px">
+            <div class="x_size" style="font-size: 26px;color: #F44522;font-weight: bold;margin-top: 5px">
               {{ orderStatistics.discountAmount || 0 }}
             </div>
             <div class="size-hui">
@@ -103,7 +103,7 @@
             </div>
           </div>
           <div class="box2">
-            <div style="font-size: 26px;color: #FA6400;font-weight: bold;margin-top: 5px">
+            <div class="x_size" style="font-size: 26px;color: #FA6400;font-weight: bold;margin-top: 5px">
               {{ orderStatistics.wechat || 0 }}/{{ orderStatistics.alipay || 0 }}
             </div>
             <div class="size-hui">
@@ -112,7 +112,7 @@
             </div>
           </div>
           <div class="box2">
-            <div style="font-size: 26px;color: #2B63F4;font-weight: bold;margin-top: 5px">
+            <div class="x_size" style="font-size: 26px;color: #2B63F4;font-weight: bold;margin-top: 5px">
               {{ orderStatistics.wechat || 0 }}/{{ orderStatistics.alipay || 0 }}
             </div>
             <div class="size-hui">
@@ -121,7 +121,7 @@
             </div>
           </div>
           <div class="box2">
-            <div style="font-size: 26px;color: #F7B500;font-weight: bold;margin-top: 5px">
+            <div class="x_size" style="font-size: 26px;color: #F7B500;font-weight: bold;margin-top: 5px">
               {{ orderStatistics.cash || 0 }}
             </div>
             <div class="size-hui">
@@ -184,7 +184,7 @@
                 <span>{{ parseTime(scope.row.payTime) }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" width="300" class-name="small-padding fixed-width">
+            <el-table-column label="操作" align="center"  class-name="small-padding fixed-width">
               <template slot-scope="scope">
                 <el-button style="color: #fe8c4a" @click="patchwork(scope.row)"
                            type="text" >补打
@@ -200,15 +200,13 @@
           </el-table>
         </div>
         <div class="pagination-box">
-          <el-pagination
-            background
-            layout="prev, pager, next"
+          <pagination
             v-show="total>0"
             :total="total"
             :page.sync="queryParams.page"
             :limit.sync="queryParams.pageSize"
-            @current-change="getList">
-          </el-pagination>
+            @pagination="getList"
+          />
         </div>
         <!--    订单退款-->
         <el-dialog
@@ -457,7 +455,7 @@ export default {
                 margin: 5px 0px;
               }
              .box-ge{
-                border-bottom: 1px solid #000000 ;
+
                 box-sizing: border-box;
                 padding: 10px;
               }
@@ -872,7 +870,8 @@ export default {
 
 .table-box {
   width: 100%;
-  min-height: 69vh;
+  height: 65vh;
+  overflow: auto;
 }
 
 .pagination-box {
@@ -880,7 +879,7 @@ export default {
   margin: 10px auto;
   display: flex;
   align-items: center;
-  justify-content: center;
+  justify-content: flex-end;
 }
 
 .top-app-sou {
@@ -939,4 +938,9 @@ export default {
   padding: 15px;
   height: 64px;
 }
+.x_size{
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
 </style>
diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue
index eac4f5170..a4a7e04da 100644
--- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue
+++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue
@@ -111,7 +111,6 @@
       </el-form>
     </div>
     <div class="cot-box">
-
       <div>
         <div class="box-gang">
           <div class="box2">
@@ -181,7 +180,6 @@
         </div>
       </div>
       <div class="new_bottom">
-
           <el-table
             v-loading="loading"
             border