From 4ec385d97f0db881e1a1af3516fca487c6b2b6c6 Mon Sep 17 00:00:00 2001
From: "DESKTOP-369JRHT\\12997" <9>
Date: Fri, 11 Oct 2024 09:16:49 +0800
Subject: [PATCH] 10.10

---
 .../views/cashier/NewComponents/Handover.vue  | 50 ++++++++-----------
 .../NewComponents/HandoverDetailsInfo.vue     | 10 ++--
 .../cashier/NewComponents/HandoverRecord.vue  |  6 +--
 .../views/cashier/NewComponents/Integral.vue  |  6 +--
 4 files changed, 31 insertions(+), 41 deletions(-)

diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/Handover.vue b/fuintCashierWeb/src/views/cashier/NewComponents/Handover.vue
index 326e12486..0b9f5b0cb 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/Handover.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/Handover.vue
@@ -1,6 +1,6 @@
 <!-- 交接班 在用的 -->
 <template>
-  <div class="app-containers">
+  <div class="app-containerss">
 
     <div class="tab-box">
       <div class="tab_" :class="{active:index== tabindex }" @click="getindex(index)" v-for="(item,index) in  tabs"  :key="index">
@@ -11,13 +11,13 @@
       <div class="card-box" style="width: 98%;margin: 10px auto;background: #fff;box-sizing: border-box;padding-top: 15px" >
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px">
           <el-form-item label="" prop="status">
-            <el-select v-model="queryParams.status" style="width: 150px" placeholder="交班方式" clearable>
+            <el-select v-model="queryParams.status" style="width: 230px" placeholder="交班方式" clearable>
               <el-option  label="统一交班" value="统一交班">统一交班</el-option>
               <el-option  label="个人交班" value="个人交班">个人交班</el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="" prop="staffId">
-            <el-select v-model="queryParams.staffId" style="width: 150px" placeholder="交班员工" clearable>
+            <el-select v-model="queryParams.staffId" style="width: 230px" placeholder="交班员工" clearable>
               <el-option
                 v-for="option in staffList"
                 :key="option.id"
@@ -26,9 +26,6 @@
               ></el-option>
             </el-select>
           </el-form-item>
-
-
-
           <el-form-item class="flex-container" style="float: right">
             <el-button type="primary" icon="el-icon-search"  @click="handleQuery">搜索</el-button>
             <el-button icon="el-icon-refresh"  @click="resetQuery">重置</el-button>
@@ -36,8 +33,12 @@
         </el-form>
       </div>
 
-      <el-card style="margin-top: 20px;  height: 70vh;overflow: auto"   class="box-card">
-        <div class="title_">门店交接单</div>
+      <div style=" margin-top: 10px; margin-bottom: 10px; background: #FFFFFF;box-sizing: border-box;padding: 15px; border-radius: 8px;  height: 78vh;"   class="box-card">
+        <div class="title_" style="display: flex;justify-content: space-between">
+          <div style="width: 10%;"></div>
+          <div>门店交接单</div>
+          <div style=" color: #FF9655;font-size: 14px;">打印</div>
+        </div>
         <div class="d-s-b">
           <div>油站名称</div>
           <div>{{baseInfo.storeName}}</div>
@@ -99,6 +100,7 @@
           <div>{{orderSummary.sumnum}}</div>
         </div>
         <div class="xxing"></div>
+        <div style="overflow: auto; height: 35vh;scrollbar-width: none; ">
         <div class="for-box">
           <div class="for-title">
             <div class="x-"></div>
@@ -343,9 +345,9 @@
             <div class="r-size">￥{{item.paidAmount?item.paidAmount:'--'}}</div>
           </div>
         </div>
-
-      </el-card>
-      <div style="width: 98%; margin: 20px auto;display: flex;align-items: center;justify-content: center; background: #fff;box-sizing: border-box;padding: 15px " >
+        </div>
+      </div>
+      <div style="width: 98%; margin: 10px auto;display: flex;align-items: center;justify-content: center; background: #fff;box-sizing: border-box;padding: 15px " >
         <el-button type="primary" @click="shift()">交班</el-button>
       </div>
     </div>
