From 9d4a615676d47dfcc5717e54dd3609a6cb0dd189 Mon Sep 17 00:00:00 2001
From: xvv <cccccc420590@163.com>
Date: Mon, 12 Aug 2024 17:49:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/handover/HandoverDetails.vue       | 12 ++++++------
 .../views/cashier/orderComponents/order_Vip.vue  | 16 ----------------
 2 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/fuintAdmin/src/views/handover/HandoverDetails.vue b/fuintAdmin/src/views/handover/HandoverDetails.vue
index 340e0e815..033e15dbe 100644
--- a/fuintAdmin/src/views/handover/HandoverDetails.vue
+++ b/fuintAdmin/src/views/handover/HandoverDetails.vue
@@ -7,7 +7,7 @@
         </div>
       </div>
 <div v-if="tabindex == 0">
-    <el-card class="card-box" style="width: 98%;margin: 10px auto" >
+    <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>
@@ -33,10 +33,9 @@
           <el-button icon="el-icon-refresh"  @click="resetQuery">重置</el-button>
         </el-form-item>
       </el-form>
-    </el-card>
+    </div>
 
-    <el-card style="margin-top: 20px;  height: 100vh
-"   class="box-card">
+    <el-card style="margin-top: 20px;  height: 70vh;overflow: auto"   class="box-card">
      <div class="title_">门店交接单</div>
       <div class="d-s-b">
         <div>油站名称</div>
@@ -127,9 +126,9 @@
         </div>
       </div>
     </el-card>
-    <el-card style="width: 98%; margin: 20px auto;display: flex;align-items: center;justify-content: center;" >
+    <div style="width: 98%; margin: 20px auto;display: flex;align-items: center;justify-content: center; background: #fff;box-sizing: border-box;padding: 15px " >
       <el-button type="primary">交班</el-button>
-    </el-card>
+    </div>
 </div>
 <div v-if="tabindex == 1">
   <div class="table-boxs">
@@ -419,6 +418,7 @@ export default {
 <style scoped lang="scss">
 .app-containers {
   width: 100%;
+  height: 100vh;
   background: #f6f8f9;
   box-sizing: border-box;
   padding-bottom: 20px;
diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Vip.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Vip.vue
index 8d68749d9..d7db026b6 100644
--- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Vip.vue
+++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Vip.vue
@@ -3,18 +3,6 @@
   <div>
 <!--    条件查询-->
     <el-card class="box-card">
-<!--      <div style="display: flex;">-->
-<!--        <div class="top-app-sou">-->
-<!--          <el-form :label-position="labelPosition" label-width="40px" :model="formLabelAlign">-->
-<!--            <el-form-item label="名称">-->
-<!--              <el-input v-model="formLabelAlign.name" placeholder="请输入要搜索的内容"></el-input>-->
-<!--            </el-form-item>-->
-<!--          </el-form>-->
-<!--        </div>-->
-<!--        <div style="margin-left: 10px">-->
-<!--          <el-button type="primary" icon="el-icon-search">搜索</el-button>-->
-<!--        </div>-->
-<!--      </div>-->
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
         <el-form-item label="" prop="staffId">
           <el-select
@@ -636,14 +624,10 @@ export default {
     flex-wrap: wrap;
   }
   .box{
-    //box-sizing: border-box;
     padding: 5px;
-    //background: #f9f9f9;
     margin-bottom: 20px;
-
     margin-right: 20px;
     padding-left: 20px;
-
     width: 211px;
     height: 60px;
     background: rgba(64,158,255,0.05);