From 490e4f034461ae5617e8707d766760189573b844 Mon Sep 17 00:00:00 2001
From: e <2432808546@qq.com>
Date: Thu, 28 Oct 2021 10:13:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=8E=E8=81=8C=E7=AB=99=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E5=88=B0=E9=93=B6=E8=A1=8C=E9=A1=B9=E7=9B=AE=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=20=E5=AD=98=E6=AC=BE/=E5=8F=96=E6=AC=BE/=E8=BD=AC=E8=B4=A6/?=
 =?UTF-8?q?=E7=BB=93=E6=B8=85/=E9=94=80=E6=88=B7=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=E6=95=B4=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/api.js                                |  3 +-
 src/components/case/index.vue                 |  5 +-
 src/pages/counter/list/index.vue              | 66 ++++++++++++++-----
 .../manage/list/client/consumerClient.vue     |  4 +-
 .../currentAccount/accountCancellation.vue    | 22 ++++++-
 .../list/personal/currentAccount/deposit.vue  | 31 ++++++++-
 .../personal/currentAccount/openAccount.vue   | 28 ++++----
 .../list/personal/currentAccount/settle.vue   | 25 ++++++-
 .../currentAccount/transferAccounts.vue       | 32 ++++++++-
 .../personal/currentAccount/withdrawal.vue    | 32 ++++++++-
 10 files changed, 205 insertions(+), 43 deletions(-)

diff --git a/src/api/api.js b/src/api/api.js
index 769cc47..57f4194 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -28,7 +28,8 @@ service.interceptors.response.use(
         return Promise.reject(error.response)
     }
 )
