From 733e3d38c49d0401a9c07de0487ff486814b5db8 Mon Sep 17 00:00:00 2001
From: "DESKTOP-369JRHT\\12997" <9>
Date: Fri, 18 Oct 2024 10:29:49 +0800
Subject: [PATCH] 10.16

---
 .../src/views/handover/HandoverDetails.vue    | 64 +++++++------
 .../views/handover/HandoverDetailsInfo.vue    |  4 +-
 .../src/views/handover/HandoverRecord.vue     | 21 ++--
 fuintAdmin/src/views/shopowner.vue            | 95 +++++++++++--------
 4 files changed, 109 insertions(+), 75 deletions(-)

diff --git a/fuintAdmin/src/views/handover/HandoverDetails.vue b/fuintAdmin/src/views/handover/HandoverDetails.vue
index 829a597d0..c03eb0c17 100644
--- a/fuintAdmin/src/views/handover/HandoverDetails.vue
+++ b/fuintAdmin/src/views/handover/HandoverDetails.vue
@@ -7,19 +7,19 @@
         {{ item }}
       </div>
     </div>
-    <div v-if="tabindex == 0">
+    <div style="height: 87.5vh;position: relative;" v-if="tabindex == 0">
       <div class="card-box"
-           style="width: 100%;margin: 10px auto;background: #fff;box-sizing: border-box;padding-top: 15px; margin-bottom: 0px ">
+           style="width: 98%;margin: 0px auto;background: #fff;box-sizing: border-box;padding-top: 5px; margin-bottom: 0px ">
         <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: 220px" placeholder="交班方式" clearable
                        @change="onChange">
               <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 @change="onChange2">
+            <el-select v-model="queryParams.staffId" style="width: 220px" placeholder="交班员工" clearable @change="onChange2">
               <el-option
                 v-for="option in staffList"
                 :key="option.id"
@@ -29,17 +29,18 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item class="flex-container" style="float: right">
+          <el-form-item class="flex-container" style="margin-right:0px;float: right">
             <el-button type="primary" icon="el-icon-search" :disabled="!isSearch" @click="handleQuery">搜索</el-button>
             <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-form>
       </div>
 
-      <div style="margin-top: 20px; padding-top:  0px; scrollbar-width: none; height: 70vh;overflow: auto" class="box-card">
+      <div style="margin-top: 10px; padding-top:  0px; height: 73vh;" class="box-card">
         <div class="title_" style="height: 50px; padding-top: 20px; background-color: white; display: flex;justify-content: space-between">
-          <div style="width: 80%;margin-left: 50px">门店交接单</div>
-          <span style="cursor: pointer; color: blue;font-weight: 400;" >打印预览</span>
+          <div style="width: 5%;"></div>
+          <div style="width: 80%;">门店交接单</div>
+          <span style="cursor: pointer; color: blue;font-weight: 400;" >打印</span>
         </div>
         <div class="d-s-b">
           <div>油站名称</div>
@@ -102,6 +103,7 @@
           <div>{{ orderSummary.sumnum }}</div>
         </div>
         <div class="xxing"></div>
+        <div style="width: 100%; height: 29vh;overflow: auto;scrollbar-width: none;  ">
         <div class="for-box">
           <div class="for-title">
             <div class="x-"></div>
@@ -129,8 +131,6 @@
             <div class="r-size">￥{{ orderSummary.allyingye + orderSummary.allchuzhika }}</div>
           </div>
         </div>
-
-
         <div class="for-box">
           <div class="for-title">
             <div class="x-"></div>
@@ -148,7 +148,6 @@
             <div class="r-size">￥{{ item.paidAmount }}</div>
           </div>
         </div>
-
         <div class="for-box">
           <div class="for-title">
             <div class="x-"></div>
@@ -166,7 +165,6 @@
             <div class="r-size">￥{{ item.paidAmount }}</div>
           </div>
         </div>
-
         <div class="for-box">
           <div class="for-title">
             <div class="x-"></div>
@@ -184,7 +182,6 @@
             <div class="r-size">￥{{ item.paidAmount }}</div>
           </div>
         </div>
