From 41ef3575b83b71591a936330859eb48100c796cd Mon Sep 17 00:00:00 2001
From: "luoJunYong.123" <you@example.com>
Date: Wed, 22 Dec 2021 18:27:12 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=9A=E5=8A=A1?=
 =?UTF-8?q?=EF=BC=8C=E6=B4=BB=E6=9C=9F=E4=B8=9A=E5=8A=A1=E5=88=B7=E5=8D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/counter/list/index.vue              | 90 ++++++++++++-----
 src/pages/manage/list/business/deposit.vue    |  2 +-
 .../manage/list/business/openAccount.vue      |  6 +-
 src/pages/manage/list/business/transfer.vue   |  2 +-
 src/pages/manage/list/business/withdrawal.vue |  1 -
 .../currentAccount/accountCancellation.vue    | 68 +++++++------
 .../list/personal/currentAccount/deposit.vue  |  7 +-
 .../list/personal/currentAccount/settle.vue   | 99 ++++++++++++-------
 .../currentAccount/transferAccounts.vue       | 86 ++++++++--------
 .../personal/currentAccount/withdrawal.vue    |  4 +-
 .../list/personal/timeDeposit/openAccount.vue | 30 +++++-
 src/utils/utilFunction.js                     | 35 +++++--
 12 files changed, 273 insertions(+), 157 deletions(-)

diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue
index 205ee21..ef8e3e2 100644
--- a/src/pages/counter/list/index.vue
+++ b/src/pages/counter/list/index.vue
@@ -469,7 +469,7 @@ export default {
                 }else if (this.$store.state.system.id == '67,1'){
                     this.nbm = 67
                     let param= {
-                        parentId: '0,5,26,57,67,101'
+                        parentId: '0,5,26,57,67,113'
                     }
                     getOperation(param).then((data)=> {
                         console.log(data)
@@ -484,6 +484,7 @@ export default {
                             }
                         }else{
                             let nomCurrentCancellCard1 = sessionStorage.getItem('nomCurrentCancellCard1')
+                            console.log(nomCurrentCancellCard1)
                             this.receptionList = JSON.parse(nomCurrentCancellCard1);
                             if(this.receptionList == null){
                                 this.receptionList = []
@@ -491,32 +492,8 @@ export default {
                         }
                     }).catch((error)=>{
                     })
-                }else if (this.$store.state.system.id == '67,2'){
-                    this.nbm = 67
-                    let param= {
-                        parentId: '0,5,26,57,67,115'
-                    }
-                    getOperation(param).then((data)=> {
-                        console.log(data)
-                        if (data.data.status == 200) {
-                            var list = data.data.judgmentRuleReqs
-                            for(var j=0;j<list.length;j++){
-                                for(var i=0;i<this.goodsShelfTotalData.length;i++){
-                                    if(list[j].answerId == this.goodsShelfTotalData[i].id){
-                                        this.receptionList.push(this.goodsShelfTotalData[i])
-                                    }
-                                }
-                            }
-                        }else{
-                            let nomCurrentCancellCard1 = sessionStorage.getItem('nomCurrentCancellCard2')
-                            this.receptionList = JSON.parse(nomCurrentCancellCard1);
-                            if(this.receptionList == null){
-                                this.receptionList = []
-                            }
-                        }
-                    }).catch((error)=>{
-                    })
-                }else{
+                }
+                else{
                     let dataList = JSON.parse(sessionStorage.getItem('dataList'));
                     if (dataList){
                         this.receptionList = []
@@ -608,6 +585,58 @@ export default {
                         }
                     }).catch((error)=>{
                     })
+                }else if (this.$store.state.system.id == '67,2'){
+                    this.nbm = 67
+                    let param= {
+                        parentId: '0,5,26,57,67,116'
+                    }
+                    getOperation(param).then((data)=> {
+                        if (data.data.status == 200) {
+                            var list = data.data.judgmentRuleReqs
+                            for(var j=0;j<list.length;j++){
+                                for(var i=0;i<this.goodsShelfTotalData.length;i++){
+                                    if(list[j].answerId == this.goodsShelfTotalData[i].id){
+                                        this.receptionList.push(this.goodsShelfTotalData[i])
+                                    }
+                                }
+                            }
+                        }else{
+                            let nomCurrentCancellCard2 = sessionStorage.getItem('nomCurrentCancellCard2')
+                            console.log(nomCurrentCancellCard2)
+                            this.receptionList = JSON.parse(nomCurrentCancellCard2);
+                            
+                            if(this.receptionList == null){
+                                this.receptionList = []
+                            }
+                        }
+                    }).catch((error)=>{
+                    })
+                }else if (this.$store.state.system.id == '118,1'){
+                    this.nbm = 118
+                    let param= {
+                        parentId: '0,5,26,58,118'
+                    }
+                    getOperation(param).then((data)=> {
+                        if (data.data.status == 200) {
+                            var list = data.data.judgmentRuleReqs
+                            for(var j=0;j<list.length;j++){
+                                for(var i=0;i<this.goodsShelfTotalData.length;i++){
+                                    if(list[j].answerId == this.goodsShelfTotalData[i].id){
+                                        this.receptionList.push(this.goodsShelfTotalData[i])
+                                    }
+                                }
+                            }
+                        }else{
+                            let nomtimeOpenAccount1 = sessionStorage.getItem('nomtimeOpenAccount1')
+                            console.log(nomtimeOpenAccount1)
+                            this.receptionList = JSON.parse(nomtimeOpenAccount1);
+                            
+                            if(this.receptionList == null){
+                                this.receptionList = []
+                            }
+                        }
+                    }).catch((error)=>{
+                    })
                 }else{
                     let dataList = JSON.parse(sessionStorage.getItem('dataList'));
                     if (dataList){
@@ -973,6 +1002,13 @@ export default {
                       sessionStorage.setItem('nomCurrentCancellCard2', JSON.stringify(this.receptionList))
                   }
                   
+              }else if (this.$store.state.system.id == '118,1'){
+                  this.nbm = 118
+                  this.goodsShelfTotalData = this.auditGoodsShelf
+                  if (this.receptionList.length >0){
+                      sessionStorage.setItem('nomtimeOpenAccount1', JSON.stringify(this.receptionList))
+                  }
+                  
               }else if (this.$store.state.system.id == '67,3'){
                   this.nbm = 67
                   if (this.passwordForm.passwordAgain){
diff --git a/src/pages/manage/list/business/deposit.vue b/src/pages/manage/list/business/deposit.vue
index 90e718f..75f6e57 100644
--- a/src/pages/manage/list/business/deposit.vue
+++ b/src/pages/manage/list/business/deposit.vue
@@ -186,7 +186,7 @@ export default {
                 this.visible = true;
                 let formList = [];
                 const parentId = '0,5,27,225'
-                autoPlay(parentId, this.form, this.myTable2, this.myTable, projectId, startTime)
+                autoPlay(parentId, this.form, this.myTable2, this.myTable)
             }, this.$refs));
         },
         ismoney: ismoney,