@@ -603,12 +605,12 @@ export default {
 </script>
 
 <style scoped lang="scss">
-.app-containers {
+.app-containerss {
   width: 100%;
   height: 100vh;
   background: #f6f8f9;
   box-sizing: border-box;
-  padding-bottom: 20px;
+
   display: flex;
   flex-direction: column;
 }
@@ -617,8 +619,8 @@ export default {
   background: #fff;
   display: flex;
   box-sizing: border-box;
-  padding: 0px 25px;
-  margin-bottom: 25px;
+  padding:  5px;
+  padding-bottom: 0px;
 
 }
 .box_{
@@ -668,20 +670,12 @@ export default {
   width: 100%; /* 让父容器占满可用宽度 */
 }
 .el-form--inline .el-form-item {
-  margin-right: 44px;
-}
-.tab-box{
-  width: 100%;
-  height: 40px;
-  background: #fff;
-  display: flex;
-  box-sizing: border-box;
-  margin-bottom: 25px;
 
 }
+
 .tab_{
   width: 75px;
-  height: 100%;
+  height: 40px;
   //border-bottom: 2px solid #FF770F;
   display: flex;
   font-weight: 500;
@@ -710,7 +704,7 @@ export default {
   font-weight: 400;
   font-size: 14px;
   color: #333333;
-  margin: 20px auto;
+  margin: 5px auto;
 }
 .xxing{
   width: 100%;
@@ -737,8 +731,8 @@ export default {
 .f-size{
   width: 33%;
   text-align: center;
-  font-weight: 600;
-  font-size: 16px;
+
+  font-size: 14px;
   color: #333333;
 }
 .s-size{
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/HandoverDetailsInfo.vue b/fuintCashierWeb/src/views/cashier/NewComponents/HandoverDetailsInfo.vue
index 6af263555..8d05c565b 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/HandoverDetailsInfo.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/HandoverDetailsInfo.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="">
 
-    <div style="margin-top: 0px;  height: 70vh;overflow: auto"   class="box-card">
+    <div style="margin-top: 0px;  height: 70vh;overflow: auto;scrollbar-width: none; "   class="box-card">
      <div class="title_">门店交接单</div>
       <div class="d-s-b">
         <div>油站名称</div>
@@ -256,8 +256,6 @@
           <div class="r-size">￥{{item.paidAmount?item.paidAmount:'--'}}</div>
         </div>
       </div>
-
-
       <div class="for-box">
         <div class="for-title">
           <div class="x-"></div>
@@ -271,8 +269,6 @@
         </div>
 
       </div>
-
-
       <div class="for-box">
         <div class="for-title">
           <div class="x-"></div>
@@ -643,7 +639,7 @@ export default {
   font-weight: 400;
   font-size: 14px;
   color: #333333;
-  margin: 20px auto;
+  margin: 5px auto;
 }
 .xxing{
   width: 100%;
@@ -671,7 +667,7 @@ export default {
   width: 33%;
   text-align: center;
   font-weight: 600;
-  font-size: 16px;
+  font-size: 14px;
   color: #333333;
 }
 .s-size{
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/HandoverRecord.vue b/fuintCashierWeb/src/views/cashier/NewComponents/HandoverRecord.vue
index b191cb976..ba6e7efde 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/HandoverRecord.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/HandoverRecord.vue
@@ -174,7 +174,7 @@ export default {
           placeholder="交易结束日期">
         </el-date-picker>
       </el-form-item>
-      <el-form-item class="flex-container" style="float: right">
+      <el-form-item class="flex-container"  style="float: right;margin-right: 0px">
         <el-button type="primary" icon="el-icon-search"  @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh"  @click="resetQuery">重置</el-button>
       </el-form-item>
@@ -274,9 +274,9 @@ export default {
   border-radius: 8px;
   width: 98%;
   background: #fff;
-  margin: 25px auto;
+  margin: 15px auto;
   box-sizing: border-box;
-
+  height: 98vh;
   padding: 15px;
 }
 </style>
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue b/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue
index 675d5413e..38a020a19 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue
@@ -1653,8 +1653,8 @@ import {getReturnCode, printIntegralReport, sendPrintIndex} from "@/api/print";
     color: red;
   }
   .center-left-lv{
-    width: 60%;
-    height: 80px;
+    width: 40%;
+    height: 60px;
     color: white;
     background: linear-gradient( 312deg, #FF945B 0%, #FEB37C 100%);
     border-radius: 6px 6px 6px 6px;
@@ -1758,7 +1758,7 @@ import {getReturnCode, printIntegralReport, sendPrintIndex} from "@/api/print";
     position: absolute;
     bottom: 0px;
     justify-content: space-between;
-    width: 58%;
+    width: 57%;
     background: white;
     display: flex;
     align-items: center;