update

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'){
+                }else if (myConfig[this.$store.state.system.id]){
-                    this.nbm = 118
+                    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
+                            let tmpName = sessionStorage.getItem(name)
-                            for(var j=0;j<list.length;j++){
+                            console.log(tmpName)
-                                for(var i=0;i<this.goodsShelfTotalData.length;i++){
+                            if(tmpName) {
-                                    if(list[j].answerId == this.goodsShelfTotalData[i].id){
+                                this.receptionList = JSON.parse(tmpName);
-                                        this.receptionList.push(this.goodsShelfTotalData[i])
+                            }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'){
+              }else if (myConfig[this.$store.state.system.id]){ // myConfig[this.$store.state.system.id]
-                  this.nbm = 118
+                
+                  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'){

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
+}

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));
             
         },

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('输入器')">
+                        <div class="idCard" @click="popUp2('身份证扫描仪')">
-                            <p>请填凭证号码</p>
+                            <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',
+                13: 'nomtimeOpenAccount1',
-                // 128: 'nomCurrentCancellCard2',
+                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 nomtimeOpenAccount2 = sessionStorage.getItem('nomtimeOpenAccount2')
-                    // let nomCurrentCancellPassword = sessionStorage.getItem('nomCurrentCancellPassword')
                     const cards = [
                         {
                             13: nomtimeOpenAccount1
                         },
-                        // {
+                        {
-                        //     128: nomtimeOpenAccount2
+                            128: nomtimeOpenAccount2
-                        // },  
+                        },  
                         // {
                         //     129: nomCurrentCancellPassword
                         // }

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({