diff --git a/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue b/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue
index 9abc99745..6bb682b7d 100644
--- a/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue
@@ -2,7 +2,7 @@
   <div class="app-containers">
     <!--      存油卡-->
 
-    <div class="card-box" style="margin-bottom: 20px">
+    <div class="card-box" style="margin-bottom: -2px">
       <div class="d-s">
         <div class="gang"></div>
         <div style="font-weight: bold">电子囤油卡</div>
@@ -200,7 +200,7 @@
           <el-input type="textarea" v-model="oilForm.gzDetail"></el-input>
         </el-form-item>
       </el-form>
-      <div slot="footer" class="dialog-footer" style="text-align: center;">
+      <div style="text-align: center;">
         <el-button @click="resetForm('oilForm')">取 消</el-button>
         <el-button type="primary" @click="submitForms('oilForm')">保 存</el-button>
       </div>
@@ -296,10 +296,10 @@
         </el-form-item>
 
       </el-form>
-      <span slot="footer" class="dialog-footer" center>
+      <div style="text-align: center;">
           <el-button @click="centerDialogVisible = false">取 消</el-button>
            <el-button type="primary" @click="postadd('ruleForm')">保 存</el-button>
-        </span>
+        </div>
     </el-dialog>
   </div>
 </template>
diff --git a/fuintAdmin/src/views/convenienceStore/goodsFile.vue b/fuintAdmin/src/views/convenienceStore/goodsFile.vue
index ce5f55eed..4764b4a20 100644
--- a/fuintAdmin/src/views/convenienceStore/goodsFile.vue
+++ b/fuintAdmin/src/views/convenienceStore/goodsFile.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <div class="card-change" style="height: 86vh;">
+    <div class="card-change" style="height: 86.8vh;">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
         <!--        <el-tabs v-model="activeName" @tab-click="handleClick">-->
         <!--          <el-tab-pane label="商品档案" name="goods"></el-tab-pane>-->
@@ -75,7 +75,7 @@
         <div style="font-size: 12px;color: red;margin: 5px 0">注：库存为0或未设置零售价和会员价的商品不可上架</div>
       </div>
 
-      <div style="height: 66vh;overflow: auto">
+      <div style="height: 69vh;overflow: auto">
         <el-table ref="tables" v-loading="loading" :data="list"
                   @selection-change="handleSelectionChange"
                   border
diff --git a/fuintAdmin/src/views/convenienceStore/goodsSale.vue b/fuintAdmin/src/views/convenienceStore/goodsSale.vue
index 8a56be7bf..7ed6014c9 100644
--- a/fuintAdmin/src/views/convenienceStore/goodsSale.vue
+++ b/fuintAdmin/src/views/convenienceStore/goodsSale.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <!--    商品销售统计-->
     <!--    搜索框-->
-    <div class="card-change" style="height: 86vh;">
+    <div class="card-change" style="height: 86.8vh;">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
         <el-form-item label="" prop="name">
           <el-input
diff --git a/fuintAdmin/src/views/convenienceStore/pinlei.vue b/fuintAdmin/src/views/convenienceStore/pinlei.vue
index c65d2e9e0..894047acb 100644
--- a/fuintAdmin/src/views/convenienceStore/pinlei.vue
+++ b/fuintAdmin/src/views/convenienceStore/pinlei.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <div class="card-change" style="height: 86vh;">
+    <div class="card-change" style="height: 86.8vh;">
       <!-- 查询类别 -->
       <el-form :inline="true" :model="queryParams">
         <el-form-item label="" prop="name">
@@ -28,7 +28,7 @@
         </el-form-item>
       </el-form>
 
-      <div style="height: 68vh;overflow: auto">
+      <div style="height: 71vh;overflow: auto">
         <el-table ref="tables" v-loading="loading" :data="list" row-key="id" border>
           <el-table-column type="expand">
             <template slot-scope="props">
diff --git a/fuintAdmin/src/views/convenienceStore/stockStatistic.vue b/fuintAdmin/src/views/convenienceStore/stockStatistic.vue
index 345fba9f2..f04c8971b 100644
--- a/fuintAdmin/src/views/convenienceStore/stockStatistic.vue
+++ b/fuintAdmin/src/views/convenienceStore/stockStatistic.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <!--    搜索框-->
-    <div class="card-change" style="height: 86vh;">
+    <div class="card-change" style="height: 86.8vh;">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
         <el-form-item label="" prop="name">
           <el-input
