From 88d7e50f6ef8464ee0015e743d44b5bbcd4e9db3 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Wed, 12 Jun 2024 11:17:31 +0800
Subject: [PATCH] fix

---
 src/pages/manage/list/agent/agent.vue         | 233 +++++++++---------
 src/pages/manage/list/agent/telRate.vue       | 138 +++--------
 src/pages/manage/list/agent/waterRate.vue     | 125 +++-------
 .../manage/list/foreignExchange/puchasing.vue |   8 +-
 .../list/foreignExchange/settlement.vue       |  18 +-
 5 files changed, 203 insertions(+), 319 deletions(-)

diff --git a/src/pages/manage/list/agent/agent.vue b/src/pages/manage/list/agent/agent.vue
index c5f3ec0..125e1a5 100644
--- a/src/pages/manage/list/agent/agent.vue
+++ b/src/pages/manage/list/agent/agent.vue
@@ -2,10 +2,7 @@
   <!-- 零存整取 -->
   <div class="wrap wrap2">
     <div class="nav">
-      <el-menu :default-active="activeIndex"
-               class="el-menu-demo"
-               mode="horizontal"
-               @select="handleSelect">
+      <el-menu :default-active="activeIndex" class="el-menu-demo" mode="horizontal" @select="handleSelect">
         <el-menu-item index="1">代收水费</el-menu-item>
         <el-menu-item index="2">代收电费</el-menu-item>
         <el-menu-item index="3">代收电话费</el-menu-item>
@@ -15,32 +12,23 @@
     <MyTitle :titleArr="['代理业务', text]" />
 
     <!-- 代收水费 -->
-    <waterRate v-if="activeIndex==='1'"></waterRate>
+    <waterRate v-if="activeIndex === '1'"></waterRate>
     <!-- 代收电费 -->
-    <electricRate v-if="activeIndex==='2'"></electricRate>
+    <electricRate v-if="activeIndex === '2'"></electricRate>
     <!-- 代收电话费 -->
-    <telRate v-if="activeIndex==='3'"></telRate>
-
-    <el-dialog style="margin-top:10vh"
-               :visible.sync="visible"
-               :modal="false"
-               width="40%"
-               :close-on-click-modal="false"
-               :show-close="false"
-               custom-class="data-dia">
-      <div slot="title"
-           class="dia-header">
+    <telRate v-if="activeIndex === '3'"></telRate>
+
+    <el-dialog style="margin-top:10vh" :visible.sync="visible" :modal="false" width="40%" :close-on-click-modal="false"
+      :show-close="false" custom-class="data-dia">
+      <div slot="title" class="dia-header">
         <div class="data-title">提交</div>
       </div>
       <div class="popBody">
         <h2>本业务需要授权</h2>
       </div>
       <div class="popBtns">
-        <el-button class="close btn"
-                   @click="visible = false">取 消</el-button>
-        <el-button class="sure btn"
-                   type="primary"
-                   @click="visible = false">确 定</el-button>
+        <el-button class="close btn" @click="visible = false">取 消</el-button>
+        <el-button class="sure btn" type="primary" @click="visible = false">确 定</el-button>
       </div>
     </el-dialog>
   </div>