diff --git a/src/pages/manage/list/business/openAccount.vue b/src/pages/manage/list/business/openAccount.vue
index fdf3e9d..2ee0222 100644
--- a/src/pages/manage/list/business/openAccount.vue
+++ b/src/pages/manage/list/business/openAccount.vue
@@ -284,13 +284,13 @@ export default {
             autoPlay2(parentId, this.form,  this.myTable2, this.myTable)
         },
         submitForm(){
-            let projectId = sessionStorage.getItem('projectId')
-            let startTime = sessionStorage.getItem('startTime')
+            // let projectId = sessionStorage.getItem('projectId')
+            // let startTime = sessionStorage.getItem('startTime')
             this.$refs.form.validate(myValidate(() => {
                 // 验证通过逻辑写在这
                 this.visible = true;
                 const parentId = '0,5,27,224'
-                autoPlay(parentId, this.form, this.myTable2, this.myTable, projectId, startTime)
+                autoPlay(parentId, this.form, this.myTable2, this.myTable)
             }, this.$refs));
         },
         checkHanzi: checkHanzi,
diff --git a/src/pages/manage/list/business/transfer.vue b/src/pages/manage/list/business/transfer.vue
index ca129b2..fec3af8 100644
--- a/src/pages/manage/list/business/transfer.vue
+++ b/src/pages/manage/list/business/transfer.vue
@@ -230,7 +230,7 @@ export default {
                 // 验证通过逻辑写在这
                 this.visible = true;
                 const parentId = '0,5,27,227'
-                autoPlay(parentId, this.form, this.myTable2, this.myTable, projectId, startTime)
+                autoPlay(parentId, this.form, this.myTable2, this.myTable)
             }, this.$refs));
         },
         ismoney: ismoney,
diff --git a/src/pages/manage/list/business/withdrawal.vue b/src/pages/manage/list/business/withdrawal.vue
index 9b9e8c6..8523733 100644
--- a/src/pages/manage/list/business/withdrawal.vue
+++ b/src/pages/manage/list/business/withdrawal.vue
@@ -207,7 +207,6 @@ export default {
                 // 验证通过逻辑写在这
                 this.visible = true;
                 const parentId = '0,5,27,226'
-                autoPlay(parentId, this.form, this.myTable2, this.myTable, projectId, startTime)
                 autoPlay(parentId, this.form, this.myTable2, this.myTable)
                 // let tmpIndex = 100;
                 // for(const key in this.myTable2) {
diff --git a/src/pages/manage/list/personal/currentAccount/accountCancellation.vue b/src/pages/manage/list/personal/currentAccount/accountCancellation.vue
index 3235c9a..8b3f170 100644
--- a/src/pages/manage/list/personal/currentAccount/accountCancellation.vue
+++ b/src/pages/manage/list/personal/currentAccount/accountCancellation.vue
@@ -10,7 +10,7 @@
                         </div>
                     </el-form-item>
                     <el-form-item label="证件类型">
-                        <el-select v-model="form.idType" disabled placeholder="请选择">
+                        <el-select v-model="form.idType" placeholder="请选择">
                             <el-option label="身份证" value="身份证"> </el-option>
                         </el-select>
                     </el-form-item>
@@ -25,7 +25,7 @@
                         <el-input ref="userName" :value="form.userName" @input="(val) => checkName(val, form, 'userName')"></el-input>
                     </el-form-item>
                     <el-form-item label="证件号码" required>
-                        <div class="idCard" @click="popUp2('身份证扫描器')">
+                        <div class="idCard" @click="popUp2('身份证扫描仪')">
                             <p>请刷身份证</p>
                         </div>
                     </el-form-item>
@@ -37,7 +37,7 @@
 </template>
 <script>
 import { vercustomer  } from '@/utils/verify.js'
-import { myValidate, checkHanzi, checkName } from '@/utils/utilFunction.js'
+import { myValidate, checkHanzi, checkName, autoPlay, autoPlay2 } from '@/utils/utilFunction.js'
 export default{
     name:'',
     props:{},
@@ -49,6 +49,18 @@ export default{
             },
             rules: {
                 userName: vercustomer 
+            },
+            myTable2: {
+                115: {
+                    prop: 'idType',
+                    type: '1'
+                }
+            },
+            myTable: {
+                114: {
+                    prop: 'userName',
+                    type: '3'
+                }
             }
         }
     },
