Merge remote-tracking branch 'origin/main'

2024-11-02 08:31:22 +08:00 · 2024-11-02 08:31:22 +08:00 · 0f8a9058cf
commit 0f8a9058cf
parent 204e353d6a eb78f504ee
82 changed files with 263 additions and 280 deletions
--- a/fuintAdmin/src/layout/components/AppMain.vue
+++ b/fuintAdmin/src/layout/components/AppMain.vue
@ -53,7 +53,7 @@ export default {
 // fix css style bug in open el-dialog
 .el-popup-parent--hidden {
  .fixed-header {
-    padding-right: 17px;
+    //padding-right: 17px;
  }
 }
 </style>
--- a/fuintAdmin/src/views/EventMarketing/CardHolder/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/CardHolder/index.vue
@ -211,6 +211,7 @@ export default {
 }

 .tap-box {
+  margin-top: 2px;
  width: 100%;
  height: 50px;
  background: #fff;
--- a/fuintAdmin/src/views/EventMarketing/center/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/center/index.vue
@ -9,7 +9,7 @@
    </div>
    <div class="rp-box">
      <!--      营销活动-->
-      <div class="bai-box" style="height: 84.5vh;overflow: auto" v-show="tabindex == 0">
+      <div class="bai-box" style="overflow: auto" v-show="tabindex == 0">
        <div class="d-s">
          <div class="gang"></div>
          <div style="font-weight: bold">会员营销</div>
@ -217,7 +217,7 @@
            <el-button icon="el-icon-refresh-right" @click="resetQuery">重置</el-button>
          </div>
        </div>
-        <div style="height: 70vh;overflow: auto">
+        <div style="height: 66vh;overflow: auto">
          <el-table
            :data="tableData"
            border
@ -312,7 +312,7 @@
            <el-button icon="el-icon-refresh-right" @click="resetOldQuery">重置</el-button>
          </div>
        </div>
-        <div style="height: 70vh;overflow: auto">
+        <div style="height: 66vh;overflow: auto">
          <el-table
            :data="oldTableData"
            border
@ -703,6 +703,7 @@ export default {
 }

 .tap-box {
+  margin-top: 2px;
  width: 100%;
  height: 50px;
  background: #fff;
@ -732,7 +733,7 @@ export default {

 .bai-box {
  width: 100%;
-  height: 100%;
+  height: 83vh;
  background: #fff;
  border-radius: 10px;
  box-sizing: border-box;
--- a/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue
@ -804,7 +804,7 @@ export default {
 }
 .table-box{
  width: 100%;
-  height: 70vh;
+  height: 68vh;
  overflow: auto;
  scrollbar-width: none;
  //padding: 15px;
@ -916,7 +916,7 @@ export default {

 .card-boxs {
  width: 100%;
-  height: 85vh;
+  height: 83.5vh;
  background: #fff;
  box-sizing: border-box;
  padding: 15px;
--- a/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue
@ -25,7 +25,7 @@
          <el-button type="primary" @click="addCertificate">新增优惠券</el-button>
        </div>
      </div>
-      <div style="height: 71vh;overflow: auto">
+      <div style="height: 68.5vh;overflow: auto">
        <el-table border :data="tableData" style="width: 100%">
          <el-table-column label="序号" type="index"></el-table-column>
          <el-table-column prop="number" label="优惠券编号"></el-table-column>
--- a/fuintAdmin/src/views/convenienceStore/goodsFile.vue
+++ b/fuintAdmin/src/views/convenienceStore/goodsFile.vue
@ -75,7 +75,7 @@
        <div style="font-size: 12px;color: red;margin: 5px 0">注：库存为0或未设置零售价和会员价的商品不可上架</div>
      </div>

-      <div style="height: 68vh;overflow: auto">
+      <div style="height: 66vh;overflow: auto">
        <el-table ref="tables" v-loading="loading" :data="list"
                  @selection-change="handleSelectionChange"
                  border
--- a/fuintAdmin/src/views/convenienceStore/goodsSale.vue
+++ b/fuintAdmin/src/views/convenienceStore/goodsSale.vue
@ -44,7 +44,7 @@
        </el-form-item>
      </el-form>

-      <div style="height: 71vh;overflow: auto">
+      <div style="height: 69vh;overflow: auto">
        <el-table ref="tables" v-loading="loading" :data="list" border
                  @selection-change="handleSelectionChange" :default-sort="defaultSort"
                  @sort-change="handleSortChange">
@ -91,7 +91,7 @@
      direction="rtl"
      size="60%">
      <div style="width: 96%;margin: 0 auto">
-        <div style="display: flex;margin-bottom: 20px">
+        <div style="display: flex;margin-bottom: 20px;color: #606266;font-size: 14px">
          <div>商品名称：{{goodsInfo.name || 0}}</div>
          <div style="margin: 0 50px">品类名称：{{goodsInfo.pinLeiName || 0}}</div>
          <div>销售总额：{{goodsInfo.saleTotal || 0}}</div>
--- a/fuintAdmin/src/views/convenienceStore/index.vue
+++ b/fuintAdmin/src/views/convenienceStore/index.vue
@ -85,6 +85,7 @@ export default {
 }

 .tab-box {
+  margin-top: 2px;
  width: 100%;
  background: #fff;
  display: flex;
--- a/fuintAdmin/src/views/convenienceStore/pinlei.vue
+++ b/fuintAdmin/src/views/convenienceStore/pinlei.vue
@ -28,7 +28,7 @@
        </el-form-item>
      </el-form>

-      <div style="height: 70vh;overflow: auto">
+      <div style="height: 68vh;overflow: auto">
        <el-table ref="tables" v-loading="loading" :data="list" row-key="id" border>
          <el-table-column type="expand">
            <template slot-scope="props">
--- a/fuintAdmin/src/views/convenienceStore/purchase/index.vue
+++ b/fuintAdmin/src/views/convenienceStore/purchase/index.vue
@ -59,6 +59,7 @@ export default {
 }

 .tab-box {
+  margin-top: 2px;
  width: 100%;
  background: #fff;
  display: flex;
--- a/fuintAdmin/src/views/convenienceStore/purchase/purchase.vue
+++ b/fuintAdmin/src/views/convenienceStore/purchase/purchase.vue
@ -52,7 +52,7 @@
        </el-form-item>
      </el-form>

-      <div style="height: 71vh;overflow: auto">
+      <div style="height: 69vh;overflow: auto;scrollbar-width: none">
        <el-table ref="tables" border
                  v-loading="loading"
                  :data="purchaseList"
@ -62,7 +62,6 @@
          <el-table-column label="供应商" align="center" prop="supplierName"/>
          <el-table-column label="商品数量" align="center" prop="productQuantity"/>
          <el-table-column label="单据金额" align="center" prop="totalAmount"/>
-
          <el-table-column label="状态" align="center" prop="status">
            <template slot-scope="scope">
              <div slot="reference" class="name-wrapper">
--- a/fuintAdmin/src/views/convenienceStore/returns/index.vue
+++ b/fuintAdmin/src/views/convenienceStore/returns/index.vue
@ -53,7 +53,7 @@
        </el-form-item>
      </el-form>

-      <div style="height: 71vh;overflow: auto">
+      <div style="height: 69vh;overflow: auto">
        <el-table ref="tables" border
                  v-loading="loading"
                  :data="returnsList"
--- a/fuintAdmin/src/views/convenienceStore/saleStatistic.vue
+++ b/fuintAdmin/src/views/convenienceStore/saleStatistic.vue
@ -61,6 +61,7 @@ export default {
 }

 .tab-box {
+  margin-top: 2px;
  width: 100%;
  background: #fff;
  display: flex;
--- a/fuintAdmin/src/views/convenienceStore/stockStatistic.vue
+++ b/fuintAdmin/src/views/convenienceStore/stockStatistic.vue
@ -93,7 +93,7 @@
          </el-button>
        </el-form-item>
      </el-form>
-      <div style="height: 71vh;overflow: auto;scrollbar-width: none">
+      <div style="height: 69vh;overflow: auto;scrollbar-width: none">
        <el-table ref="tables" v-loading="loading" :data="list" border
                  @selection-change="handleSelectionChange" :default-sort="defaultSort"
                  @sort-change="handleSortChange">
--- a/fuintAdmin/src/views/convenienceStore/supplier.vue
+++ b/fuintAdmin/src/views/convenienceStore/supplier.vue
@ -42,7 +42,7 @@
        </el-form-item>
      </el-form>

-      <div style="height: 70vh;overflow: auto">
+      <div style="height: 68vh;overflow: auto">
        <el-table ref="tables" v-loading="loading" :data="list" border
                  @selection-change="handleSelectionChange" :default-sort="defaultSort"
                  @sort-change="handleSortChange">
@ -309,7 +309,7 @@ export default {
 <style lang="scss" scoped>
 .app-container {
  width: 100%;
-  height: 100vh;
+  height: 100%;
  background: #f6f8f9;
 }
 </style>
--- a/fuintAdmin/src/views/duty/index.vue
+++ b/fuintAdmin/src/views/duty/index.vue
@ -32,7 +32,7 @@
        </el-form-item>
      </el-form>

-      <div style="height: 76vh;overflow: auto">
+      <div style="height: 74vh;overflow: auto">
        <el-table ref="tables"
                  border
                  v-loading="loading"
--- a/fuintAdmin/src/views/feedBack/index.vue
+++ b/fuintAdmin/src/views/feedBack/index.vue
@ -32,7 +32,7 @@

      </el-form>

-      <div style="height: 76.5vh;overflow: auto">
+      <div style="height: 74vh;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="所属机构"/>
--- a/fuintAdmin/src/views/financialStatement/buy/list.vue
+++ b/fuintAdmin/src/views/financialStatement/buy/list.vue
@ -10,19 +10,13 @@
    <buy-goods v-if="activeindex == '3'"></buy-goods>
    <buy-inter v-if="activeindex == '4'"></buy-inter>
  </div>
-
-
 </template>
-
 <script>
-
-
 import BuyOil from "@/views/financialStatement/buy/tab/oil.vue";
 import BuyEm from "@/views/financialStatement/buy/tab/em.vue";
 import BuyGun from "@/views/financialStatement/buy/tab/gun.vue";
 import BuyGoods from "@/views/financialStatement/buy/tab/goods.vue";
 import BuyInter from "@/views/financialStatement/buy/tab/inter.vue";
-
 export default {
  name: "buy-list",
  data() {
--- a/fuintAdmin/src/views/financialStatement/buy/tab/em.vue
+++ b/fuintAdmin/src/views/financialStatement/buy/tab/em.vue
@ -291,7 +291,7 @@ export default {
  margin-bottom: 15px;
 }
 .card-chan{
-  width: 98%;
+  width: 99%;
  background: #fff;

  margin: 10px auto;
@ -347,7 +347,7 @@ export default {
  text-transform: none;
 }
 .wgang{
-  width: 98%;
+  width: 99%;
  background: #fff;
  display: flex;
  align-items: center;
@ -365,13 +365,13 @@ export default {
  overflow: auto;
 }
 .wit_box{
-  width: 98%;
+  width: 99%;
  background: #FFFFFF;
  margin: 5px auto;
  box-sizing: border-box;
  padding: 15px;
  border-radius: 4px;
-  height: 80vh;
+  height: 78vh;
 }
 .pagination-box{
  width: 100%;
--- a/fuintAdmin/src/views/financialStatement/buy/tab/goods.vue
+++ b/fuintAdmin/src/views/financialStatement/buy/tab/goods.vue
@ -347,7 +347,7 @@ export default {
  text-transform: none;
 }
 .wgang{
-  width: 98%;
+  width: 99%;
  background: #fff;
  display: flex;
  align-items: center;
@ -365,13 +365,13 @@ export default {
  overflow: auto;
 }
 .wit_box{
-  width: 98%;
+  width: 99%;
  background: #FFFFFF;
  margin: 5px auto;
  box-sizing: border-box;
  padding: 15px;
  border-radius: 4px;
-  height: 80vh;
+  height: 78vh;
 }
 .pagination-box{
  width: 100%;
--- a/fuintAdmin/src/views/financialStatement/buy/tab/gun.vue
+++ b/fuintAdmin/src/views/financialStatement/buy/tab/gun.vue
@ -1,7 +1,6 @@
 <!-- 收银台订单-->
 <template>
  <div class="container" >
-
    <div class="wgang">
      <div style="display: flex;align-items: center ">
        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
@ -91,8 +90,6 @@
          </div>
        </div>
      </div>
-
-
      <div class="table-box">
        <el-table
          :data="orderList"
@ -107,9 +104,6 @@
          <el-table-column prop="content" align="center" label="退款金额（元）"> </el-table-column>
          <el-table-column prop="content" align="center" label="实收金额（元）"> </el-table-column>
          <el-table-column prop="content" align="center" label="统计周期"> </el-table-column>
-          <!--          <div slot="empty" class="empty">-->
-          <!--            <el-empty description="暂无数据"></el-empty>-->
-          <!--          </div>-->
        </el-table>
      </div>
      <div class="pagination-box">
@ -347,7 +341,7 @@ export default {
  text-transform: none;
 }
 .wgang{
-  width: 98%;
+  width: 99%;
  background: #fff;
  display: flex;
  align-items: center;
@ -365,13 +359,13 @@ export default {
  overflow: auto;
 }
 .wit_box{
-  width: 98%;
+  width: 99%;
  background: #FFFFFF;
  margin: 5px auto;
  box-sizing: border-box;
  padding: 15px;
  border-radius: 4px;
-  height: 80vh;
+  height: 78%;
 }
 .pagination-box{
  width: 100%;
--- a/fuintAdmin/src/views/financialStatement/buy/tab/inter.vue
+++ b/fuintAdmin/src/views/financialStatement/buy/tab/inter.vue
@ -107,7 +107,6 @@ import {
  getmyDataApi,
  getInstituionListApi2
 } from "@/api/allOrder";
-
 export default {
  name: "runningWater-oilDepot",
  data(){
@ -317,7 +316,7 @@ export default {
  text-transform: none;
 }
 .wgang{
-  width: 98%;
+  width: 99%;
  background: #fff;
  display: flex;
  align-items: center;
@ -335,13 +334,13 @@ export default {
  overflow: auto;
 }
 .wit_box{
-  width: 98%;
+  width: 99%;
  background: #FFFFFF;
  margin: 5px auto;
  box-sizing: border-box;
  padding: 15px;
  border-radius: 4px;
-  height: 80.5vh;
+  height: 78vh;
 }
 .pagination-box{
  width: 100%;
--- a/fuintAdmin/src/views/financialStatement/buy/tab/oil.vue
+++ b/fuintAdmin/src/views/financialStatement/buy/tab/oil.vue
@ -91,8 +91,6 @@
          </div>
        </div>
      </div>
-
-
      <div class="table-box">
        <el-table
          :data="orderList"
@ -347,7 +345,7 @@ export default {
  text-transform: none;
 }
 .wgang{
-  width: 98%;
+  width: 99%;
  background: #fff;
  display: flex;
  align-items: center;
@ -365,13 +363,13 @@ export default {
  overflow: auto;
 }
 .wit_box{
-  width: 98%;
+  width: 99%;
  background: #FFFFFF;
  margin: 5px auto;
  box-sizing: border-box;
  padding: 15px;
  border-radius: 4px;
-  height: 80vh;
+  height: 78vh;
 }
 .pagination-box{
  width: 100%;
--- a/fuintAdmin/src/views/financialStatement/reconciliation/list.vue
+++ b/fuintAdmin/src/views/financialStatement/reconciliation/list.vue
@ -1,5 +1,4 @@
 <template>
-
  <div class="container">
    <div class="tab-box">
      <div class="f-box" v-for="(item,index) in tablist" :key="index" @click="activeindex=index" :class="{ 'active' :activeindex==index}">{{item.name}}</div>
@ -8,8 +7,6 @@
    <reconciliation-ref v-if="activeindex == '1' "></reconciliation-ref>
    <reconciliation-favourable v-if="activeindex == '2' "></reconciliation-favourable>
  </div>
-
-
 <!--      <reconciliation-time v-if="radio1 == '按时间统计手续费' "></reconciliation-time>-->
 <!--      <reconciliation-store v-if="radio1 == '按门店统计手续费' "></reconciliation-store>-->
 </template>
--- a/fuintAdmin/src/views/financialStatement/reconciliation/tab/favourable.vue
+++ b/fuintAdmin/src/views/financialStatement/reconciliation/tab/favourable.vue
@ -543,7 +543,7 @@ export default {
 }
 .table-box{
  width: 100%;
-  height: 58vh;
+  height: 54vh;
  overflow: auto;
 }
 .pagination-box{
@ -562,7 +562,7 @@ export default {
  margin: 10px 0;
 }
 .new-top{
-  width: 98%;
+  width: 99%;
  background: #FFFFFF;
  margin: 15px auto;
  height: 115px;
@ -570,15 +570,16 @@ export default {
  padding: 15px;
  border-radius: 4px;
  margin-bottom: 5px;
+  margin-top: 5px;
 }
 .wit_box{
-  width: 98%;
+  width: 99%;
  background: #FFFFFF;
  margin: 5px auto;
  box-sizing: border-box;
  padding: 15px;
  border-radius: 4px;
-  height: 74vh;
+  height: 72vh;
 }

 </style>
--- a/fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue
+++ b/fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue
@ -514,7 +514,7 @@ export default {
 }
 .table-box{
  width: 100%;
-  height: 58vh;
+  height: 52vh;
  overflow: auto;
 }
 .pagination-box{
@ -533,7 +533,7 @@ export default {
  margin: 10px 0;
 }
 .new-top{
-  width: 98%;
+  width: 99%;
  background: #FFFFFF;
  margin: 15px auto;
  height: 115px;
@ -543,13 +543,13 @@ export default {
  margin-bottom: 5px;
 }
 .wit_box{
-  width: 98%;
+  width: 99%;
  background: #FFFFFF;
  margin: 5px auto;
  box-sizing: border-box;
  padding: 15px;
  border-radius: 4px;
-  height: 74vh;
+  height: 71vh;
 }

 </style>
--- a/fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue
+++ b/fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue
@ -286,8 +286,8 @@
          <el-table-column prop="mchntCd" align="center" label="商户号"></el-table-column>
          <el-table-column prop="createBy" align="center" label="关联员工"></el-table-column>

-          <el-table-column prop="createTime" align="center" label="订单创建时间" width="220"></el-table-column>
-          <el-table-column prop="updateTime" align="center" label="订单完成时间" width="220"></el-table-column>
+          <el-table-column prop="createTime" align="center" label="订单创建时间" ></el-table-column>
+          <el-table-column prop="updateTime" align="center" label="订单完成时间"></el-table-column>
        </el-table>
      </div>
      <pagination
@ -549,11 +549,8 @@ export default {
 }

 .box {
-  //box-sizing: border-box;
  padding: 5px;
-  //background: #f9f9f9;
  padding-left: 20px;
-
  width: 211px;
  height: 60px;
  background: #fff;
@ -614,16 +611,11 @@ export default {
 }

 .size-bole {
-  //font-weight: bold;
-
-  //width: 53px;
  height: 31px;
-  //font-family: YouSheBiaoTiHei;
  font-size: 24px;
  color: #0DC291;
  font-weight: 600;
  font-size: 24px;
-  //line-height: 0px;
  text-align: left;
  font-style: normal;
  text-transform: none;
@ -643,8 +635,9 @@ export default {

 .table-box {
  width: 100%;
-  height: 58vh;
+  height: 52vh;
  overflow: auto;
+  scrollbar-width: none;
 }

 .pagination-box {
@ -666,7 +659,7 @@ export default {
 }

 .new-top {
-  width: 98%;
+  width: 99%;
  background: #FFFFFF;
  margin: 15px auto;
  height: 115px;
@ -677,13 +670,13 @@ export default {
 }

 .wit_box {
-  width: 98%;
+  width: 99%;
  background: #FFFFFF;
  margin: 5px auto;
  box-sizing: border-box;
  padding: 15px;
  border-radius: 4px;
-  height: 74vh;
+  height: 71vh;
 }

 </style>
--- a/fuintAdmin/src/views/financialStatement/runningWater/tab/day.vue
+++ b/fuintAdmin/src/views/financialStatement/runningWater/tab/day.vue
@ -359,7 +359,7 @@ export default {
  text-transform: none;
 }
 .wgang{
-  width: 98%;
+  width: 99%;
  background: #fff;
  display: flex;
  align-items: center;
@ -377,13 +377,13 @@ export default {
  overflow: auto;
 }
 .wit_box{
-  width: 98%;
+  width: 99%;
  background: #FFFFFF;
  margin: 5px auto;
  box-sizing: border-box;
  padding: 15px;
  border-radius: 4px;
-  height: 79vh;
+  height: 78vh;
 }
 .pagination-box{
  width: 100%;
--- a/fuintAdmin/src/views/financialStatement/runningWater/tab/none.vue
+++ b/fuintAdmin/src/views/financialStatement/runningWater/tab/none.vue
@ -17,13 +17,6 @@
          <el-table-column prop="leaderPhone" align="center" label="联系电话"> </el-table-column>
 <!--          <el-table-column prop="parentStoreId" align="center" label="机构编号"> </el-table-column>-->
          <el-table-column prop="parentStoreName" align="center" label="机构名称"> </el-table-column>
-<!--          <el-table-column prop="leaderName" align="center" label="业务员"> </el-table-column>-->
-<!--          <el-table-column prop="leaderPhone" align="center" label="业务员联系电话"> </el-table-column>-->
-<!--          <el-table-column prop="seekZero" align="center" label="品牌编号"> </el-table-column>-->
-<!--          <el-table-column prop="seekZero" align="center" label="品牌名称"> </el-table-column>-->
-<!--          <el-table-column prop="seekZero" align="center" label="省"> </el-table-column>-->
-<!--          <el-table-column prop="seekZero" align="center" label="市"> </el-table-column>-->
-<!--          <el-table-column prop="seekZero" align="center" label="区"> </el-table-column>-->
          <el-table-column prop="addr" align="center" label="地址"> </el-table-column>
          <el-table-column prop="createTime" align="center" label="创建日期"> </el-table-column>
        </el-table>
--- a/fuintAdmin/src/views/financialStatement/runningWater/tab/oilDepot.vue
+++ b/fuintAdmin/src/views/financialStatement/runningWater/tab/oilDepot.vue
@ -330,7 +330,7 @@ import {
    text-transform: none;
  }
  .wgang{
-    width: 98%;
+    width: 99%;
    background: #fff;
    display: flex;
    align-items: center;
@ -348,13 +348,13 @@ import {
  overflow: auto;
 }
 .wit_box{
-  width: 98%;
+  width: 99%;
  background: #FFFFFF;
  margin: 5px auto;
  box-sizing: border-box;
  padding: 15px;
  border-radius: 4px;
-  height: 79vh;
+  height: 78vh;
 }
  .pagination-box{
    width: 100%;
--- a/fuintAdmin/src/views/fleet/tab/fleetInfo.vue
+++ b/fuintAdmin/src/views/fleet/tab/fleetInfo.vue
@ -477,8 +477,9 @@ export default {

 .table-box {
  width: 100%;
-  height: 73.5vh;
+  height: 70vh;
  overflow: auto;
+  scrollbar-width: none;
 }

 .wrap-boxs {
@ -540,6 +541,6 @@ export default {
  background: #fff;
  box-sizing: border-box;
  padding: 15px;
-  height: 87vh;
+  height: 85vh;
 }
 </style>
--- a/fuintAdmin/src/views/fleet/tab/fleetMember.vue
+++ b/fuintAdmin/src/views/fleet/tab/fleetMember.vue
@ -107,7 +107,7 @@
            </template>
          </el-table-column>
          <el-table-column align="center" prop="accountName" label="创建人"></el-table-column>
-          <el-table-column align="center" prop="createTime" label="创建时间" width="150"></el-table-column>
+          <el-table-column align="center" prop="createTime" label="创建时间" width="180"></el-table-column>
          <el-table-column align="center" label="操作" width="230">
            <template slot-scope="scope">
              <el-button
@ -826,7 +826,7 @@ export default {

 .table-boxs {
  width: 100%;
-  height: 78vh;
+  height: 74vh;
  overflow: auto;
 }

@ -848,6 +848,6 @@ export default {
  box-sizing: border-box;
  padding: 15px;
  padding-bottom: 0px;
-  height: 87vh;
+  height: 85vh;
 }
 </style>
--- a/fuintAdmin/src/views/integral/gift/gift.vue
+++ b/fuintAdmin/src/views/integral/gift/gift.vue
@ -1255,10 +1255,10 @@ export default {
  height: 98px;
 }
 .card-change{
-  height: 87vh;
+  height: 85vh;
 }
 .table_box{
-  height: 70vh;
+  height: 68vh;
  overflow: auto;
  scrollbar-width: none;
 }
--- a/fuintAdmin/src/views/integral/gift/index.vue
+++ b/fuintAdmin/src/views/integral/gift/index.vue
@ -76,6 +76,7 @@ export default {
 }

 .tab-box {
+  margin-top: 2px;
  width: 100%;
  background: #fff;
  display: flex;
--- a/fuintAdmin/src/views/integral/order/index.vue
+++ b/fuintAdmin/src/views/integral/order/index.vue
@ -73,13 +73,13 @@
          </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-button type="primary" @click="exportExcelVip">导出</el-button>
        </el-form-item>
      </el-form>
-      <div style="height: 70vh;overflow: auto">
+      <div style="height: 73.5vh;overflow: auto">

        <el-table ref="tables"
                  v-loading="loading"
--- a/fuintAdmin/src/views/integral/settings/index.vue
+++ b/fuintAdmin/src/views/integral/settings/index.vue
@ -464,6 +464,7 @@ valiNumberPass(rule, value, callback, fieldName)
 }

 .tab-box {
+  margin-top: 2px;
  width: 100%;
  background: #fff;
  display: flex;
--- a/fuintAdmin/src/views/member/analysis.vue
+++ b/fuintAdmin/src/views/member/analysis.vue
@ -903,6 +903,7 @@ export default {
 }

 .tab-box {
+  margin-top: 2px;
  width: 100%;
  height: 40px;
  background: #fff;
--- a/fuintAdmin/src/views/member/creditIndex.vue
+++ b/fuintAdmin/src/views/member/creditIndex.vue
@ -57,7 +57,7 @@
        </el-form-item>
      </el-form>

-      <div style="height: 77vh;overflow: auto" >
+      <div style="height: 75vh;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" />
--- a/fuintAdmin/src/views/member/index.vue
+++ b/fuintAdmin/src/views/member/index.vue
@ -164,7 +164,7 @@

        </el-form>
      </div>
-      <div style="height: 62vh;overflow: auto;margin-top: 15px;margin-bottom: 15px">
+      <div style="height: 58vh;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">
@ -318,7 +318,7 @@
        </el-form>
      </div>
      <!--      -->
-      <div style="height: 72vh;overflow: auto">
+      <div style="height: 70vh;overflow: auto">
        <el-table
          :data="massSendRecordList"
          border
@ -576,7 +576,6 @@
      <div slot="footer" class="dialog-footer">
        <el-button @click="cancel">取 消</el-button>
        <el-button type="primary" @click="submitForm">确 定</el-button>
-
      </div>
    </el-dialog>

@ -1449,7 +1448,7 @@ export default {
  box-sizing: border-box;
  padding: 20px;
  margin: 0 auto;
-  height: 87vh;
+  height: 86vh;


 }
--- a/fuintAdmin/src/views/member/manage.vue
+++ b/fuintAdmin/src/views/member/manage.vue
@ -43,7 +43,7 @@
        </el-form>
      </div>
      <!--      -->
-      <div style="height: 72vh;overflow: auto">
+      <div style="height: 70vh;overflow: auto">
        <el-table
          :data="userGroupList"
          border
@ -156,7 +156,7 @@
        </el-form>
      </div>
      <!--      -->
-      <div style="height: 72vh;overflow: auto">
+      <div style="height: 70vh;overflow: auto">
        <el-table
          :data="massSendList"
          border
@ -239,8 +239,8 @@
    <div class="cot-box" v-if="tabindex==2">
      <div>
        <el-form :model="queryParams2" ref="queryForm" size="small" :inline="true" label-width="120px">
-          <el-form-item label="" prop="groupName" style="width: 180px">
-            <el-input placeholder="请输入活动名称"  v-model="queryParams.tableName"/>
+          <el-form-item label="" prop="activityName" style="width: 180px">
+            <el-input placeholder="请输入活动名称"  v-model="queryParams2.activityName"/>
          </el-form-item>

          <el-form-item label="" prop="groupName" style="width: 180px">
@ -272,7 +272,7 @@
        </el-form>
      </div>
      <!--      -->
-      <div style="height: 72vh;overflow: auto">
+      <div style="height: 70vh;overflow: auto">
        <el-table
          :data="massSendRecordList"
          border
@ -288,7 +288,7 @@
              <span>{{ scope.row.sendGift || "--" }}</span>
            </template>
          </el-table-column>
-          <el-table-column prop="sendWay" align="center" label="群发方式">
+          <!-- <el-table-column prop="sendWay" align="center" label="群发方式">
            <template slot-scope="scope">
              <span>{{ scope.row.sendWay || "--" }}</span>
            </template>
@ -297,7 +297,7 @@
            <template slot-scope="scope">
              <span>{{ scope.row.massContent || "--" }}</span>
            </template>
-          </el-table-column>
+          </el-table-column> -->

          <el-table-column prop="userNum" align="center" label="群发会员数量">
            <template slot-scope="scope">
--- a/fuintAdmin/src/views/member/userLabel.vue
+++ b/fuintAdmin/src/views/member/userLabel.vue
@ -280,7 +280,7 @@ export default {

 .table-box {
  width: 100%;
-  height: 77vh;
+  height: 75vh;
  overflow: auto;
 }

--- a/fuintAdmin/src/views/oilConfig/oilGun/list.vue
+++ b/fuintAdmin/src/views/oilConfig/oilGun/list.vue
@ -48,7 +48,7 @@
        </el-form-item>
      </el-form>
      <div>
-        <div style="width: 100%;overflow: auto;height: 72vh">
+        <div style="width: 100%;overflow: auto;height: 69vh">
          <el-table ref="tables"
                  v-loading="loading"
                  :data="gunList"
@ -98,6 +98,7 @@
      />
    </div>
    <el-dialog
+      center
      :title="title"
      :visible.sync="dialogVisible"
      width="30%"
--- a/fuintAdmin/src/views/oilConfig/oilInventory/list.vue
+++ b/fuintAdmin/src/views/oilConfig/oilInventory/list.vue
@ -53,7 +53,7 @@
        </el-form-item>
      </el-form>

-      <div style="height: 76vh;overflow: auto;scrollbar-width: none">
+      <div style="height: 74vh;overflow: auto;scrollbar-width: none">
        <el-table ref="tables"
                  v-loading="loading"
                  :data="inventoryList"
--- a/fuintAdmin/src/views/oilConfig/oilPrice/comp/addprice.vue
+++ b/fuintAdmin/src/views/oilConfig/oilPrice/comp/addprice.vue
@ -335,7 +335,7 @@ export default {
      </div>

    </div>
-    <el-dialog title="新增/修改预设油价" :visible.sync="dialogFormPricesAdd" width="30%" :close-on-click-modal="false">
+    <el-dialog center title="新增/修改预设油价" :visible.sync="dialogFormPricesAdd" width="30%" :close-on-click-modal="false">
      <el-form ref="priForm" :model="oilPresetPrices" label-width="135px" :rules="oilPresetPricesRules">
        <el-form-item label="预设油品油号" prop="numberId">
          <el-select v-model="oilPresetPrices.numberId" placeholder="请选择油品名称" style="width: 100%"
--- a/fuintAdmin/src/views/oilConfig/oilPrice/comp/oilcon.vue
+++ b/fuintAdmin/src/views/oilConfig/oilPrice/comp/oilcon.vue
@ -329,7 +329,7 @@ export default {


    </div>
-    <el-dialog :title="title" width="30%" :visible.sync="dialogFormNumberEdit" :close-on-click-modal="false">
+    <el-dialog center :title="title" width="30%" :visible.sync="dialogFormNumberEdit" :close-on-click-modal="false">
      <el-form ref="form" :model="oilNumber" :rules="rules" label-width="120px" >
        <el-form-item label="油品类型" prop="oilType">
          <el-radio-group  v-model="oilNumber.oilType" @change="oilTypeClick(oilNumber.oilType),oilTypeClick2()">
--- a/fuintAdmin/src/views/oilConfig/oilPrice/oilconfig-index.vue
+++ b/fuintAdmin/src/views/oilConfig/oilPrice/oilconfig-index.vue
@ -36,6 +36,7 @@ export default {

 <style scoped lang="scss">
 .tab-box{
+  margin-top: 2px;
  width: 100%;
  background: #fff;
  display: flex;
--- a/fuintAdmin/src/views/oilConfig/oilPurchase/list.vue
+++ b/fuintAdmin/src/views/oilConfig/oilPurchase/list.vue
@ -17,7 +17,7 @@
        </el-form-item>

        <el-form-item label="" prop="numberId">
-          <el-select v-model="queryParams.numberId" placeholder="请选择油品油号">
+          <el-select v-model="queryParams.numberId" placeholder="请选择油品-油号">
            <el-option
              v-for="option in selectOilTypeByPrice"
              :key="option.numberId"
@ -44,7 +44,7 @@
            type="date"
            placeholder="开始日期">
          </el-date-picker>
-          至
+          ~
          <el-date-picker
            v-model="endTime"
            style="width: 160px"
@ -63,14 +63,14 @@
          </el-button>
        </el-form-item>
      </el-form>
-      <div style="height: 75vh;overflow: auto;scrollbar-width: none">
+      <div style="height: 73vh;overflow: auto;scrollbar-width: none">
        <el-table ref="tables"
                  v-loading="loading"
                  :data="purchaseList"
                  border
                  :default-sort="defaultSort">
          <el-table-column label="序号" align="center" type="index"/>
-          <el-table-column label="进货单号" align="center" prop="purchaseNo"/>
+          <el-table-column label="进货单号" align="center" width="150px" prop="purchaseNo"/>
          <el-table-column label="供应商" align="center" prop="supplierss"/>
          <el-table-column label="油品-油号" align="center" prop="oils"/>
          <el-table-column label="入库油罐" align="center" prop="tanks"/>
@ -79,7 +79,7 @@
            <template slot-scope="scope">
              <div slot="reference" class="name-wrapper">
                <div style="color: #FF770F" v-if="scope.row.status == 'await'">待审核</div>
-                <div style="color: #0DC291" v-if="scope.row.status == 'qrts'">已审核入库</div>
+                <div style="color: #0DC291" v-if="scope.row.status == 'qrts'">已入库</div>
                <div style="color: #F44522" v-if="scope.row.status == 'yzf'">已作废</div>
                <div style="color: #00CAFF" v-if="scope.row.status == 'ysh'">已审核</div>
              </div>
--- a/fuintAdmin/src/views/oilConfig/oilStatistics/list.vue
+++ b/fuintAdmin/src/views/oilConfig/oilStatistics/list.vue
@ -46,7 +46,7 @@
        </el-form-item>
      </el-form>

-      <div style="height: 77vh;overflow: auto">
+      <div style="height: 75vh;overflow: auto">
        <el-table key="2" ref="tables"
                  v-loading="loading"
                  :data="statisticsList"
--- a/fuintAdmin/src/views/oilConfig/oilSuppliers/list.vue
+++ b/fuintAdmin/src/views/oilConfig/oilSuppliers/list.vue
@ -43,7 +43,7 @@
          </el-button>
        </el-form-item>
      </el-form>
-      <div style="height: 76vh;overflow: auto">
+      <div style="height: 74vh;overflow: auto">
        <el-table ref="tables"
                  v-loading="loading"
                  :data="suppliersList"
--- a/fuintAdmin/src/views/oilConfig/oilTank/list.vue
+++ b/fuintAdmin/src/views/oilConfig/oilTank/list.vue
@ -53,7 +53,7 @@
      <!--    </div>-->

      <!--     列表-->
-      <div style="height: 72vh;overflow: auto">
+      <div style="height: 69vh;overflow: auto">
        <el-table ref="tables"
                  v-loading="loading"
                  :data="tankList"
--- a/fuintAdmin/src/views/order/order_Added.vue
+++ b/fuintAdmin/src/views/order/order_Added.vue
@ -425,6 +425,8 @@ export default {

 .box-card {
  width: 100%;
+  height: 89vh;
+  border-radius: 8px;
  margin-bottom: 15px;
  background: #fff;
  box-sizing: border-box;
@ -495,7 +497,7 @@ export default {

 .table-box {
  width: 100%;
-  height: 75vh;
+  height: 73vh;
  overflow: auto;
 }

--- a/fuintAdmin/src/views/order/order_Goods.vue
+++ b/fuintAdmin/src/views/order/order_Goods.vue
@ -1,7 +1,7 @@
 <!--商品交易列表-->
 <template>
  <div class="app-container">
-    <div class="card-change">
+    <div class="box-card">
      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="85px">
        <el-form-item label="" prop="orderNo">
          <el-input
@ -551,6 +551,11 @@ export default {

 .box-card {
  width: 100%;
+  height: 89vh;
+  border-radius: 8px;
+  background: #fff;
+  box-sizing: border-box;
+  padding: 10px;
  margin-bottom: 15px;
 }

@ -626,7 +631,7 @@ export default {

 .table-box {
  width: 100%;
-  height: 70vh;
+  height: 66vh;
  overflow: auto;
 }

--- a/fuintAdmin/src/views/order/order_Oil.vue
+++ b/fuintAdmin/src/views/order/order_Oil.vue
@ -2,7 +2,7 @@

 <template>
  <div class="app-container">
-    <div class="card-change">
+    <div class="box-card">
      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
        <el-form-item label="">
          <el-input v-model="queryParams.orderNo" clearable placeholder="请输入订单号"></el-input>
@ -713,8 +713,13 @@
    width: 100%;

  }
-  .box-card{
+  .box-card {
    width: 100%;
+    height: 89vh;
+    border-radius: 8px;
+    background: #fff;
+    box-sizing: border-box;
+    padding: 10px;
    margin-bottom: 15px;
  }
  .box-gang{
@ -775,7 +780,7 @@
  }
  .table-box{
    width: 100%;
-    height: 69vh;
+    height: 66vh;
    overflow: auto;
    scrollbar-width: none;
  }
--- a/fuintAdmin/src/views/order/order_Vip.vue
+++ b/fuintAdmin/src/views/order/order_Vip.vue
@ -422,6 +422,7 @@ export default {

 .box-card {
  width: 100%;
+  height: 89vh;
  border-radius: 8px;
  background: #fff;
  box-sizing: border-box;
@ -490,7 +491,7 @@ export default {

 .table-box {
  width: 100%;
-  height: 82vh;
+  height: 72vh;
  overflow: auto;
 }

--- a/fuintAdmin/src/views/power/message.vue
+++ b/fuintAdmin/src/views/power/message.vue
@ -1155,7 +1155,7 @@ export default {
  box-sizing: border-box;
  padding: 15px;
  margin: 10px;
-  height: 86vh;
+  height: 84.5vh;
 }

 .common-dialog > > > .el-upload--picture-card {
@ -1186,6 +1186,7 @@ export default {
 }

 .tab-box {
+  margin-top: 2px;
  width: 100%;
  height: 40px;
  background: #fff;
--- a/fuintAdmin/src/views/power/notice.vue
+++ b/fuintAdmin/src/views/power/notice.vue
@ -33,6 +33,7 @@ export default {

 <style scoped lang="scss">
 .tab-box{
+  margin-top: 2px;
  width: 100%;
  background: #fff;
  display: flex;
--- a/fuintAdmin/src/views/power/page/mode.vue
+++ b/fuintAdmin/src/views/power/page/mode.vue
@ -40,7 +40,7 @@
          </el-button>
        </el-form-item>
      </el-form>
-      <div style="height: 70vh;overflow: auto">
+      <div style="height: 68vh;overflow: auto">

        <el-table :data="tableData" style="width: 100%" border>
          <el-table-column align="center" type="index" label="序号"></el-table-column>
@ -479,7 +479,7 @@ export default {

 }
 .cards-change{
-    height: 83vh;
+    height: 81vh;
 }

 </style>
--- a/fuintAdmin/src/views/power/page/record.vue
+++ b/fuintAdmin/src/views/power/page/record.vue
@ -557,7 +557,7 @@ export default {

 }
 .cards-change{
-  height: 83vh;
+  height: 81vh;
 }

 </style>
--- a/fuintAdmin/src/views/setting/device/content/youqiji.vue
+++ b/fuintAdmin/src/views/setting/device/content/youqiji.vue
@ -318,7 +318,7 @@ export default {
  border-radius: 8px;
  box-sizing: border-box;
  padding: 15px;
-  height: 87vh;
+  height: 85vh;
 }
 </style>

--- a/fuintAdmin/src/views/setting/print/index.vue
+++ b/fuintAdmin/src/views/setting/print/index.vue
@ -49,7 +49,7 @@
          <el-button type="primary" icon="el-icon-search" @click="handleAdd">新增设备</el-button>
        </el-form-item>
      </el-form>
-      <div style="width: 100%; height: 674px; overflow: auto; ">
+      <div style="width: 100%; height: 68vh; 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>
@ -427,7 +427,7 @@ export default {
  border-radius: 8px;
  box-sizing: border-box;
  padding: 15px;
-  height: 87vh;
+  height: 85vh;
 }
 </style>

--- a/fuintAdmin/src/views/staff/list.vue
+++ b/fuintAdmin/src/views/staff/list.vue
@ -48,7 +48,7 @@

        </el-form-item>
      </el-form>
-      <div style="height: 78.5vh;overflow: auto">
+      <div style="height: 76vh;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="序号"/>
--- a/fuintAdmin/src/views/staffCommission/staffCommission.vue
+++ b/fuintAdmin/src/views/staffCommission/staffCommission.vue
@ -60,7 +60,7 @@
          </el-form>
        </div>

-        <div style="height: 72vh;overflow: auto">
+        <div style="height: 70vh;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">-->
@ -179,7 +179,7 @@
            </el-form-item>
          </el-form>
        </div>
-        <div style="height: 72vh; overflow: auto ">
+        <div style="height: 70vh; overflow: auto ">


        <el-table ref="tables" v-loading="loading" :data="list" border
--- a/fuintAdmin/src/views/userGrade/index.vue
+++ b/fuintAdmin/src/views/userGrade/index.vue
@ -169,7 +169,7 @@

        </el-form>
      </div>
-      <div style="height: 72vh;overflow: auto">
+      <div style="height: 69vh;overflow: auto">
        <el-table ref="tables" v-loading="loading" :data="list" border>
          <el-table-column label="序号" align="center" type="index" width="55"/>
          <el-table-column label="会员等级名称" align="center" prop="name">
@ -269,7 +269,7 @@
        </el-form>
      </div>
      <!--      -->
-      <div style="height: 72vh;overflow: auto">
+      <div style="height: 69vh;overflow: auto">
        <el-table
          :data="discountList"
          border
@ -1932,10 +1932,11 @@ export default {
  box-sizing: border-box;
  padding: 20px;
  margin: 0 auto;
-  height: 86vh;
+  height: 85vh;
 }

 .tab-box {
+  margin-top: 2px;
  width: 100%;
  height: 40px;
  background: #fff;
--- a/fuintAdmin_zt/src/api/system/Site/site.js
+++ b/fuintAdmin_zt/src/api/system/Site/site.js
@ -26,6 +26,16 @@ export function getPidInfo(id) {
  })
 }

+
+// 获取部门信息
+export function getPidInfo1(id) {
+  return request({
+    url: '/system/dept/'+id,
+    method: 'get',
+  })
+}
+
+
 export function getMaxNumber(data) {
  return request({
    url: '/system/dept/getMaxNumber',
--- a/fuintAdmin_zt/src/layout/components/AppMain.vue
+++ b/fuintAdmin_zt/src/layout/components/AppMain.vue
@ -52,7 +52,7 @@ export default {
 // fix css style bug in open el-dialog
 .el-popup-parent--hidden {
  .fixed-header {
-    padding-right: 17px;
+    //padding-right: 17px;
  }
 }
 </style>
--- a/fuintAdmin_zt/src/layout/components/Navbar.vue
+++ b/fuintAdmin_zt/src/layout/components/Navbar.vue
@ -1,10 +1,10 @@
 <template>
  <div class="navbar">
    <div style="display: flex;align-items: center" >
-      <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
+      <!-- <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" /> -->
      <div class="title-logo">

-        <div>
+        <div style="margin-left: 30px;">
          百业兴智慧油站欢迎您
        </div>

--- a/fuintAdmin_zt/src/views/Site/add.vue
+++ b/fuintAdmin_zt/src/views/Site/add.vue
@ -321,7 +321,6 @@ export default {
    <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>
          <el-form-item label="角色名称" prop="roleName">
            <el-input v-model="ruleForm.roleName"></el-input>
@ -358,22 +357,11 @@ export default {
    </div>
    <div class="center-box">
      <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-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"
@ -409,7 +397,7 @@ export default {
          </template>
        </el-table-column>
      </el-table>
-      <div style="display: flex">
+      <div style="display: flex;justify-content: center">
        <el-button @click="resetForm('ruleForm')">取消</el-button>
        <el-button type="primary" @click="submitForm('ruleForm')">保存</el-button>

@ -425,7 +413,7 @@ export default {
 .container {
  width: 100%;
  box-sizing: border-box;
-  padding: 20px;
+  padding: 10px;
  background: #f4f5f9;
 }

@ -440,21 +428,17 @@ export default {
  font-size: 14px;
  color: #999;
  padding-left: 25px;
-}
-
-.demo-ruleForm {
-
+  border-radius: 10px ;
 }

 .center-box {
  width: 100%;
  box-sizing: border-box;
  padding: 20px;
-
  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;
+  border-radius: 10px ;
+  margin-top: 10px;
 }

 .f-box {
--- a/fuintAdmin_zt/src/views/Site/index.vue
+++ b/fuintAdmin_zt/src/views/Site/index.vue
@ -1,11 +1,9 @@
 <template>
-  <div class="app-container" style="padding: 0px">
-
+  <div class="app-container" style="padding: 10px">
    <div class="tab-box">
      <div class="f-box" v-for="(item,index) in tablist" :key="index" @click="handleClick1(index)" :class="{ 'active' :activeindex==index}">{{item.name}}</div>
    </div>
-
-    <el-row style="padding: 20px">
+    <el-row style="padding: 10px">
      <el-col :span="6">
        <el-card  style="margin-right: 5px; border: none;box-shadow: none;" shadow="never">
          <div class="left-box">
@ -286,7 +284,7 @@
                    </span>
                  </el-form-item>
 <!--                  <template v-if="ruleForm.deptType !== '3'">-->
-                    <template v-if="is2Store">
+                    <template v-if="ruleForm.deptType == '1' || ruleForm.deptType == '2'">
                    <el-row >
                      <el-col :span="20">
                        <el-form-item label="计费方式" prop="turnoverType">
@ -414,7 +412,7 @@
                        </el-col>
                        <el-col :span="8">
                          <el-form-item label="价格">
-                            <el-input :disabled="isTopDept" v-model="ruleForm.prepaidAmount">
+                            <el-input type="number" :disabled="isTopDept" v-model="ruleForm.prepaidAmount">
                              <template slot="append">万元</template>
                            </el-input>
                          </el-form-item>
@ -625,9 +623,9 @@

    <!-- 添加或修改用户配置对话框 class="common-dialog" -->
    <el-dialog :title="title" :visible.sync="open"  width="600px" append-to-body :close-on-click-modal="false" >
-      
+
      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        
+
        <el-row>
          <el-col :span="24">
            <el-form-item label="所属机构" prop="deptId">
@ -653,20 +651,20 @@
        <el-row>
          <el-col :span="24">
            <el-form-item label="联系方式" prop="mobile">
-              <el-input v-model="form.mobile" placeholder="请输入用户的联系方式" maxlength="50" autocomplete="off" />
+              <el-input onkeyup="this.value=this.value.replace(/\D/g,'')" v-model="form.mobile" placeholder="请输入用户的联系方式" maxlength="50" autocomplete="off" />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-col :span="24">
            <el-form-item label="登录账号" prop="accountName">
-              <el-input v-model="form.accountName" placeholder="请输入" onkeyup="value=value.replace(/[^\x00-\xff]/g, '')" maxlength="50" autocomplete="off" />
+              <el-input v-model="form.accountName" placeholder="登录账号（5-12位大小写字母、数字）" onkeyup="value=value.replace(/[^\x00-\xff]/g, '')" maxlength="50" autocomplete="off" />
            </el-form-item>
          </el-col>
        </el-row>


-        <template v-if="title == '新增用户'">
+        <template v-if="title == '新增用户信息'">

          <el-row>
          <el-col :span="24">
@ -680,7 +678,7 @@
        <el-row>
          <el-col :span="24">
            <el-form-item label="用户角色" prop="roleIds">
-              <el-select v-model="form.roleIds"  @change="$forceUpdate(),getCodeByRole($event)" placeholder="请选择角色">
+              <el-select v-model="form.roleIds"  @change="$forceUpdate(),getCodeByRole($event)" placeholder="请选择角色" style="width: 100%;">
                <el-option
                  v-for="item in rolelist"
                  :key="item.dutyId"
@ -1726,8 +1724,6 @@ export default {
          this.parentName = res.data.parentName
          this.ruleForm = res.data

-
-
          // this.ruleForm.parentId = res.data.parentId
          // this.ruleForm.status = res.data.status
          // this.ruleForm.leaderName = res.data.leaderName
@ -2038,7 +2034,7 @@ export default {
      /** 新增按钮操作 */
      handleAdd() {
        this.open = true
-        this.title = "新增用户"
+        this.title = "新增用户信息"
        this.resetForm()
        let permissionType
        if (this.deptType === "3") {
@ -2248,6 +2244,7 @@ export default {
    margin-right: 50px;
    display: flex;
    align-items: center;
+    cursor: pointer;

  }
  .active{
--- a/fuintAdmin_zt/src/views/components/Service/index.vue
+++ b/fuintAdmin_zt/src/views/components/Service/index.vue
@ -71,15 +71,15 @@

          </div>
        </div>
-        <el-dialog title="编辑油站" class="d-dialog"  :visible.sync="editDialog" width="700px" style="padding-right: 10px;">
+        <el-dialog title="修改油站信息" class="d-dialog"  :visible.sync="editDialog" width="35%" style="padding-right: 10px;">
          <el-form :model="from" ref="form" :rules="rules">
            <el-row>
-                <el-col :span="10">
-                  <el-form-item label="油站名称" prop="name" :label-width="formLabelWidth">
-                    <el-input v-model="from.name" autocomplete="off" style="width:500px"></el-input>
+                <el-col>
+                  <el-form-item label="油站名称" prop="name" :label-width="formLabelWidth" style="margin-left: -25px;">
+                    <el-input v-model="from.name" autocomplete="off"></el-input>
                  </el-form-item>

-                  <el-form-item label="上传头像" prop="name" :label-width="formLabelWidth">
+                  <el-form-item label="上传头像" prop="name" :label-width="formLabelWidth" style="margin-left: -25px;">
                  <el-upload
                      :action="uploadAction"
                      list-type="picture-card"
@ -98,26 +98,25 @@
                  </el-upload>
                   </el-form-item>

-                  <el-form-item label="油站联系人" prop="contact" :label-width="formLabelWidth" placeholder="请输入油站负责人">
-                    <el-input v-model="from.contact" autocomplete="off" style="width:500px"></el-input>
+                  <el-form-item label="油站联系人" prop="contact" :label-width="formLabelWidth" style="margin-left: -25px;" >
+                    <el-input v-model="from.contact" autocomplete="off" placeholder="请输入油站负责人" />
                  </el-form-item>

                </el-col>
            </el-row>
            <el-row>
-                <el-col :span="10">
-                  <el-form-item label="联系电话" prop="phone" :label-width="formLabelWidth" placeholder="请输入联系方式">
-                    <el-input v-model="from.phone" autocomplete="off" style="width:500px"></el-input>
+                <el-col>
+                  <el-form-item label="联系电话" prop="phone" :label-width="formLabelWidth" style="margin-left: -25px;">
+                    <el-input v-model="from.phone" autocomplete="off" placeholder="请输入联系方式"/>
                  </el-form-item>
                </el-col>
                <el-col :span="10">
                </el-col>
            </el-row>
            <el-row>
-              <el-col :span="10">
-                <el-form-item label="店铺地址" prop="address" :label-width="formLabelWidth">
+              <el-col>
+                <el-form-item label="店铺地址" prop="address" :label-width="formLabelWidth" style="margin-left: -25px;">
                  <el-input
-                    style="width:500px"
                    type="textarea"
                    :rows="2"
                    placeholder="请输入店铺地址"
@ -125,7 +124,7 @@
                  </el-input>
                </el-form-item>

-                <el-form-item label="油站状态" prop="status" :label-width="formLabelWidth">
+                <el-form-item label="油站状态" prop="status" :label-width="formLabelWidth" style="margin-left: -25px;">
                  <el-tooltip class="item" effect="dark" content="油站状态在组织架构中设置" placement="top-start">

                  <el-switch
@ -141,8 +140,8 @@
              </el-col>
            </el-row>
            <el-row>
-              <el-col  :span="6">
-                <el-form-item label="营业执照" prop="name" :label-width="formLabelWidth">
+              <el-col>
+                <el-form-item label="营业执照" prop="name" :label-width="formLabelWidth" style="margin-left: -25px;">
                  <el-upload
                      :action="uploadAction"
                      list-type="picture-card"
@ -161,7 +160,7 @@
                  </el-upload>
                </el-form-item>

-                <el-form-item label="经营照" prop="name" :label-width="formLabelWidth">
+                <el-form-item label="经营照" prop="name" :label-width="formLabelWidth" style="margin-left: -25px;">
                  <el-upload
                    :action="uploadAction"
                      list-type="picture-card"
@ -185,9 +184,9 @@
 
            </el-row>
          </el-form>
-          <div slot="footer" class="dialog-footer">
+          <div slot="footer" class="dialog-footer" style="text-align: center;">
            <el-button @click="editDialog = false">取 消</el-button>
-            <el-button type="primary" @click=" edit">确 定</el-button>
+            <el-button type="primary" @click=" edit">保 存</el-button>
          </div>
        </el-dialog>
        <el-dialog title="收货地址" :visible.sync="dialogFormVisible">
--- a/fuintAdmin_zt/src/views/components/Service/payment.vue
+++ b/fuintAdmin_zt/src/views/components/Service/payment.vue
@ -202,10 +202,10 @@
        </el-table-column>
      </el-table>
    </div>
-    <el-dialog :title="addMerchantTitile" :visible.sync="addMerchants" width="550px">
+    <el-dialog :title="addMerchantTitile" :visible.sync="addMerchants" width="30%">
      <el-form :model="form" ref="formAdd" :rules="rules">
        <el-form-item label="所属机构" :label-width="formLabelWidth" prop="deptId">
-          <el-select v-model="form.deptId+''" disabled placeholder="请选择所属机构" style="width: 350px">
+          <el-select v-model="form.deptId+''" disabled placeholder="请选择所属机构" style="width: 100%">
            <el-option
              v-for="item in deptListSelect"
              :key="item.deptId"
@ -219,7 +219,7 @@
            v-model="form.merchantName"
            placeholder="全部"
            clearable
-            style="width: 350px"
+            style="width: 100%"
          >
 <!--            <el-option-->
 <!--              v-for="dict in dict.type.payment_channel"-->
@ -237,16 +237,16 @@
        </el-form-item>
        <el-form-item label="商户号编号" :label-width="formLabelWidth" prop="mchntCd">
          <el-input v-model="form.mchntCd" placeholder="请输入商户号编号" autocomplete="off"
-                    style="width: 350px"></el-input>
+                    style="width: 100%"></el-input>
        </el-form-item>
        <el-form-item label="备注" :label-width="formLabelWidth">
          <el-input type="textarea" v-model="form.remark" placeholder="请输入备注" autocomplete="off"
-                    style="width: 350px"></el-input>
+                    style="width: 100%"></el-input>
        </el-form-item>
      </el-form>
-      <div slot="footer" class="dialog-footer">
+      <div slot="footer" class="dialog-footer" style="text-align: center;">
        <el-button @click="addMerchants = false">取 消</el-button>
-        <el-button type="primary" @click="submitMerchant">确 定</el-button>
+        <el-button type="primary" @click="submitMerchant">保 存</el-button>
      </div>
    </el-dialog>
    <el-dialog :title="Ruletitle" :visible.sync="addRule" width="60%">
@ -297,7 +297,7 @@
            </el-form-item>
            <el-form-item label="交易占比" :label-width="formLabelWidth" style="margin-left: -20px;">

-              <el-input v-model="item.proportion" placeholder="请输入交易占比" autocomplete="off" style="width: 350px">
+              <el-input v-model="item.proportion" onkeyup="this.value=this.value.replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')">  placeholder="请输入交易占比" autocomplete="off" style="width: 350px">
                <template slot="append">%</template>
              </el-input>
            </el-form-item>
--- a/fuintAdmin_zt/src/views/components/Service/staff.vue
+++ b/fuintAdmin_zt/src/views/components/Service/staff.vue
@ -116,8 +116,8 @@
    <el-dialog :title="title" :visible.sync="open" width="30%" append-to-body>
      <el-form ref="form" :model="form" :rules="rules" label-width="120px">

-        <el-form-item label="所属机构" prop="storeId">
-          <el-select v-model="form.storeId+''" placeholder="请选择角色" style="width: 270px">
+        <el-form-item label="所属机构" prop="storeId" style="margin-left: -30px;">
+          <el-select v-model="form.storeId+''" placeholder="请选择角色" style="width: 100%">
            <el-option
              v-for="item in options"
              :key="item.id+''"
@ -127,25 +127,25 @@
          </el-select>
        </el-form-item>

-        <el-form-item label="员工姓名" prop="realName">
-          <el-input v-model="form.realName" placeholder="请输入姓名" maxlength="30" style="width: 270px"/>
+        <el-form-item label="员工姓名" prop="realName" style="margin-left: -30px;">
+          <el-input v-model="form.realName" placeholder="请输入姓名" maxlength="30" style="width: 100%"/>
        </el-form-item>

-        <el-form-item label="联系方式" prop="mobile">
-          <el-input v-model="form.mobile" placeholder="请输入联系人电话" maxlength="30" style="width: 270px"/>
+        <el-form-item label="联系方式" prop="mobile" style="margin-left: -30px;">
+          <el-input onkeyup="this.value=this.value.replace(/\D/g,'')" v-model="form.mobile" placeholder="请输入联系人电话" maxlength="30" style="width: 100%"/>
        </el-form-item>

-        <el-form-item label="登录账号" prop="accountName">
-          <el-input v-model="form.accountName" placeholder="请输入登录账号" maxlength="30" style="width: 270px"/>
+        <el-form-item label="登录账号" prop="accountName" style="margin-left: -30px;">
+          <el-input v-model="form.accountName" placeholder="请输入登录账号" maxlength="30" style="width: 100%"/>
        </el-form-item>

-        <el-form-item label="登录密码" prop="password" v-if="!form.id">
-          <el-input v-model="form.password" placeholder="请输入登录密码" type="password" maxlength="30" style="width: 270px"/>
+        <el-form-item label="登录密码" prop="password" v-if="!form.id" style="margin-left: -30px;">
+          <el-input v-model="form.password" placeholder="请输入登录密码" type="password" maxlength="30" style="width: 100%"/>
        </el-form-item>


-        <el-form-item label="用户角色" prop="roleId">
-          <el-select v-model="form.roleId" placeholder="请选择角色" style="width: 270px">
+        <el-form-item label="用户角色" prop="roleId" style="margin-left: -30px;">
+          <el-select v-model="form.roleId" placeholder="请选择角色" style="width: 100%">
            <el-option
              v-for="item in roleList"
              :key="item.dutyId+''"
@ -155,7 +155,7 @@
          </el-select>
        </el-form-item>

-        <el-form-item label="账号状态" prop="status">
+        <el-form-item label="账号状态" prop="status" style="margin-left: -30px;">
          <el-switch
            v-model="form.status"
            active-value="qy"
@ -166,7 +166,7 @@
        </el-form-item>


-        <el-form-item label="一键加油" prop="isRefuel">
+        <el-form-item label="一键加油" prop="isRefuel" style="margin-left: -30px;">
          <!--              <el-select v-model="form.isRefuel" style="width: 270px">-->
          <!--                <el-option-->
          <!--                  v-for="dict in dict.type.display"-->
@ -201,9 +201,9 @@


      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+      <div slot="footer" class="dialog-footer" style="text-align: center;">
        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">保 存</el-button>
      </div>
    </el-dialog>
  </div>
@ -498,7 +498,7 @@ export default {
    handleAdd() {
      this.reset();
      this.open = true;
-      this.title = "新增员工";
+      this.title = "新增用户信息";
      this.getRoleList1()
    },
    // 获取角色信息
@ -589,7 +589,7 @@ export default {
        this.form = response.data;
        // this.form.category = response.data.staffInfo.category + '';
        this.open = true;
-        this.title = "编辑员工信息";
+        this.title = "修改用户信息";
        this.writeOff = this.form.writeOff.split(",");
        this.specialPrem = this.form.specialPrem.split(",");
        this.posPrem = JSON.parse(this.form.posPrem);
--- a/fuintAdmin_zt/src/views/components/Service/way.vue
+++ b/fuintAdmin_zt/src/views/components/Service/way.vue
@ -1,5 +1,5 @@
 <script >
-import {getPidInfo, Userlist} from "@/api/system/Site/site";
+import {getPidInfo,getPidInfo1, Userlist} from "@/api/system/Site/site";
 import Yearff from "@/views/Site/components/yearff.vue";
 import Beforeff from "@/views/Site/components/before.vue";
 import Afterff from "@/views/Site/components/afterff.vue";
@ -35,7 +35,7 @@ export default {
  },
  methods:{
    getInfo(){
-      getPidInfo(this.deptId).then(res => {
+      getPidInfo1(this.deptId).then(res => {
        this.storeDeptInfo = res.data
      })
    },
--- a/fuintAdmin_zt/src/views/homeComponents/agent.vue
+++ b/fuintAdmin_zt/src/views/homeComponents/agent.vue
@ -154,21 +154,23 @@
      </div>
    </div>
    <div class="bottom_">
-      <div class="h-tt" style="margin-bottom: 15px" >数据统计</div>
      <div class="d-s">
+      <div class="h-tt" style="margin-bottom: 15px" >数据统计</div>
        <div class="anniu-h" :class="{ 'anniu-act': index == timeIndex }" v-for="(item,index) in timeList" :key="index" @click="editColor(index)">
          {{item}}
        </div>
-        <el-date-picker
-          v-model="value2"
-          type="daterange"
-          range-separator="至"
-          value-format="yyyy-MM-dd"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :disabled="disabled"
-          @change="getStoreList()">
-        </el-date-picker>
+        <span style="margin-top: -10px;">
+          <el-date-picker
+            v-model="value2"
+            type="daterange"
+            range-separator="至"
+            value-format="yyyy-MM-dd"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            :disabled="disabled"
+            @change="getStoreList()">
+          </el-date-picker>
+        </span>
      </div>
      <div id="ctct" style="width: 100%; height: 315px;background: linear-gradient( 360deg, #F8F0E7 0%, #FFFFFF 100%); "></div>
 <!--      <div id="cccc" style="width: 300px;height: 200px;"></div>-->
@ -865,6 +867,7 @@ export default {
 .anniu-h{
  width: 80px;
  height: 26px;
+  margin-top: -10px;
  background: #FAFAFA;
  border-radius: 4px 4px 4px 4px;
  border: 1px solid #DDDDDD;
--- a/fuintAdmin_zt/src/views/setting/app/index.vue
+++ b/fuintAdmin_zt/src/views/setting/app/index.vue
@ -109,7 +109,7 @@
        <!--            <el-input v-model="deviceInfo.orgName" style="width: 300px"></el-input>-->
        <!--          </el-form-item>-->
        <!--          -->
-        <el-form-item label="机构名称" prop="orgId">
+        <el-form-item label="机构名称" prop="orgId" style="margin-left: -20px;">
          <el-select
            v-model="deviceInfo.orgId"
            clearable
@ -121,25 +121,25 @@
          </el-select>

        </el-form-item>
-        <el-form-item label="统一社会信用代码" prop="unifiedSocialCreditCode">
+        <el-form-item label="统一社会信用代码" prop="unifiedSocialCreditCode" style="margin-left: -20px;">
          <el-input v-model="deviceInfo.unifiedSocialCreditCode" style="width: 100%;" placeholder="请输入统一社会信用代码"></el-input>
        </el-form-item>
-        <el-form-item label="小程序appID" prop="appId">
+        <el-form-item label="小程序appID" prop="appId" style="margin-left: -20px;">
          <el-input v-model="deviceInfo.appId" style="width: 100%;" placeholder="请输入小程序appID"></el-input>
        </el-form-item>
-        <el-form-item label="密钥" prop="appKey">
+        <el-form-item label="密钥" prop="appKey" style="margin-left: -20px;">
          <el-input v-model="deviceInfo.appKey" style="width: 100%;" placeholder="请输入密钥"></el-input>
        </el-form-item>
-        <el-form-item label="法人姓名" prop="legalRepresentativeName">
+        <el-form-item label="法人姓名" prop="legalRepresentativeName" style="margin-left: -20px;">
          <el-input v-model="deviceInfo.legalRepresentativeName" style="width: 100%;" placeholder="请输入法人姓名"></el-input>
        </el-form-item>
-        <el-form-item label="法人微信号" prop="legalRepresentativeWechat">
+        <el-form-item label="法人微信号" prop="legalRepresentativeWechat" style="margin-left: -20px;">
          <el-input v-model="deviceInfo.legalRepresentativeWechat" style="width: 100%;" placeholder="请输入法人微信号"></el-input>
        </el-form-item>
-        <el-form-item label="法人联系方式" prop="legalRepresentativeContact">
+        <el-form-item label="法人联系方式" prop="legalRepresentativeContact" style="margin-left: -20px;">
          <el-input v-model="deviceInfo.legalRepresentativeContact" style="width: 100%;" placeholder="请输入法人联系方式"></el-input>
        </el-form-item>
-        <el-form-item label="小程序状态" prop="appStatus">
+        <el-form-item label="小程序状态" prop="appStatus" style="margin-left: -20px;">
          <el-switch
            v-model="deviceInfo.appStatus"
            active-color="#13ce66"
@ -305,7 +305,7 @@ export default {
    edit(e) {
      this.clean()
      this.open = true;
-      this.title = "编辑小程序配置"
+      this.title = "修改小程序配置"
      this.deviceInfo = e
      console.log('提交设备信息数据:', this.deviceInfo);

--- a/fuintAdmin_zt/src/views/setting/banner/index.vue
+++ b/fuintAdmin_zt/src/views/setting/banner/index.vue
@ -203,7 +203,7 @@
            </el-select>
          </el-form-item>
          <el-form-item label="排序号" prop="sortOrder">
-            <el-input v-model="deviceInfo.sortOrder" placeholder="请选择排序号" style="width: 100%"></el-input>
+            <el-input v-model="deviceInfo.sortOrder" placeholder="请输入排序号1/2/3..." style="width: 100%"></el-input>
          </el-form-item>
          <el-form-item label="banner图链接" prop="bannerLink">
            <el-input v-model="deviceInfo.bannerLink" placeholder="请输入banner图链接地址"  style="width: 100%"></el-input>
--- a/fuintAdmin_zt/src/views/setting/message.vue
+++ b/fuintAdmin_zt/src/views/setting/message.vue
@ -97,13 +97,13 @@
      <el-form ref="form" :rules="rules" :model="form" label-width="120px">

        <el-form-item label="短信模板ID" prop="messageId" style="margin-left: -25px;">
-          <el-input v-model="form.messageId" style="width: 100%"></el-input>
+          <el-input v-model="form.messageId" placeholder="请输入短信模板ID" style="width: 100%"></el-input>
        </el-form-item>
        <el-form-item label="短信名称" prop="name" style="margin-left: -25px;">
-          <el-input v-model="form.name" style="width: 100%"></el-input>
+          <el-input v-model="form.name" placeholder="请输入短信名称" style="width: 100%"></el-input>
        </el-form-item>
        <el-form-item label="适用范围" prop="deptIdList" style="margin-left: -25px;">
-          <el-select v-model="form.deptIdList" multiple placeholder="请选择所属机构" style="width: 100%">
+          <el-select v-model="form.deptIdList" multiple placeholder="请选择适用组织机构（多选）" style="width: 100%">
            <el-option
              v-for="item in deptListSelect"
              :key="item.deptId"
@ -313,12 +313,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.form = e
    },
    del(e) {
--- a/fuintAdmin_zt/src/views/setting/pay/index.vue
+++ b/fuintAdmin_zt/src/views/setting/pay/index.vue
@ -137,7 +137,7 @@
        <el-form :model="deviceInfo" ref="deviceForm" label-width="120px"  :rules="rules">

          <el-form-item label="机构名称" prop="deptId" style="margin-left: -30px;" >
-            <el-select v-model="deviceInfo.deptId" placeholder="请选择机构" @change="chooseDept(deviceInfo.deptId)" style="width: 100%">
+            <el-select v-model="deviceInfo.deptId" placeholder="请选择机构名称" @change="chooseDept(deviceInfo.deptId)" style="width: 100%">
              <el-option
                v-for="item in deptListSelect"
                :key="item.deptId"
@ -155,7 +155,7 @@
            </el-select>
          </el-form-item>
          <el-form-item label="支付通道" prop="paymentChannel" style="margin-left: -30px;">
-            <el-select v-model="deviceInfo.paymentChannel" placeholder="请选择支付通道" clearable style="width: 100%">
+            <el-select v-model="deviceInfo.paymentChannel" placeholder="请选择机构支付通道" clearable style="width: 100%">
              <el-option
                v-for="dict in dict.type.payment_channel"
                :key="dict.value"
@ -164,23 +164,23 @@
              />
            </el-select>
          </el-form-item>
-          <el-form-item label="机构号" prop="" v-if="deviceInfo.paymentChannel!='富友'" style="margin-left: -30px;">
+          <!-- <el-form-item label="机构号" prop="" v-if="deviceInfo.paymentChannel!='富友'" style="margin-left: -30px;">
            <el-input v-model="deviceInfo.insCd" style="width: 100%"></el-input>
          </el-form-item>
          <el-form-item label="机构号" prop="insCd" v-else style="margin-left: -30px;">
            <el-input v-model="deviceInfo.insCd" style="width: 100%"></el-input>
-          </el-form-item>
+          </el-form-item> -->
          <el-form-item label="公钥" prop="publicKey" style="margin-left: -30px;">
-            <el-input v-model="deviceInfo.publicKey" style="width: 100%"></el-input>
+            <el-input v-model="deviceInfo.publicKey" placeholder="请输入支付通道的公钥" style="width: 100%"></el-input>
          </el-form-item>
          <el-form-item label="私钥" prop="privateKey" style="margin-left: -30px;">
-            <el-input v-model="deviceInfo.privateKey" style="width: 100%"></el-input>
+            <el-input v-model="deviceInfo.privateKey" placeholder="请输入支付通道的私钥" style="width: 100%"></el-input>
          </el-form-item>
          <el-form-item label="联系人" prop="contact" style="margin-left: -30px;">
-            <el-input v-model="deviceInfo.contact" style="width: 100%"></el-input>
+            <el-input v-model="deviceInfo.contact" placeholder="请输入负责人姓名" style="width: 100%"></el-input>
          </el-form-item>
          <el-form-item label="联系方式" prop="information" style="margin-left: -30px;">
-            <el-input v-model="deviceInfo.information" style="width: 100%"></el-input>
+            <el-input v-model="deviceInfo.information" placeholder="请输入负责人联系方式" style="width: 100%"></el-input>
          </el-form-item>
          <el-form-item label="支付通道状态" prop="appStatus" style="margin-left: -25px;" >
            <el-switch
@ -341,17 +341,17 @@ export default {
    handleAdd(e) {
      this.clean()
      this.open = true;
-      this.title = "增加支付参数"
+      this.title = "新增支付参数"
      // this.selectChildByDeptIdApi();
    },
    edit(e) {
      this.clean()
      // this.open = true;
-      // this.title = "编辑支付参数"
+      // this.title = "支付参数"
      // this.deviceInfo = e
      getPaymentParameter(e.id).then(res => {
        this.open = true;
-        this.title = "编辑支付参数"
+        this.title = "修改支付参数"
        this.deviceInfo = res.data
      })
    },
--- a/fuintAdmin_zt/src/views/system/notify/page/mode.vue
+++ b/fuintAdmin_zt/src/views/system/notify/page/mode.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" style="padding: 10px">
    <div class="card-change" style="min-height: 80vh;">
      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
        <el-form-item label="" prop="notificationName">
@ -113,7 +113,7 @@

        <!-- 通知模板 -->
        <el-form-item label="通知模板" prop="templateContent" style="margin-left: -30px;">
-          <el-input type="textarea" v-model="form.templateContent"  :rows="3" placeholder="请输入通知内容" :maxlength="200" show-word-limit 
+          <el-input type="textarea" v-model="form.templateContent"  :rows="3" placeholder="请输入通知内容" :maxlength="200" show-word-limit
                          style="width: 100%"></el-input>
          <div>
            <span @click = "insertText('{系统到期日期}')">{系统到期日期}</span>
@ -125,7 +125,7 @@

        <!-- 接收角色 -->
        <el-form-item label="接收角色" prop="recipientRoles" style="margin-left: -30px;">
-          <el-select v-model="form.recipientRoles" multiple placeholder="请选择角色" style="width: 100%">
+          <el-select v-model="form.recipientRoles" multiple placeholder="请选择角色（可多选）" style="width: 100%">
            <el-option v-for="item in dutyList1" :label="item.dutyName" :value="item.dutyId" ></el-option>
          </el-select>
        </el-form-item>
@ -351,12 +351,12 @@ export default {
      this.open = true;
      this.getDutyList()

-      this.title = "增加通知模板"
+      this.title = "新增通知模板"
    },
    edit(e) {
      this.clean()
      this.open = true;
-      this.title = "编辑通知模板"
+      this.title = "修改通知模板"
      this.getDutyList()

      this.form = e
--- a/fuintAdmin_zt/src/views/system/notify/page/record.vue
+++ b/fuintAdmin_zt/src/views/system/notify/page/record.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" style="padding: 10px">
    <div class="card-change" style="min-height: 80vh;">
      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
        <el-form-item label="" prop="deptName">
@ -107,7 +107,6 @@
      />

    </div>
-
    <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="27%" append-to-body>
      <el-form ref="form" :model="form" label-width="120px" :rules="rules" >
        <!-- 通知名称 -->
@ -429,7 +428,7 @@ export default {
    edit(e) {
      this.cleanForm()
      this.open = true;
-      this.title = "编辑通知"
+      this.title = "修改通知"
      this.getDutyList()

      this.form = JSON.parse(JSON.stringify(e));
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/entity/FleetLinesChange.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/entity/FleetLinesChange.java
@ -67,9 +67,6 @@ public class FleetLinesChange implements Serializable {
    @ApiModelProperty(value = "被调整额度的用户id")
    private Integer userId;

-    @ApiModelProperty(value = "订单号")
-    private String orderNo;
-


 }
--- a/fuintCashierWeb/src/layout/components/AppMain.vue
+++ b/fuintCashierWeb/src/layout/components/AppMain.vue
@ -51,7 +51,7 @@ export default {
 // fix css style bug in open el-dialog
 .el-popup-parent--hidden {
  .fixed-header {
-    padding-right: 17px;
+    //padding-right: 17px;
  }
 }
 </style>
--- a/pos-uni/uni_modules/uview-ui/libs/config/zIndex.js
+++ b/pos-uni/uni_modules/uview-ui/libs/config/zIndex.js
@ -13,7 +13,7 @@ export default {
    // popup包含popup，actionsheet，keyboard，picker的值
    popup: 10075,
    mask: 10070,
-    navbar: 980,
+    : 980,
    topTips: 975,
    sticky: 970,
    indexListSticky: 965