From f81228b459a6ac555d34fd6b6b6d316d37247c86 Mon Sep 17 00:00:00 2001
From: "DESKTOP-369JRHT\\12997" <9>
Date: Thu, 14 Nov 2024 13:50:34 +0800
Subject: [PATCH] 11.14

---
 fuintAdmin_zt/src/views/Service/details.vue   | 25 ++-----------
 fuintAdmin_zt/src/views/Service/index.vue     | 18 +++++++--
 .../src/views/components/Service/allOrder.vue | 18 +++------
 .../src/views/components/Service/index.vue    | 20 +++++-----
 .../src/views/components/Service/payment.vue  | 37 +------------------
 .../src/views/components/Service/staff.vue    | 37 +++----------------
 .../src/views/components/Service/way.vue      |  9 +++--
 .../yunyingfenxi/tab/oil.vue                  |  2 +-
 8 files changed, 45 insertions(+), 121 deletions(-)

diff --git a/fuintAdmin_zt/src/views/Service/details.vue b/fuintAdmin_zt/src/views/Service/details.vue
index 4ed7320e8..943858005 100644
--- a/fuintAdmin_zt/src/views/Service/details.vue
+++ b/fuintAdmin_zt/src/views/Service/details.vue
@@ -8,31 +8,12 @@
       {{item.title}}
     </div>
   </div>
+
                  <jcindex :id="id" v-if="tabindex == 0"></jcindex>
                 <payment  :id="id" :deptId="deptId" v-if="tabindex == 1" ></payment>
                   <way :id="id" :deptId="deptId" v-if="tabindex == 2"  ></way>
                   <staff :id="id" :deptId="deptId" v-if="tabindex == 3" ></staff>
                     <allOrder :id="id" v-if="tabindex == 4"></allOrder>
-
-<!--    <el-card >-->
-<!--      <div class="top-box">-->
-<!--        <el-tabs v-model="activeName" @tab-click="handleClick">-->
-<!--          <el-tab-pane label="基本设置" name="first">-->
-<!--             <jcindex :id="id"></jcindex>-->
-<!--          </el-tab-pane>-->
-<!--          <el-tab-pane label="支付配置" name="second">-->
-<!--             <payment  :id="id"></payment>-->
-<!--          </el-tab-pane>-->
-<!--          <el-tab-pane label="员工管理" name="staff">-->
-<!--            <staff :id="id"></staff>-->
-<!--          </el-tab-pane>-->
-<!--          <el-tab-pane label="订单查看" name="allOrder">-->
-<!--            <allOrder :id="id"></allOrder>-->
-<!--          </el-tab-pane>-->
-
-<!--        </el-tabs>-->
-<!--      </div>-->
-<!--    </el-card >-->
     </div>
     </div>
 