@@ -93,7 +93,7 @@
           </el-button>
         </el-form-item>
       </el-form>
-      <div style="height: 71vh;overflow: auto;scrollbar-width: none">
+      <div style="height: 72vh;overflow: auto;scrollbar-width: none">
         <el-table ref="tables" v-loading="loading" :data="list" border
                   @selection-change="handleSelectionChange" :default-sort="defaultSort"
                   @sort-change="handleSortChange">
diff --git a/fuintAdmin/src/views/convenienceStore/supplier.vue b/fuintAdmin/src/views/convenienceStore/supplier.vue
index 31afa5c4f..e9bf757c1 100644
--- a/fuintAdmin/src/views/convenienceStore/supplier.vue
+++ b/fuintAdmin/src/views/convenienceStore/supplier.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <div class="card-change" style="height: 86vh;">
+    <div class="card-change" style="height: 86.8vh;">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
         <el-form-item label="" prop="name">
           <el-input
@@ -42,7 +42,7 @@
         </el-form-item>
       </el-form>
 
-      <div style="height: 68vh;overflow: auto">
+      <div style="height: 72vh;overflow: auto">
         <el-table ref="tables" v-loading="loading" :data="list" border
                   @selection-change="handleSelectionChange" :default-sort="defaultSort"
                   @sort-change="handleSortChange">
diff --git a/fuintAdmin/src/views/oilConfig/oilGun/list.vue b/fuintAdmin/src/views/oilConfig/oilGun/list.vue
index 1fda89336..82f43c991 100644
--- a/fuintAdmin/src/views/oilConfig/oilGun/list.vue
+++ b/fuintAdmin/src/views/oilConfig/oilGun/list.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <div class="card-change" style="height: 86vh;">
+    <div class="card-change" style="height: 86.5vh;">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
         <el-form-item label="" prop="gunName">
           <el-input
@@ -48,7 +48,7 @@
         </el-form-item>
       </el-form>
       <div>
-        <div style="width: 100%;overflow: auto;height: 69vh">
+        <div style="width: 100%;overflow: auto;height: 71.5vh">
           <el-table ref="tables"
                   v-loading="loading"
                   :data="gunList"
