From b773788839b6116d55bf33dfe995cab91ca054c2 Mon Sep 17 00:00:00 2001
From: "DESKTOP-369JRHT\\12997" <9>
Date: Sat, 19 Oct 2024 18:03:31 +0800
Subject: [PATCH] 10.19

---
 fuintAdmin/src/App.vue                        |   1 +
 fuintAdmin/src/assets/styles/index.scss       |   2 +-
 fuintAdmin/src/views/duty/add.vue             |  85 ++++++-----
 fuintAdmin/src/views/duty/index.vue           |  20 +--
 fuintAdmin/src/views/feedBack/index.vue       |  17 +--
 .../src/views/handover/HandoverDetails.vue    |   2 +-
 fuintAdmin/src/views/handover/info/list.vue   |   1 +
 fuintAdmin/src/views/member/creditIndex.vue   |  36 +++--
 fuintAdmin/src/views/member/index.vue         | 131 +++++++++++------
 .../views/setting/device/content/canshu.vue   |  16 ++-
 .../views/setting/device/content/youqiji.vue  |  27 ++--
 .../src/views/setting/device/device-index.vue |   1 +
 fuintAdmin/src/views/setting/print/index.vue  | 114 +++++++++------
 fuintAdmin/src/views/staff/list.vue           |  52 ++-----
 .../src/views/staff/storeInfo/index.vue       |  21 ++-
 .../views/staffCommission/staffCommission.vue | 136 ++++++------------
 .../src/main/resources/application.properties |   2 +-
 .../views/cashier/NewComponents/Handover.vue  |   2 +-
 18 files changed, 340 insertions(+), 326 deletions(-)

diff --git a/fuintAdmin/src/App.vue b/fuintAdmin/src/App.vue
index 55c8037c3..b719ee683 100644
--- a/fuintAdmin/src/App.vue
+++ b/fuintAdmin/src/App.vue
@@ -21,5 +21,6 @@
   .app-container{
     width: 100%;
     background: #f6f8f9;
+
   }
 </style>