-let token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ1c2VyIiwiaWF0IjoxNjM1MzE1Nzc2LCJleHAiOjE2MzUzNTg5NzYsImFjY291bnRJZCI6IjEifQ.8K5ySMaieffu79LZjJPfA7u_OfMRo6JfiarCJGdoCiE'
+let token = sessionStorage.getItem('token')
+// let token = sessionStorage.getItem('token')
 export function get(url, params = {}) {
     // params.t = new Date().getTime(); //get方法加一个时间参数,解决ie下可能缓存问题.
     return service({
diff --git a/src/components/case/index.vue b/src/components/case/index.vue
index 1288a59..0c7aaf1 100644
--- a/src/components/case/index.vue
+++ b/src/components/case/index.vue
@@ -297,17 +297,20 @@ export default {
         for (var i=0;i<this.requires.length;i++){
           lcld.push(this.requires[i].judgmentId)
         }
+       let systemId = sessionStorage.getItem('systemId')
+        let cid = sessionStorage.getItem('cid')
         let  params = {
           "accountId": 0,
           "assessmentId": 0,
           "classId": 0,
+          "curriculumId":cid,
           "endTime": this.actEndTime,
           "lcId": lcld,
           "projectId": 0,
           "ruleReqs": ruleReqsList,
           "startTime": +startTime,
           "submitTime": this.actEndTime,
-          "systemId": 11,
+          "systemId": systemId,
           "timeSum": 0
         }
         submit(params).then((data)=>{
diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue
index 45a9f51..c359b74 100644
--- a/src/pages/counter/list/index.vue
+++ b/src/pages/counter/list/index.vue
@@ -334,6 +334,7 @@ export default {
         }
     },
     mounted(){
+      this.getQueryVariable()
         // Promise.resolve(2).then(value => {
         //     console.log(111, value)
         //     return value
@@ -420,9 +421,23 @@ export default {
         });
     },
     methods: {
+      getQueryVariable(variable) {
+        var query = window.location.href;
+        var vars = query.split("?");
+        for (var i=1;i<vars.length;i++) {
+          var pair = vars[i].split("&");
+          if(pair[0] == variable){return pair[1];}
+        }
+        for (var j=0;j<pair.length;j++){
+          var index=pair[j].lastIndexOf("=");
+          pair[j]=pair[j].substring(index+1,pair[j].length);
+        }
+        sessionStorage.setItem('token', pair[0])
+        sessionStorage.setItem('cid', pair[1])
+        sessionStorage.setItem('systemId', pair[2])
+      },
         toggleGoods() {
-          console.log('========')
-            this.showGoods = !this.showGoods;
+          this.showGoods = !this.showGoods;
         },
         showData(type) {/* 展示弹窗-type为弹窗标题文字 */
             this.$store.commit('system/changePop',{show:true,text:type})
@@ -522,24 +537,41 @@ export default {
                 this.$store.commit('system/changeGoods',{push:arr})
                 clickList.length = 0
             }else{
-              if (this.id == '33'){
-                sessionStorage.setItem('consumerClientDrag', JSON.stringify(this.receptionList))
-              }
-                switch (this.popText) {/* 其他物品交互逻辑： */
-                    case'':
-                        break;
-                    case'':
-                        break;
-                    default:
-                        break;
+              if (this.id == '62'){
+                let formExternalData = {
+                  openAccount:{
+                    voucherNumber:this.receptionList,
+                    paymentCode:this.passwordForm.passwordAgain,
+                  }
                 }
+                sessionStorage.setItem('formExternalData', JSON.stringify(formExternalData))
+              }
             }
           this.toggleGoods()
-            this.$message.success(`${this.popText}操作成功！`)
-            setTimeout(()=>{
-                this.$store.commit('system/changePop',{show:false,text:''})
-            },800)
-          this.receptionList = [];
+          if(this.popText == '密码器'){
+            if(this.passwordForm.password && this.passwordForm.passwordAgain){
+              if(this.passwordForm.password.length >=6 && this.passwordForm.passwordAgain.length >=6){
+                if(this.passwordForm.password == this.passwordForm.passwordAgain) {
+                  this.$store.commit('system/changePop', {show: false, text: ''})
+                  this.$message.success(`${this.popText}操作成功！`)
+                }
+              }
+            }else{
+              this.$message.error('请输入密码和确认密码');
+            }
+          }else{
+            if (this.receptionList.length >0){
+              this.$message.success(`${this.popText}操作成功！`)
+              // setTimeout(()=>{
+              //
+              // },800)
+              this.$store.commit('system/changePop',{show:false,text:''})
+              this.receptionList = [];
+            }else{
+              this.$message.error('请从物品栏中拖拽所需资料');
+            }
+          }
+
         }
     }
 };
diff --git a/src/pages/manage/list/client/consumerClient.vue b/src/pages/manage/list/client/consumerClient.vue
index 47e83c5..035e586 100644
--- a/src/pages/manage/list/client/consumerClient.vue
+++ b/src/pages/manage/list/client/consumerClient.vue
@@ -143,8 +143,8 @@ export default {
         },
       //提交个人用户信息
       submitForm(){
-        let consumerClientDrag = sessionStorage.getItem('consumerClientDrag')
-        let consumerClientDragList = JSON.parse(consumerClientDrag);
+        let formExternalData = sessionStorage.getItem('formExternalData')
+        let consumerClientDragList = JSON.parse(formExternalData);
         console.log(consumerClientDragList)
         if(this.form.idNumber && this.form.idNumber.userName &&  this.form.idNumber.sex && this.form.idNumber.birthday && this.form.idNumber.phone) {
           this.visible = true;
diff --git a/src/pages/manage/list/personal/currentAccount/accountCancellation.vue b/src/pages/manage/list/personal/currentAccount/accountCancellation.vue
index 126dc09..2e27de2 100644
--- a/src/pages/manage/list/personal/currentAccount/accountCancellation.vue
+++ b/src/pages/manage/list/personal/currentAccount/accountCancellation.vue
@@ -32,7 +32,7 @@
                 </el-col>
             </el-form>
         </el-row>
-        <el-button @click="visible = true" type="primary" class="submitBtn">提交</el-button>
+        <el-button @click="submitForm" type="primary" class="submitBtn">提交</el-button>
     </div>
 </template>
 <script>
@@ -51,7 +51,25 @@ export default{
       
     },
     methods: {
-
+//提交表单
+      submitForm(){
+        let ruleReqs = sessionStorage.getItem('ruleReqs')
+        let formList = JSON.parse(ruleReqs);
+        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: ''
+          });
+        }else{
+          this.$message.error('有必填项未填哦~');
+        }
+      },
     },
 }
 </script>
diff --git a/src/pages/manage/list/personal/currentAccount/deposit.vue b/src/pages/manage/list/personal/currentAccount/deposit.vue
index bf9c967..3e9490b 100644
--- a/src/pages/manage/list/personal/currentAccount/deposit.vue
+++ b/src/pages/manage/list/personal/currentAccount/deposit.vue
@@ -38,7 +38,7 @@
                 </el-col>
             </el-form>
         </el-row>
-        <el-button @click="visible = true" type="primary" class="submitBtn">提交</el-button>
+        <el-button @click="submitForm" type="primary" class="submitBtn">提交</el-button>
     </div>
 </template>
 <script>
@@ -56,7 +56,34 @@ export default{
               remark:'',
             }
         }
-    }
+    },
+  mounted() {
+
+  },
+  methods: {
+    //提交表单
+    submitForm(){
+      let ruleReqs = sessionStorage.getItem('ruleReqs')
+      let formList = JSON.parse(ruleReqs);
+      if(this.form.userName && this.form.goldLogo && this.form.annualInterest){
+        if (this.form.currency){formList.push({"emptyOne": "8", "emptyTwo": this.form.currency, "operationIds": "26,57,63,80","type": "3"})}//币种
+        if (this.form.money){formList.push({"emptyOne": "14", "emptyTwo": this.form.money, "operationIds": "26,57,63,82", "type": "3"})}//金额
+        if (this.form.remark){formList.push({"emptyOne": "16", "emptyTwo": this.form.remark, "operationIds": "26,57,63,84", "type": "3"})}//摘要
+        formList.push(
+            {"emptyOne": "7", "emptyTwo": this.form.userName, "operationIds": "26,57,63,79", "type": "3"},//用户名称
+            {"emptyOne": "9", "emptyTwo": this.form.goldLogo, "operationIds": "26,57,63,81", "type": "3"},//钞汇标识
+            {"emptyOne": "15", "emptyTwo": this.form.annualInterest, "operationIds": "26,57,63,83", "type": "3"},//年利率
+        )
+        sessionStorage.setItem('ruleReqs', JSON.stringify(formList))
+        this.$message({
+          message: '提交成功',
+          type: ''
+        });
+      }else{
+        this.$message.error('有必填项未填哦~');
+      }
+    },
+  },
 }
 </script>
 <style lang='scss' scoped>