@@ -57,50 +69,50 @@ export default{
     },
     mounted() {
         this.$refs.userName.focus()
+        const parentId = '0,5,26,57,67'
+        const cardArr = {
+            113: 'nomCurrentCancellCard1',
+            116: 'nomCurrentCancellCard2',
+            117: 'nomCurrentCancellPassword'
+        }
+        autoPlay2(parentId, this.form,  this.myTable2, this.myTable, cardArr)
     },
     methods: {
 //提交表单
       submitForm(){
         let nomCurrentCancellCard1 = sessionStorage.getItem('nomCurrentCancellCard1')
+        console.log(nomCurrentCancellCard1)
         let nomCurrentCancellCard1s = JSON.parse(nomCurrentCancellCard1);
         let nomCurrentCancellCard2 = sessionStorage.getItem('nomCurrentCancellCard2')
         let nomCurrentCancellCard2s = JSON.parse(nomCurrentCancellCard2);
         let nomCurrentCancellPassword = sessionStorage.getItem('nomCurrentCancellPassword')
         let nomCurrentCancellPasswords = JSON.parse(nomCurrentCancellPassword);
         this.$refs.form.validate(myValidate(() => {
-            console.log(nomCurrentCancellCard1s)
             // 验证通过逻辑写在这
-            if (this.form.userName){formList.push({"emptyOne": "16", "emptyTwo": this.form.userName, "operationIds": "26,57,64,93", "type": "3"})}//客户姓名
-            if (this.form.idType){formList.push({"emptyOne": "8", "emptyTwo": this.form.idType, "operationIds": "26,57,64,87","type": "3"})}//证件类型
-            // formList.push(
-            //     {"emptyOne": "7", "emptyTwo": this.form.chargeWay, "operationIds": "26,57,64,86", "type": "3"},//支取方式
-            // )
-            sessionStorage.setItem('ruleReqs', JSON.stringify(formList))
-            this.$message({
-                message: '提交成功',
-                type: 'success'
-            });
+            const cards = [
+                {
+                    113: nomCurrentCancellCard1
+                },
+                {
+                    116: nomCurrentCancellCard2
+                },  
+                {
+                    117: nomCurrentCancellPassword
+                }
+            ]
+            // const passwords = [
+            //     { 117: nomCurrentCancellPasswords }
+            // ]
+            const parentId = '0,5,26,57,67'
+            autoPlay(parentId, this.form, this.myTable2, this.myTable, cards)
         }, this.$refs));
-        // if(this.form.chargeWay){
-        //   if (this.form.userName){formList.push({"emptyOne": "16", "emptyTwo": this.form.userName, "operationIds": "26,57,64,93", "type": "3"})}//客户姓名
-        //   if (this.form.idType){formList.push({"emptyOne": "8", "emptyTwo": this.form.idType, "operationIds": "26,57,64,87","type": "3"})}//证件类型
-        //   // formList.push(
-        //   //     {"emptyOne": "7", "emptyTwo": this.form.chargeWay, "operationIds": "26,57,64,86", "type": "3"},//支取方式
-        //   // )
-        //   sessionStorage.setItem('ruleReqs', JSON.stringify(formList))
-        //   this.$message({
-        //     message: '提交成功',
-        //     type: 'success'
-        //   });
-        // }else{
-        //   this.$message.error('有必填项未填哦~');
-        // }
       },
         popUp1(text) {
             this.$store.commit('system/changePop',{show:true,text, id: '67,1'})
         },
         popUp2(text) {
             this.$store.commit('system/changePop',{show:true,text, id: '67,2'})
+            console.log(this.$store.state.system.id)
         },
         popUp3(text) {
             this.$store.commit('system/changePop',{show:true,text, id: '67,3'})
diff --git a/src/pages/manage/list/personal/currentAccount/deposit.vue b/src/pages/manage/list/personal/currentAccount/deposit.vue
index dbe3249..3685dc2 100644
--- a/src/pages/manage/list/personal/currentAccount/deposit.vue
+++ b/src/pages/manage/list/personal/currentAccount/deposit.vue
@@ -120,12 +120,9 @@ export default{
             this.visible = true;
             let formList = [];
             let nomBusinessDepositCard = sessionStorage.getItem('nomBusinessDepositCard')
-            let nomBusinessDepositCards = JSON.parse(nomBusinessDepositCard);
-            console.log(nomBusinessDepositCard)
+            let nomBusinessDepositCards = nomBusinessDepositCard // JSON.parse(nomBusinessDepositCard);
             if (nomBusinessDepositCards && nomBusinessDepositCards.length > 0){
-                for (var i=0;i<nomBusinessDepositCards.length;i++){
-                    formList.push({"answerId":nomBusinessDepositCards[i].id,"emptyOne": "", "emptyTwo": "", "operationIds": "0,5,26,57,63,78,"+nomBusinessDepositCards[i].id,"type": ""})// 卡号
-                }
+                 formList.push({"answerId":78,"emptyOne": "", "emptyTwo": nomBusinessDepositCards, "operationIds": "0,5,26,57,63,78","type": ""})// 卡号
                 if(this.form.currency){
                     formList.push({ "answerId":'80', "emptyOne": "8", "emptyTwo": this.form.currency, "operationIds": "0,5,26,57,63,80", "type": "1" })//币种
                 }
diff --git a/src/pages/manage/list/personal/currentAccount/settle.vue b/src/pages/manage/list/personal/currentAccount/settle.vue
index 90629b7..e1a2581 100644
--- a/src/pages/manage/list/personal/currentAccount/settle.vue
+++ b/src/pages/manage/list/personal/currentAccount/settle.vue
@@ -56,7 +56,7 @@
 </template>
 <script>
 import { mobPattern, namePattern, ratePattern, vercustomer  } from '@/utils/verify.js'
-import { myValidate, checkHanzi, checkName, ismoney } from '@/utils/utilFunction.js'
+import { myValidate, checkHanzi, checkName, ismoney, autoPlay, autoPlay2 } from '@/utils/utilFunction.js'
 export default{
     name:'',
     props:{},
@@ -81,6 +81,51 @@ export default{
                         trigger: 'blur'
                     }
                 ]
+            },
+            myTable2: {
+                105: {
+                    prop: 'currency',
+                    type: '1'
+                },
+                106: {
+                    prop: 'goldLogo',
+                    type: '1'
+                },
+                107: {
+                    prop: 'money',
+                    type: '1'
+                },
+                108: {
+                    prop: 'interest',
+                    type: '1'
+                },
+                109: {
+                    prop: 'totalMoney',
+                    type: '1'
+                },
+                110: {
+                    prop: 'totalMoney',
+                    type: '1'
+                },
+                112: {
+                    prop: 'totalMoney',
+                    type: '1'
+                },
+            },
+            myTable: {
+                104: {
+                    prop: 'userName',
+                    type: '3'
+                },
+                110: {
+                    prop: 'chargeWay',
+                    type: '1'
+                },
+                112: {
+                    prop: 'remark',
+                    type: '3'
+                },
+                
             }
         }
     },
@@ -89,53 +134,33 @@ export default{
     },
     mounted() {
         this.$refs.userName.focus()
+        const parentId = '0,5,26,57,66'
+        const cardArr = {
+            103: 'nomCurrentSettleCard',
+            111: 'nomCurrentSettlePassword'
+        }
+        autoPlay2(parentId, this.form,  this.myTable2, this.myTable, cardArr)
     },
     methods: {
 //提交表单
       submitForm(){
-        let ruleReqs = sessionStorage.getItem('ruleReqs')
-        let formList = JSON.parse(ruleReqs);
         let nomCurrentSettleCard = sessionStorage.getItem('nomCurrentSettleCard')
         let nomCurrentSettleCards = JSON.parse(nomCurrentSettleCard);
         let nomCurrentSettlePassword = sessionStorage.getItem('nomCurrentSettlePassword')
         let nomCurrentSettlePasswords = JSON.parse(nomCurrentSettlePassword);
         this.$refs.form.validate(myValidate(() => {
             // 验证通过逻辑写在这
-            if (this.form.userName){formList.push({"emptyOne": "16", "emptyTwo": this.form.userName, "operationIds": "26,57,64,93", "type": "3"})}//客户姓名
-            if (this.form.goldLogo){formList.push({"emptyOne": "8", "emptyTwo": this.form.goldLogo, "operationIds": "26,57,64,87","type": "3"})}//钞汇标识
-            if (this.form.money){formList.push({"emptyOne": "8", "emptyTwo": this.form.money, "operationIds": "26,57,64,87","type": "3"})}//金额
-            if (this.form.interest){formList.push({"emptyOne": "8", "emptyTwo": this.form.interest, "operationIds": "26,57,64,87","type": "3"})}//利息
-            if (this.form.totalMoney){formList.push({"emptyOne": "8", "emptyTwo": this.form.totalMoney, "operationIds": "26,57,64,87","type": "3"})}//总金额
-
-            if (this.form.remark){formList.push({"emptyOne": "16", "emptyTwo": this.form.remark, "operationIds": "26,57,64,93", "type": "3"})}//摘要
-            formList.push(
-                {"emptyOne": "7", "emptyTwo": this.form.chargeWay, "operationIds": "26,57,64,86", "type": "3"},//支取方式
-            )
-            sessionStorage.setItem('ruleReqs', JSON.stringify(formList))
-            this.$message({
-                message: '提交成功',
-                type: 'success'
-            });
+            const cards = [
+                {
+                    103: nomCurrentSettleCard
+                }, 
+                {
+                    111: nomCurrentSettlePassword
+                }
+            ]
+            const parentId = '0,5,26,57,66'
+            autoPlay(parentId, this.form, this.myTable2, this.myTable, cards)
         }, this.$refs));
-        // if(this.form.chargeWay){
-        //   if (this.form.userName){formList.push({"emptyOne": "16", "emptyTwo": this.form.userName, "operationIds": "26,57,64,93", "type": "3"})}//客户姓名
-        //   if (this.form.goldLogo){formList.push({"emptyOne": "8", "emptyTwo": this.form.goldLogo, "operationIds": "26,57,64,87","type": "3"})}//钞汇标识
-        //   if (this.form.money){formList.push({"emptyOne": "8", "emptyTwo": this.form.money, "operationIds": "26,57,64,87","type": "3"})}//金额
-        //   if (this.form.interest){formList.push({"emptyOne": "8", "emptyTwo": this.form.interest, "operationIds": "26,57,64,87","type": "3"})}//利息
-        //   if (this.form.totalMoney){formList.push({"emptyOne": "8", "emptyTwo": this.form.totalMoney, "operationIds": "26,57,64,87","type": "3"})}//总金额
-
-        //   if (this.form.remark){formList.push({"emptyOne": "16", "emptyTwo": this.form.remark, "operationIds": "26,57,64,93", "type": "3"})}//摘要
-        //   formList.push(
-        //       {"emptyOne": "7", "emptyTwo": this.form.chargeWay, "operationIds": "26,57,64,86", "type": "3"},//支取方式
-        //   )
-        //   sessionStorage.setItem('ruleReqs', JSON.stringify(formList))
-        //   this.$message({
-        //     message: '提交成功',
-        //     type: 'success'
-        //   });
-        // }else{
-        //   this.$message.error('有必填项未填哦~');
-        // }
       },
       popUp(text) {
         this.$store.commit('system/changePop',{show:true,text, id: 66})
diff --git a/src/pages/manage/list/personal/currentAccount/transferAccounts.vue b/src/pages/manage/list/personal/currentAccount/transferAccounts.vue
index 0f57990..d84c4de 100644
--- a/src/pages/manage/list/personal/currentAccount/transferAccounts.vue
+++ b/src/pages/manage/list/personal/currentAccount/transferAccounts.vue
@@ -51,7 +51,7 @@
 </template>
 <script>
 import { mobPattern, namePattern, ratePattern, vercustomer  } from '@/utils/verify.js'
-import { myValidate, checkHanzi, ismoney, checkName } from '@/utils/utilFunction.js'
+import { myValidate, checkHanzi, ismoney, checkName, autoPlay, autoPlay2 } from '@/utils/utilFunction.js'
 export default{
     name:'',
     props:{},
@@ -93,61 +93,67 @@ export default{
                         trigger: 'blur'
                     }
                 ],
+            },
+            myTable2: {
+                100: {
+                    prop: 'shroffAccount',
+                    type: '1'
+                },
+                101: {
+                    prop: 'payeeName',
+                    type: '1'
+                },
+                102: {
+                    prop: 'remark',
+                    type: '1'
+                }
+            },
+            myTable: {
+                95: {
+                    prop: 'userName',
+                    type: '3'
+                },
+                97: {
+                    prop: 'goldLogo',
+                    type: '1'
+                },
+                98: {
+                    prop: 'money',
+                    type: '3'
+                },
+                
             }
         }
     },
   mounted() {
       this.$refs.money.focus()
+      const parentId = '0,5,26,57,65'
+        const cardArr = {
+            94: 'nomCurrentTransferCard',
+            99: 'nomCurrentTransferPassword'
+        }
+        autoPlay2(parentId, this.form,  this.myTable2, this.myTable, cardArr)
   },
   methods: {
     //提交表单
     submitForm(){
-        let projectId = sessionStorage.getItem('projectId')
-        let startTime = sessionStorage.getItem('startTime')
-        const formList = []
         let nomCurrentTransferCard = sessionStorage.getItem('nomCurrentTransferCard')
         let nomCurrentTransferCards = JSON.parse(nomCurrentTransferCard);
         let nomCurrentTransferPassword = sessionStorage.getItem('nomCurrentTransferPassword')
         let nomCurrentTransferPasswords = JSON.parse(nomCurrentTransferPassword);
         this.$refs.form.validate(myValidate(() => {
             // 验证通过逻辑写在这
-            if (nomCurrentTransferCards && nomCurrentTransferCards.length > 0 && nomCurrentTransferPasswords){
-                if (this.form.userName){formList.push({"emptyOne": "16", "emptyTwo": this.form.userName, "operationIds": "26,57,64,93", "type": "3"})}//客户姓名
-                if (this.form.currency){formList.push({"emptyOne": "8", "emptyTwo": this.form.currency, "operationIds": "26,57,64,87","type": "3"})}//币种
-                if (this.form.remark){formList.push({"emptyOne": "16", "emptyTwo": this.form.remark, "operationIds": "26,57,64,93", "type": "3"})}//摘要
-                formList.push(
-                    {"emptyOne": "9", "emptyTwo": this.form.goldLogo, "operationIds": "26,57,64,88", "type": "3"},//钞汇标识
-                    {"emptyOne": "7", "emptyTwo": this.form.money, "operationIds": "26,57,64,86", "type": "3"},//金额
-                    {"emptyOne": "15", "emptyTwo": this.form.shroffAccount, "operationIds": "26,57,64,90", "type": "3"},//收款卡号
-                    {"emptyOne": "15", "emptyTwo": this.form.payeeName, "operationIds": "26,57,64,92", "type": "3"},//收款人名称
-                )
-                sessionStorage.setItem('ruleReqs', JSON.stringify(formList))
-                this.$message({
-                    message: '提交成功',
-                    type: 'success'
-                });
-            }else{
-                this.$message.error('有必填项未填哦~');
-            }
+            const cards = [
+                {
+                    94: nomCurrentTransferCard
+                }, 
+                {
+                    99: nomCurrentTransferPassword
+                }
+            ]
+            const parentId = '0,5,26,57,65'
+            autoPlay(parentId, this.form, this.myTable2, this.myTable, cards)
         }, this.$refs));
-    //   if(this.form.goldLogo && this.form.money && this.form.shroffAccount && this.form.payeeName){
-    //     if (this.form.userName){formList.push({"emptyOne": "16", "emptyTwo": this.form.userName, "operationIds": "26,57,64,93", "type": "3"})}//客户姓名
-    //     if (this.form.currency){formList.push({"emptyOne": "8", "emptyTwo": this.form.currency, "operationIds": "26,57,64,87","type": "3"})}//币种
-    //     if (this.form.remark){formList.push({"emptyOne": "16", "emptyTwo": this.form.remark, "operationIds": "26,57,64,93", "type": "3"})}//摘要
-    //     formList.push(
-    //         {"emptyOne": "9", "emptyTwo": this.form.goldLogo, "operationIds": "26,57,64,88", "type": "3"},//钞汇标识
-    //         {"emptyOne": "7", "emptyTwo": this.form.money, "operationIds": "26,57,64,86", "type": "3"},//金额
-    //         {"emptyOne": "15", "emptyTwo": this.form.shroffAccount, "operationIds": "26,57,64,90", "type": "3"},//收款卡号
-    //         {"emptyOne": "15", "emptyTwo": this.form.payeeName, "operationIds": "26,57,64,92", "type": "3"},//收款人名称
-    //     )
-    //     sessionStorage.setItem('ruleReqs', JSON.stringify(formList))
-    //     this.$message({
-    //       message: '提交成功',
-    //       type: 'success'
-    //     });
-    //   }else{
-    //     this.$message.error('有必填项未填哦~');
-    //   }
     },
     popUp(text) {
         this.$store.commit('system/changePop',{show:true,text, id: 65})
diff --git a/src/pages/manage/list/personal/currentAccount/withdrawal.vue b/src/pages/manage/list/personal/currentAccount/withdrawal.vue
index 37b695d..e140cc6 100644
--- a/src/pages/manage/list/personal/currentAccount/withdrawal.vue
+++ b/src/pages/manage/list/personal/currentAccount/withdrawal.vue
@@ -109,7 +109,6 @@ export default{
           getOperation(param).then((data)=>{
               if(data.status == 200) {
                   var list = data.data.judgmentRuleReqs
-                  console.log(data)
                   for (var i = 0; i < list.length; i++) {
                       if (list[i].answerId == '85') {
                           sessionStorage.setItem('nomCurrentWithdrawalCard', list[i].emptyTwo)
@@ -120,7 +119,7 @@ export default{
                       if (list[i].answerId == '88') {this.form.goldLogo = list[i].emptyTwo} //钞汇标识
                       if (list[i].answerId == '89') {this.form.money = list[i].emptyTwo} //金额
                       if (list[i].answerId == '90') {this.form.chargeWay = list[i].emptyTwo} //支取方式
-                      // if (list[i].answerId == '91') {sessionStorage.setItem('firmClientIdentity', list[i].emptyTwo)} //支取密码
+                      if (list[i].answerId == '91') {sessionStorage.setItem('firmClientIdentity', list[i].emptyTwo)} //支取密码
                       if (list[i].answerId == '92') {this.form.serviceCharge = list[i].emptyTwo} //手续费
                       if (list[i].answerId == '93') {this.form.remark = list[i].emptyTwo} //摘要
                   }
@@ -135,6 +134,7 @@ export default{
         let nomCurrentWithdrawalCards = nomCurrentWithdrawalCard // JSON.parse(nomCurrentWithdrawalCard);
         let nomCurrentWithdrawalPassword = sessionStorage.getItem('nomCurrentWithdrawalPassword')
         let nomCurrentWithdrawalPasswords = nomCurrentWithdrawalPassword // JSON.parse(nomCurrentWithdrawalPassword);
+        console.log(nomCurrentWithdrawalCards)
         this.$refs.form.validate(myValidate(() => {
             this.visible = true;
             let formList = [];
diff --git a/src/pages/manage/list/personal/timeDeposit/openAccount.vue b/src/pages/manage/list/personal/timeDeposit/openAccount.vue
index 93beadb..4955d9d 100644
--- a/src/pages/manage/list/personal/timeDeposit/openAccount.vue
+++ b/src/pages/manage/list/personal/timeDeposit/openAccount.vue
@@ -13,7 +13,7 @@
                         <el-input ref="clientNumber" :value="form.clientNumber" @input="(val) => checkHanzi(val, form, 'clientNumber')"></el-input>
                     </el-form-item>
                     <el-form-item label="币种" prop="currency">
-                        <el-select disabled v-model="form.currency" placeholder="请选择" ref="currency">
+                        <el-select v-model="form.currency" placeholder="请选择" ref="currency">
                             <el-option  label="CYN人民币" value="CYN人民币"> </el-option>
                         </el-select>
                     </el-form-item>
@@ -30,7 +30,7 @@
                 </el-col>
                 <el-col :span="10" :offset="1">
                     <el-form-item label="身份证" required>
-                        <div class="idCard" @click="popUp('身份证扫描器')">
+                        <div class="idCard" @click="popUp1('身份证扫描仪')">
                             <p>请刷身份证</p>
                         </div>
                     </el-form-item>
@@ -157,7 +157,15 @@ export default{
     methods: {
         getFormData(){
             const parentId = '0,5,26,58,118'
-            autoPlay2(parentId, this.form,  this.myTable2, this.myTable)
+            const cards = {    
+                13: 'nomtimeOpenAccount',
+                // 128: 'nomCurrentCancellCard2',
+                // 129: 'nomCurrentCancellPassword'
+            }           
+            autoPlay2(parentId, this.form,  this.myTable2, this.myTable, cards)
+        },
+        popUp1(text) {
+            this.$store.commit('system/changePop',{show:true,text, id: '118,1'})
         },
         popUp(text) {
             this.$store.commit('system/changePop',{show:true,text})
@@ -166,8 +174,22 @@ export default{
             this.$refs.form.validate(myValidate(() => {
                     // 验证通过逻辑写在这
                     this.visible = true;
+                    let nomtimeOpenAccount1 = sessionStorage.getItem('nomtimeOpenAccount1')
+                    // let nomtimeOpenAccount2 = sessionStorage.getItem('nomtimeOpenAccount2')
+                    // let nomCurrentCancellPassword = sessionStorage.getItem('nomCurrentCancellPassword')
+                    const cards = [
+                        {
+                            13: nomtimeOpenAccount1
+                        },
+                        // {
+                        //     128: nomtimeOpenAccount2
+                        // },  
+                        // {
+                        //     129: nomCurrentCancellPassword
+                        // }
+                    ]
                     const parentId = '0,5,26,58,118'
-                    autoPlay(parentId, this.form, this.myTable2, this.myTable)
+                    autoPlay(parentId, this.form, this.myTable2, this.myTable, cards)
             }, this.$refs));
         },
         checkHanzi: checkHanzi,
diff --git a/src/utils/utilFunction.js b/src/utils/utilFunction.js
index 51ec915..fc4435d 100644
--- a/src/utils/utilFunction.js
+++ b/src/utils/utilFunction.js
@@ -116,12 +116,10 @@ const myValidate = (callback, refs) => {
     }
 }
 
-const autoPlay = (parentId, form,  myTable2, myTable) => {
+const autoPlay = (parentId, form,  myTable2, myTable, cards=[]) => {
     let projectId = sessionStorage.getItem('projectId')
     let startTime = sessionStorage.getItem('startTime')
     let formList = [];
-    // const parentId = '0,5,27,226'
-    // 因为没说emptyOne是多少
     let tmpIndex = 100;
     for(const key in myTable2) {
         const { prop, type } = myTable2[key]
@@ -129,12 +127,20 @@ const autoPlay = (parentId, form,  myTable2, myTable) => {
             formList.push({ "answerId": key + '', "emptyOne": '' + tmpIndex++, "emptyTwo": form[prop], "operationIds": parentId + ',' + key, "type":type })
         }
     }
-    
+
     for(const key in myTable) {
-        console.log(myTable[key])
         const { prop, type } = myTable[key]
         formList.push({ "answerId": key + '', "emptyOne": '' + tmpIndex++, "emptyTwo": form[prop], "operationIds": parentId + ',' + key, "type":type })
     }
+    
+    for(let i=0; i<cards.length; i++ ) {
+        for(const key in cards[i]) {
+            const tmpJson = JSON.stringify(cards[i][key])
+            formList.push({ "answerId": key + '', "emptyOne": '' + tmpIndex++, "emptyTwo": tmpJson, "operationIds": parentId + ',' + key, "type":5 })
+        }
+    }
+
+    
     let params= {
         parentId,
         lcJudgmentRuleReq:formList,
@@ -150,18 +156,31 @@ const autoPlay = (parentId, form,  myTable2, myTable) => {
     })
 }
 
-const autoPlay2 = (parentId, form,  myTable2, myTable) => {
+const autoPlay2 = (parentId, form,  myTable2, myTable, cardArr) => {
     let param= {
-        // parentId: '0,5,27,226'
         parentId
     }
     getOperation(param).then((data)=>{
+        console.log(data)
+        console.log(data)
         if(data.status == 200) {
             var list = data.data.judgmentRuleReqs
             const tmpObj = Object.assign(myTable, myTable2)
             for (var i = 0; i < list.length; i++) {
                 const { answerId, emptyTwo } = list[i]
-                form[tmpObj[answerId].prop] = emptyTwo
+                if(!cardArr) {
+                    form[tmpObj[answerId].prop] = emptyTwo
+                } else {
+                    if(cardArr[answerId]) {
+                        sessionStorage.setItem(cardArr[answerId], JSON.parse(list[i].emptyTwo))
+                        // form[tmpObj[answerId].prop] = emptyTwo
+                    }else {
+                        console.log(emptyTwo)
+                        form[tmpObj[answerId].prop] = emptyTwo
+                    }
+                }
+                
+                // form[tmpObj[answerId].prop] = emptyTwo
             }
         }
     }).catch((error)=>{

From 078f08b3ecda613474525b42d57774bbc941a2b9 Mon Sep 17 00:00:00 2001
From: "luoJunYong.123" <you@example.com>
Date: Thu, 23 Dec 2021 11:24:25 +0800
Subject: [PATCH 2/2] update

---
 src/pages/counter/list/index.vue              | 55 +++++++++++++------
 src/pages/counter/list/myConfig.js            | 21 +++++++
 .../list/personal/timeDeposit/deposit.vue     | 24 ++++++--
 .../list/personal/timeDeposit/openAccount.vue | 23 +++++---
 .../list/servicesAccount/passwordChange.vue   | 11 +++-
 5 files changed, 104 insertions(+), 30 deletions(-)
 create mode 100644 src/pages/counter/list/myConfig.js

diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue
index ef8e3e2..becb28c 100644
--- a/src/pages/counter/list/index.vue
+++ b/src/pages/counter/list/index.vue
@@ -196,6 +196,7 @@ import Sortable from 'sortablejs'
 import manage from '../../manage/index';
 import { addOperation, getOperation } from '@/api/http';
 import backButton from '@/components/backButton'
+import { myConfig } from './myConfig.js'
 
 export default {
     name: 'index',
@@ -602,7 +603,7 @@ export default {
                             }
                         }else{
                             let nomCurrentCancellCard2 = sessionStorage.getItem('nomCurrentCancellCard2')
-                            console.log(nomCurrentCancellCard2)
+
                             this.receptionList = JSON.parse(nomCurrentCancellCard2);
                             
                             if(this.receptionList == null){
@@ -611,32 +612,50 @@ export default {
                         }
                     }).catch((error)=>{
                     })
-                }else if (this.$store.state.system.id == '118,1'){
-                    this.nbm = 118
+                }else if (myConfig[this.$store.state.system.id]){
+                    const { nbm, parentId, name } = myConfig[this.$store.state.system.id]
+                    console.log(nbm)
+                    console.log(sessionStorage.getItem(name))
+                    this.nbm = nbm
                     let param= {
-                        parentId: '0,5,26,58,118'
+                        parentId
                     }
                     getOperation(param).then((data)=> {
+                        console.log(data)
+                        
                         if (data.data.status == 200) {
-                            var list = data.data.judgmentRuleReqs
-                            for(var j=0;j<list.length;j++){
-                                for(var i=0;i<this.goodsShelfTotalData.length;i++){
-                                    if(list[j].answerId == this.goodsShelfTotalData[i].id){
-                                        this.receptionList.push(this.goodsShelfTotalData[i])
+                            let tmpName = sessionStorage.getItem(name)
+                            console.log(tmpName)
+                            if(tmpName) {
+                                this.receptionList = JSON.parse(tmpName);
+                            }else {
+                                var list = data.data.judgmentRuleReqs
+                                for(var j=0;j<list.length;j++){
+                                    for(var i=0;i<this.goodsShelfTotalData.length;i++){
+                                        if(list[j].answerId == this.goodsShelfTotalData[i].id){
+                                            this.receptionList.push(this.goodsShelfTotalData[i])
+                                        }
                                     }
                                 }
                             }
-                        }else{
-                            let nomtimeOpenAccount1 = sessionStorage.getItem('nomtimeOpenAccount1')
-                            console.log(nomtimeOpenAccount1)
-                            this.receptionList = JSON.parse(nomtimeOpenAccount1);
                             
+                        }else{
+                            let tmpName = sessionStorage.getItem(name)
+                            this.receptionList = JSON.parse(tmpName);
                             if(this.receptionList == null){
                                 this.receptionList = []
                             }
                         }
                     }).catch((error)=>{
                     })
+                    // const { nbm, name } = myConfig[this.$store.state.system.id]
+                    // this.nbm = nbm
+                    // let tmpName = sessionStorage.getItem(name)
+                    // this.receptionList = JSON.parse(tmpName);
+                    
+                    // if(this.receptionList == null){
+                    //     this.receptionList = []
+                    // }
                 }else{
                     let dataList = JSON.parse(sessionStorage.getItem('dataList'));
                     if (dataList){
@@ -1002,11 +1021,15 @@ export default {
                       sessionStorage.setItem('nomCurrentCancellCard2', JSON.stringify(this.receptionList))
                   }
                   
-              }else if (this.$store.state.system.id == '118,1'){
-                  this.nbm = 118
+              }else if (myConfig[this.$store.state.system.id]){ // myConfig[this.$store.state.system.id]
+                
+                  const { nbm, name } = myConfig[this.$store.state.system.id]
+                  console.log(nbm)
+                  this.nbm = nbm
                   this.goodsShelfTotalData = this.auditGoodsShelf
                   if (this.receptionList.length >0){
-                      sessionStorage.setItem('nomtimeOpenAccount1', JSON.stringify(this.receptionList))
+                      sessionStorage.setItem(name, JSON.stringify(this.receptionList))
+                      console.log(sessionStorage.getItem(name))
                   }
                   
               }else if (this.$store.state.system.id == '67,3'){
diff --git a/src/pages/counter/list/myConfig.js b/src/pages/counter/list/myConfig.js
new file mode 100644
index 0000000..35846a5
--- /dev/null
+++ b/src/pages/counter/list/myConfig.js
@@ -0,0 +1,21 @@
+const myConfig = {
+    '118,1': {
+        nbm: 118,
+        name: 'nomtimeOpenAccount1',
+        parentId: '0,5,26,58,118'
+    },
+    '118,2': {
+        nbm: 118,
+        name: 'nomtimeOpenAccount2',
+        parentId: '0,5,26,58,118'
+    },
+    '131': {
+        nbm: 131,
+        name: 'nomtimeDeposit1',
+        parentId: '0,5,26,58,119'
+    }
+}
+
+export {
+    myConfig
+}
\ No newline at end of file
diff --git a/src/pages/manage/list/personal/timeDeposit/deposit.vue b/src/pages/manage/list/personal/timeDeposit/deposit.vue
index a3d4f4b..eccccf9 100644
--- a/src/pages/manage/list/personal/timeDeposit/deposit.vue
+++ b/src/pages/manage/list/personal/timeDeposit/deposit.vue
@@ -5,7 +5,7 @@
             <el-form ref="form" :model="form" label-width="120px" :rules="rules">
                 <el-col :span="10" :offset="1">
                     <el-form-item label="凭证号码" required>
-                        <div class="idCard" @click="popUp('输入器')">
+                        <div class="idCard" @click="popUp('身份证扫描仪')">
                             <p>请输入凭证号</p>
                         </div>
                     </el-form-item>
@@ -57,7 +57,7 @@
                         </el-radio-group>
                     </el-form-item>
                     <el-form-item label="支取密码" required>
-                        <div class="idCard" @click="popUp('输入器')">
+                        <div class="idCard" @click="popUp2('输入器')">
                             <p>请输入密码</p>
                         </div>
                     </el-form-item>
@@ -209,17 +209,33 @@ export default{
     methods: {
         getFormData(){
             const parentId = '0,5,26,58,119'
-            autoPlay2(parentId, this.form,  this.myTable2, this.myTable)
+            const cards = {    
+                131: 'nomtimeDeposit1'
+                // 129: 'nomCurrentCancellPassword'
+            }
+            autoPlay2(parentId, this.form,  this.myTable2, this.myTable, cards)
         },
         popUp(text) {
+            this.$store.commit('system/changePop',{show:true,text, id: '131'})
+        },
+        popUp2(text) {
             this.$store.commit('system/changePop',{show:true,text})
         },
         submitForm() {
+            let nomtimeDeposit1 = sessionStorage.getItem('nomtimeDeposit1')
             this.$refs.form.validate(myValidate(() => {
                 // 验证通过逻辑写在这
                 this.visible = true;
                 const parentId = '0,5,26,58,119'
-                autoPlay(parentId, this.form, this.myTable2, this.myTable)
+                const cards = [
+                    {
+                        131: nomtimeDeposit1
+                    }
+                    // {
+                    //     129: nomCurrentCancellPassword
+                    // }
+                ]
+                autoPlay(parentId, this.form, this.myTable2, this.myTable, cards)
             }, this.$refs));
             
         },
diff --git a/src/pages/manage/list/personal/timeDeposit/openAccount.vue b/src/pages/manage/list/personal/timeDeposit/openAccount.vue
index 4955d9d..4f07c8c 100644
--- a/src/pages/manage/list/personal/timeDeposit/openAccount.vue
+++ b/src/pages/manage/list/personal/timeDeposit/openAccount.vue
@@ -43,8 +43,8 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="凭证号码" required>
-                        <div class="idCard" @click="popUp('输入器')">
-                            <p>请填凭证号码</p>
+                        <div class="idCard" @click="popUp2('身份证扫描仪')">
+                            <p>请刷身份证</p>
                         </div>
                     </el-form-item>
                     <el-form-item label="支取密码" required>
@@ -158,8 +158,8 @@ export default{
         getFormData(){
             const parentId = '0,5,26,58,118'
             const cards = {    
-                13: 'nomtimeOpenAccount',
-                // 128: 'nomCurrentCancellCard2',
+                13: 'nomtimeOpenAccount1',
+                128: 'nomtimeOpenAccount2',
                 // 129: 'nomCurrentCancellPassword'
             }           
             autoPlay2(parentId, this.form,  this.myTable2, this.myTable, cards)
@@ -167,6 +167,12 @@ export default{
         popUp1(text) {
             this.$store.commit('system/changePop',{show:true,text, id: '118,1'})
         },
+        popUp2(text) {
+            this.$store.commit('system/changePop',{show:true,text, id: '118,2'})
+        },
+        popUp3(text) {
+            this.$store.commit('system/changePop',{show:true,text, id: '118,1'})
+        },
         popUp(text) {
             this.$store.commit('system/changePop',{show:true,text})
         },
@@ -175,15 +181,14 @@ export default{
                     // 验证通过逻辑写在这
                     this.visible = true;
                     let nomtimeOpenAccount1 = sessionStorage.getItem('nomtimeOpenAccount1')
-                    // let nomtimeOpenAccount2 = sessionStorage.getItem('nomtimeOpenAccount2')
-                    // let nomCurrentCancellPassword = sessionStorage.getItem('nomCurrentCancellPassword')
+                    let nomtimeOpenAccount2 = sessionStorage.getItem('nomtimeOpenAccount2')
                     const cards = [
                         {
                             13: nomtimeOpenAccount1
                         },
-                        // {
-                        //     128: nomtimeOpenAccount2
-                        // },  
+                        {
+                            128: nomtimeOpenAccount2
+                        },  
                         // {
                         //     129: nomCurrentCancellPassword
                         // }
diff --git a/src/pages/manage/list/servicesAccount/passwordChange.vue b/src/pages/manage/list/servicesAccount/passwordChange.vue
index ed2a432..8a9ee36 100644
--- a/src/pages/manage/list/servicesAccount/passwordChange.vue
+++ b/src/pages/manage/list/servicesAccount/passwordChange.vue
@@ -70,7 +70,7 @@
 </template>
 <script>
 import { vercustomer } from '@/utils/verify.js'
-import { myValidate, checkHanzi, checkName } from '@/utils/utilFunction.js'
+import { myValidate, checkHanzi, checkName, autoPlay, autoPlay2 } from '@/utils/utilFunction.js'
 export default{
     name:'',
     props:{},
@@ -108,6 +108,15 @@ export default{
             this.$store.commit('system/changePop',{show:true,text})
         },
         submitForm() {
+            let servicesAccount = sessionStorage.getItem('servicesAccount')
+            const cards = [
+                {
+                    94: nomCurrentTransferCard
+                }, 
+                {
+                    99: nomCurrentTransferPassword
+                }
+            ]
             this.$refs.form.validate(myValidate(() => {
                 // 验证通过逻辑写在这
                 this.$message({