-
         <div class="for-box">
           <div class="for-title">
             <div class="x-"></div>
@@ -202,8 +199,6 @@
             <div class="r-size">￥{{ item.paidAmount }}</div>
           </div>
         </div>
-
-
         <div class="for-box">
           <div class="for-title">
             <div class="x-"></div>
@@ -221,7 +216,6 @@
             <div class="r-size">￥{{ item.paidAmount ? item.paidAmount : '--' }}</div>
           </div>
         </div>
-
         <div class="for-box">
           <div class="for-title">
             <div class="x-"></div>
@@ -239,7 +233,6 @@
             <div class="r-size">￥{{ item.paidAmount ? item.paidAmount : '--' }}</div>
           </div>
         </div>
-
         <div class="for-box">
           <div class="for-title">
             <div class="x-"></div>
@@ -257,7 +250,6 @@
             <div class="r-size">￥{{ item.paidAmount ? item.paidAmount : '--' }}</div>
           </div>
         </div>
-
         <div class="for-box">
           <div class="for-title">
             <div class="x-"></div>
@@ -305,8 +297,6 @@
           </div>
 
         </div>
-
-
         <div class="for-box">
           <div class="for-title">
             <div class="x-"></div>
@@ -324,7 +314,6 @@
             <div class="r-size">￥{{ item.paidAmount ? item.paidAmount : '--' }}</div>
           </div>
         </div>
-
         <div class="for-box">
           <div class="for-title">
             <div class="x-"></div>
@@ -342,10 +331,9 @@
             <div class="r-size">￥{{ item.paidAmount ? item.paidAmount : '--' }}</div>
           </div>
         </div>
-
-      </div>
-      <div
-        style="width: 100%; margin: 20px auto;display: flex;align-items: center;justify-content: center; background: #fff;box-sizing: border-box;margin-bottom: 0px ">
+        </div>
+        </div>
+      <div class="bot-a-ds" >
         <el-button type="primary" @click="shift()">交班</el-button>
       </div>
     </div>