@@ -111,7 +92,7 @@
 
 <style scoped >
   .ap-container{
-    height: 100vh;
+
 
       background: #f9f9f9;
       box-sizing: border-box;
@@ -124,7 +105,7 @@
     width: 100%;
     background: #fff;
     box-sizing: border-box;
-    padding: 10px 25px;
+    padding: 10px;
     padding-bottom: 0px;
     display: flex;
     align-items: center;
diff --git a/fuintAdmin_zt/src/views/Service/index.vue b/fuintAdmin_zt/src/views/Service/index.vue
index e928b5b97..3a5734084 100644
--- a/fuintAdmin_zt/src/views/Service/index.vue
+++ b/fuintAdmin_zt/src/views/Service/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <div class="card-change">
+    <div class="c_box">
       <div class="top-box">
         <div class="d-s">
           <el-input v-model="queryParams.name" placeholder="请输入油站名称" style="width: 200px;margin-right: 15px;"></el-input>
@@ -50,7 +50,7 @@
         </div>
 
       </div>
-      <div style="width: 100%;height: 68vh;overflow: auto">
+      <div style="width: 100%;height: 74vh;overflow: auto;scrollbar-width: none">
 
       <el-table
         :data="tableData"
@@ -159,6 +159,8 @@
           </template>
         </el-table-column>
       </el-table>
+
+      </div>
       <pagination
         v-show="total>0"
         :total="total"
@@ -166,8 +168,6 @@
         :limit.sync="queryParams.pageSize"
         @pagination="getStoreList"
       />
-      </div>
-
     </div>
 
 <!--    <el-card style="margin-top: 20px" v-for="(item,index) in arrlist" :key="index">-->
@@ -380,6 +380,8 @@ export default {
   height: 100%;
   /* height: 100vh; */
   background: #f9f9f9;
+  box-sizing: border-box;
+  padding: 10px;
 }
 .ding-top{
   width: 100%;
@@ -469,5 +471,13 @@ export default {
 .d-s{
   display: flex;
   align-items: center;
+}
+.c_box{
+  background: #fff;
+  box-sizing: border-box;
+  padding: 10px;
+  border: 6px;
+
+
 }
 </style>
diff --git a/fuintAdmin_zt/src/views/components/Service/allOrder.vue b/fuintAdmin_zt/src/views/components/Service/allOrder.vue
index 54feb3fc9..5e77920e8 100644
--- a/fuintAdmin_zt/src/views/components/Service/allOrder.vue
+++ b/fuintAdmin_zt/src/views/components/Service/allOrder.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-containers">
 
     <div class="bai-box" >
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
@@ -83,7 +83,7 @@
 
         </el-form-item>
       </el-form>
-      <div style="width: 100%;height: 65vh;overflow: auto">
+      <div style="width: 100%;height: 73vh;overflow: auto">
       <el-table ref="tables" border v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
         <el-table-column label="序号" align="center" type="index" />
         <el-table-column label="订单号" align="center" prop="orderNo"  width="220"/>
@@ -375,23 +375,15 @@
 </script>
 
 <style scoped>
-  .app-container{
+  .app-containers{
     width: 100%;
     height: 100%;
     /* height: 100vh; */
     background: #f9f9f9;
-  }
-  .pagin-box{
-    background: white;
     box-sizing: border-box;
-    padding: 20px;
-  }
-  .baoguo{
-    background: white;
-    box-sizing: border-box;
-    padding: 20px;
-    margin-bottom: 20px;
+    padding: 10px;
   }
+
   .bai-box{
     background: #fff;
     box-sizing: border-box;
diff --git a/fuintAdmin_zt/src/views/components/Service/index.vue b/fuintAdmin_zt/src/views/components/Service/index.vue
index 8bc15f744..345d8b9cf 100644
--- a/fuintAdmin_zt/src/views/components/Service/index.vue
+++ b/fuintAdmin_zt/src/views/components/Service/index.vue
@@ -1,6 +1,6 @@
 <template>
 
-      <div style="width: 100%;height: 100%;position: relative;background: #f9f9f9; ">
+      <div style="width: 100%;height: 100%; box-sizing: border-box;padding: 10px; padding-bottom: 0px; position: relative;background: #f9f9f9; ">
         <div class="box-h">
         <div class="dis-box" style="align-items: center; margin-bottom: 15px">
           <div class="gang"></div>
@@ -53,15 +53,15 @@
         </div>
         <div class="bottom-box2">
           <div style="height: 200px; width: 300px;">
-            <span class="demonstration" >营业执照</span>
+            <div class="demonstration" style="font-weight: bold;margin-bottom: 10px" >营业执照</div>
             <br/>
 
             <el-image v-if="from.license" :src="imagePath+from.license" style="margin-top: 10px;width: 220px;height: 135px;border-radius: 3%;" ></el-image>
             <el-image v-else src="https://cube.elemecdn.com/e/fd/0fc7d20532fdaf769a25683617711png.png" ></el-image>
 
           </div>
-          <div style="height: 1000px; width: 1000px; margin-left: 30px;">
-            <span class="demonstration">经营照</span>
+          <div style=" width: 1000px; margin-left: 30px;">
+            <div class="demonstration" style="font-weight: bold;margin-bottom: 10px" >经营照</div>
             <br/>
             <div style="width: 1220px;display: flex">
               <el-image v-for="(item, index) in from.doorstepPhoto" v-if="from.doorstepPhoto[0]" :src="imagePath+item" style="margin-top: 10px;margin-right:10px;width: 220px;height: 135px;display: flex;border-radius: 3%; "></el-image>
@@ -150,6 +150,7 @@
                       :auto-upload="true"
                       :show-file-list="false"
                       :headers="uploadHeader"
+                      style="margin-top: 15px"
                       :on-success="handleUploadSuccessLicence">
                     <img
                       v-if="this.from.license"
@@ -170,7 +171,7 @@
                       :auto-upload="true"
                       :on-preview="handlePictureCardPreview"
                       :on-success="handleUploadSuccessGift"
-                      style="width: 700px; flex-wrap: wrap;"   
+                      style="width: 700px; flex-wrap: wrap;"
                       :on-remove="handleRemove"
                       :before-upload="beforeUpload"
                         >
@@ -181,7 +182,7 @@
                   </el-dialog>
                 </el-form-item>
               </el-col>
- 
+
             </el-row>
           </el-form>
           <div slot="footer" class="dialog-footer" style="text-align: center;">
@@ -215,7 +216,6 @@
   import { parseTime } from "@/utils/fuint";
   import BigNumber from 'bignumber.js';
   import { getToken } from '@/utils/auth'
-
   export default {
     name: 'index',
     props: ["id"],
@@ -545,10 +545,10 @@
   }
   .box-h{
     background: rgb(255, 255, 255);
-    width: 98%;
-    margin: 20px auto;
+    width: 100%;
+    height: 82vh;
     box-sizing: border-box;
-    padding: 20px;
+    padding: 10px;
   }
   .bottom-box{
     width: 1600px;
diff --git a/fuintAdmin_zt/src/views/components/Service/payment.vue b/fuintAdmin_zt/src/views/components/Service/payment.vue
index a30cb06a7..a5e3eae1f 100644
--- a/fuintAdmin_zt/src/views/components/Service/payment.vue
+++ b/fuintAdmin_zt/src/views/components/Service/payment.vue
@@ -221,12 +221,6 @@
             clearable
             style="width: 100%"
           >
-<!--            <el-option-->
-<!--              v-for="dict in dict.type.payment_channel"-->
-<!--              :key="dict.value"-->
-<!--              :label="dict.label"-->
-<!--              :value="dict.value"-->
-<!--            />-->
             <el-option
               v-for="(item,index) in payChannel"
               :key="index"
@@ -296,7 +290,6 @@
                         style="width: 350px" disabled></el-input>
             </el-form-item>
             <el-form-item label="交易占比" :label-width="formLabelWidth" style="margin-left: -20px;">
-
               <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>
@@ -359,17 +352,13 @@
             <div style="width: 15px"></div>
           </div>
           <div style="margin-left: 80px">启用成功后其他规则的规则状态变为停用！</div>
-
-
         </el-form-item>
-
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="Enable = false">取 消</el-button>
         <el-button type="primary" @click="submitEnable('qy')">确 定</el-button>
       </div>
     </el-dialog>
-
     <el-dialog :title="title" :visible.sync="dialogVisible" width="30%">
       <el-form :model="form1" ref="form1" :rules="rules">
         <el-form-item label="支付通道" :label-width="formLabelWidth" prop="merchantName" width="300px">
@@ -379,12 +368,6 @@
             clearable
             style="width: 240px"
           >
-<!--            <el-option-->
-<!--              v-for="dict in dict.type.payment_channel"-->
-<!--              :key="dict.value"-->
-<!--              :label="dict.label"-->
-<!--              :value="dict.value"-->
-<!--            />-->
             <el-option
               v-for="(item,index) in payChannel"
               :key="index"
@@ -405,7 +388,6 @@
         <el-button type="primary" @click="submitMerchant">确 定</el-button>
       </span>
     </el-dialog>
-
     <el-dialog :title="title" :visible.sync="show" width="25%" style="margin-top: 200px">
       <span>请输入备注信息</span>
       <el-input placeholder="请输入备注信息" style="margin-top: 20px"
@@ -414,7 +396,6 @@
       </el-input>
       <span slot="footer" class="dialog-footer">
         <el-button @click="show = false">取 消</el-button>
-
         <el-button type="primary" @click="submitRemark">确 定</el-button>
       </span>
     </el-dialog>
@@ -447,20 +428,6 @@
           </el-input>
           <div>交易占比满足规则后切换到下一个支付通道</div>
         </el-form-item>
-        <!--        <el-form-item label="参与次数" :label-width="formLabelWidth">-->
-        <!--          <el-radio-group v-model="form.resource" >-->
-        <!--            <el-radio label="不固定次数"></el-radio>-->
-        <!--            <el-radio label="固定次数"></el-radio>-->
-        <!--          </el-radio-group>-->
-        <!--          <div>是否限制当前配置在生效期间内的参与次数</div>-->
-        <!--        </el-form-item>-->
-
-        <!--        <el-form-item label="排序" :label-width="formLabelWidth">-->
-        <!--          <el-input-number v-model="form.num" controls-position="right"  :min="1" :max="100"></el-input-number>-->
-        <!--          <div>数值越大顺序越在前</div>-->
-        <!--        </el-form-item>-->
-
-
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="clearOil">取 消</el-button>
@@ -1025,12 +992,12 @@ export default {
   width: 100%;
   background: #f9f9f9;
   box-sizing: border-box;
-  padding: 20px;
+  padding: 10px;
 }
 
 .new-box {
   width: 100%;
-  height: 80vh;
+  height: 82vh;
   overflow: auto;
   background: #fff;
   box-sizing: border-box;
diff --git a/fuintAdmin_zt/src/views/components/Service/staff.vue b/fuintAdmin_zt/src/views/components/Service/staff.vue
index efad67f6a..cbaa15c1e 100644
--- a/fuintAdmin_zt/src/views/components/Service/staff.vue
+++ b/fuintAdmin_zt/src/views/components/Service/staff.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-containers">
-    <div class="bai-box" style="margin-top: 20px">
+    <div class="bai-box" >
       <div class="top-box">
         <div class="d-s">
           <el-input v-model="queryParams.realName" placeholder="请输入用户姓名"
@@ -34,11 +34,9 @@
             @click="handleAdd"
           >新增员工
           </el-button>
-
         </div>
-
       </div>
-      <div style="width: 100%;height: 64vh;overflow: auto">
+      <div style="width: 100%;height: 74vh;overflow: auto">
       <el-table ref="tables" border v-loading="loading" :data="list" @selection-change="handleSelectionChange"
                 :default-sort="defaultSort" @sort-change="handleSortChange">
         <el-table-column
@@ -65,17 +63,11 @@
             </el-switch>
           </template>
         </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"/>
           </template>
         </el-table-column>
-        <!--        <el-table-column label="收款通知" align="center" prop="notice">-->
-        <!--          <template slot-scope="scope">-->
-        <!--            <dict-tag :options="dict.type.notice" :value="scope.row.notice"/>-->
-        <!--          </template>-->
-        <!--        </el-table-column>-->
         <el-table-column label="创建时间" align="center" prop="createTime">
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -111,7 +103,6 @@
         @pagination="getList"
       />
     </div>
-
     <!-- 添加或修改对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="30%" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
@@ -130,20 +121,15 @@
         <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" 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" 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" 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" style="margin-left: -30px;">
           <el-select v-model="form.roleId" placeholder="请选择角色" style="width: 100%">
             <el-option
@@ -154,7 +140,6 @@
             ></el-option>
           </el-select>
         </el-form-item>
-
         <el-form-item label="账号状态" prop="status" style="margin-left: -30px;">
           <el-switch
             v-model="form.status"
@@ -164,17 +149,7 @@
             inactive-color="#ff4949">
           </el-switch>
         </el-form-item>
-
-
         <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"-->
-          <!--                  :key="dict.value"-->
-          <!--                  :label="dict.label"-->
-          <!--                  :value="dict.value"-->
-          <!--                />-->
-          <!--              </el-select>-->
           <div style="display: flex;" v-if="form.isRefuel=='xs'" @click="form.isRefuel='yc'">
             <div>
               <img src="@/assets/images/danxuan_c.png"/>
@@ -195,11 +170,8 @@
               <span class="text_49">隐藏</span>
             </div>
           </div>
-
           <span class="text_51" >*&nbsp;若用户的一键加油设置为隐藏，则收银台无法选择该员工</span>
         </el-form-item>
-
-
       </el-form>
       <div slot="footer" class="dialog-footer" style="text-align: center;">
         <el-button @click="cancel">取 消</el-button>
@@ -614,11 +586,12 @@ export default {
 
 <style scoped>
 .app-containers {
-  width: 98%;
+  width: 99%;
   height: 100%;
   /* height: 100vh; */
   background: #f9f9f9;
-  margin: 20px auto;
+  margin: 10px auto;
+  margin-bottom: 0px;
 }
 
 .bai-box {
diff --git a/fuintAdmin_zt/src/views/components/Service/way.vue b/fuintAdmin_zt/src/views/components/Service/way.vue
index 0bd34adfd..0daabeaf4 100644
--- a/fuintAdmin_zt/src/views/components/Service/way.vue
+++ b/fuintAdmin_zt/src/views/components/Service/way.vue
@@ -115,11 +115,12 @@ export default {
 .container-app{
   background: #fff;
   box-sizing: border-box;
-  padding: 20px;
-  width: 98%;
-  height: 80vh;
+  padding: 10px;
+  width: 99%;
+  height: 83vh;
   overflow: auto;
-  margin: 20px auto;
+  margin: 10px auto;
+  margin-bottom: 0px;
 }
 .d-s{
   display: flex;
diff --git a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/oil.vue b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/oil.vue
index 9fddf5ee6..45b4753ea 100644
--- a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/oil.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/oil.vue
@@ -12,7 +12,7 @@
             v-model="value2"
             style="height:32px"
 
-            type="datetimerange"
+            type="daterange"
             range-separator="至"
             value-format="yyyy-MM-dd HH:mm:ss"
             start-placeholder="开始日期"