Merge branch 'master' of ssh://git.czcyedu.com:222/huoran/FE_bankTeaching into master

src/pages/counter/list/index.vue

@@ -407,12 +407,16 @@ export default {
                 }
             }
             if(this.$store.state.system.popText == '密码器'){
+                if(this.$store.state.system.id == '62,1'){
+
+                }else{
                     let accountPasswordAll = sessionStorage.getItem('accountPasswordAll');
                     if(accountPasswordAll){
                         this.passwordForm.password = accountPasswordAll
                         this.passwordForm.passwordAgain = accountPasswordAll
                     }
                 }
+            }
             if(this.$store.state.system.popText == '身份证扫描仪'){
                 if (this.$store.state.system.id == '33'){
                     this.nbm = 33
@@ -439,7 +443,6 @@ export default {
                     }).catch((error)=>{
                     })
                 }else if (this.$store.state.system.id == '34'){
-                    console.log('===========')
                     this.nbm = 34
                     let param= {
                         parentId: '0,5,25,34,54'

src/pages/manage/list/business/withdrawal.vue

@@ -228,7 +228,6 @@ export default {
             this.$refs.form.validate(myValidate(() => {
                 // 验证通过逻辑写在这
                 this.visible = true;
-                const formList = []
                 const parentId = '0,5,27,226'
                 autoPlay(parentId, this.form, this.myTable2, this.myTable, projectId, startTime)
                 // let tmpIndex = 100;

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

@@ -2,7 +2,7 @@
 <template>
     <div class="body">
         <el-row :gutter="20" style="margin: 0">
-            <el-form ref="form" :rules="rules" :model="form" label-width="120px" @click.native="depositFinishJudge">
+            <el-form ref="form" :rules="rules" :model="form" label-width="120px">
                 <el-col :span="10" :offset="1">
                     <el-form-item label="卡号" required>
                         <div class="idCard" @click="popUp('刷卡器')">
@@ -19,7 +19,7 @@
                     </el-form-item>
                     <el-form-item label="支取密码" required>
                         <div class="idCard" @click="popUp('密码器')">
-                            <p>请刷卡</p>
+                            <p>请输入密码</p>
                         </div>
                     </el-form-item>
                 </el-col>
@@ -54,6 +54,7 @@
 <script>
 import { mobPattern, namePattern, ratePattern, vercustomer  } from '@/utils/verify.js'
 import { myValidate, ismoney, checkName, checkHanzi  } from '@/utils/utilFunction.js'
+import { addOperation, getOperation } from '@/api/http';
 export default{
     name:'',
     props:{
@@ -97,36 +98,61 @@ export default{
         }
     },
   mounted() {
+      this.getFormData()
       this.$refs.userName.focus();
   },
   methods: {
-    //提交表单
+      getFormData(){
-    depositFinishJudge() {
+          let param= {
-        if(!this.depositFinish) {
+              parentId: '0,5,26,57,64'
-            this.$alert('请根据案例内容，操作存款业务', '提示', {
+          }
-                confirmButtonText: '确定'
+          getOperation(param).then((data)=>{
-            });
+              if(data.status == 200) {
+                  var list = data.data.judgmentRuleReqs
+                  for (var i = 0; i < list.length; i++) {
+                      if (list[i].answerId == '85') {sessionStorage.setItem('firmClientIdentity', list[i].emptyTwo)} //卡号
+                      if (list[i].answerId == '86') {this.form.userName = list[i].emptyTwo} //客户姓名
+                      if (list[i].answerId == '87') {this.form.currency = list[i].emptyTwo} //币种
+                      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 == '92') {this.form.serviceCharge = list[i].emptyTwo} //手续费
+                      if (list[i].answerId == '93') {this.form.remark = list[i].emptyTwo} //摘要
                   }
+              }
+          }).catch((error)=>{
+          })
       },
     submitForm(){
-        let ruleReqs = sessionStorage.getItem('ruleReqs')
+        let projectId = sessionStorage.getItem('projectId')
-        let formList = JSON.parse(ruleReqs);
+        let startTime = sessionStorage.getItem('startTime')
         this.$refs.form.validate(myValidate(() => {
+            this.visible = true;
+            let formList = [];
             // 验证通过逻辑写在这
-            if (this.form.currency){formList.push({"emptyOne": "8", "emptyTwo": this.form.currency, "operationIds": "26,57,64,87","type": "3"})}//币种
+            if (this.form.currency){formList.push({"answerId":'87', "emptyOne": "8", "emptyTwo": this.form.currency, "operationIds": "0,5,26,57,64,87","type": "1"})}//币种
-            if (this.form.money){formList.push({"emptyOne": "14", "emptyTwo": this.form.money, "operationIds": "26,57,64,89", "type": "3"})}//金额
+            if (this.form.money){formList.push({"answerId":'89', "emptyOne": "14", "emptyTwo": this.form.money, "operationIds": "0,5,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"})}//摘要
+            if (this.form.remark){formList.push({"answerId":'93', "emptyOne": "16", "emptyTwo": this.form.remark, "operationIds": "0,5,26,57,64,93", "type": "3"})}//摘要
             formList.push(
-                {"emptyOne": "7", "emptyTwo": this.form.userName, "operationIds": "26,57,64,86", "type": "3"},//用户名称
+                {"answerId":'86', "emptyOne": "7", "emptyTwo": this.form.userName, "operationIds": "0,5,26,57,64,86", "type": "3"},//客户姓名
-                {"emptyOne": "9", "emptyTwo": this.form.goldLogo, "operationIds": "26,57,64,88", "type": "3"},//钞汇标识
+                {"answerId":'88', "emptyOne": "9", "emptyTwo": this.form.goldLogo, "operationIds": "0,5,26,57,64,88", "type": "1"},//钞汇标识
-                {"emptyOne": "15", "emptyTwo": this.form.chargeWay, "operationIds": "26,57,64,90", "type": "3"},//支取方式
+                {"answerId":'90', "emptyOne": "15", "emptyTwo": this.form.chargeWay, "operationIds": "0,5,26,57,64,90", "type": "1"},//支取方式
-                {"emptyOne": "15", "emptyTwo": this.form.serviceCharge, "operationIds": "26,57,64,92", "type": "3"},//手续费
+                {"answerId":'92', "emptyOne": "15", "emptyTwo": this.form.serviceCharge, "operationIds": "0,5,26,57,64,92", "type": "3"},//手续费
             )
-            sessionStorage.setItem('ruleReqs', JSON.stringify(formList))
+            let params= {
+                parentId:'0,5,26,57,64',
+                lcJudgmentRuleReq:formList,
+                projectId:+projectId,
+                startTime:startTime,
+            }
+            addOperation(params).then((data)=>{
                 this.$message({
                     message: '提交成功',
                     type: 'success'
                 });
+            }).catch((error)=>{
+            })
         }, this.$refs));
     //   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"})}//币种