@@ -101,104 +89,119 @@ export default {
 
 <style lang="scss" scoped>
 .wrap {
-    width: 100%;
-    display: flex;
-    flex-direction: column;
-    overflow: hidden;
-    padding: 24px 0 24px 24px;
-    .nav {
-        /deep/ .el-menu.el-menu--horizontal {
-            border: 0;
-        }
-        /deep/ .el-menu--horizontal > .el-menu-item.is-active {
-            border: 2px solid #568df2;
-            border-radius: 10px;
-            color: #000;
-        }
-        /deep/ .el-menu--horizontal > .el-menu-item {
-            border: 2px solid transparent;
-            border-radius: 10px;
-            margin-right: 10px;
-            height: 30px;
-            line-height: 28px;
-        }
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+  padding: 24px 0 24px 24px;
+
+  .nav {
+    /deep/ .el-menu.el-menu--horizontal {
+      border: 0;
+    }
+
+    /deep/ .el-menu--horizontal>.el-menu-item.is-active {
+      border: 2px solid #568df2;
+      border-radius: 10px;
+      color: #000;
+    }
+
+    /deep/ .el-menu--horizontal>.el-menu-item {
+      border: 2px solid transparent;
+      border-radius: 10px;
+      margin-right: 10px;
+      height: 30px;
+      line-height: 28px;
     }
-    .title {
-        height: 60px;
-        display: flex;
-        align-items: center;
-        font-size: 20px;
-        padding-left: 0px;
-        margin-top: 10px;
+  }
+
+  .title {
+    height: 60px;
+    display: flex;
+    align-items: center;
+    font-size: 20px;
+    padding-left: 0px;
+    margin-top: 10px;
+  }
+
+  .body {
+    margin-top: 50px;
+    overflow: auto;
+
+    .idCard {
+      border-radius: 5px;
+      background: #cfddff;
+      text-align: center;
+      height: 40px;
+      line-height: 40px;
+      font-size: 18px;
+      color: #6191ff;
     }
-    .body {
-        margin-top: 50px;
-        overflow: auto;
-        .idCard {
-            border-radius: 5px;
-            background: #cfddff;
-            text-align: center;
-            height: 40px;
-            line-height: 40px;
-            font-size: 18px;
-            color: #6191ff;
-        }
-        .add {
-            position: relative;
-            &::after {
-                content: '';
-                display: block;
-                position: absolute;
-                right: 3%;
-                top: -4%;
-                border: 1px dashed #cfddff;
-                width: 88%;
-                height: 268px;
-            }
-            .addBtn {
-                position: absolute;
-                left: 0;
-                top: 50%;
-                transform: translate(50%, -50%);
-                font-size: 22px;
-            }
-        }
+
+    .add {
+      position: relative;
+
+      &::after {
+        content: '';
+        display: block;
+        position: absolute;
+        right: 3%;
+        top: -4%;
+        border: 1px dashed #cfddff;
+        width: 88%;
+        height: 268px;
+      }
+
+      .addBtn {
+        position: absolute;
+        left: 0;
+        top: 50%;
+        transform: translate(50%, -50%);
+        font-size: 22px;
+      }
     }
-    .submitBtn {
-        position: relative;
-        width: 300px;
-        font-size: 18px;
-        height: 45px;
-        margin-top: 50px;
-        border-radius: 10px;
-        bottom: 10px;
-        left: 50%;
-        transform: translate(-50%, -50%);
+  }
+
+  .submitBtn {
+    position: relative;
+    width: 300px;
+    font-size: 18px;
+    height: 45px;
+    margin-top: 50px;
+    border-radius: 10px;
+    bottom: 10px;
+    left: 50%;
+    transform: translate(-50%, -50%);
+  }
+
+  .popBody {
+    min-height: 200px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    text-align: center;
+  }
+
+  .popBtns {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+
+    .btn {
+      width: 180px;
+      border-radius: 10px;
+      font-size: 18px;
     }
-    .popBody {
-        min-height: 200px;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        text-align: center;
+
+    .close {
+      background: #cfdeff;
+      color: #6191ff;
     }
-    .popBtns {
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        .btn {
-            width: 180px;
-            border-radius: 10px;
-            font-size: 18px;
-        }
-        .close {
-            background: #cfdeff;
-            color: #6191ff;
-        }
-        .sure {
-            background: #6191ff;
-            color: #fff;
-        }
+
+    .sure {
+      background: #6191ff;
+      color: #fff;
     }
+  }
 }
 </style>
diff --git a/src/pages/manage/list/agent/telRate.vue b/src/pages/manage/list/agent/telRate.vue
index 571dd8a..b093ede 100644
--- a/src/pages/manage/list/agent/telRate.vue
+++ b/src/pages/manage/list/agent/telRate.vue
@@ -1,136 +1,79 @@
 <!-- 代收电话费 -->
 <template>
   <div class="body">
-    <el-row :gutter="20"
-            style="margin: 0">
-      <el-form ref="form"
-               :model="form"
-               label-width="120px"
-               :rules="rules">
-        <el-col :span="10"
-                :offset="1">
-          <el-form-item label="证件类型"
-                        prop="certificateType">
-            <el-select v-model.trim="form.certificateType"
-                       placeholder="请选择"
-                       ref="certificateType">
-              <el-option label="身份证"
-                         :value="83"> </el-option>
+    <el-row :gutter="20" style="margin: 0">
+      <el-form ref="form" :model="form" label-width="120px" :rules="rules">
+        <el-col :span="10" :offset="1">
+          <el-form-item label="证件类型" prop="certificateType">
+            <el-select v-model.trim="form.certificateType" placeholder="请选择" ref="certificateType">
+              <el-option label="身份证" :value="83"> </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="账号"
-                        required>
-            <div v-if='!cardNumberJudge'
-                 class="idCard"
-                 @click="popUp2('刷卡器')">
+          <el-form-item label="账号" required>
+            <div v-if='!cardNumberJudge' class="idCard" @click="popUp2('刷卡器')">
               <p>请刷卡</p>
             </div>
             <div v-else>
-              <el-input @blur="getDataBlur"
-                        maxlength="20"
-                        ref="voucherNumber"
-                        disabled
-                        :value="form.voucherNumber"
-                        @input="(val) => inputListen(val, form, 'voucherNumber')"></el-input>
+              <el-input @blur="getDataBlur" maxlength="20" ref="voucherNumber" disabled :value="form.voucherNumber"
+                @input="(val) => inputListen(val, form, 'voucherNumber')"></el-input>
             </div>
             <!-- <el-input @blur="getDataBlur" maxlength="20" ref="voucherNumber" :value="form.voucherNumber" @input="(val) => inputListen(val, form, 'voucherNumber')"></el-input> -->
           </el-form-item>
 
-          <el-form-item label="缴费单位"
-                        required>
-            <el-input :value="form.mailbox"
-                      @input="val => mailBoxListen(val, form, 'mailbox')"
-                      maxlength="30"
-                      ref="mailbox"></el-input>
+          <el-form-item label="缴费单位" required>
+            <el-input :value="form.mailbox" @input="val => mailBoxListen(val, form, 'mailbox')" maxlength="30"
+              ref="mailbox"></el-input>
           </el-form-item>
-          <el-form-item label="缴费号码"
-                        required>
-            <el-input :value="form.mailbox"
-                      @input="val => mailBoxListen(val, form, 'mailbox')"
-                      maxlength="30"
-                      ref="mailbox"></el-input>
+          <el-form-item label="缴费号码" required>
+            <el-input :value="form.mailbox" @input="val => mailBoxListen(val, form, 'mailbox')" maxlength="30"
+              ref="mailbox"></el-input>
           </el-form-item>
-          <el-form-item label="每月代扣"
-                        prop="extendPeriod"
-                        required>
-            <el-radio-group v-model.trim="form.extendPeriod"
-                            ref="extendPeriod">
+          <el-form-item label="每月代扣" prop="extendPeriod" required>
+            <el-radio-group v-model.trim="form.extendPeriod" ref="extendPeriod">
               <el-radio :label="90">是</el-radio>
               <el-radio :label="91">否</el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
-        <el-col :span="10"
-                :offset="1">
-          <el-form-item label="证件号码"
-                        required>
-            <div class="idCard"
-                 @click="popUp1('身份证扫描仪')"
-                 v-if='!idNumberJudge'>
+        <el-col :span="10" :offset="1">
+          <el-form-item label="证件号码" required>
+            <div class="idCard" @click="popUp1('身份证扫描仪')" v-if='!idNumberJudge'>
               <p>请刷身份证</p>
             </div>
             <div v-else>
-              <el-input :value="form.idNumber"
-                        disabled
-                        ref="idNumber"></el-input>
+              <el-input :value="form.idNumber" disabled ref="idNumber"></el-input>
             </div>
           </el-form-item>
-          <el-form-item label="客户姓名"
-                        prop="customerName">
-            <el-input ref="customerName"
-                      disabled
-                      :value="form.customerName"
-                      @input="(val) => checkName(val, form, 'customerName')"></el-input>
+          <el-form-item label="客户姓名" prop="customerName">
+            <el-input ref="customerName" disabled :value="form.customerName"
+              @input="(val) => checkName(val, form, 'customerName')"></el-input>
           </el-form-item>
 
-          <el-form-item label="号码类型"
-                        prop="goldLogo">
-            <el-select v-model.trim="form.goldLogo"
-                       placeholder="请选择"
-                       ref="goldLogo">
-              <el-option v-for="item in getSelectList.goldLogoSelectList"
-                         :label="item.options"
-                         :value="item.itemId"
-                         :key="item.itemId"> </el-option>
+          <el-form-item label="号码类型" prop="goldLogo">
+            <el-select v-model.trim="form.goldLogo" placeholder="请选择" ref="goldLogo">
+              <el-option v-for="item in getSelectList.goldLogoSelectList" :label="item.options" :value="item.itemId"
+                :key="item.itemId"> </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="缴费金额"
-                        prop="monthDeposit"
-                        required>
+          <el-form-item label="缴费金额" prop="monthDeposit" required>
             <!-- :value="form.monthDeposit" -->
-            <el-input :value="form.monthDeposit"
-                      maxlength="15"
-                      @input="val => ismoney(val, form, 'monthDeposit')"
-                      ref="monthDeposit"></el-input>
+            <el-input :value="form.monthDeposit" maxlength="15" @input="val => ismoney(val, form, 'monthDeposit')"
+              ref="monthDeposit"></el-input>
           </el-form-item>
-          <el-form-item label="支取密码"
-                        required>
-            <div v-if='!form.drawPassword'
-                 class="idCard"
-                 @click="popUp3('密码器')">
+          <el-form-item label="支取密码" required>
+            <div v-if='!form.drawPassword' class="idCard" @click="popUp3('密码器')">
               <p>请输入密码</p>
             </div>
-            <div v-else
-                 @click="popUp3('密码器')">
-              <el-input :value="form.drawPassword"
-                        ref="drawPassword"
-                        type="password"></el-input>
+            <div v-else @click="popUp3('密码器')">
+              <el-input :value="form.drawPassword" ref="drawPassword" type="password"></el-input>
             </div>
           </el-form-item>
         </el-col>
-        <my-dialog :moduleName="moduleName"
-                   v-if="visible"
-                   :visible.sync="visible"
-                   :showForm="form"
-                   :formName="formName"
-                   @submitIt="submitForm2"
-                   depositNumber='0816' />
+        <my-dialog :moduleName="moduleName" v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName"
+          @submitIt="submitForm2" depositNumber='0816' />
       </el-form>
     </el-row>
-    <el-button @click="submitForm"
-               type="primary"
-               class="submitBtn"
-               v-throttle>提交</el-button>
+    <el-button @click="submitForm" type="primary" class="submitBtn" v-throttle>提交</el-button>
   </div>
   <!-- <need-before v-else :moduleName='needBefore' :unNeed="unNeed" /> -->
 </template>
@@ -479,5 +422,4 @@ export default {
   }
 }
 </script>
-<style lang='scss' scoped>
-</style>
\ No newline at end of file
+<style lang='scss' scoped></style>
\ No newline at end of file
diff --git a/src/pages/manage/list/agent/waterRate.vue b/src/pages/manage/list/agent/waterRate.vue
index ff58d22..4e32c38 100644
--- a/src/pages/manage/list/agent/waterRate.vue
+++ b/src/pages/manage/list/agent/waterRate.vue
@@ -1,125 +1,73 @@
 <!-- 代收水费 -->
 <template>
   <div class="body">
-    <el-row :gutter="20"
-            style="margin: 0">
-      <el-form ref="form"
-               :model="form"
-               label-width="120px"
-               :rules="rules">
-        <el-col :span="10"
-                :offset="1">
-          <el-form-item label="证件类型"
-                        prop="certificateType">
-            <el-select v-model.trim="form.certificateType"
-                       placeholder="请选择"
-                       ref="certificateType">
-              <el-option label="身份证"
-                         :value="83"> </el-option>
+    <el-row :gutter="20" style="margin: 0">
+      <el-form ref="form" :model="form" label-width="120px" :rules="rules">
+        <el-col :span="10" :offset="1">
+          <el-form-item label="证件类型" prop="certificateType">
+            <el-select v-model.trim="form.certificateType" placeholder="请选择" ref="certificateType">
+              <el-option label="身份证" :value="83"> </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="账号"
-                        required>
-            <div v-if='!cardNumberJudge'
-                 class="idCard"
-                 @click="popUp2('刷卡器')">
+          <el-form-item label="账号" required>
+            <div v-if='!cardNumberJudge' class="idCard" @click="popUp2('刷卡器')">
               <p>请刷卡</p>
             </div>
             <div v-else>
-              <el-input @blur="getDataBlur"
-                        maxlength="20"
-                        ref="voucherNumber"
-                        disabled
-                        :value="form.voucherNumber"
-                        @input="(val) => inputListen(val, form, 'voucherNumber')"></el-input>
+              <el-input @blur="getDataBlur" maxlength="20" ref="voucherNumber" disabled :value="form.voucherNumber"
+                @input="(val) => inputListen(val, form, 'voucherNumber')"></el-input>
             </div>
             <!-- <el-input @blur="getDataBlur" maxlength="20" ref="voucherNumber" :value="form.voucherNumber" @input="(val) => inputListen(val, form, 'voucherNumber')"></el-input> -->
           </el-form-item>
 
-          <el-form-item label="缴费单位"
-                        required>
-            <el-input :value="form.mailbox"
-                      @input="val => mailBoxListen(val, form, 'mailbox')"
-                      maxlength="30"
-                      ref="mailbox"></el-input>
+          <el-form-item label="缴费单位" required>
+            <el-input :value="form.mailbox" @input="val => mailBoxListen(val, form, 'mailbox')" maxlength="30"
+              ref="mailbox"></el-input>
           </el-form-item>
-          <el-form-item label="缴费金额"
-                        prop="monthDeposit"
-                        required>
+          <el-form-item label="缴费金额" prop="monthDeposit" required>
             <!-- :value="form.monthDeposit" -->
-            <el-input :value="form.monthDeposit"
-                      maxlength="15"
-                      @input="val => ismoney(val, form, 'monthDeposit')"
-                      ref="monthDeposit"></el-input>
+            <el-input :value="form.monthDeposit" maxlength="15" @input="val => ismoney(val, form, 'monthDeposit')"
+              ref="monthDeposit"></el-input>
           </el-form-item>
-          <el-form-item label="支取密码"
-                        required>
-            <div v-if='!form.drawPassword'
-                 class="idCard"
-                 @click="popUp3('密码器')">
+          <el-form-item label="支取密码" required>
+            <div v-if='!form.drawPassword' class="idCard" @click="popUp3('密码器')">
               <p>请输入密码</p>
             </div>
-            <div v-else
-                 @click="popUp3('密码器')">
-              <el-input :value="form.drawPassword"
-                        ref="drawPassword"
-                        type="password"></el-input>
+            <div v-else @click="popUp3('密码器')">
+              <el-input :value="form.drawPassword" ref="drawPassword" type="password"></el-input>
             </div>
           </el-form-item>
         </el-col>
-        <el-col :span="10"
-                :offset="1">
-          <el-form-item label="证件号码"
-                        required>
-            <div class="idCard"
-                 @click="popUp1('身份证扫描仪')"
-                 v-if='!idNumberJudge'>
+        <el-col :span="10" :offset="1">
+          <el-form-item label="证件号码" required>
+            <div class="idCard" @click="popUp1('身份证扫描仪')" v-if='!idNumberJudge'>
               <p>请刷身份证</p>
             </div>
             <div v-else>
-              <el-input :value="form.idNumber"
-                        disabled
-                        ref="idNumber"></el-input>
+              <el-input :value="form.idNumber" disabled ref="idNumber"></el-input>
             </div>
           </el-form-item>
-          <el-form-item label="客户姓名"
-                        prop="customerName">
-            <el-input ref="customerName"
-                      disabled
-                      :value="form.customerName"
-                      @input="(val) => checkName(val, form, 'customerName')"></el-input>
+          <el-form-item label="客户姓名" prop="customerName">
+            <el-input ref="customerName" disabled :value="form.customerName"
+              @input="(val) => checkName(val, form, 'customerName')"></el-input>
           </el-form-item>
 
-          <el-form-item label="户号"
-                        required>
-            <el-input :value="form.mailbox"
-                      @input="val => mailBoxListen(val, form, 'mailbox')"
-                      maxlength="30"
-                      ref="mailbox"></el-input>
+          <el-form-item label="户号" required>
+            <el-input :value="form.mailbox" @input="val => mailBoxListen(val, form, 'mailbox')" maxlength="30"
+              ref="mailbox"></el-input>
           </el-form-item>
-          <el-form-item label="每月代扣"
-                        prop="extendPeriod"
-                        required>
-            <el-radio-group v-model.trim="form.extendPeriod"
-                            ref="extendPeriod">
+          <el-form-item label="每月代扣" prop="extendPeriod" required>
+            <el-radio-group v-model.trim="form.extendPeriod" ref="extendPeriod">
               <el-radio :label="90">是</el-radio>
               <el-radio :label="91">否</el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
-        <my-dialog :moduleName="moduleName"
-                   v-if="visible"
-                   :visible.sync="visible"
-                   :showForm="form"
-                   :formName="formName"
-                   @submitIt="submitForm2"
-                   depositNumber='0816' />
+        <my-dialog :moduleName="moduleName" v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName"
+          @submitIt="submitForm2" depositNumber='0816' />
       </el-form>
     </el-row>
-    <el-button @click="submitForm"
-               type="primary"
-               class="submitBtn"
-               v-throttle>提交</el-button>
+    <el-button @click="submitForm" type="primary" class="submitBtn" v-throttle>提交</el-button>
   </div>
   <!-- <need-before v-else :moduleName='needBefore' :unNeed="unNeed" /> -->
 </template>
@@ -468,5 +416,4 @@ export default {
   }
 }
 </script>
-<style lang='scss' scoped>
-</style>
\ No newline at end of file
+<style lang='scss' scoped></style>
\ No newline at end of file
diff --git a/src/pages/manage/list/foreignExchange/puchasing.vue b/src/pages/manage/list/foreignExchange/puchasing.vue
index 5c36e47..34c2021 100644
--- a/src/pages/manage/list/foreignExchange/puchasing.vue
+++ b/src/pages/manage/list/foreignExchange/puchasing.vue
@@ -146,17 +146,17 @@ export default {
             trigger: 'blur'
           }
         ],
-        drawWay: [
+        money: [
           {
             required: true,
-            message: '请选择支取方式',
+            message: '请输入外汇金额',
             trigger: 'blur'
           }
         ],
-        money: [
+        drawWay: [
           {
             required: true,
-            message: '请输入金额',
+            message: '请选择购汇用途',
             trigger: 'blur'
           }
         ],
diff --git a/src/pages/manage/list/foreignExchange/settlement.vue b/src/pages/manage/list/foreignExchange/settlement.vue
index 0664cd4..fd6003d 100644
--- a/src/pages/manage/list/foreignExchange/settlement.vue
+++ b/src/pages/manage/list/foreignExchange/settlement.vue
@@ -119,7 +119,6 @@ export default {
         drawPassword: '支取密码',
       },
       rules: {
-        userName: vercustomer,
         currency: [
           {
             required: true,
@@ -127,25 +126,18 @@ export default {
             trigger: 'blur'
           }
         ],
-        drawWay: [
-          {
-            required: true,
-            message: '请选择支取方式',
-            trigger: 'blur'
-          }
-        ],
-        serviceCharge: [
+        money: [
           {
             required: true,
-            message: '请输入手续费',
+            message: '请输入外币金额',
             trigger: 'blur'
           }
         ],
-        money: [
+        drawWay: [
           {
             required: true,
-            message: '请输入金额',
-            trigger: 'blur'
+            message: '请选择资金来源',
+            trigger: 'change'
           }
         ],
       },