解决提交不了提示有空的bug

解决钱箱和刷卡器冲突问题

src/components/case/index.vue

@@ -410,6 +410,10 @@ export default {
       let params = {
           "projectId":this.projectId,
       }
+        let formList = []
+        sessionStorage.setItem('ruleReqs', JSON.stringify(formList))
+        sessionStorage.setItem('accountVoucher', JSON.stringify(formList))
+        sessionStorage.setItem('accountPasswordAll', '')
       sessionStorage.setItem('projectId', this.projectId)
       getProjectDetail(params).then((data)=>{
         if(data.status == 200){
@@ -474,8 +478,8 @@ export default {
               let datas= data.data.retMap.scoreInfo;
               let formList = []
               sessionStorage.setItem('ruleReqs', JSON.stringify(formList))
-              sessionStorage.setItem('formDataAccountVoucher', JSON.stringify(formList))
+              sessionStorage.setItem('accountVoucher', JSON.stringify(formList))
-              sessionStorage.setItem('formDataAccountPassword', '')
+              sessionStorage.setItem('accountPasswordAll', '')
               let list = this.requires
               this.grade = data.data.retMap.totalScore
               for (var j=0;j<list.length;j++){
@@ -544,6 +548,10 @@ export default {
         let cid = sessionStorage.getItem('cid')
         let systemId = sessionStorage.getItem('systemId')
         let projectId = sessionStorage.getItem('projectId')
+        let formList = []
+        sessionStorage.setItem('ruleReqs', JSON.stringify(formList))
+        sessionStorage.setItem('accountVoucher', JSON.stringify(formList))
+        sessionStorage.setItem('accountPasswordAll', '')
         let params = {
             "projectId":projectId,
         }

src/pages/counter/list/index.vue

@@ -339,10 +339,32 @@ export default {
             return this.$store.state.system.fullScreen;
         },
         showPop:function(){/* 展示弹框 */
+            this.receptionList = []
             if(this.$store.state.system.popText == '刷卡器'){
                 if (this.$store.state.system.id == '62,1'){
-                    let receptionList = sessionStorage.getItem('accountVoucher')
+                    this.nbm = 62
-                    this.receptionList = JSON.parse(receptionList)
+                    let param= {
+                        parentId: '0,5,26,57,62,75'
+                    }
+                    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 accountVoucher = sessionStorage.getItem('accountVoucher')
+                            this.receptionList = JSON.parse(accountVoucher);
+                            if(this.receptionList == null){
+                                this.receptionList = []
+                            }
+                        }
+                    }).catch((error)=>{
+                    })
                 }else{
                     let dataList = JSON.parse(sessionStorage.getItem('dataList'));
                     if (dataList){
@@ -363,7 +385,6 @@ export default {
                     this.passwordForm.password = accountPasswordAll
                     this.passwordForm.passwordAgain = accountPasswordAll
                 }
-                // this.passwordForm.passwordAgain = accountPasswordAll
             }
             if(!this.showGoods) this.showGoods = this.$store.state.system.showPop
             if(!this.showGoods) this.checkList = []
@@ -421,6 +442,9 @@ export default {
                         let ifElse = 0;
                         for(var i=0;i<that.popArr.length;i++){
                             if (that.goodsShelfTotalData[evt.oldIndex].name == that.popArr[i].name){
+                                if (that.receptionList == null){
+                                    that.receptionList = []
+                                }
                                 if (that.receptionList.length){
                                     for(var j=0;j< that.receptionList.length;j++){
                                         if (that.receptionList[j].name == that.goodsShelfTotalData[evt.oldIndex].name){
@@ -484,24 +508,6 @@ export default {
                 if(type == '系统'){
                     parentId = '0,5'
                 }
-                let param= {
-                    parentId: parentId
-                }
-                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{
-                        this.receptionList = []
-                    }
-                }).catch((error)=>{
-                })
             }else if(type == '身份证扫描仪' || type == '验钞机' || type == '资料' || type == '重要空白凭证箱'){
               this.goodsShelfTotalData = this.auditGoodsShelf
                 let parentId = ''
@@ -520,21 +526,6 @@ export default {
                 let param= {
                     parentId: parentId
                 }
-                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{
-                        this.receptionList = []
-                    }
-                }).catch((error)=>{
-                })
             }else if(type == '打印机' || type == '客户签字' ||  type == '印章盒'){
               this.goodsShelfTotalData = this.printoutGoodsShelf
                 let parentId = ''
@@ -547,24 +538,6 @@ export default {
                 if(type == '印章盒'){
                     parentId = '0,8'
                 }
-                let param= {
-                    parentId: parentId
-                }
-                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{
-                        this.receptionList = []
-                    }
-                }).catch((error)=>{
-                })
             }else if(type == '钱箱'){
                 this.goodsShelfTotalData = this.cashboxGoodsShelf;
                 let param= {
@@ -684,41 +657,38 @@ export default {
                 this.$store.commit('system/changeGoods',{push:arr})
                 clickList.length = 0
             }else{
-              if (this.id == '62,1'){
+              if (this.$store.state.system.id == '62,1'){
+                  this.nbm = 62
                   this.goodsShelfTotalData = this.auditGoodsShelf
-                  let accountVoucher = [];
+                  if (this.receptionList.length >0){
-                  let accountPassword = '';
+                      sessionStorage.setItem('accountVoucher', JSON.stringify(this.receptionList))
-                  if (this.receptionList.length){
-                      accountVoucher = this.receptionList
-                      sessionStorage.setItem('accountVoucher', JSON.stringify(accountVoucher))
                   }
                   if (this.passwordForm.passwordAgain){
+                      let accountPassword = '';
                       accountPassword = this.passwordForm.passwordAgain
                       sessionStorage.setItem('accountPassword', accountPassword)
                   }
               }
-                if (this.id == '62,2'){
+                if (this.$store.state.system.id == '62,2'){
+                    this.nbm = 62
                     this.goodsShelfTotalData = this.auditGoodsShelf
-                    let accountVoucherTwo = []
+                    if (this.receptionList.length >0){
-                    let accountPasswordTwo = ''
+                        sessionStorage.setItem('accountVoucherTwo', JSON.stringify(this.receptionList))
-                    if (this.receptionList.length){
-                        accountVoucherTwo = this.receptionList
-                        sessionStorage.setItem('accountVoucherTwo', JSON.stringify(accountVoucherTwo))
                     }
                     if (this.passwordForm.passwordAgain){
+                        let accountPasswordTwo = ''
                         accountPasswordTwo = this.passwordForm.passwordAgain
                         sessionStorage.setItem('accountPasswordTwo', accountPasswordTwo)
                     }
                 }
-                if (this.id == '62,3'){
+                if (this.$store.state.system.id == '62,3'){
+                    this.nbm = 62
                     this.goodsShelfTotalData = this.auditGoodsShelf
-                    let accountVoucherThree = []
+                    if (this.receptionList.length >0){
-                    let accountPasswordThree = ''
+                        sessionStorage.setItem('accountVoucherThree', JSON.stringify(this.receptionList))
-                    if (this.receptionList.length){
-                        accountVoucherThree = this.receptionList
-                        sessionStorage.setItem('accountVoucherThree', JSON.stringify(accountVoucherThree))
                     }
                     if (this.passwordForm.passwordAgain){
+                        let accountPasswordThree = ''
                         accountPasswordThree = this.passwordForm.passwordAgain
                         sessionStorage.setItem('accountPasswordThree', accountPasswordThree)
                     }

src/pages/manage/list/personal/currentAccount/openAccount.vue

@@ -341,6 +341,7 @@ export default {
           let startTime = sessionStorage.getItem('startTime')
           let accountVoucher = sessionStorage.getItem('accountVoucher')
           let formExternalDataList = JSON.parse(accountVoucher);
+          console.log(accountVoucher)
           if (formExternalDataList){
               voucherNumber = formExternalDataList
           }else{
@@ -435,6 +436,8 @@ export default {
               }).catch((error)=>{
               })
           }else{
+              console.log(voucherNumber)
+              console.log(paymentCode)
               this.$message.error('有必填项未填哦~');
           }
       },