开户提交bug

src/assets/svg/fullscreen.svg

@@ -6,7 +6,7 @@
     <g id="图标-/-系统录入-/-全屏" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g>
             <rect id="矩形" x="0" y="0" width="24" height="24"></rect>
-            <path d="M19.8232193,20.8000205 L14.9304136,20.8000205 L14.9304136,18.8464182 L18.8376182,18.8464182 L18.8376182,14.9392137 L20.8000205,14.9392137 L20.8000205,20.8000205 L19.8232193,20.8000205 Z M20.8000205,4.17680114 L20.8000205,3.2 L14.9304136,3.2 L14.9304136,5.15360227 L18.8376182,5.15360227 L18.8376182,9.06080682 L20.8000205,9.06080682 L20.8000205,4.17680114 Z M3.2,19.8232193 L3.2,20.8000205 L9.06960683,20.8000205 L9.06960683,18.8464182 L5.15360227,18.8464182 L5.15360227,14.9392137 L3.2,14.9392137 L3.2,19.8232193 L3.2,19.8232193 Z M4.17680114,3.2 L9.06960683,3.2 L9.06960683,5.15360227 L5.15360227,5.15360227 L5.15360227,9.06080682 L3.2,9.06080682 L3.2,3.2 L4.17680114,3.2 Z" id="形状" fill="#7F7F7F" fill-rule="nonzero"></path>
+            <path d="M19.82193,20.8000205 L14.9304136,20.8000205 L14.9304136,18.8464182 L18.8376182,18.8464182 L18.8376182,14.9392137 L20.8000205,14.9392137 L20.8000205,20.8000205 L19.8232193,20.8000205 Z M20.8000205,4.17680114 L20.8000205,3.2 L14.9304136,3.2 L14.9304136,5.15360227 L18.8376182,5.15360227 L18.8376182,9.06080682 L20.8000205,9.06080682 L20.8000205,4.17680114 Z M3.2,19.8232193 L3.2,20.8000205 L9.06960683,20.8000205 L9.06960683,18.8464182 L5.15360227,18.8464182 L5.15360227,14.9392137 L3.2,14.9392137 L3.2,19.8232193 L3.2,19.8232193 Z M4.17680114,3.2 L9.06960683,3.2 L9.06960683,5.15360227 L5.15360227,5.15360227 L5.15360227,9.06080682 L3.2,9.06080682 L3.2,3.2 L4.17680114,3.2 Z" id="形状" fill="#7F7F7F" fill-rule="nonzero"></path>
         </g>
     </g>
 </svg>

src/components/case/index.vue