@@ -383,7 +371,8 @@ export default {
     return {
 
       tabs: [
-        "交接班1",
+        "交接班",
+        // "交接班1",
         "交班记录"
       ],
       isSearch: true,
@@ -643,7 +632,7 @@ export default {
   display: flex;
   box-sizing: border-box;
   padding: 0px 25px;
-  margin-bottom: 25px;
+  //margin-bottom: 25px;
 }
 .box_ {
   height: 100%;
@@ -702,6 +691,8 @@ export default {
 
 .el-form--inline .el-form-item {
   margin-right: 44px;
+  margin-top: 5px;
+  margin-bottom: 10px;
 }
 
 .tab-box {
@@ -711,6 +702,7 @@ export default {
   display: flex;
   box-sizing: border-box;
   margin-bottom: 25px;
+  margin-bottom: 15px;
 
 }
 
@@ -748,7 +740,7 @@ export default {
   font-weight: 400;
   font-size: 14px;
   color: #333333;
-  margin: 20px auto;
+  margin:5px auto;
 }
 
 .xxing {
@@ -804,13 +796,27 @@ export default {
   width: 98%;
 }
 
-.table-boxs {
+.table-s {
   border-radius: 8px;
   width: 98%;
   background: #fff;
   margin: 25px auto;
   box-sizing: border-box;
+  margin-top: 5px;
 
   padding: 15px;
+}
+.bot-a-ds{
+  width: 100%;
+  background: #fff;
+  position: absolute;
+  bottom: 0px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  box-sizing: border-box;
+  padding: 15px;
+
+
 }
 </style>
diff --git a/fuintAdmin/src/views/handover/HandoverDetailsInfo.vue b/fuintAdmin/src/views/handover/HandoverDetailsInfo.vue
index edbaab321..eab517210 100644
--- a/fuintAdmin/src/views/handover/HandoverDetailsInfo.vue
+++ b/fuintAdmin/src/views/handover/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>
@@ -645,7 +645,7 @@ export default {
   font-weight: 400;
   font-size: 14px;
   color: #333333;
-  margin: 20px auto;
+  margin: 5px auto;
 }
 .xxing{
   width: 100%;
diff --git a/fuintAdmin/src/views/handover/HandoverRecord.vue b/fuintAdmin/src/views/handover/HandoverRecord.vue
index 24fa0f2ab..cafb3318f 100644
--- a/fuintAdmin/src/views/handover/HandoverRecord.vue
+++ b/fuintAdmin/src/views/handover/HandoverRecord.vue
@@ -142,7 +142,7 @@ export default {
 
 <template>
 <div class="f-hx">
-  <div class="table-boxs">
+  <div class="table-s">
     <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>
@@ -175,7 +175,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>
@@ -211,9 +211,9 @@ export default {
   <el-dialog title="查看详情" :visible.sync="openSeeDetails" width="600px" append-to-body :close-on-click-modal="false">
     <HandoverDetailsInfo :recordData="recordData"></HandoverDetailsInfo>
   </el-dialog>
-  <el-dialog title="商品汇总" :visible.sync="openGoodsSum" width="600px" append-to-body :close-on-click-modal="false">
+  <el-dialog title="商品汇总" :visible.sync="openGoodsSum" width="600px" style="padding-top: 0px" append-to-body :close-on-click-modal="false">
       <div>
-        <div>油品交易信息</div>
+        <div class="tou_">油品交易信息</div>
         <div>
           <el-table :data="oilNumberStatistics" style="width: 100%" border>
             <el-table-column align="center" prop="oilName" label="油品油号" ></el-table-column>
@@ -224,7 +224,7 @@ export default {
         </div>
       </div>
     <div>
-      <div>便利店交易信息</div>
+      <div class="tou_">便利店交易信息</div>
       <div>
         <el-table :data="goodsNumberStatistics" style="width: 100%" border>
           <el-table-column align="center" prop="goodsName" label="商品名称" ></el-table-column>
@@ -235,7 +235,7 @@ export default {
       </div>
     </div>
     <div>
-      <div >积分商城兑换信息</div>
+      <div class="tou_">积分商城兑换信息</div>
       <div>
         <el-table :data="IntegerNumberStatistics" style="width: 100%" border>
           <el-table-column align="center" prop="giftName" label="商品名称" ></el-table-column>
@@ -267,13 +267,14 @@ export default {
   margin-bottom: 25px;
 
 }
-.table-boxs{
+.table-s{
   border-radius: 8px;
   width: 98%;
   background: #fff;
   margin: 25px auto;
   margin-bottom: 0px;
   box-sizing: border-box;
+  margin-top: 5px;
   height: 85vh;
   padding: 15px;
 }
@@ -283,4 +284,10 @@ export default {
 
   padding-bottom: 12px;
 }
+.tou_{
+  font-size: 14px;
+  font-weight: bold;
+  margin-bottom: 10px;
+  margin-top: 10px;
+}
 </style>
diff --git a/fuintAdmin/src/views/shopowner.vue b/fuintAdmin/src/views/shopowner.vue
index 31a11c3d8..1e1afb835 100644
--- a/fuintAdmin/src/views/shopowner.vue
+++ b/fuintAdmin/src/views/shopowner.vue
@@ -101,16 +101,16 @@
         </div>
         <div class="hui-hang"></div>
         <div class="d-s">
-          <div>
-            <div class="h-tt">数据分析</div>
-            <div id="ccc" style="width: 300px;height: 200px; "></div>
+          <div style="position: relative">
+            <div class="h-tt" style="position: absolute;top: 0px">数据分析</div>
+            <div id="ccc" style="width: 400px;height: 200px; "></div>
           </div>
-          <div class="h-r-ba"></div>
+<!--          <div class="h-r-ba"></div>-->
           <div>
             <!--            <div class="h-tt" >活跃油站</div>-->
             <div class="d-s" style="justify-content: space-between">
-              <div id="cccc" style="width: 300px;height: 200px;margin-right: 50px"></div>
-              <div id="ccct" style="width: 300px;height: 200px;"></div>
+              <div id="cccc" style="width: 400px;height: 200px;"></div>
+              <div id="ccct" style="width: 400px;height: 200px;"></div>
             </div>
           </div>
         </div>
@@ -135,7 +135,6 @@
             <div style="font-size: 14px">{{ item.name }}</div>
           </div>
         </div>
-
       </div>
     </div>
     <div class="b-bs">
@@ -793,14 +792,23 @@ export default {
 
       const option = {
         color: [
-          '#b7f1e2',
+          '#36b713',
           '#fc7150',
           '#fea500',
           '#5facfe',
+          '#b7f1e2',
         ],
         tooltip: {
           trigger: 'item'
         },
+        legend: {
+          type:'scroll',
+          orient: 'vertical',
+          right: '0%',
+          bottom: '0%',
+          left:'right',
+          size:8
+        },
         series: [
           {
             name: '',
@@ -812,7 +820,14 @@ export default {
             },
             radius: ['40%', '80%'],
             data: this.dataAnalysisOilNumberList,
-          }
+            label: {
+              show: true,
+              position: "inside",
+              color:'#fff',
+              formatter: `{d}%`,
+            },
+          },
+
         ]
       };
       const option1 = {
@@ -823,7 +838,14 @@ export default {
         tooltip: {
           trigger: 'item'
         },
-
+        legend: {
+          type:'scroll',
+          orient: 'vertical',
+          right: '0%',
+          bottom: '0%',
+          left:'right',
+          size:8
+        },
         series: [
           {
             name: '',
@@ -837,8 +859,16 @@ export default {
                 shadowOffsetX: 0,
                 shadowColor: 'rgba(0, 0, 0, 0.5)'
               }
-            }
-          }
+            },
+            label: {
+              show: true,
+              position: "inside",
+              color:'#fff',
+              formatter: `{d}%`,
+            },
+          },
+
+
         ]
       };
       const option2 = {
@@ -851,35 +881,19 @@ export default {
         tooltip: {
           trigger: 'item'
         },
-
+        legend: {
+          type:'scroll',
+          orient: 'vertical',
+          right: '0%',
+          bottom: '0%',
+          left:'right',
+          size:8
+        },
         series: [
           {
             name: '',
             type: 'pie',
             radius: [50, '80%'],
-            // data: [
-            //   // { value: 28, name: '会员充值占比' },
-            //   // { value: 72, name: '积分商城交易占比' },
-            //   // { value: 28, name: '油品交易占比' },
-            //   // { value: 72, name: '便利店交易占比' },
-            //   {
-            //     value: this.countPercentage(Number(this.storeAmount.userNum), Number(this.storeAmount.oilNum) + Number(this.storeAmount.userNum) + Number(this.storeAmount.integralNum) + Number(this.storeAmount.goodNum)),
-            //     name: '会员充值占比'
-            //   },
-            //   {
-            //     value: this.countPercentage(Number(this.storeAmount.integralNum), Number(this.storeAmount.oilNum) + Number(this.storeAmount.userNum) + Number(this.storeAmount.integralNum) + Number(this.storeAmount.goodNum)),
-            //     name: '积分商城交易占比'
-            //   },
-            //   {
-            //     value: this.countPercentage(Number(this.storeAmount.oilNum), Number(this.storeAmount.oilNum) + Number(this.storeAmount.userNum) + Number(this.storeAmount.integralNum) + Number(this.storeAmount.goodNum)),
-            //     name: '油品交易占比'
-            //   },
-            //   {
-            //     value: this.countPercentage(Number(this.storeAmount.goodNum), Number(this.storeAmount.oilNum) + Number(this.storeAmount.userNum) + Number(this.storeAmount.integralNum) + Number(this.storeAmount.goodNum)),
-            //     name: '便利店交易占比'
-            //   },
-            //
-            // ],
             data: this.dataAnalysisAllList,
             emphasis: {
               itemStyle: {
@@ -887,7 +901,14 @@ export default {
                 shadowOffsetX: 0,
                 shadowColor: 'rgba(0, 0, 0, 0.5)'
               }
-            }
+            },
+
+            label: {
+              show: true,
+              position: "inside",
+              color:'#fff',
+              formatter: `{d}%`,
+            },
           }
         ]
       };