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

src/pages/counter/list/index.vue

@@ -790,7 +790,12 @@ export default {
                     let projectId = sessionStorage.getItem('projectId')
                     let startTime = sessionStorage.getItem('startTime')
                      let formList = [];
-                     for (var i=0;i<this.receptionList.length;i++){formList.push({ "answerId":this.receptionList[i].id, "emptyOne": "", "emptyTwo": "", "operationIds": "0,1,"+this.receptionList[i].id, "type": "" })}
+                     for (var i=0;i<this.receptionList.length;i++){formList.push({
+                         "answerId":this.receptionList[i].id,
+                         "emptyOne": "",
+                         "emptyTwo": "",
+                         "operationIds": "0,1,"+this.receptionList[i].id,
+                         "type": "" })}
                     let params= {
                         parentId:'0,1',
                         lcJudgmentRuleReq:formList,

src/pages/manage/list/client/consumerClient.vue

@@ -108,6 +108,8 @@
 
 <script>
 import { mapState, mapMutations } from 'vuex'
+import { vername, vermob } from '@/utils/verify.js'
+import { addOperation } from '@/api/http';
 import { mobPattern, namePattern, ratePattern, vercustomer  } from '@/utils/verify.js'
 import { phoneListen, mailBoxListen, checkRequired, myValidate, checkName } from '@/utils/utilFunction.js'
 
@@ -175,36 +177,60 @@ export default {
         },
       //提交个人用户信息
       submitForm(){
-        let formExternalData = sessionStorage.getItem('formExternalData')
-        let consumerClientDragList = JSON.parse(formExternalData);
-        this.$refs.form.validate(myValidate(() => {
-            this.visible = true;
-            let formList = [];
-            if(this.form.nationality){
-                formList.push({
-                "emptyOne": "",
-                "emptyTwo": "",
-                "operationIds": "0,5,25,33,45",
-                "type": ""
-                })
-            }
-            if(this.form.mailbox){
-                formList.push({
-                "emptyOne": "",
-                "emptyTwo": "",
-                "operationIds": "0,5,25,33,46",
-                "type": ""
-                })
-            }
-            formList.push(
-                {"emptyOne": "", "emptyTwo": "", "operationIds": "0,5,25,33,40", "type": ""},
-                {"emptyOne": "", "emptyTwo": "", "operationIds": "0,5,25,33,41,13", "type": ""},
-                {"emptyOne": "", "emptyTwo": "", "operationIds": "0,5,25,33,42", "type": ""},
-                {"emptyOne": "", "emptyTwo": "", "operationIds": "0,5,25,33,44", "type": ""},
-                {"emptyOne": "", "emptyTwo": "", "operationIds": "0,5,25,33,47", "type": ""}
-            );
-            sessionStorage.setItem('ruleReqs', JSON.stringify(formList))
-        }, this.$refs));
+          let formExternalData = sessionStorage.getItem('formExternalData')
+          let consumerClientDragList = JSON.parse(formExternalData);
+          this.$refs.form.validate(myValidate(() => {
+                    this.visible = true;
+                    let formList = [];
+                    if(this.form.sex){
+                        formList.push({
+                            "answerId":'43',
+                            "emptyOne": "1",
+                            "emptyTwo": this.form.sex,
+                            "operationIds": "0,5,25,33,43",//性别
+                            "type": "1"
+                        })
+                    }
+                    if(this.form.nationality){
+                        formList.push({
+                            "answerId":'45',
+                            "emptyOne": "3",
+                            "emptyTwo": this.form.nationality,
+                            "operationIds": "0,5,25,33,45",//民族
+                            "type": "1"
+                        })
+                    }
+                    if(this.form.mailbox){
+                        formList.push({
+                            "answerId":'46',
+                            "emptyOne": "4",
+                            "emptyTwo": this.form.mailbox,
+                            "operationIds": "0,5,25,33,46",//通讯地址
+                            "type": "3"
+                        })
+                    }
+                    formList.push(
+                        {"answerId":'40',"emptyOne": "19", "emptyTwo": this.form.idType, "operationIds": "0,5,25,33,40", "type": "1"},//证件类型
+                        {"answerId":'46',"emptyOne": "", "emptyTwo": "", "operationIds": "0,5,25,33,41,13", "type": ""},//证件号码
+                        {"answerId":'42',"emptyOne": "7", "emptyTwo": this.form.userName, "operationIds": "0,5,25,33,42", "type": "3"},//客户姓名
+                        {"answerId":'44',"emptyOne": "2", "emptyTwo": this.form.birthday, "operationIds": "0,5,25,33,44", "type": ""},//出生日期
+                        {"answerId":'47',"emptyOne": "5", "emptyTwo": this.form.phone, "operationIds": "0,5,25,33,47", "type": "3"}//联系电话
+                    );
+                    let params= {
+                        parentId:'0,5,25,33',
+                        lcJudgmentRuleReq:formList,
+                        projectId:+projectId,
+                        startTime:startTime,
+                    }
+                    addOperation(params).then((data)=>{
+                        this.$message({
+                            message: '提交成功',
+                            type: 'success'
+                        });
+                    }).catch((error)=>{
+                    })
+                } , this.$refs));
+        //
         // if(this.form.idNumber && this.form.idNumber.userName &&  this.form.idNumber.sex && this.form.idNumber.birthday && this.form.idNumber.phone) {
         //   this.visible = true;
         //   let formList = [];
@@ -236,7 +262,7 @@ export default {
         //   this.$message.error('有必填项为填哦~');
         // }
       },
-        
+
         popSure(){
             this.success&&(this.visible = false)
             this.authorization&&(this.success=true)