diff --git a/src/pages/manage/list/personal/currentAccount/openAccount.vue b/src/pages/manage/list/personal/currentAccount/openAccount.vue
index da36113..38666c5 100644
--- a/src/pages/manage/list/personal/currentAccount/openAccount.vue
+++ b/src/pages/manage/list/personal/currentAccount/openAccount.vue
@@ -227,15 +227,9 @@ export default {
         },
         openAccount(){
           this.count = this.count+1;
-          if (this.count > 2){
-            this.count = 2
-          }
-          if(this.count == 1){
-            this.formTwo = true
-          }
-          if (this.count == 2){
-            this.formThree = true
-          }
+          if (this.count > 2){this.count = 2}
+          if(this.count == 1){this.formTwo = true}
+          if (this.count == 2){this.formThree = true}
             // if(this.second.length){/* 检测已有二级卡是否填写完整 */
             //     return this.$message('请把已有的二级卡填写完整再执行新增操作！')
             //     for (let i= 0; i< this.second.length; i++) {
@@ -244,7 +238,6 @@ export default {
             //         }
             //     }
             // }
-
             // let obj = {}/* 二级卡定义空属性 */
             // this.second.push(obj)``
         },
@@ -255,7 +248,12 @@ export default {
       //确认提交
       popSure(){
         this.visible = false
-        let formList = [];
+        let ruleReqs = sessionStorage.getItem('ruleReqs')
+        let formList = JSON.parse(ruleReqs);
+
+        let formExternalData = sessionStorage.getItem('formExternalData')
+        let formExternalDataList = JSON.parse(formExternalData);
+        console.log(formExternalDataList.openAccount.voucherNumber)
         if(this.form.userName && this.form.currency && this.form.goldLogo && this.form.accountType && this.form.drawWay && this.form.voucherType ||
             (this.formTwo == true && this.form.accountTypesTwo && this.form.drawWaysTwo && this.form.voucherTypesTwo) ||
             (this.formThree == true && this.form.accountTypesThree && this.form.drawWaysThree && this.form.voucherTypesThree)){
@@ -278,6 +276,10 @@ export default {
               {"emptyOne": "11", "emptyTwo": this.form.voucherType, "operationIds": "26,57,62,73", "type": "3"} //凭证类型
           )
           sessionStorage.setItem('ruleReqs', JSON.stringify(formList))
+          this.$message({
+            message: '提交成功',
+            type: ''
+          });
         }else{
           this.$message.error('有必填项未填哦~');
         }
@@ -305,10 +307,10 @@ export default {
             });
         },
       popUp(){
-        this.$store.commit('system/changePop',{show:true,text:'刷卡器'})
+        this.$store.commit('system/changePop',{show:true,text:'刷卡器',id:'62'})
       },
       popUps(){
-        this.$store.commit('system/changePop',{show:true,text:'密码器'})
+        this.$store.commit('system/changePop',{show:true,text:'密码器',id:'62'})
       },
     }
 };
