From 4078f4b6519708b7a0f2ab7beb699b30c801ccb0 Mon Sep 17 00:00:00 2001
From: "DESKTOP-369JRHT\\12997" <9>
Date: Wed, 13 Nov 2024 15:21:38 +0800
Subject: [PATCH] 11.13

---
 .../runningWater/tab/oilDepot.vue             |  2 +-
 fuintAdmin/src/views/fleet/index.vue          |  1 +
 fuintAdmin/src/views/fleet/tab/fleetInfo.vue  |  5 +--
 .../src/views/fleet/tab/fleetMember.vue       | 26 ++++++-------
 fuintAdmin_zt/src/views/setting/pay/index.vue | 39 ++-----------------
 5 files changed, 21 insertions(+), 52 deletions(-)

diff --git a/fuintAdmin/src/views/financialStatement/runningWater/tab/oilDepot.vue b/fuintAdmin/src/views/financialStatement/runningWater/tab/oilDepot.vue
index 7cd348561..4b2665ae3 100644
--- a/fuintAdmin/src/views/financialStatement/runningWater/tab/oilDepot.vue
+++ b/fuintAdmin/src/views/financialStatement/runningWater/tab/oilDepot.vue
@@ -278,7 +278,7 @@ import {getInstituionListApi3} from "../../../../api/allOrder";
 .container{
   background: #f4f5f9;
   box-sizing: border-box;
-  padding-bottom: 8px;
+  padding-bottom: 0px;
 }
   .app-top{
     width: 100%;
diff --git a/fuintAdmin/src/views/fleet/index.vue b/fuintAdmin/src/views/fleet/index.vue
index 6749a6f43..04fb0065e 100644
--- a/fuintAdmin/src/views/fleet/index.vue
+++ b/fuintAdmin/src/views/fleet/index.vue
@@ -85,6 +85,7 @@ export default {
 }
 .nbox{
   margin-right: 30px;
+  cursor: pointer;
 }
 .fount-box{
   font-size: 14px;
diff --git a/fuintAdmin/src/views/fleet/tab/fleetInfo.vue b/fuintAdmin/src/views/fleet/tab/fleetInfo.vue
index 5f33b73b4..36aa420b9 100644
--- a/fuintAdmin/src/views/fleet/tab/fleetInfo.vue
+++ b/fuintAdmin/src/views/fleet/tab/fleetInfo.vue
@@ -1,6 +1,6 @@
 <!-- 收银台订单-->
 <template>
-  <div style="box-sizing: border-box;padding: 10px; background: #f6f8f9;">
+  <div style="box-sizing: border-box;padding: 10px; background: #f6f8f9;padding-bottom: 0px">
     <div class="bor_s" shadow="never">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
         <el-form-item label="" prop="fleetName" style="width: 180px">
@@ -477,7 +477,7 @@ export default {
 
 .table-box {
   width: 100%;
-  height: 70vh;
+  height: 73vh;
   overflow: auto;
   scrollbar-width: none;
 }
@@ -541,6 +541,5 @@ export default {
   background: #fff;
   box-sizing: border-box;
   padding: 15px;
-  height: 85vh;
 }
 </style>
diff --git a/fuintAdmin/src/views/fleet/tab/fleetMember.vue b/fuintAdmin/src/views/fleet/tab/fleetMember.vue
index 408727659..8a299afe4 100644
--- a/fuintAdmin/src/views/fleet/tab/fleetMember.vue
+++ b/fuintAdmin/src/views/fleet/tab/fleetMember.vue
@@ -302,7 +302,8 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <div style="margin: 50px 0;display: flex">
+          <div style="margin: 15px 0;display: flex">
+            <div style="font-weight: bold;margin-left: 10px">会员导入</div>
           <el-upload
             class="upload-demo"
             v-loading="uploading"
@@ -310,9 +311,9 @@
             :headers="headers"
             :limit="1"
             :on-change="handleChange"
-            style="margin-left: 50px;width: 200px"
+            style="margin-left: 5px;width: 200px"
             :file-list="fileList">
-            <div style="display: flex;margin-left: 20px">
+            <div style="display: flex;margin-left: 10px">
               <div style="position: relative">
                 <img src="@/assets/images/scimg.png" style="width: 167px;height: 144px;">
                 <div style=" width: 100%; position: absolute;left: 50%;transform: translate(-50%,50%);bottom: 36px">
@@ -320,19 +321,19 @@
                 </div>
               </div>
             </div>
-            <!--            <el-button size="small" type="success" icon="el-icon-upload">点击上传</el-button>-->
-
           </el-upload>
           <div style="margin-top: 120px">
-            <!--                dev-api   fuint-application-->
-            <a style="margin-left: 50px;color: #00A1FF;"
+            <a style="margin-left: 10px;color: #00A1FF;"
                href="/fuint-application/fleetMember/export"> 导入模板下载.xlsx </a>
           </div>
+          </div>
 
-        </div>
         <div  style="color: grey;font-size: 12px;line-height: 20px">
-        只能上传xls/xlsx文件，批量导入会员手机号，单次最大支持5000个会员手机号认证，请确保用户手机号已注册为油站会员(在会员列表已显示)，否则无法添加成员信息
-      </div>
+          只能上传xls/xlsx文件，批量导入会员手机号，单次最大支持5000个会员手机号认证，请确保用户手机号已注册为油站会员(在会员列表已显示)，否则无法添加成员信息
+        </div>
+
+
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancelMembers">取 消</el-button>
@@ -421,7 +422,6 @@
               </template>
             </el-table-column>
           </el-table>
-
           <pagination
             v-show="total2>0"
             :total="total2"
@@ -826,7 +826,7 @@ export default {
 
 .table-boxs {
   width: 100%;
-  height: 74vh;
+  height: 80vh;
   overflow: auto;
 }
 
@@ -848,6 +848,6 @@ export default {
   box-sizing: border-box;
   padding: 15px;
   padding-bottom: 0px;
-  height: 85vh;
+
 }
 </style>
diff --git a/fuintAdmin_zt/src/views/setting/pay/index.vue b/fuintAdmin_zt/src/views/setting/pay/index.vue
index 4b22eafaf..d497ce6eb 100644
--- a/fuintAdmin_zt/src/views/setting/pay/index.vue
+++ b/fuintAdmin_zt/src/views/setting/pay/index.vue
@@ -3,13 +3,6 @@
     <div class="card-change">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
         <el-form-item label="" prop="deptId">
-<!--          <el-input-->
-<!--            v-model="queryParams.deptId"-->
-<!--            placeholder="请选择机构名称"-->
-<!--            clearable-->
-<!--            style="width: 240px;"-->
-<!--            @keyup.enter.native="handleQuery"-->
-<!--          />-->
           <el-select v-model="queryParams.deptId" placeholder="请选择机构名称" clearable>
             <el-option
               v-for="item in deptListSelect"
@@ -38,7 +31,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="" prop="status">
-          <el-select v-model="queryParams.status" placeholder="请选择支付通道状态" clearable style="width: 200px;margin-right: 15px;">
+          <el-select v-model="queryParams.status" placeholder="请选择支付通道状态" clearable >
             <el-option
               v-for="dict in dict.type.zhzt"
               :key="dict.value"
@@ -57,11 +50,7 @@
           >新增支付参数</el-button>
         </el-form-item>
       </el-form>
-<!--    </el-card>-->
-
-<!--    &lt;!&ndash;    列表信息&ndash;&gt;-->
-<!--    <el-card style="margin-top: 20px" >-->
-      <div style="height: 71vh;overflow: auto">
+      <div style="height: 73vh;overflow: auto;scrollbar-width: none">
       <el-table :data="tableData" style="width: 100%">
         <el-table-column type="index" label="序号"></el-table-column>
         <el-table-column prop="deptName" label="机构名称"></el-table-column>
@@ -132,10 +121,8 @@
       />
 
     </div>
-
     <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="30%" append-to-body>
         <el-form :model="deviceInfo" ref="deviceForm" label-width="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-option
@@ -164,12 +151,6 @@
               />
             </el-select>
           </el-form-item>
-          <!-- <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 label="公钥" prop="publicKey" style="margin-left: -30px;">
             <el-input v-model="deviceInfo.publicKey" placeholder="请输入支付通道的公钥" style="width: 100%"></el-input>
           </el-form-item>
@@ -197,13 +178,9 @@
           <el-button type="primary" @click="submitForm('deviceForm')">保存</el-button>
         </div>
     </el-dialog>
-
   </div>
 </template>
-
 <script>
-
-
 import {deleteAppApi, getAppListApi, saveAppApi, updateAppApi} from "@/api/sys/app";
 import {selectChildByDeptId} from "@/api/system/Site/site";
 import {addMerchantApi, editMerchantRemark, getMerchant, listMerchantPage} from "@/api/payConfig/merchantconfig";
@@ -213,10 +190,8 @@ import {
   getPaymentParameter,
   listPaymentParameterPage
 } from "@/api/payConfig/paymentParameter";
-
 export default {
   name: "printIndex",
-
   dicts: ['zhzt','payment_channel'],
   data() {
     return {
@@ -232,7 +207,6 @@ export default {
         status:"qy"
       },
       deptListSelect:[],
-
       // 是否显示弹出层
       open: false,
       title:"",
@@ -289,7 +263,6 @@ export default {
       })
     },
     getsSubmitDeviceInfo(){},
-
     submitForm(formName) {
       this.$refs[formName].validate(valid => {
         if (valid) {
@@ -360,9 +333,7 @@ export default {
         this.deptListSelect = res.data
       })
     },
-
     del(e) {
-
       this.$confirm('此操作将永久删除该支付参数, 是否继续?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -377,16 +348,12 @@ export default {
             this.getList()
           }
         })
-
       }).catch(() => {
         this.$message({
           type: 'info',
           message: '已取消删除'
         });
       });
-
-
-
     },
     clean() {
       this.deviceInfo= {
@@ -418,6 +385,8 @@ export default {
 }
 .app-container{
   height: 100%;
+  box-sizing: border-box;
+  padding: 10px;
 }
 .single-row {
   overflow: hidden;