diff --git a/fuintAdmin/src/assets/styles/index.scss b/fuintAdmin/src/assets/styles/index.scss
index d3deb2968..9d0eb5f1f 100644
--- a/fuintAdmin/src/assets/styles/index.scss
+++ b/fuintAdmin/src/assets/styles/index.scss
@@ -121,7 +121,7 @@ aside {
 
 //main-container全局样式
 .app-container {
-  padding: 20px;
+  padding: 10px;
 
   .el-form--inline .el-form-item {
     margin-right: 44px;
diff --git a/fuintAdmin/src/views/duty/add.vue b/fuintAdmin/src/views/duty/add.vue
index bd5206e93..ac1598521 100644
--- a/fuintAdmin/src/views/duty/add.vue
+++ b/fuintAdmin/src/views/duty/add.vue
@@ -30,6 +30,9 @@ export default {
         roleCode: [
           {required: true, message: '请选择登录权限', trigger: 'change'}
         ],
+        status: [
+          {required: true, message: '请选择状态', trigger: 'change'}
+        ],
         checkedKeys: [
           {required: true, message: '请选择菜单信息', trigger: 'change'}
         ],
@@ -50,6 +53,9 @@ export default {
 
   },
   methods: {
+    goback(){
+      this.$router.go(-1)
+    },
     // 查询菜单树结构
     getMenuTreeselect() {
       // merchantId 代表deptType
@@ -311,15 +317,23 @@ export default {
 
 <template>
   <div class="container">
-    <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="110px">
-    <div class="top-box">
-<!--      <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">-->
-        <div>
+    <div class="cont_top"  @click="goback">
+      <span style="cursor: pointer" v-if="this.dutyId != '' "> 当前位置：油站设置--角色管理--修改角色</span>
+      <span style="cursor: pointer" v-else> 当前位置：油站设置--角色管理--新增角色</span>
+
+    </div>
+    <div style="height: 50px;width: 100%;"></div>
+    <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="80px">
+
+    <div class="center-box">
+
+      <div class="top-box">
+        <div style="margin-right: 15px;">
           <el-form-item label="角色名称" prop="roleName">
             <el-input v-model="ruleForm.roleName"></el-input>
           </el-form-item>
         </div>
-        <div>
+        <div style="margin-right: 15px;">
           <el-form-item label="所属机构" prop="storeId">
             <el-select v-model="ruleForm.storeId" placeholder="请选择所属机构"
                        :disabled="dutyId!=''"
@@ -333,39 +347,26 @@ export default {
             </el-select>
           </el-form-item>
         </div>
-        <div>
+        <div style="margin-right: 15px;">
           <el-form-item label="角色状态" prop="status">
             <el-switch v-model="ruleForm.status"
                        active-value="A"
                        inactive-value="N"></el-switch>
           </el-form-item>
         </div>
-        <div>
-          <el-form-item label="角色描述" prop="description">
-            <el-input v-model="ruleForm.description"></el-input>
-          </el-form-item>
-        </div>
 
-<!--      </el-form>-->
-    </div>
-    <div class="center-box">
+      </div>
       <div>
-<!--        <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="110px" class="demo-ruleForm">-->
-<!--          <el-form-item label="角色登录权限" prop="roleCode">-->
-<!--            <el-radio-group v-model="ruleForm.roleCode">-->
-<!--              <el-radio :label="0">都无</el-radio>-->
-<!--              <el-radio :label="1">后台</el-radio>-->
-<!--              <el-radio :label="2">收银台</el-radio>-->
-<!--              <el-radio :label="3">全部</el-radio>-->
-<!--            </el-radio-group>-->
-<!--          </el-form-item>-->
-          <el-form-item label="菜单功能权限">
+        <el-form-item label="角色描述" prop="description">
+          <el-input type="textarea" :rows="4" v-model="ruleForm.description"></el-input>
+        </el-form-item>
+      </div>
+      <div>
+
+          <el-form-item label="菜单功能权限" label-width="100px">
             <el-checkbox v-model="checked" @change="chooseAllOrNo">全选</el-checkbox>
             <el-checkbox v-model="isOpen" @change="openTable">展开</el-checkbox>
           </el-form-item>
-<!--        </el-form>-->
-<!--        <el-button size="mini" @click.native="openTable('open')">一键展开</el-button>-->
-<!--        <el-button size="mini" @click.native="openTable('fold')">折叠</el-button>-->
       </div>
       <el-table
         ref="table"
@@ -415,19 +416,18 @@ export default {
 .container {
   width: 100%;
   box-sizing: border-box;
-  padding: 20px;
+  //padding: 10px;
   background: #f4f5f9;
 }
 
 .top-box {
   width: 100%;
-  box-sizing: border-box;
-  padding: 20px;
+  //box-sizing: border-box;
+  //padding: 20px;
   display: flex;
   align-items: center;
   background: #FFFFFF;
-  box-shadow: 0px 3px 6px 1px rgba(255, 255, 255, 0.4), inset 0px 3px 6px 1px rgba(255, 255, 255, 0.5);
-  border-radius: 10px 10px 10px 10px;
+
 }
 
 .demo-ruleForm {
@@ -435,14 +435,13 @@ export default {
 }
 
 .center-box {
-  width: 100%;
+  width: 99%;
   box-sizing: border-box;
   padding: 20px;
-
+  margin: 0 auto;
   background: #FFFFFF;
   box-shadow: 0px 3px 6px 1px rgba(255, 255, 255, 0.4), inset 0px 3px 6px 1px rgba(255, 255, 255, 0.5);
   border-radius: 10px 10px 10px 10px;
-  margin-top: 20px;
 }
 
 .f-box {
@@ -458,4 +457,20 @@ export default {
   margin-right: 5px;
   border: 1px solid #ccc;
 }
+.cont_top{
+  width: 100%;
+  height: 40px;
+  background: #fff;
+  font-size: 12px;
+  color: #666666;
+  box-sizing: border-box;
+  padding-left: 50px;
+  margin-bottom: 20px;
+  display: flex;
+  align-items: center;
+  position: fixed;
+  top: 60px;
+  z-index: 9;
+  border-top: 1px solid #eceff1;
+}
 </style>
diff --git a/fuintAdmin/src/views/duty/index.vue b/fuintAdmin/src/views/duty/index.vue
index f7e3422e2..dc3df1c92 100644
--- a/fuintAdmin/src/views/duty/index.vue
+++ b/fuintAdmin/src/views/duty/index.vue
@@ -20,7 +20,7 @@
             <el-option label="禁用" value="D"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item style="float: right">
+        <el-form-item style="float: right;margin-right: 0px">
           <el-button type="primary" icon="el-icon-search" @click="handleQuery1">查询</el-button>
           <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
           <el-button
@@ -32,26 +32,13 @@
         </el-form-item>
       </el-form>
 
-
-      <el-row :gutter="10" class="mb8">
-        <el-col :span="1.5">
-
-        </el-col>
-      </el-row>
-      <div style="height: 72.7vh;overflow: auto">
+      <div style="height: 76vh;overflow: auto">
         <el-table ref="tables"
+                  border
                   v-loading="loading"
                   :data="dutyList">
           <el-table-column label="序号" align="center" type="index" width="50"></el-table-column>
           <el-table-column label="角色名称" align="center" prop="dutyName"/>
-          <!--        <el-table-column label="角色类型" align="center" prop="dutyType" >-->
-          <!--          <template slot-scope="scope">-->
-          <!--            <span v-if="scope.row.dutyType=='1'">超级管理员</span>-->
-          <!--            <span v-if="scope.row.dutyType=='2'">普通管理员</span>-->
-          <!--            <span v-if="scope.row.dutyType=='3'">用户角色</span>-->
-          <!--            <span v-if="scope.row.dutyType=='3'">员工角色</span>-->
-          <!--          </template>-->
-          <!--        </el-table-column>-->
           <el-table-column label="所属机构" align="center" prop="deptName"/>
           <el-table-column label="角色描述" align="center" prop="description">
             <template slot-scope="scope">
@@ -64,6 +51,7 @@
                 v-model="scope.row.status"
                 active-value="A"
                 inactive-value="N"
+                disabled="true"
                 active-color="#13ce66"
                 inactive-color="#ff4949"
                 @change="handleStatusChangeDuty(scope.row)"
diff --git a/fuintAdmin/src/views/feedBack/index.vue b/fuintAdmin/src/views/feedBack/index.vue
index 9202908ab..b7198f16a 100644
--- a/fuintAdmin/src/views/feedBack/index.vue
+++ b/fuintAdmin/src/views/feedBack/index.vue
@@ -1,12 +1,7 @@
 <template>
   <div class="app-container">
-    <div class="cot-box">
-      <!--      <div slot="header" class="clearfix">-->
-      <!--        <span>用户反馈</span>-->
-      <!--      </div>-->
-
+    <div class="cot-boxs">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
-
         <el-form-item label="" prop="userMobile" style="width: 180px">
           <el-input
             v-model="queryParams.userMobile"
@@ -30,15 +25,15 @@
             placeholder="结束日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item style="float: right">
+        <el-form-item 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>
 
       </el-form>
 
-      <div style="height: 70vh;overflow: auto">
-        <el-table v-loading="loading" :data="list">
+      <div style="height: 76.5vh;overflow: auto">
+        <el-table border v-loading="loading" :data="list">
           <el-table-column type="index" width="80" align="center" label="序号"/>
           <el-table-column align="center" prop="storeName" label="所属机构"/>
           <el-table-column align="center" prop="userName" label="用户昵称"/>
@@ -254,8 +249,8 @@ export default {
   background: #f6f8f9;
 }
 
-.cot-box {
-  width: 98%;
+.cot-boxs {
+  width: 100%;
   border-radius: 8px;
   background: #fff;
   box-sizing: border-box;
diff --git a/fuintAdmin/src/views/handover/HandoverDetails.vue b/fuintAdmin/src/views/handover/HandoverDetails.vue
index c03eb0c17..7a7a4920e 100644
--- a/fuintAdmin/src/views/handover/HandoverDetails.vue
+++ b/fuintAdmin/src/views/handover/HandoverDetails.vue
@@ -703,7 +703,7 @@ export default {
   box-sizing: border-box;
   margin-bottom: 25px;
   margin-bottom: 15px;
-
+  border-top: 1px solid #eceff1;
 }
 
 .tab_ {
diff --git a/fuintAdmin/src/views/handover/info/list.vue b/fuintAdmin/src/views/handover/info/list.vue
index cdeb76a31..dac9fbaa0 100644
--- a/fuintAdmin/src/views/handover/info/list.vue
+++ b/fuintAdmin/src/views/handover/info/list.vue
@@ -75,6 +75,7 @@ export default {
   display: flex;
   box-sizing: border-box;
   padding: 0px 50px;
+  border-top: 1px solid #eceff1;
 }
 
 .f-box {
diff --git a/fuintAdmin/src/views/member/creditIndex.vue b/fuintAdmin/src/views/member/creditIndex.vue
index 726d19b76..8407408b6 100644
--- a/fuintAdmin/src/views/member/creditIndex.vue
+++ b/fuintAdmin/src/views/member/creditIndex.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="app-container">
-    <el-card >
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
-        <el-form-item label="单位名称" prop="unitName">
+    <div class="he-box" >
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="0px">
+        <el-form-item label="" prop="unitName">
           <el-input
             v-model="queryParams.unitName"
             placeholder="请输入单位名称"
@@ -11,7 +11,7 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="挂账人" prop="personCredit">
+        <el-form-item label="" prop="personCredit">
           <el-input
             v-model="queryParams.personCredit"
             placeholder="请输入挂账人名称"
@@ -20,7 +20,7 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="联系电话" prop="contactMobile">
+        <el-form-item label="" prop="contactMobile">
           <el-input
             v-model="queryParams.contactMobile"
             placeholder="请输入挂账人联系电话"
@@ -29,10 +29,10 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="状态" prop="status">
+        <el-form-item label="" prop="status">
           <el-select
             v-model="queryParams.status"
-            placeholder="全部"
+            placeholder="请选择状态"
             clearable
             style="width: 240px"
           >
@@ -45,7 +45,7 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item>
+        <el-form-item 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-button
@@ -57,11 +57,8 @@
         </el-form-item>
       </el-form>
 
-      <div>
-
-      </div>
-
-      <el-table ref="tables" v-loading="loading" :data="list" >
+      <div style="height: 77vh;overflow: auto" >
+      <el-table border ref="tables" v-loading="loading" :data="list" >
         <el-table-column type="index" width="80" align="center" label="序号"/>
         <el-table-column label="单位名称" prop="unitName" align="center" />
         <el-table-column label="挂账人" prop="personCredit" align="center"/>
@@ -105,6 +102,7 @@
         </el-table-column>
       </el-table>
 
+      </div>
       <pagination
         v-show="total>0"
         :total="total"
@@ -112,7 +110,7 @@
         :limit.sync="queryParams.pageSize"
         @pagination="getList"
       />
-    </el-card>
+    </div>
 
     <!--      新增挂账单位信息-->
     <el-dialog :title="title" :visible.sync="open1" width="700px" append-to-body>
@@ -182,7 +180,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-form-item label="备注信息" prop="remark">
+        <el-form-item label="备注" prop="remark">
           <el-input v-model="form1.remark" type="textarea" placeholder="请输入内容"></el-input>
         </el-form-item>
         <el-row>
@@ -353,4 +351,12 @@ html, body {
   height: 93vh;
   background: #f6f8f9;
 }
+.he-box{
+  width: 100%;
+  border-radius: 8px;
+  background: #fff;
+  box-sizing: border-box;
+  padding: 15px;
+  margin: 0 auto;
+}
 </style>
diff --git a/fuintAdmin/src/views/member/index.vue b/fuintAdmin/src/views/member/index.vue
index 0a968d06d..087cbf2d1 100644
--- a/fuintAdmin/src/views/member/index.vue
+++ b/fuintAdmin/src/views/member/index.vue
@@ -32,15 +32,45 @@
             <el-select
               v-model="queryParams.gradeId"
               clearable
+              style="width: 180px"
               placeholder="请选择会员等级"
             >
               <el-option v-for="grade in userGradeList" :key="grade.id+''" :label="grade.name" :value="grade.id+''"/>
             </el-select>
           </el-form-item>
+          <el-form-item label="" prop="gradeId">
+            <el-select
+              v-model="queryParams.gradeId"
+              clearable
+              style="width: 180px"
+              placeholder="请选择会员标签"
+            >
+              <el-option v-for="grade in userGradeList" :key="grade.id+''" :label="grade.name" :value="grade.id+''"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="" prop="userNo">
+            <el-input
+              v-model="queryParams.name"
+              placeholder="请输入车牌号"
+              clearable
+              style="width: 180px;"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="" prop="gradeId">
+            <el-select
+              v-model="queryParams.gradeId"
+              clearable
+              style="width: 180px"
+              placeholder="请选择性别"
+            >
+              <el-option v-for="grade in userGradeList" :key="grade.id+''" :label="grade.name" :value="grade.id+''"/>
+            </el-select>
+          </el-form-item>
           <el-form-item label="" prop="mobile">
             <el-input
               v-model="queryParams.mobile"
-              placeholder="请输入会员手机号"
+              placeholder="请输入手机号"
               clearable
               style="width: 180px;"
               @keyup.enter.native="handleQuery"
@@ -50,6 +80,7 @@
             <el-select
               v-model="queryParams.userStatus"
               clearable
+              style="width: 180px"
               placeholder="请选择状态"
             >
               <el-option v-for="grade in userStatusList"
@@ -58,23 +89,55 @@
                          :value="grade.value"/>
             </el-select>
           </el-form-item>
-
+          <el-form-item label="">
+            <el-input
+              v-model="queryParams.age"
+              placeholder="请输入年龄"
+              clearable
+              style="width: 140px;"
+              @keyup.enter.native="handleQuery"
+            />
+         至
+            <el-input
+              v-model="queryParams.age"
+              placeholder="请输入年龄"
+              clearable
+              style="width: 140px;"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
           <el-form-item label="">
             <el-date-picker
               v-model="beginTime"
-              style="width: 160px"
+              style="width: 140px"
               type="date"
               placeholder="开始日期">
             </el-date-picker>
             至
             <el-date-picker
               v-model="endTime"
-              style="width: 160px"
+              style="width: 140px"
               type="date"
               placeholder="结束日期">
             </el-date-picker>
           </el-form-item>
-
+          <el-form-item label="">
+            <el-input
+              v-model="queryParams.age"
+              placeholder="请输入剩余积分"
+              clearable
+              style="width: 140px;"
+              @keyup.enter.native="handleQuery"
+            />
+            至
+            <el-input
+              v-model="queryParams.age"
+              placeholder="请输入剩余积分"
+              clearable
+              style="width: 140px;"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
           <div style="float: right">
             <el-button style="background: linear-gradient( 180deg, #FF8646 0%, #FFA360 100%); border: transparent "
                        type="primary" @click="handleQuery">搜索
@@ -101,69 +164,39 @@
 
         </el-form>
       </div>
-      <!--    </el-card>-->
-
-      <div class="ds-dbox">
-        <div class="k-one">
-          <div class="title_">激活会员总数</div>
-          <div class="num-size">{{total}}</div>
-          <img class="r-bot-img" src="./imgs/hy-1.png" alt="">
-        </div>
-
-        <div class="k-two">
-          <div class="title_">今日新增/昨日新增</div>
-          <div class="num-size"> {{ addNum }}/{{ yesterdayAddNum }}</div>
-          <img class="r-bot-img" src="./imgs/hy-2.png" alt="">
-        </div>
-        <div class="k-three">
-          <div class="title_">充值总人数</div>
-          <div class="num-size">{{rechargeTotal || 0}}</div>
-          <img class="r-bot-img" src="./imgs/hy-3.png" alt="">
-        </div>
-        <div class="k-four">
-          <div class="title_">储值总余额</div>
-          <div class="num-size">{{balance}}</div>
-          <img class="r-bot-img" src="./imgs/hy-4.png" alt="">
-        </div>
-        <div class="k-five">
-          <div class="title_">积分总余额</div>
-          <div class="num-size">{{point}}</div>
-          <img class="r-bot-img" src="./imgs/hy-5.png" alt="">
-        </div>
-      </div>
-      <div style="height: 50vh;overflow: auto;margin-top: 15px;margin-bottom: 15px">
+      <div style="height: 66vh;overflow: auto;margin-top: 15px;margin-bottom: 15px">
         <el-table ref="tables" v-loading="loading" :data="list" border
                   @selection-change="handleSelectionChange" :default-sort="defaultSort"
                   @sort-change="handleSortChange">
           <el-table-column type="index" width="50" align="center" label="序号"/>
-          <el-table-column label="会员名称" align="center" prop="name" width="200">
+          <el-table-column label="会员名称" align="center" prop="name">
             <template slot-scope="scope">
               <span style="color: #fe8c4a;cursor: pointer  "
                     @click="goDedi(scope.row.id)">{{ scope.row.name ? scope.row.name : "--" }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="会员号" align="center" prop="userNo" width="100"/>
-          <el-table-column label="会员等级" align="center" prop="gradeId" width="80">
+          <el-table-column label="会员号" align="center" prop="userNo" />
+          <el-table-column label="会员等级" align="center" prop="gradeId" >
             <template slot-scope="scope">
               <span>{{ scope.row.gradeId ? getName(allUserGrade, scope.row.gradeId) : '--' }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="会员标签" align="center" prop="userLabelName" width="80">
+          <el-table-column label="会员标签" align="center" prop="userLabelName" >
             <template slot-scope="scope">
               <span>{{ scope.row.userLabelName || '--' }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="车牌号" align="center" prop="carNo" width="80">
+          <el-table-column label="车牌号" align="center" prop="carNo" >
             <template slot-scope="scope">
               <span>{{ scope.row.carNo || '--' }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="手机号" align="center" prop="mobile" width="110">
+          <el-table-column label="手机号" align="center" prop="mobile" >
             <template slot-scope="scope">
               <span>{{ scope.row.mobile ? scope.row.mobile : '-' }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="生日" align="center" prop="birthday" width="110">
+          <el-table-column label="生日" align="center" prop="birthday" >
             <template slot-scope="scope">
               <span>{{ scope.row.birthday || '--' }}</span>
             </template>
@@ -284,7 +317,7 @@
         </el-form>
       </div>
       <!--      -->
-      <div style="height: 68vh;overflow: auto">
+      <div style="height: 72vh;overflow: auto">
         <el-table
           :data="massSendRecordList"
           border
@@ -681,7 +714,7 @@ export default {
       tabindex: 0,
       tabs: [
         {
-          name: "会员信息1",
+          name: "会员信息",
         },
         {
           name: "群发记录",
@@ -1214,8 +1247,9 @@ export default {
 
 .app-container {
   width: 100%;
-  //height: 100vh;
   background: #f6f8f9;
+  box-sizing: border-box;
+  padding-bottom: 15px;
   margin: 0;
   padding: 0;
 }
@@ -1330,7 +1364,8 @@ export default {
   background: #fff;
   display: flex;
   box-sizing: border-box;
-  margin-bottom: 25px;
+  margin-bottom: 10px;
+  border-top: 1px solid #eceff1;
 
 }
 
@@ -1360,6 +1395,8 @@ export default {
   box-sizing: border-box;
   padding: 20px;
   margin: 0 auto;
+  height: 88vh;
+
 }
 
 .d-s {
diff --git a/fuintAdmin/src/views/setting/device/content/canshu.vue b/fuintAdmin/src/views/setting/device/content/canshu.vue
index 74d66a865..b4341478e 100644
--- a/fuintAdmin/src/views/setting/device/content/canshu.vue
+++ b/fuintAdmin/src/views/setting/device/content/canshu.vue
@@ -1,6 +1,6 @@
 <template>
-  <div class="app-container">
-    <div class="card-change" style="height: 85vh">
+  <div class="aainer">
+    <div class="wit-b" style="height: 85vh">
       <div style="margin-bottom: 20px">
         <div style="margin-bottom: 20px">
           加油数量保留两位小数，后面余数部分规则
@@ -85,5 +85,17 @@ export default {
 .radioo {
   margin-bottom: 18px;
 }
+.aainer{
+  background: #f5f7f8;
+  box-sizing: border-box;
+  padding: 10px;
+}
+.wit-b{
+  background: #fff;
+  border-radius: 8px;
+  box-sizing: border-box;
+  padding: 15px;
+  height: 87vh;
+}
 </style>
 
diff --git a/fuintAdmin/src/views/setting/device/content/youqiji.vue b/fuintAdmin/src/views/setting/device/content/youqiji.vue
index 671d99f00..4185d7d4a 100644
--- a/fuintAdmin/src/views/setting/device/content/youqiji.vue
+++ b/fuintAdmin/src/views/setting/device/content/youqiji.vue
@@ -1,6 +1,6 @@
 <template>
-  <div class="app-container">
-    <div class="card-change">
+  <div class="aainer">
+    <div class="wit-b">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
         <el-form-item label="" prop="legalRepresentativeContact">
 
@@ -87,8 +87,8 @@
 
     </div>
 
-    <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="30%" append-to-body>
-      <el-form :model="deviceInfo" ref="deviceForm" label-width="140px" :rules="rule">
+    <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="24%" append-to-body>
+      <el-form :model="deviceInfo" ref="deviceForm" label-width="95px" :rules="rule">
         <el-form-item label="设备类型" prop="deviceType">
           <el-select
             v-model="deviceInfo.deviceType"
@@ -109,7 +109,7 @@
           <el-input v-model="deviceInfo.deviceId" style="width: 300px;"></el-input>
         </el-form-item>
         <el-form-item label="" prop="deviceId1">
-          <div style="color: red; line-height: 15px">注：DD、LY的设备ID，需要找业务人员获取，DD是集线器ID、LY是门店ID。
+          <div style="color: red; width: 300px; font-size: 12px; line-height: 15px">注：DD、LY的设备ID，需要找业务人员获取，DD是集线器ID、LY是门店ID。
        BY的设备ID，创建后将自动生成，请把设备ID提供给BY技术人员进行配置。 </div>
         </el-form-item>
 
@@ -241,12 +241,12 @@ export default {
     handleAdd(e) {
       this.clean()
       this.open = true;
-      this.title = "新增设置"
+      this.title = "新增设备"
     },
     edit(e) {
       this.clean()
       this.open = true;
-      this.title = "编辑设置"
+      this.title = "编辑设备"
       this.deviceInfo = e
       console.log('提交设备信息数据:', this.deviceInfo);
 
@@ -296,8 +296,17 @@ export default {
   height: 50px;
   line-height: 60px;
 }
-.app-container{
-
+.aainer{
+  background: #f5f7f8;
+  box-sizing: border-box;
+  padding: 10px;
+}
+.wit-b{
+  background: #fff;
+  border-radius: 8px;
+  box-sizing: border-box;
+  padding: 15px;
+  height: 87vh;
 }
 </style>
 
diff --git a/fuintAdmin/src/views/setting/device/device-index.vue b/fuintAdmin/src/views/setting/device/device-index.vue
index baac05691..79331df2b 100644
--- a/fuintAdmin/src/views/setting/device/device-index.vue
+++ b/fuintAdmin/src/views/setting/device/device-index.vue
@@ -42,6 +42,7 @@ export default {
   display: flex;
   box-sizing: border-box;
   padding: 0px 50px;
+  border-top: 1px solid #eceff1;
 }
 
 .f-box{
diff --git a/fuintAdmin/src/views/setting/print/index.vue b/fuintAdmin/src/views/setting/print/index.vue
index dd19d1240..fbed60986 100644
--- a/fuintAdmin/src/views/setting/print/index.vue
+++ b/fuintAdmin/src/views/setting/print/index.vue
@@ -50,51 +50,55 @@
           <el-button type="primary" icon="el-icon-search" @click="handleAdd">新增设备</el-button>
         </el-form-item>
       </el-form>
-      <el-table :data="tableData" style="width: 100%" border>
-        <el-table-column align="center" type="index" label="序号"></el-table-column>
-        <el-table-column align="center" prop="deviceName" label="设备名称"></el-table-column>
-        <el-table-column align="center" prop="deviceSi" label="品牌"></el-table-column>
-        <el-table-column align="center" prop="deviceAb" label="设备功能"></el-table-column>
-        <el-table-column align="center" prop="deptName" label="所属机构"></el-table-column>
-        <el-table-column align="center" prop="staffIds" label="关联员工">
-          <template slot-scope="scope">
-            {{ jsonChange(scope.row.staffIds) }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" prop="machineCode" label="设备编号"></el-table-column>
-        <el-table-column align="center" prop="msign" label="密钥"></el-table-column>
-        <el-table-column align="center" prop="acquiesce" label="设备状态">
-          <template slot-scope="scope">
-            <el-switch
-              v-model="scope.row.acquiesce"
-              disabled
-              active-color="#13ce66"
-              inactive-color="#ff4949">
-            </el-switch>
-          </template>
-        </el-table-column>
+      <div style="width: 100%; height: 674px; overflow: auto; ">
+        <el-table :data="tableData" style="width: 100%" border>
+          <el-table-column align="center" type="index" label="序号"></el-table-column>
+          <el-table-column align="center" prop="deviceName" label="设备名称"></el-table-column>
+          <el-table-column align="center" prop="deviceSi" label="品牌"></el-table-column>
+          <el-table-column align="center" prop="deviceAb" label="设备功能"></el-table-column>
+          <el-table-column align="center" prop="deptName" label="所属机构"></el-table-column>
+          <el-table-column align="center" prop="staffIds" label="关联员工">
+            <template slot-scope="scope">
+              {{ jsonChange(scope.row.staffIds) }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" prop="machineCode" label="设备编号"></el-table-column>
+          <el-table-column align="center" prop="msign" label="密钥"></el-table-column>
+          <el-table-column align="center" prop="acquiesce" label="设备状态">
+            <template slot-scope="scope">
+              <el-switch
+                v-model="scope.row.acquiesce"
+                disabled
+                active-color="#13ce66"
+                inactive-color="#ff4949">
+              </el-switch>
+            </template>
+          </el-table-column>
+
+          <el-table-column align="center" prop="machineCode" label="备注"></el-table-column>
+          <el-table-column align="center" prop="machineCode" label="创建时间"></el-table-column>
+          <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-view"
+                @click="edit(scope.row)"
+              >编辑
+              </el-button>
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="del(scope.row)"
+              >删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+
 
-        <el-table-column align="center" prop="machineCode" label="备注"></el-table-column>
-        <el-table-column align="center" prop="machineCode" label="创建时间"></el-table-column>
-        <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-view"
-              @click="edit(scope.row)"
-            >编辑
-            </el-button>
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-edit"
-              @click="del(scope.row)"
-            >删除
-            </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
       <pagination
         v-show="total>0"
         :total="total"
@@ -141,6 +145,21 @@
               </el-option>
             </el-select>
           </el-form-item>
+          <el-form-item label="所属机构" prop="deptName">
+            <el-select
+              v-model="deptName"
+              clearable
+              placeholder=""
+              style="width: 300px"
+              multiple
+              collapse-tags
+            >
+              <el-option v-for="item in staffList" :key="item.id" :label="item.realName" :value="item.id+''">
+                <span style="float: left">{{ item.realName }}</span>
+                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.mobile }}</span>
+              </el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="启用状态" prop="isAcquiesce">
             <el-switch
               v-model="deviceInfo.acquiesce"
@@ -198,6 +217,9 @@ export default {
         deviceName: [
           {required: true, message: '设备名称不能为空', trigger: 'blur'}
         ],
+        deptName: [
+          {required: true, message: '机构不能为空', trigger: 'blur'}
+        ],
         deviceSi: [
           {required: true, message: '设备品牌不能为空', trigger: 'blur'}
         ],
@@ -317,7 +339,7 @@ export default {
     handleAdd(e) {
       this.clean()
       this.open = true;
-      this.title = "增加设备"
+      this.title = "新增设备"
     },
     edit(e) {
       this.clean()
@@ -397,7 +419,7 @@ export default {
   border-radius: 8px;
   box-sizing: border-box;
   padding: 15px;
-  height: 86vh;
+  height: 87vh;
 }
 </style>
 
diff --git a/fuintAdmin/src/views/staff/list.vue b/fuintAdmin/src/views/staff/list.vue
index d22e12e47..e35b1aee1 100644
--- a/fuintAdmin/src/views/staff/list.vue
+++ b/fuintAdmin/src/views/staff/list.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <!--    搜索-->
-    <div class="card-change">
+    <div class="cont_box">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
         <el-form-item label="" prop="name">
           <el-input
@@ -48,7 +48,7 @@
 
         </el-form-item>
       </el-form>
-      <div style="height: 73.6vh;overflow: auto">
+      <div style="height: 78.5vh;overflow: auto">
         <el-table ref="tables" v-loading="loading" :data="list" border @selection-change="handleSelectionChange"
                   :default-sort="defaultSort" @sort-change="handleSortChange">
           <el-table-column type="index" width="80" align="center" label="序号"/>
@@ -88,6 +88,7 @@
             <template slot-scope="scope">
               <el-switch
                 v-model="scope.row.status"
+                disabled="true"
                 active-value="qy"
                 inactive-value="jy"
                 active-color="#13ce66"
@@ -95,8 +96,6 @@
               </el-switch>
             </template>
           </el-table-column>
-
-          <!--        </el-table-column>-->
           <el-table-column label="一键加油" align="center" prop="isRefuel">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.display" :value="scope.row.isRefuel"/>
@@ -118,23 +117,6 @@
                 v-hasPermi="['staff:list:update']"
               >修改
               </el-button>
-              <!--            <el-button-->
-              <!--              size="mini"-->
-              <!--              type="text"-->
-              <!--              icon="el-icon-edit"-->
-              <!--              @click="binding(scope.row)"-->
-
-              <!--            >一键绑定</el-button>-->
-
-              <!--              <el-button-->
-              <!--                size="mini"-->
-              <!--                type="text"-->
-              <!--                icon="el-icon-edit"-->
-              <!--                @click="nobinding(scope.row)"-->
-              <!--                v-if="scope.row.tagStatus == 1"-->
-              <!--              >解绑</el-button>-->
-
-
               <el-button
                 size="mini"
                 type="text"
@@ -147,7 +129,6 @@
           </el-table-column>
         </el-table>
       </div>
-
       <pagination
         v-show="total>0"
         :total="total"
@@ -203,6 +184,7 @@
         <el-form-item label="账号状态" prop="status">
           <el-switch
             v-model="form.status"
+
             active-value="qy"
             inactive-value="jy"
             active-color="#13ce66"
@@ -243,9 +225,9 @@
       :title="title"
       :visible.sync="dialogVisible"
       style="margin-top: 100px"
-      width="23%">
+      width="18%">
       <div style="text-align: center">
-        <img id="qrCodeImg" class="qrcode" :src="baseUrl+imgUrl"/>
+        <img id="qrCodeImg" class="qrcode" style="height: 550px;width: 250px"  :src="baseUrl+imgUrl"/>
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false">取 消</el-button>
@@ -273,21 +255,6 @@
           </div>
         </div>
         <div class="gang-box" :class="{'oilid' :oilid == item.id }" v-for="(item,index) in arrList" :key="index">
-          <!--          <el-table-column label="厂商名称" align="center" width="110">-->
-          <!--            <template slot-scope="item">-->
-          <!--              <span>{{item.companyName || ''}}</span>-->
-          <!--            </template>-->
-          <!--          </el-table-column>-->
-          <!--          <el-table-column label="二维码SN号" align="center" width="110">-->
-          <!--            <template slot-scope="item">-->
-          <!--              <span>{{item.tagCodeSn|| ''}}</span>-->
-          <!--            </template>-->
-          <!--          </el-table-column>-->
-          <!--          <el-table-column label="码牌SN号" align="center" width="110">-->
-          <!--            <template slot-scope="item">-->
-          <!--              <span>{{item.snCode|| ''}}</span>-->
-          <!--            </template>-->
-          <!--          </el-table-column>-->
           <div class="rw">
             {{ index + 1 }}
           </div>
@@ -922,7 +889,12 @@ export default {
 .el-form--inline .el-form-item {
   margin-right: 44px;
 }
-
+.cont_box{
+  border-radius: 8px;
+  background: #fff;
+  box-sizing: border-box;
+  padding: 10px;
+}
 .app-container {
   width: 100%;
   height: 100%;
diff --git a/fuintAdmin/src/views/staff/storeInfo/index.vue b/fuintAdmin/src/views/staff/storeInfo/index.vue
index 5e1f394d2..76ef1e96a 100644
--- a/fuintAdmin/src/views/staff/storeInfo/index.vue
+++ b/fuintAdmin/src/views/staff/storeInfo/index.vue
@@ -3,7 +3,7 @@
     <div class="box">
       <el-row>
         <el-col :span="18">
-          <el-card class="card">
+          <div class="card">
             <div slot="header" class="clearfix">
               <span>{{ store.name }}{{ store.description ? "(" + store.description + ")" : "" }}</span>
             </div>
@@ -48,14 +48,14 @@
             </el-row>
             <el-button type="primary" @click="submitStore" v-hasPermi="['staff:storeInfo:index:save']">保存信息
             </el-button>
-          </el-card>
+          </div>
         </el-col>
         <el-col :span="6">
-          <el-card class="card" style="margin-left: 20px;">
+          <div class="card" style="margin-left: 20px;text-align: center">
             <div slot="header" class="clearfix">
               <span>油站二维码</span>
             </div>
-            <div style="position: relative;">
+            <div style="position: relative;margin: 0 auto">
               <img id="collection" class="qrcode" :src="baseUrl + collectionImg"/><br/>
               <div style="display: flex;justify-content: center;position: absolute;bottom: 25px;left: 90px">
                 <el-button type="warning" size="small"
@@ -71,7 +71,7 @@
                 </el-button>
               </div>
             </div>
-          </el-card>
+          </div>
         </el-col>
       </el-row>
     </div>
@@ -301,4 +301,15 @@ export default {
   width: 50%;
   margin-top: 20px;
 }
+.card{
+  background: #fff;
+  border-radius: 4px;
+  box-sizing: border-box;
+  padding: 10px;
+}
+.clearfix{
+  font-size: 16px;
+  font-weight: bold;
+  margin-bottom: 15px;
+}
 </style>
diff --git a/fuintAdmin/src/views/staffCommission/staffCommission.vue b/fuintAdmin/src/views/staffCommission/staffCommission.vue
index 0713221b3..5ff479a6e 100644
--- a/fuintAdmin/src/views/staffCommission/staffCommission.vue
+++ b/fuintAdmin/src/views/staffCommission/staffCommission.vue
@@ -9,10 +9,6 @@
     </div>
 
     <div class="cot-box">
-      <!--      <el-tabs v-model="activeName" @tab-click="handleClick">-->
-      <!--        <el-tab-pane label="油品提成方案" name="oil"></el-tab-pane>-->
-      <!--        <el-tab-pane label="非油品提成方案" name="nonOil"></el-tab-pane>-->
-      <!--        <el-tab-pane label="员工提成记录" name="staffCommission">-->
       <div v-if="tabindex==0">
         <div>
           <el-form :model="queryParams1" ref="queryForm" size="small" :inline="true" label-width="68px">
@@ -43,16 +39,6 @@
               </el-select>
             </el-form-item>
             <el-form-item label="">
-              <!--                  <el-date-picker-->
-              <!--                    v-model="dateRange"-->
-              <!--                    style="width: 240px"-->
-              <!--                    size="medium"-->
-              <!--                    value-format="yyyy-MM-dd"-->
-              <!--                    type="daterange"-->
-              <!--                    range-separator="-"-->
-              <!--                    start-placeholder="开始日期"-->
-              <!--                    end-placeholder="结束日期"-->
-              <!--                  ></el-date-picker>-->
               <el-date-picker
                 v-model="beginTime"
                 style="width: 160px"
@@ -67,14 +53,14 @@
                 placeholder="结束日期">
               </el-date-picker>
             </el-form-item>
-            <el-form-item style="float: right">
+            <el-form-item 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>
           </el-form>
         </div>
 
-        <div style="height: 70vh;overflow: auto">
+        <div style="height: 72vh;overflow: auto">
           <el-table ref="tables" v-loading="loading" :data="staffCommissionList" border>
             <el-table-column type="index" width="80" align="center" label="序号"/>
             <!--            <el-table-column label="员工信息" align="center">-->
@@ -132,17 +118,9 @@
           @pagination="getStaffCommissionList"
         />
       </div>
-      <!--        </el-tab-pane>-->
-      <!--      </el-tabs>-->
 
-      <!--      <el-alert-->
-      <!--        title="方案说明"-->
-      <!--        type="info"-->
-      <!--        v-if="activeName=='oil' || activeName=='nonOil'"-->
-      <!--        description="同一角色组、同一参与油品只能设置一种启用的提成方案，挂账订单不参与提成">-->
-      <!--      </el-alert>-->
 
-      <div style="margin-top: 20px" v-if="tabindex==1">
+      <div  v-if="tabindex==1">
         <div>
           <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
             <el-form-item label="" prop="name">
@@ -188,7 +166,7 @@
                 placeholder="结束日期">
               </el-date-picker>
             </el-form-item>
-            <el-form-item style="float: right">
+            <el-form-item style="float: right;margin-right: 0px">
               <el-button type="primary" icon="el-icon-search" @click="handleQuery2">搜索</el-button>
               <el-button icon="el-icon-refresh" @click="resetQuery2">重置</el-button>
               <el-button
@@ -201,6 +179,8 @@
             </el-form-item>
           </el-form>
         </div>
+        <div style="height: 72vh; overflow: auto ">
+
 
         <el-table ref="tables" v-loading="loading" :data="list" border
                   @selection-change="handleSelectionChange" :default-sort="defaultSort"
@@ -234,17 +214,11 @@
             </template>
           </el-table-column>
           <el-table-column label="提成信息" prop="royaltyRate" align="center"/>
-          <!--          <el-table-column label="生效时间" prop="takeEffect" align="center">-->
-          <!--            <template slot-scope="scope">-->
-          <!--              <span>-->
-          <!--                {{JSON.parse(scope.row.takeEffect)[0]}}至{{JSON.parse(scope.row.takeEffect)[1]}}-->
-          <!--              </span>-->
-          <!--            </template>-->
-          <!--          </el-table-column>-->
           <el-table-column label="方案状态" align="center" prop="status">
             <template slot-scope="scope">
               <el-switch
                 v-model="scope.row.status"
+                disabled="true"
                 active-value="qy"
                 inactive-value="jy"
                 active-color="#13ce66"
@@ -277,7 +251,7 @@
             </template>
           </el-table-column>
         </el-table>
-
+        </div>
         <pagination
           v-show="total>0"
           :total="total"
@@ -290,11 +264,11 @@
     </div>
 
     <!-- 添加或修改提成方案对话框 -->
-    <el-dialog :close-on-click-modal="false" :title="title" width="40%" :visible.sync="open" append-to-body>
+    <el-dialog :close-on-click-modal="false" :title="title" width="30%" :visible.sync="open" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="90px">
         <el-row>
           <el-col :span="24">
-            <el-form-item label="方案名称" prop="name" style="width: 420px">
+            <el-form-item label="方案名称" prop="name" >
               <el-input v-model="form.name" placeholder="请输入方案名称" maxlength="30"/>
             </el-form-item>
           </el-col>
@@ -318,6 +292,7 @@
             <el-form-item label="适用角色" prop="staffRoleGroup">
               <el-select v-model="staffRoleGroup"
                          multiple
+                         style="width: 100%"
                          placeholder="请选择角色名称（多选）"
                          @change="getCheckbox">
                 <el-option
@@ -331,8 +306,8 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="24" style="display: flex;margin-bottom: 10px">
-            <el-form-item label="提成来源" prop="commissionSource" style="width: 90%">
+          <el-col :span="24" style="display: flex;">
+            <el-form-item label="提成来源" prop="commissionSource" style="width: 90%;margin-bottom: 0px">
               <el-checkbox-group v-model="form.commissionSource">
                 <el-checkbox label="油品"></el-checkbox>
                 <el-checkbox label="便利店"></el-checkbox>
@@ -340,15 +315,6 @@
                 <el-checkbox label="会员充值-电子储值卡"></el-checkbox>
                 <el-checkbox label="会员充值-囤油卡"></el-checkbox>
               </el-checkbox-group>
-              <!--              <el-radio-group v-model="form.commissionSource" v-if="form.commissionSource == '非油品'">-->
-              <!--                <el-radio v-if="form.commissionSource == '非油品'" @change="isChange" label="非油品"-->
-              <!--                          value="非油品"></el-radio>-->
-              <!--              </el-radio-group>-->
-              <!--              <el-radio-group v-model="form.commissionSource" v-else>-->
-              <!--                <el-radio @change="isChange" label="电子储值卡充值" value="电子储值卡充值"></el-radio>-->
-              <!--                <el-radio @change="isChange" label="电子囤油卡充值" value="电子囤油卡充值"></el-radio>-->
-              <!--                <el-radio @change="isChange" label="车主加油" value="车主加油"></el-radio>-->
-              <!--              </el-radio-group>-->
             </el-form-item>
           </el-col>
         </el-row>
@@ -363,14 +329,6 @@
                   {{ item }}
                 </div>
               </div>
-              <!--              <el-radio-group v-model="form.type" v-if="form.commissionSource == '车主加油'">-->
-              <!--                <el-radio v-for="dict in dict.type.comissionType" :label="dict.value">{{ dict.label }}</el-radio>-->
-              <!--              </el-radio-group>-->
-              <!--              <el-radio-group v-model="form.type" v-else>-->
-              <!--                <el-radio v-for="dict in dict.type.comissionType" v-if="dict.value!='payAmount'" :label="dict.value">-->
-              <!--                  {{ dict.label }}-->
-              <!--                </el-radio>-->
-              <!--              </el-radio-group>-->
             </el-form-item>
           </el-col>
         </el-row>
@@ -421,12 +379,10 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
-        </el-form-item>
+
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button type="primary" @click="submitForm">保存</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -440,12 +396,12 @@
       :before-close="handleClose">
       <div style="width: 94%;margin: 0 auto">
         <div>
-          <el-form :model="queryParams2" ref="queryForm" size="small" :inline="true" label-width="68px">
-            <el-form-item label="订单类型">
+          <el-form :model="queryParams2" ref="queryForm" size="small" :inline="true" label-width="0px">
+            <el-form-item label="">
               <el-select
                 v-model="queryParams2.type"
                 clearable
-                placeholder="全部"
+                placeholder="请选择订单分类"
               >
                 <el-option label="油品订单提成" :value="1"></el-option>
                 <el-option label="商品订单提成" :value="2"></el-option>
@@ -455,35 +411,25 @@
                 <!--                <el-option label="囤油卡充值提成" :value="6"></el-option>-->
               </el-select>
             </el-form-item>
-            <el-form-item label="订单号">
+            <el-form-item label="">
               <el-input v-model="queryParams2.orderNo" placeholder="请输入订单号"></el-input>
             </el-form-item>
-            <!--            <el-form-item label="创建时间">-->
-            <!--&lt;!&ndash;              <el-date-picker&ndash;&gt;-->
-            <!--&lt;!&ndash;                v-model="dateRange"&ndash;&gt;-->
-            <!--&lt;!&ndash;                style="width: 240px"&ndash;&gt;-->
-            <!--&lt;!&ndash;                size="medium"&ndash;&gt;-->
-            <!--&lt;!&ndash;                value-format="yyyy-MM-dd"&ndash;&gt;-->
-            <!--&lt;!&ndash;                type="daterange"&ndash;&gt;-->
-            <!--&lt;!&ndash;                range-separator="-"&ndash;&gt;-->
-            <!--&lt;!&ndash;                start-placeholder="开始日期"&ndash;&gt;-->
-            <!--&lt;!&ndash;                end-placeholder="结束日期"&ndash;&gt;-->
-            <!--&lt;!&ndash;              ></el-date-picker>&ndash;&gt;-->
-            <!--              <el-date-picker-->
-            <!--                v-model="beginTime"-->
-            <!--                style="width: 160px"-->
-            <!--                type="date"-->
-            <!--                placeholder="开始日期">-->
-            <!--              </el-date-picker>-->
-            <!--              至-->
-            <!--              <el-date-picker-->
-            <!--                v-model="endTime"-->
-            <!--                style="width: 160px"-->
-            <!--                type="date"-->
-            <!--                placeholder="结束日期">-->
-            <!--              </el-date-picker>-->
-            <!--            </el-form-item>-->
-            <el-form-item>
+            <el-form-item label="">
+              <el-date-picker
+                v-model="beginTime"
+                style="width: 160px"
+                type="date"
+                placeholder="开始日期">
+              </el-date-picker>
+              至
+              <el-date-picker
+                v-model="endTime"
+                style="width: 160px"
+                type="date"
+                placeholder="结束日期">
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item style="float: right;margin-right: 0px">
               <el-button type="primary" icon="el-icon-search" @click="handleQuery1">搜索</el-button>
               <el-button icon="el-icon-refresh" @click="resetQuery1">重置</el-button>
             </el-form-item>
@@ -493,10 +439,6 @@
           <div v-if="tabindex==0">
             <el-table ref="tables" v-loading="loading" border :data="commissionList">
               <el-table-column type="index" width="80" align="center" label="序号"/>
-              <!--              <el-table-column label="员工信息" align="center">-->
-              <!--                <el-table-column label="姓名" prop="realName" align="center"/>-->
-              <!--                <el-table-column label="手机号" prop="mobile" align="center"/>-->
-              <!--              </el-table-column>-->
               <el-table-column label="关联订单号" prop="orderNo" align="center" width="260"/>
               <el-table-column label="订单分类" prop="type" align="center">
                 <template slot-scope="scope">
@@ -991,11 +933,12 @@ export default {
 }
 
 .cot-box {
-  width: 98%;
+  width: 99%;
   border-radius: 8px;
   background: #fff;
   box-sizing: border-box;
   padding: 20px;
+
   margin: 0 auto;
 }
 
@@ -1035,7 +978,7 @@ export default {
 }
 
 .el-form--inline .el-form-item {
-  margin-right: 44px;
+  margin-right: 25px;
 }
 
 .tab-box {
@@ -1044,7 +987,8 @@ export default {
   background: #fff;
   display: flex;
   box-sizing: border-box;
-  margin-bottom: 25px;
+  margin-bottom: 10px;
+  border-top: 1px solid #e6e6e6;
 
 }
 
diff --git a/fuintBackend/fuint-application/src/main/resources/application.properties b/fuintBackend/fuint-application/src/main/resources/application.properties
index 597d7d885..19cc8fd6a 100644
--- a/fuintBackend/fuint-application/src/main/resources/application.properties
+++ b/fuintBackend/fuint-application/src/main/resources/application.properties
@@ -1,9 +1,9 @@
 # \u57FA\u672C\u914D\u7F6E
 server.port=8080
 env.profile=dev
-env.properties.path=D:/workspaces/oil-stations/fuintBackend/configure/
 #env.properties.path=F:/work/oilSystem/fuintBackend/configure/
 #env.properties.path=D:/oil/new-oil/oilSystem/fuintBackend/configure/
+env.properties.path=D:/code/bulidmap/oil-station/fuintBackend/configure
 #env.properties.path=D:/work/oilSystem/fuintBackend/configure/
 #env.properties.path=/www/wwwroot/shenlanshuke/oilAdmin/
 
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/Handover.vue b/fuintCashierWeb/src/views/cashier/NewComponents/Handover.vue
index 4ed4f988f..a7f4f5235 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/Handover.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/Handover.vue
@@ -620,7 +620,7 @@ export default {
   box-sizing: border-box;
   padding:  5px;
   padding-bottom: 0px;
-
+  border-top: 1px solid #eceff1;
 }
 .box_{
   height: 100%;