diff --git a/fuintAdmin/src/views/oilConfig/oilPrice/comp/addprice.vue b/fuintAdmin/src/views/oilConfig/oilPrice/comp/addprice.vue
index fa444931d..acf861c31 100644
--- a/fuintAdmin/src/views/oilConfig/oilPrice/comp/addprice.vue
+++ b/fuintAdmin/src/views/oilConfig/oilPrice/comp/addprice.vue
@@ -207,7 +207,7 @@ export default {
 
 <template>
   <div>
-    <div class="card-change-box" style="margin-bottom: 20px">
+    <div class="card-change-box">
       <div style="display: flex; justify-content: space-between;margin-bottom: 10px">
         <div style="display: flex;">
           <div style="background-color: #FF9655;height: 22px;width: 4px;margin-right: 10px"></div>
diff --git a/fuintAdmin/src/views/oilConfig/oilPrice/comp/oilcon.vue b/fuintAdmin/src/views/oilConfig/oilPrice/comp/oilcon.vue
index 6244d891a..644378769 100644
--- a/fuintAdmin/src/views/oilConfig/oilPrice/comp/oilcon.vue
+++ b/fuintAdmin/src/views/oilConfig/oilPrice/comp/oilcon.vue
@@ -283,7 +283,7 @@ export default {
     <div style="display: flex; justify-content: space-between;margin-bottom: 10px">
       <div style="display: flex;">
         <div style="background-color: #FF9655;height: 22px;width: 4px;margin-right: 10px"></div>
-        <span>油价配置</span>
+        <span>油品配置</span>
       </div>
       <div>
         <el-button type="primary" @click="oilTypeMethods(1)"
diff --git a/fuintAdmin/src/views/oilConfig/oilTank/list.vue b/fuintAdmin/src/views/oilConfig/oilTank/list.vue
index b83ecabdf..113b771d3 100644
--- a/fuintAdmin/src/views/oilConfig/oilTank/list.vue
+++ b/fuintAdmin/src/views/oilConfig/oilTank/list.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <!--    搜索框-->
-    <div class="card-box" style="height: 86vh; margin-bottom: 0px;">
+    <div class="card-box" style="height: 86.5vh; margin-bottom: 0px;">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
         <el-form-item label="" prop="tankName">
           <el-input
@@ -53,7 +53,7 @@
       <!--    </div>-->
 
       <!--     列表-->
-      <div style="height: 69vh;overflow: auto">
+      <div style="height: 72vh;overflow: auto">
         <el-table ref="tables"
                   v-loading="loading"
                   :data="tankList"
diff --git a/fuintAdmin/src/views/order/order_Added.vue b/fuintAdmin/src/views/order/order_Added.vue
index 53f605003..e846a0491 100644
--- a/fuintAdmin/src/views/order/order_Added.vue
+++ b/fuintAdmin/src/views/order/order_Added.vue
@@ -130,60 +130,55 @@
 
     <!--    归还记录信息-->
     <el-drawer
-      title="归还详情"
       :visible.sync="drawer"
       direction="rtl"
       size="55%"
       :before-close="handleClose">
-      <div style="display: grid; place-items: center;">
-        <div style="background-color: #f5f5f5;width: 90%;box-sizing: border-box;padding: 15px;padding-top: 20px">
-          <div slot="header" class="clearfix">
-            <div style="position: relative;">
-              <div style="position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%);">
-                <h2>单据号：{{ record.orderNo }}</h2>
-              </div>
-            </div>
-            <br>
-            <div style="display: flex; justify-content: space-between;">
-              <span>操作员工：</span>
-              <span>{{ record.realName }}</span>
-            </div>
-          </div>
-          <div>
-            <div style="display: flex; justify-content: space-between;">
-              <span>挂账单位</span>
-              <span>{{ record.unitName }}</span>
-            </div>
-            <div style="display: flex; justify-content: space-between;margin: 10px 0">
-              <span>挂账人</span>
-              <span>{{ record.personCredit }}</span>
-            </div>
-            <div style="display: flex; justify-content: space-between;">
-              <span>联系电话</span>
-              <span>{{ record.contactMobile }}</span>
-            </div>
-          </div>
+      <template #title>
+        <span style="font-size: 24px; margin-left: 30px;">归还详情</span>
+      </template>
+        <div style="display: grid;">
+          <table style="width: 75%; margin-left: 50px;">
+            <tr>
+              <td >订单号：{{record.orderNo}}</td>
+              <td >挂账单位：{{record.unitName}}</td>
+              <td >挂账人：{{record.personCredit}}</td>
+            </tr>
+            <tr>
+              <td >联系电话：{{record.contactMobile}}</td>
+              <td >操作人：{{record.realName}}</td>
+              <td >操作账号：{{record.mobile}}</td>
+            </tr>
+          </table>
         </div>
-        <div style="margin-top: 15px;width: 90%">
+
+        <div style="display: flex;margin-left: 50px; margin-top: 30px;margin-bottom: 14px" >
+          <div style="height: 21px;width: 3px;background-color: #FF9655;margin-right: 10px"></div>
+          归还信息</div>
+        <div>
+
+
+
+        <div style="margin:0 auto; width: 90%">
           <el-table ref="tables"
                     border
                     v-loading="loading"
                     :data="returnRecordList">
-            <el-table-column label="单据号" align="center" prop="orderNo" width="200"></el-table-column>
+            <el-table-column label="订单号" align="center" prop="orderNo" width="240"></el-table-column>
             <el-table-column label="类型" align="center" prop="returnType">
               <template slot-scope="scope">
                 <el-tag v-if="scope.row.returnType == 0">挂账</el-tag>
                 <el-tag v-else type="success">归还</el-tag>
               </template>
             </el-table-column>
-            <el-table-column label="归还金额" align="center" prop="amount"/>
-            <el-table-column label="找零金额" align="center" prop="seekZero"/>
+            <el-table-column label="归还金额（元）" align="center" prop="amount"/>
+            <el-table-column label="找零金额（元）" align="center" prop="seekZero"/>
             <el-table-column label="归还方式" align="center" prop="status">
               <template slot-scope="scope">
                 <span>{{ getPayMeth(payList, scope.row.status) }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="支付状态" align="center" prop="payStatus">
+            <el-table-column label="状态" align="center" prop="payStatus">
               <template slot-scope="scope">
                 <el-tag v-if="scope.row.payStatus == 'unpaid'">未支付</el-tag>
                 <el-tag type="success" v-else-if="scope.row.payStatus == 'paid'">已支付</el-tag>
@@ -191,24 +186,12 @@
               </template>
             </el-table-column>
             <el-table-column label="操作人" align="center" prop="realName"/>
-            <el-table-column label="支付时间" align="center" prop="payTime" width="200">
+            <el-table-column label="完成时间" align="center" prop="payTime" width="200">
               <template slot-scope="scope">
                 <span>{{ parseTime(scope.row.payTime) }}</span>
               </template>
             </el-table-column>
           </el-table>
-
-          <div class="pagination-box">
-            <el-pagination
-              background
-              layout="prev, pager, next"
-              v-show="total2>0"
-              :total="total2"
-              :page.sync="queryParams1.page"
-              :limit.sync="queryParams1.pageSize"
-              @current-change="getRecordList">
-            </el-pagination>
-          </div>
         </div>
       </div>
     </el-drawer>
@@ -426,7 +409,7 @@ export default {
 
 .box-card {
   width: 100%;
-  height: 91vh;
+  height: 91.5vh;
   border-radius: 8px;
   // margin-bottom: 15px;
   background: #fff;
diff --git a/fuintAdmin/src/views/order/order_Vip.vue b/fuintAdmin/src/views/order/order_Vip.vue
index b73dcb508..fece09105 100644
--- a/fuintAdmin/src/views/order/order_Vip.vue
+++ b/fuintAdmin/src/views/order/order_Vip.vue
@@ -422,7 +422,7 @@ export default {
 
 .box-card {
   width: 100%;
-  height: 91vh;
+  height: 91.3vh;
   border-radius: 8px;
   background: #fff;
   box-sizing: border-box;
@@ -491,7 +491,7 @@ export default {
 
 .table-box {
   width: 100%;
-  height: 72vh;
+  height: 76vh;
   overflow: auto;
 }
 
diff --git a/fuintAdmin_zt/src/views/Site/components/afterff.vue b/fuintAdmin_zt/src/views/Site/components/afterff.vue
index 64d086dca..1ae3c5e2a 100644
--- a/fuintAdmin_zt/src/views/Site/components/afterff.vue
+++ b/fuintAdmin_zt/src/views/Site/components/afterff.vue
@@ -32,7 +32,8 @@ export default {
     }
   },
   props: {
-    deptId: Number
+    deptId: Number,
+    stauts: Boolean
   },
   created() {
     this.getList();
@@ -47,10 +48,13 @@ export default {
       })
     },
     getList() {
-      
-      getAfterListApi({deptId : this.deptId}).then(res => {
+      if(this.stauts){
+        return
+      }else {
+        getAfterListApi({deptId : this.deptId}).then(res => {
         this.tableData = res.data.records
       })
+      }
     },
     getData() {
       getALlInfoBydeptIdApi({deptId : this.deptId}).then(res => {
diff --git a/fuintAdmin_zt/src/views/Site/components/before.vue b/fuintAdmin_zt/src/views/Site/components/before.vue
index c1fed6679..ea52db047 100644
--- a/fuintAdmin_zt/src/views/Site/components/before.vue
+++ b/fuintAdmin_zt/src/views/Site/components/before.vue
@@ -38,7 +38,8 @@ export default {
     }
   },
   props: {
-    deptId: Number
+    deptId: Number,
+    stauts: Boolean
   },
   created() {
     this.getList()
@@ -52,9 +53,14 @@ export default {
       })
     },
     getList() {
-      getBeforeListApi({deptId : this.deptId}).then(res => {
-        this.tableData = res.data.records
-      })
+
+      if(this.stauts){
+        return
+      }else {
+        getBeforeListApi({deptId : this.deptId}).then(res => {
+          this.tableData = res.data.records
+        })
+      }
     },
     getData() {
       getALlInfoBydeptIdApi({deptId : this.deptId}).then(res => {
@@ -179,10 +185,11 @@ export default {
         label="创建人">
       </el-table-column>
       <el-table-column
-        v-if = "this.deptName === '百业兴总部'"
+        v-if = "this.deptName === '百业兴总部' && !stauts"
         align="center">
         <template slot="header" slot-scope="scope">
           <el-button
+            v-if="!stauts"
             size="mini"
             @click="handleUpdate1(scope.row)"
           >新增</el-button>
diff --git a/fuintAdmin_zt/src/views/Site/components/yearff.vue b/fuintAdmin_zt/src/views/Site/components/yearff.vue
index e9c9b322b..e65f0b2cd 100644
--- a/fuintAdmin_zt/src/views/Site/components/yearff.vue
+++ b/fuintAdmin_zt/src/views/Site/components/yearff.vue
@@ -148,7 +148,7 @@ export default {
       label="创建人">
     </el-table-column>
     <el-table-column
-      v-if = "this.deptName === '百业兴总部'"
+      v-if = "this.deptName === '百业兴总部' && !stauts"
       align="center">
       <template slot="header" slot-scope="scope">
         <el-button
diff --git a/fuintAdmin_zt/src/views/Site/index.vue b/fuintAdmin_zt/src/views/Site/index.vue
index 70c160e27..05f996029 100644
--- a/fuintAdmin_zt/src/views/Site/index.vue
+++ b/fuintAdmin_zt/src/views/Site/index.vue
@@ -99,7 +99,8 @@
                   </el-button>
                 </el-form-item>
               </el-form>
-              <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange" border>
+              <div style="height: 69vh;">
+                <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange" border>
                     <el-table-column type="selection" width="50" align="center" />
 
                     <el-table-column label="用户名" align="center" key="accountName" prop="accountName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
@@ -160,6 +161,7 @@
                       </template>
                     </el-table-column>
                   </el-table>
+              </div>
 
               <pagination
                 v-show="total>0"
@@ -298,11 +300,11 @@
                     </el-row>
                     <el-row>
                       <template v-if="ruleForm.turnoverType === '3'">
-                        <beforeff :deptId="queryParams.deptId"></beforeff>
+                        <beforeff :deptId="queryParams.deptId" :stauts="stauts"></beforeff>
 
                       </template>
                       <template v-if="ruleForm.turnoverType === '4'">
-                        <afterff :deptId="queryParams.deptId"></afterff>
+                        <afterff :deptId="queryParams.deptId" :stauts="stauts"></afterff>
                       </template>
                       <template v-if="ruleForm.turnoverType === '5'">
                         <yearff :deptId="queryParams.deptId" :stauts="stauts"></yearff>
@@ -536,8 +538,8 @@
 
                 </el-col>
               </el-row>
-
-              <el-table ref="tables"
+              <div style="height: 67vh;">
+                <el-table ref="tables"
                         v-loading="loading"
                         border
                         :data="dutyList">
@@ -586,6 +588,8 @@
                   </template>
                 </el-table-column>
               </el-table>
+              </div>
+
               <pagination
                 v-show="total1>0"
                 :total="total1"
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/service/impl/DeptPriceInfoServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/service/impl/DeptPriceInfoServiceImpl.java
index 7de8a3d3b..add1485bb 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/service/impl/DeptPriceInfoServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/deptPay/service/impl/DeptPriceInfoServiceImpl.java
@@ -86,10 +86,6 @@ public class DeptPriceInfoServiceImpl implements DeptPriceInfoService {
      */
     @Override
     public DeptPriceInfo insert(DeptPriceInfo deptPriceInfo) {
-        int countByTime = getCountByTime(deptPriceInfo);
-        if (countByTime>0) {
-            throw new RuntimeException("该时间段已有数据");
-        }
         AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
         deptPriceInfo.setCreateName(nowAccountInfo.getRealName());
         deptPriceInfo.setDeptId(deptPriceInfo.getDeptId());
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/HangBillController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/HangBillController.java
index 5c2f322ce..5bfe6e2c5 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/HangBillController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/HangBillController.java
@@ -39,7 +39,7 @@ public class HangBillController extends BaseController {
      */
     @GetMapping("/list")
     public ResponseObject list(HangBillVo hangBillVo,
-                               @RequestParam(value = "page[page]",defaultValue = "1") Integer pageNo,
+                               @RequestParam(value = "page",defaultValue = "1") Integer pageNo,
                                @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){
         Page page =new Page(pageNo,pageSize);
         IPage<HangBillVo> list = hangBillService.selectHangBillList(page,hangBillVo);