@@ -321,15 +321,17 @@ export default {
               console.log()
             let formList = []
             sessionStorage.setItem('ruleReqs', JSON.stringify(formList))
-              for (var j=0;j<this.requires.length;j++){
+              let list = this.requires
+              for (var j=0;j<list.length;j++){
                 for (var i=0;i<datas.length;i++){
-                if (datas[i].lcId== this.requires[j].judgmentId){
+                if (datas[i].lcId== list[j].judgmentId){
-                  this.requires[j].flag = datas[i].flag
+                  list[j].flag = datas[i].flag
-                  this.requires[j].score = datas[i].judgmentScore
+                  list[j].score = datas[i].judgmentScore
-                  this.requires[j].right = datas[i].calculate
+                  list[j].right = datas[i].calculate
                 }
               }
             }
+              this.requires = list
           }
           console.log(this.requires)
         }).catch((error)=>{

src/pages/counter/list/index.vue

@@ -359,17 +359,6 @@ export default {
         }
     },
     mounted(){
-        let token = this.getQueryVariable('token')
-        let cid = this.getQueryVariable('cid')
-        let systemId = this.getQueryVariable('systemId')
-        if (token != null){
-            sessionStorage.setItem('token', token)
-            sessionStorage.setItem('cid', cid)
-            sessionStorage.setItem('systemId', systemId)
-        }else{
-
-        }
-
         // Promise.resolve(2).then(value=>{
         //  console.log(111,value)
         //  return value
@@ -466,7 +455,6 @@ export default {
                   return null
               }
           }
-
       },
         toggleGoods() {
           this.showGoods = !this.showGoods;
@@ -582,19 +570,18 @@ export default {
             }else{
               if (this.id == '62'){
                   this.goodsShelfTotalData = this.auditGoodsShelf
-                  let formExternalData = {
+                  let formDataAccountVoucher = []
-                      openAccount:{
+                  let formDataAccountPassword = ''
-                          voucherNumber:[],
-                          paymentCode: '',
-                      }
-                  }
                   if (this.receptionList.length){
-                      formExternalData.openAccount.voucherNumber = this.receptionList
+                      formDataAccountVoucher = this.receptionList
+                      sessionStorage.setItem('formDataAccountVoucher', JSON.stringify(formDataAccountVoucher))
                   }
-                  if (this.paymentCode.length){
+                  if (this.passwordForm.passwordAgain){
-                      formExternalData.openAccount.paymentCode = this.passwordForm.passwordAgain
+                      formDataAccountPassword = this.passwordForm.passwordAgain
+                      sessionStorage.setItem('formDataAccountPassword', formDataAccountPassword)
                   }
-                sessionStorage.setItem('formExternalData', JSON.stringify(formExternalData))
+
+
               }
             }
           this.toggleGoods()

src/pages/index/list/index.vue

@@ -37,9 +37,27 @@ export default {
     },
     
     mounted() {
-        
+        let token = this.getQueryVariable('token')
+        let cid = this.getQueryVariable('cid')
+        let systemId = this.getQueryVariable('systemId')
+        if (token != null){
+            sessionStorage.setItem('token', token)
+            sessionStorage.setItem('cid', cid)
+            sessionStorage.setItem('systemId', systemId)
+        }
     },
     methods: {
+        getQueryVariable(name) {
+            var reg = new RegExp('(^|&)'+name+'=([^&]*)(&|$)')
+            if( window.location.href.split('?')[1]){
+                var r = window.location.href.split('?')[1].match(reg)
+                if (r != null){
+                    return (r[2])
+                }else{
+                    return null
+                }
+            }
+        },
         toPart(path){
             this.$router.push(path)
         },

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

@@ -277,33 +277,38 @@ export default {
         }else{
           formList = []
         }
-        let formExternalData = sessionStorage.getItem('formExternalData')
+        let formDataAccountVoucher = sessionStorage.getItem('formDataAccountVoucher')
-        let formExternalDataList = JSON.parse(formExternalData);
+          let formDataAccountPassword = sessionStorage.getItem('formDataAccountPassword')
-        let voucherNumber = []
+        let formExternalDataList = JSON.parse(formDataAccountVoucher);
-        let paymentCode = '';
+        console.log(formExternalDataList)
-        if (formExternalDataList){
+          console.log(formDataAccountPassword)
-          voucherNumber = formExternalDataList.openAccount.voucherNumber
+        let voucherNumber = formExternalDataList
-          paymentCode = formExternalDataList.openAccount.paymentCode
+        let paymentCode = formDataAccountPassword;
-        }
+        if(this.form.userName && this.form.currency && this.form.goldLogo && this.form.accountType && this.form.drawWay && this.form.voucherType && voucherNumber.length && paymentCode){
-        if(this.form.userName && this.form.currency && this.form.goldLogo && this.form.accountType && this.form.drawWay && this.form.voucherType && voucherNumber.length && paymentCode ||
-            (this.formTwo == true && this.form.accountTypesTwo && this.form.drawWaysTwo && this.form.voucherTypesTwo) ||
-            (this.formThree == true && this.form.accountTypesThree && this.form.drawWaysThree && this.form.voucherTypesThree)){
           for (var i=0;i<voucherNumber.length;i++){
             formList.push({"emptyOne": "", "emptyTwo": "", "operationIds": "0,5,26,57,62,75,"+voucherNumber[i].id,"type": ""})
           }
           formList.push(
               {"emptyOne": "17", "emptyTwo": paymentCode, "operationIds": "0,5,26,57,62,77", "type": "3"},//支取密码
           )
-          if (this.form.userNumber){formList.push({"emptyOne": "6", "emptyTwo": this.form.userNumber, "operationIds": "0,5,26,57,62,68","type": "3"})}//客户号
+            if(this.formTwo == false || this.formTwo == true && (this.form.accountTypesTwo && this.form.drawWaysTwo && this.form.voucherTypesTwo)){
-          if (this.form.accountQuality){formList.push({"emptyOne": "10", "emptyTwo": this.form.accountQuality, "operationIds": "0,5,26,57,62,72", "type": "1"})}//账户性质1
-          if (this.form.accountQualitysTwo){formList.push({"emptyOne": "10", "emptyTwo": this.form.accountQualitysTwo, "operationIds": "0,5,26,57,62,270", "type": "1"})}//账户性质2
                 if (this.form.accountTypesTwo){formList.push({"emptyOne": "12", "emptyTwo": this.form.accountTypesTwo, "operationIds": "0,5,26,57,62,272", "type": "1"})}//账户类型2
                 if (this.form.drawWaysTwo){formList.push({"emptyOne": "13", "emptyTwo": this.form.drawWaysTwo, "operationIds": "0,5,26,57,62,274", "type": "1"})} //支取方式2
                 if (this.form.voucherTypesTwo){formList.push({"emptyOne": "11", "emptyTwo": this.form.voucherTypesTwo, "operationIds": "0,5,26,57,62,271", "type": "1"})} //凭证类型2
-          if (this.form.accountQualitysThree){formList.push({"emptyOne": "10", "emptyTwo": this.form.accountQualitysThree, "operationIds": "0,5,26,57,62,276", "type": "1"})}//账户性质3
+            }else{
+                this.$message.error('有必填项未填哦~');
+            }
+            if(this.formThree == false || this.formThree == true && (this.form.accountTypesThree && this.form.drawWaysThree && this.form.voucherTypesThree)){
                 if (this.form.accountTypesThree){formList.push({"emptyOne": "12", "emptyTwo": this.form.accountTypesThree, "operationIds": "0,5,26,57,62,278", "type": "1"})}//账户类型3
                 if (this.form.drawWaysThree){formList.push({"emptyOne": "13", "emptyTwo": this.form.drawWaysThree, "operationIds": "0,5,26,57,62,280", "type": "1"})}//支取方式3
                 if (this.form.voucherTypesThree){formList.push({"emptyOne": "11", "emptyTwo": this.form.voucherTypesThree, "operationIds": "0,5,26,57,62,277", "type": "1"})}//凭证类型3
+            }else{
+                this.$message.error('有必填项未填哦~');
+            }
+          if (this.form.userNumber){formList.push({"emptyOne": "6", "emptyTwo": this.form.userNumber, "operationIds": "0,5,26,57,62,68","type": "3"})}//客户号
+          if (this.form.accountQuality){formList.push({"emptyOne": "10", "emptyTwo": this.form.accountQuality, "operationIds": "0,5,26,57,62,72", "type": "1"})}//账户性质1
+          if (this.form.accountQualitysTwo){formList.push({"emptyOne": "10", "emptyTwo": this.form.accountQualitysTwo, "operationIds": "0,5,26,57,62,270", "type": "1"})}//账户性质2
+          if (this.form.accountQualitysThree){formList.push({"emptyOne": "10", "emptyTwo": this.form.accountQualitysThree, "operationIds": "0,5,26,57,62,276", "type": "1"})}//账户性质3
           formList.push(
               {"emptyOne": "7", "emptyTwo": this.form.userName, "operationIds": "0,5,26,57,62,69", "type": "3"},//用户名称
               {"emptyOne": "8", "emptyTwo": this.form.currency, "operationIds": "0,5,26,57,62,70", "type": "1"},//币种