diff --git a/src/pages/manage/list/personal/currentAccount/settle.vue b/src/pages/manage/list/personal/currentAccount/settle.vue
index 37facfc..eee70d5 100644
--- a/src/pages/manage/list/personal/currentAccount/settle.vue
+++ b/src/pages/manage/list/personal/currentAccount/settle.vue
@@ -51,7 +51,7 @@
                 </el-col>
             </el-form>
         </el-row>
-        <el-button @click="visible = true" type="primary" class="submitBtn">提交</el-button>
+        <el-button @click="submitForm" type="primary" class="submitBtn">提交</el-button>
     </div>
 </template>
 <script>
@@ -76,7 +76,30 @@ export default{
       
     },
     methods: {
+//提交表单
+      submitForm(){
+        let ruleReqs = sessionStorage.getItem('ruleReqs')
+        let formList = JSON.parse(ruleReqs);
+        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: ''
+          });
+        }else{
+          this.$message.error('有必填项未填哦~');
+        }
+      },
     },
 }
 </script>
diff --git a/src/pages/manage/list/personal/currentAccount/transferAccounts.vue b/src/pages/manage/list/personal/currentAccount/transferAccounts.vue
index 0d8c858..d028e6b 100644
--- a/src/pages/manage/list/personal/currentAccount/transferAccounts.vue
+++ b/src/pages/manage/list/personal/currentAccount/transferAccounts.vue
@@ -46,7 +46,7 @@
                 </el-col>
             </el-form>
         </el-row>
-        <el-button @click="visible = true" type="primary" class="submitBtn">提交</el-button>
+        <el-button @click="submitForm" type="primary" class="submitBtn">提交</el-button>
     </div>
 </template>
 <script>
@@ -65,7 +65,35 @@ export default{
               remark:'',
             }
         }
-    }
+    },
+  mounted() {
+
+  },
+  methods: {
+    //提交表单
+    submitForm(){
+      let ruleReqs = sessionStorage.getItem('ruleReqs')
+      let formList = JSON.parse(ruleReqs);
+      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: ''
+        });
+      }else{
+        this.$message.error('有必填项未填哦~');
+      }
+    },
+  },
 }
 </script>
 <style lang='scss' scoped>
diff --git a/src/pages/manage/list/personal/currentAccount/withdrawal.vue b/src/pages/manage/list/personal/currentAccount/withdrawal.vue
index 2ba3c99..ff4bf2e 100644
--- a/src/pages/manage/list/personal/currentAccount/withdrawal.vue
+++ b/src/pages/manage/list/personal/currentAccount/withdrawal.vue
@@ -48,7 +48,7 @@
                 </el-col>
             </el-form>
         </el-row>
-        <el-button @click="visible = true" type="primary" class="submitBtn">提交</el-button>
+        <el-button @click="submitForm" type="primary" class="submitBtn">提交</el-button>
     </div>
 </template>
 <script>
@@ -67,7 +67,35 @@ export default{
               remark:'',
             }
         }
-    }
+    },
+  mounted() {
+
+  },
+  methods: {
+    //提交表单
+    submitForm(){
+      let ruleReqs = sessionStorage.getItem('ruleReqs')
+      let formList = JSON.parse(ruleReqs);
+      if(this.form.userName && this.form.goldLogo && this.form.chargeWay && this.form.serviceCharge){
+        if (this.form.currency){formList.push({"emptyOne": "8", "emptyTwo": this.form.currency, "operationIds": "26,57,64,87","type": "3"})}//币种
+        if (this.form.money){formList.push({"emptyOne": "14", "emptyTwo": this.form.money, "operationIds": "26,57,64,89", "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.userName, "operationIds": "26,57,64,86", "type": "3"},//用户名称
+            {"emptyOne": "9", "emptyTwo": this.form.goldLogo, "operationIds": "26,57,64,88", "type": "3"},//钞汇标识
+            {"emptyOne": "15", "emptyTwo": this.form.chargeWay, "operationIds": "26,57,64,90", "type": "3"},//支取方式
+            {"emptyOne": "15", "emptyTwo": this.form.serviceCharge, "operationIds": "26,57,64,92", "type": "3"},//手续费
+        )
+        sessionStorage.setItem('ruleReqs', JSON.stringify(formList))
+        this.$message({
+          message: '提交成功',
+          type: ''
+        });
+      }else{
+        this.$message.error('有必填项未填哦~');
+      }
+    },
+  },
 }
 </script>
 <style lang='scss' scoped>