diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue
index ea32357..1adf6fe 100644
--- a/src/pages/counter/list/index.vue
+++ b/src/pages/counter/list/index.vue
@@ -368,6 +368,30 @@ export default {
                         }
                     }).catch((error)=>{
                     })
+                }else if (this.$store.state.system.id == '63'){
+                    this.nbm = 63
+                    let param= {
+                        parentId: '0,5,26,57,63,78'
+                    }
+                    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 nomBusinessDepositCard = sessionStorage.getItem('nomBusinessDepositCard')
+                            this.receptionList = JSON.parse(nomBusinessDepositCard);
+                            if(this.receptionList == null){
+                                this.receptionList = []
+                            }
+                        }
+                    }).catch((error)=>{
+                    })
                 }else{
                     let dataList = JSON.parse(sessionStorage.getItem('dataList'));
                     if (dataList){
@@ -389,6 +413,70 @@ export default {
                     this.passwordForm.passwordAgain = accountPasswordAll
                 }
             }
+            if(this.$store.state.system.popText == '身份证扫描仪'){
+                if (this.$store.state.system.id == '33'){
+                    this.nbm = 33
+                    let param= {
+                        parentId: '0,5,25,33,41'
+                    }
+                    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 nomClientIdentity = sessionStorage.getItem('nomClientIdentity')
+                            this.receptionList = JSON.parse(nomClientIdentity);
+                            if(this.receptionList == null){
+                                this.receptionList = []
+                            }
+                        }
+                    }).catch((error)=>{
+                    })
+                }else if (this.$store.state.system.id == '34'){
+                    console.log('===========')
+                    this.nbm = 34
+                    let param= {
+                        parentId: '0,5,25,34,54'
+                    }
+                    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 firmClientIdentity = sessionStorage.getItem('firmClientIdentity')
+                            this.receptionList = JSON.parse(firmClientIdentity);
+                            if(this.receptionList == null){
+                                this.receptionList = []
+                            }
+                        }
+                    }).catch((error)=>{
+                    })
+                }else{
+                    let dataList = JSON.parse(sessionStorage.getItem('dataList'));
+                    if (dataList){
+                        this.receptionList = []
+                        for(var j=0;j<dataList.length;j++){
+                            for(var i=0;i<this.goodsShelfTotalData.length;i++){
+                                if(dataList[j].answerId == this.goodsShelfTotalData[i].id){
+                                    this.receptionList.push(this.goodsShelfTotalData[i])
+                                }
+                            }
+                        }
+                    }
+                }
+            }
             if(!this.showGoods) this.checkList = []
             return this.$store.state.system.showPop;
         },
@@ -673,6 +761,27 @@ export default {
                 this.$store.commit('system/changeGoods',{push:arr})
                 clickList.length = 0
             }else{
+                if (this.$store.state.system.id == '33'){
+                    this.nbm = 33
+                    this.goodsShelfTotalData = this.auditGoodsShelf
+                    if (this.receptionList.length >0){
+                        sessionStorage.setItem('nomClientIdentity', JSON.stringify(this.receptionList))
+                    }
+                }
+                if (this.$store.state.system.id == '34'){
+                    this.nbm = 34
+                    this.goodsShelfTotalData = this.auditGoodsShelf
+                    if (this.receptionList.length >0){
+                        sessionStorage.setItem('firmClientIdentity', JSON.stringify(this.receptionList))
+                    }
+                }
+                if (this.$store.state.system.id == '63'){
+                    this.nbm = 63
+                    this.goodsShelfTotalData = this.auditGoodsShelf
+                    if (this.receptionList.length >0){
+                        sessionStorage.setItem('nomBusinessDepositCard', JSON.stringify(this.receptionList))
+                    }
+                }
               if (this.$store.state.system.id == '62,1'){
                   this.nbm = 62
                   this.goodsShelfTotalData = this.auditGoodsShelf
diff --git a/src/pages/manage/list/client/consumerClient.vue b/src/pages/manage/list/client/consumerClient.vue
index 2b0c4bf..09cf756 100644
--- a/src/pages/manage/list/client/consumerClient.vue
+++ b/src/pages/manage/list/client/consumerClient.vue
@@ -57,8 +57,8 @@
                                 <el-option
                                 v-for="(item,index) in nations"
                                 :key="index"
-                                :label="item.name"
-                                :value="item.id">
+                                :label="item.description"
+                                :value="item.itemId">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -109,7 +109,7 @@
 <script>
 import { mapState, mapMutations } from 'vuex'
 import { vername, vermob } from '@/utils/verify.js'
-import { addOperation } from '@/api/http';
+import { addOperation, getOperation } from '@/api/http';
 import { mobPattern, namePattern, ratePattern, vercustomer  } from '@/utils/verify.js'
 import { phoneListen, mailBoxListen, checkRequired, myValidate } from '@/utils/utilFunction.js'
 
@@ -161,13 +161,93 @@ export default {
                 {name:'男',id:1},
                 {name:'女',id:2},
             ],
-            nations : [{name:"汉族",id:0}, {name:"蒙古族",id:1}, {name:"回族",id:2}, {name:"藏族",id:3}, {name:"维吾尔族",id:4}, {name:"苗族",id:5}, {name:"彝族",id:6}, {name:"壮族",id:7}, {name:"布依族",id:8}, {name:"朝鲜族",id:9}, {name:"满族",id:10}, {name:"侗族",id:11}, {name:"瑶族",id:12}, {name:"白族",id:13}, {name:"土家族",id:14},{name:"哈尼族",id:15}, {name:"哈萨克族",id:16}, {name:"傣族",id:17}, {name:"黎族",id:18}, {name:"傈僳族",id:19}, {name:"佤族",id:20}, {name:"畲族",id:21}, {name:"高山族",id:22}, {name:"拉祜族",id:23}, {name:"水族",id:24}, {name:"东乡族",id:25}, {name:"纳西族",id:26}, {name:"景颇族",id:27}, {name:"柯尔克孜族",id:28},{name:"土族",id:29}, {name:"达斡尔族",id:0}, {name:"仫佬族",id:31}, {name:"羌族",id:32}, {name:"布朗族",id:33}, {name:"撒拉族",id:34}, {name:"毛南族",id:35}, {name:"仡佬族",id:36}, {name:"锡伯族",id:37}, {name:"阿昌族",id:38}, {name:"普米族",id:39}, {name:"塔吉克族",id:40}, {name:"怒族",id:41}, {name:"乌孜别克族",id:42},{name:"俄罗斯族",id:43}, {name:"鄂温克族",id:44}, {name:"德昂族",id:45}, {name:"保安族",id:46}, {name:"裕固族",id:47}, {name:"京族",id:48}, {name:"塔塔尔族",id:49}, {name:"独龙族",id:50}, {name:"鄂伦春族",id:51}, {name:"赫哲族",id:52}, {name:"门巴族",id:53}, {name:"珞巴族",id:54}, {name:"基诺族",id:55}],
+            nations : [
+                { "itemId": 24, "description": "汉族", "options": "汉族", "subjectId": 3, "isDel": 0, "createTime": "2021-12-20 12:00:44", "updateTime": "2021-12-20 12:00:44" },
+                { "itemId": 25, "description": "蒙古族", "options": "蒙古族", "subjectId": 3, "isDel": 0, "createTime": "2021-12-20 12:00:44", "updateTime": "2021-12-20 12:00:44" },
+                { "itemId": 26, "description": "回族", "options": "回族", "subjectId": 3, "isDel": 0, "createTime": "2021-12-20 12:00:45", "updateTime": "2021-12-20 12:00:45" },
+                { "itemId": 27, "description": "藏族", "options": "藏族", "subjectId": 3, "isDel": 0, "createTime": "2021-12-20 12:00:45", "updateTime": "2021-12-20 12:00:45" },
+                { "itemId": 28, "description": "维吾尔族", "options": "维吾尔族", "subjectId": 3, "isDel": 0, "createTime": "2021-12-20 12:00:45", "updateTime": "2021-12-20 12:00:45" },
+                { "itemId": 29, "description": "苗族", "options": "苗族", "subjectId": 3, "isDel": 0, "createTime": "2021-12-20 12:00:45", "updateTime": "2021-12-20 12:00:45" },
+                { "itemId": 30, "description": "彝族", "options": "彝族", "subjectId": 3, "isDel": 0, "createTime": "2021-12-20 12:00:45", "updateTime": "2021-12-20 12:00:45" },
+                { "itemId": 31, "description": "壮族", "options": "壮族", "subjectId": 3, "isDel": 0, "createTime": "2021-12-20 12:00:45", "updateTime": "2021-12-20 12:00:45" },
+                { "itemId": 32, "description": "布依族", "options": "布依族", "subjectId": 3, "isDel": 0, "createTime": "2021-12-20 12:00:45", "updateTime": "2021-12-20 12:00:45" },
+                { "itemId": 33, "description": "朝鲜族", "options": "朝鲜族", "subjectId": 3, "isDel": 0, "createTime": "2021-12-20 12:00:45", "updateTime": "2021-12-20 12:00:45" },
+                { "itemId": 34, "description": "满族", "options": "满族", "subjectId": 3, "isDel": 0, "createTime": "2021-12-20 12:00:45", "updateTime": "2021-12-20 12:00:45" },
+                { "itemId": 35, "description": "侗族", "options": "侗族", "subjectId": 3, "isDel": 0, "createTime": "2021-12-20 12:00:45", "updateTime": "2021-12-20 12:00:45" },
+                { "itemId": 36, "description": "瑶族", "options": "瑶族", "subjectId": 3, "isDel": 0, "createTime": "2021-12-20 12:00:45", "updateTime": "2021-12-20 12:00:45" },
+                { "itemId": 37, "description": "白族", "options": "白族", "subjectId": 3, "isDel": 0, "createTime": "2021-12-20 12:00:45", "updateTime": "2021-12-20 12:00:45" },
+                { "itemId": 38, "description": "土家族", "options": "土家族", "subjectId": 3, "isDel": 0, "createTime": "2021-12-20 12:00:45", "updateTime": "2021-12-20 12:00:45" },
+                { "itemId": 39, "description": "哈尼族", "options": "哈尼族", "subjectId": 3, "isDel": 0, "createTime": "2021-12-20 12:00:45", "updateTime": "2021-12-20 12:00:45" },
+                { "itemId": 40, "description": "哈萨克族", "options": "哈萨克族", "subjectId": 3, "isDel": 0, "createTime": "2021-12-20 12:00:45", "updateTime": "2021-12-20 12:00:45" },
+                { "itemId": 41, "description": "傣族", "options": "傣族", "subjectId": 3, "isDel": 0, "createTime": "2021-12-20 12:00:45", "updateTime": "2021-12-20 12:00:45" },
+                { "itemId": 42, "description": "黎族", "options": "黎族", "subjectId": 3, "isDel": 0, "createTime": "2021-12-20 12:00:45", "updateTime": "2021-12-20 12:00:45" },
+                { "itemId": 43, "description": "傈僳族", "options": "傈僳族", "subjectId": 3, "isDel": 0, "createTime": "2021-12-20 12:00:45", "updateTime": "2021-12-20 12:00:45" },
+                { "itemId": 44, "description": "佤族", "options": "佤族", "subjectId": 3, "isDel": 0, "createTime": "2021-12-20 12:00:45", "updateTime": "2021-12-20 12:00:45" },
+                { "itemId": 45, "description": "畲族", "options": "畲族", "subjectId": 3, "isDel": 0, "createTime": "2021-12-20 12:00:45", "updateTime": "2021-12-20 12:00:45" },
+                { "itemId": 46, "description": "高山族", "options": "高山族", "subjectId": 3, "isDel": 0, "createTime": "2021-12-20 12:00:45", "updateTime": "2021-12-20 12:00:45" },
+                { "itemId": 47, "description": "拉祜族", "options": "拉祜族", "subjectId": 3, "isDel": 0, "createTime": "2021-12-20 12:00:45", "updateTime": "2021-12-20 12:00:45" },
+                { "itemId": 48, "description": "水族", "options": "水族", "subjectId": 3, "isDel": 0, "createTime": "2021-12-20 12:00:45", "updateTime": "2021-12-20 12:00:45" },
+                { "itemId": 49, "description": "东乡族", "options": "东乡族", "subjectId": 3, "isDel": 0, "createTime": "2021-12-20 12:00:45", "updateTime": "2021-12-20 12:00:45" },
+                { "itemId": 50, "description": "纳西族", "options": "纳西族", "subjectId": 3, "isDel": 0, "createTime": "2021-12-20 12:00:45", "updateTime": "2021-12-20 12:00:45" },
+                { "itemId": 51, "description": "景颇族", "options": "景颇族", "subjectId": 3, "isDel": 0, "createTime": "2021-12-20 12:00:45", "updateTime": "2021-12-20 12:00:45" },
+                { "itemId": 52, "description": "柯尔克孜族", "options": "柯尔克孜族", "subjectId": 3, "isDel": 0, "createTime": "2021-12-20 12:00:45", "updateTime": "2021-12-20 12:00:45" },
+                { "itemId": 53, "description": "土族", "options": "土族", "subjectId": 3, "isDel": 0, "createTime": "2021-12-20 12:00:45", "updateTime": "2021-12-20 12:00:45" },
+                { "itemId": 54, "description": "达斡尔族", "options": "达斡尔族", "subjectId": 3, "isDel": 0, "createTime": "2021-12-20 12:00:45", "updateTime": "2021-12-20 12:00:45" },
+                { "itemId": 55, "description": "仫佬族", "options": "仫佬族", "subjectId": 3, "isDel": 0, "createTime": "2021-12-20 12:00:45", "updateTime": "2021-12-20 12:00:45" },
+                { "itemId": 56, "description": "羌族", "options": "羌族", "subjectId": 3, "isDel": 0, "createTime": "2021-12-20 12:00:45", "updateTime": "2021-12-20 12:00:45" },
+                { "itemId": 57, "description": " 布朗族", "options": " 布朗族", "subjectId": 3, "isDel": 0, "createTime": "2021-12-20 12:00:45", "updateTime": "2021-12-20 12:00:45" },
+                { "itemId": 58, "description": " 撒拉族", "options": " 撒拉族", "subjectId": 3, "isDel": 0, "createTime": "2021-12-20 12:00:45", "updateTime": "2021-12-20 12:00:45" },
+                { "itemId": 59, "description": " 毛难族", "options": " 毛难族", "subjectId": 3, "isDel": 0, "createTime": "2021-12-20 12:00:45", "updateTime": "2021-12-20 12:00:45" },
+                { "itemId": 60, "description": " 仡佬族", "options": " 仡佬族", "subjectId": 3, "isDel": 0, "createTime": "2021-12-20 12:00:45", "updateTime": "2021-12-20 12:00:45" },
+                { "itemId": 61, "description": " 锡伯族", "options": " 锡伯族", "subjectId": 3, "isDel": 0, "createTime": "2021-12-20 12:00:46", "updateTime": "2021-12-20 12:00:46" },
+                { "itemId": 62, "description": " 阿昌族", "options": " 阿昌族", "subjectId": 3, "isDel": 0, "createTime": "2021-12-20 12:00:46", "updateTime": "2021-12-20 12:00:46" },
+                { "itemId": 63, "description": " 普米族", "options": " 普米族", "subjectId": 3, "isDel": 0, "createTime": "2021-12-20 12:00:46", "updateTime": "2021-12-20 12:00:46" },
+                { "itemId": 64, "description": " 塔吉克族", "options": " 塔吉克族", "subjectId": 3, "isDel": 0, "createTime": "2021-12-20 12:00:46", "updateTime": "2021-12-20 12:00:46" },
+                { "itemId": 65, "description": " 怒族", "options": " 怒族", "subjectId": 3, "isDel": 0, "createTime": "2021-12-20 12:00:46", "updateTime": "2021-12-20 12:00:46" },
+                { "itemId": 66, "description": " 乌孜别克族", "options": " 乌孜别克族", "subjectId": 3, "isDel": 0, "createTime": "2021-12-20 12:00:46", "updateTime": "2021-12-20 12:00:46" },
+                { "itemId": 67, "description": " 俄罗斯族", "options": " 俄罗斯族", "subjectId": 3, "isDel": 0, "createTime": "2021-12-20 12:00:46", "updateTime": "2021-12-20 12:00:46" },
+                { "itemId": 68, "description": " 鄂温克族", "options": " 鄂温克族", "subjectId": 3, "isDel": 0, "createTime": "2021-12-20 12:00:46", "updateTime": "2021-12-20 12:00:46" },
+                { "itemId": 69, "description": " 崩龙族", "options": " 崩龙族", "subjectId": 3, "isDel": 0, "createTime": "2021-12-20 12:00:46", "updateTime": "2021-12-20 12:00:46" },
+                { "itemId": 70, "description": " 保安族", "options": " 保安族", "subjectId": 3, "isDel": 0, "createTime": "2021-12-20 12:00:46", "updateTime": "2021-12-20 12:00:46" },
+                { "itemId": 71, "description": " 裕固族", "options": " 裕固族", "subjectId": 3, "isDel": 0, "createTime": "2021-12-20 12:00:46", "updateTime": "2021-12-20 12:00:46" },
+                { "itemId": 72, "description": " 京族", "options": " 京族", "subjectId": 3, "isDel": 0, "createTime": "2021-12-20 12:00:46", "updateTime": "2021-12-20 12:00:46" },
+                { "itemId": 73, "description": " 塔塔尔族", "options": " 塔塔尔族", "subjectId": 3, "isDel": 0, "createTime": "2021-12-20 12:00:46", "updateTime": "2021-12-20 12:00:46" },
+                { "itemId": 74, "description": " 独龙族", "options": " 独龙族", "subjectId": 3, "isDel": 0, "createTime": "2021-12-20 12:00:46", "updateTime": "2021-12-20 12:00:46" },
+                { "itemId": 75, "description": " 鄂伦春族", "options": " 鄂伦春族", "subjectId": 3, "isDel": 0, "createTime": "2021-12-20 12:00:46", "updateTime": "2021-12-20 12:00:46" },
+                { "itemId": 76, "description": " 赫哲族", "options": " 赫哲族", "subjectId": 3, "isDel": 0, "createTime": "2021-12-20 12:00:46", "updateTime": "2021-12-20 12:00:46" },
+                { "itemId": 77, "description": " 门巴族", "options": " 门巴族", "subjectId": 3, "isDel": 0, "createTime": "2021-12-20 12:00:46", "updateTime": "2021-12-20 12:00:46" },
+                { "itemId": 78, "description": " 珞巴族", "options": " 珞巴族", "subjectId": 3, "isDel": 0, "createTime": "2021-12-20 12:00:46", "updateTime": "2021-12-20 12:00:46" },
+                { "itemId": 79, "description": " 基诺族", "options": " 基诺族", "subjectId": 3, "isDel": 0, "createTime": "2021-12-20 12:00:46", "updateTime": "2021-12-20 12:00:46" },
+                { "itemId": 80, "description": " 其他", "options": " 其他", "subjectId": 3, "isDel": 0, "createTime": "2021-12-20 12:00:46", "updateTime": "2021-12-20 12:00:46" }
+            ],
         }
     },
     mounted() {
+        this.getFormData()
         this.$refs.userName.focus();
     },
     methods: {
+        getFormData(){
+            let param= {
+                parentId: '0,5,25,33'
+            }
+            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 == '40') {this.form.idType = +list[i].emptyTwo}
+                        if (list[i].answerId == '41') {sessionStorage.setItem('nomClientIdentity', list[i].emptyTwo)}
+                        if (list[i].answerId == '42') {this.form.userName = list[i].emptyTwo}
+                        if (list[i].answerId == '43') {this.form.sex = +list[i].emptyTwo}
+                        if (list[i].answerId == '44') {this.form.birthday = list[i].emptyTwo}
+                        if (list[i].answerId == '45') {this.form.nationality = +list[i].emptyTwo}
+                        if (list[i].answerId == '46') {this.form.mailbox = list[i].emptyTwo}
+                        if (list[i].answerId == '47') {this.form.phone = list[i].emptyTwo}
+                    }
+                }
+            }).catch((error)=>{
+            })
+        },
         ...mapMutations({
             changeShowGoods: 'system/changeShowGoods'
         }),
@@ -177,90 +257,69 @@ export default {
         },
       //提交个人用户信息
       submitForm(){
+          let projectId = sessionStorage.getItem('projectId')
+          let startTime = sessionStorage.getItem('startTime')
           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 = [];
-        //   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))
-        // }else{
-        //   this.$message.error('有必填项为填哦~');
-        // }
+              this.visible = true;
+              let formList = [];
+              let nomClientIdentity = sessionStorage.getItem('nomClientIdentity')
+              let nomClientIdentitys = JSON.parse(nomClientIdentity);
+              if (nomClientIdentitys && nomClientIdentitys.length > 0){
+                  for (var i=0;i<nomClientIdentitys.length;i++){
+                      formList.push({"answerId":nomClientIdentitys[i].id,"emptyOne": "", "emptyTwo": "", "operationIds": "0,5,25,33,41,"+nomClientIdentitys[i].id,"type": ""})
+                  }
+                  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":'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": "3"},//出生日期
+                      {"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)=>{
+                  })
+              }else{
+                  this.$message.error('有必填项未填哦~');
+              }
+          } , this.$refs));
       },
 
         popSure(){
diff --git a/src/pages/manage/list/client/corporateClient.vue b/src/pages/manage/list/client/corporateClient.vue
index 3c3d846..efad04d 100644
--- a/src/pages/manage/list/client/corporateClient.vue
+++ b/src/pages/manage/list/client/corporateClient.vue
@@ -15,7 +15,7 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="公司名称" prop="companyName">
-                        <el-input :value="form.companyName" @input="(val) => checkHanzi(val, form, 'companyName')" ref="companyName"></el-input>
+                        <el-input v-model="form.companyName" @input="(val) => checkHanzi(val, form, 'companyName')" ref="companyName"></el-input>
                     </el-form-item>
                     <el-form-item label="注册资本">
                         <el-input v-model="form.registeredCapital" ref="registeredCapital"></el-input>
@@ -42,7 +42,7 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="法人姓名" prop="name">
-                        <el-input :value="form.name" @input="(val) => checkHanzi(val, form, 'name')" ref="name"></el-input>
+                        <el-input v-model="form.name" @input="(val) => checkHanzi(val, form, 'name')" ref="name"></el-input>
                     </el-form-item>
                 </el-col>
             </el-form>
@@ -59,7 +59,7 @@
             custom-class="data-dia"
         >
             <div slot="title" class="dia-header">
-                <div class="data-title">提交</div>
+                <div class="data-title" @click="success = true">提交</div>
             </div>
             <div class="popBody" v-if="!authorization&&!success">
                 <h2>本业务需要授权</h2>
@@ -89,6 +89,7 @@
 import { mapState, mapMutations } from 'vuex'
 import { mobPattern, namePattern, ratePattern, vercustomer  } from '@/utils/verify.js'
 import { phoneListen, checkRequired, myValidate, checkHanzi } from '@/utils/utilFunction.js'
+import { addOperation, getOperation } from '@/api/http';
 
 export default {
     name: 'index',
@@ -138,7 +139,6 @@ export default {
                     }
                 ]
             },
-            visible:false,
 
         }
     },
@@ -146,26 +146,90 @@ export default {
         console.clear()
     },
     mounted() {
+        this.getFormData()
         this.$refs.codeNumber.focus()
     },
     methods: {
+        getFormData(){
+            let param= {
+                parentId: '0,5,25,34'
+            }
+            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 == '48') {this.form.documentType = list[i].emptyTwo} //证件类型
+                        if (list[i].answerId == '49') {this.form.codeNumber = list[i].emptyTwo} //代码证号
+                        if (list[i].answerId == '50') {this.form.companyName = list[i].emptyTwo} //公司名称
+                        if (list[i].answerId == '51') {this.form.companyAddress = list[i].emptyTwo} //公司地址
+                        if (list[i].answerId == '52') {this.form.registeredCapital = list[i].emptyTwo} //注册资本
+                        if (list[i].answerId == '53') {this.form.certificateType = list[i].emptyTwo} //法人证件类型
+                        if (list[i].answerId == '54') {sessionStorage.setItem('firmClientIdentity', list[i].emptyTwo)} //法人证件号码
+                        if (list[i].answerId == '55') {this.form.name = list[i].emptyTwo} //法人姓名
+                        if (list[i].answerId == '56') {this.form.phone = list[i].emptyTwo} //联系电话
+                    }
+                }
+            }).catch((error)=>{
+            })
+        },
         ...mapMutations({
             changeShowGoods: 'system/changeShowGoods'
         }),
         popUp(){// 唤起弹窗
-            this.$store.commit('system/changePop',{show:true,text:'身份证扫描仪'})
+            this.$store.commit('system/changePop',{show:true,text:'身份证扫描仪',id:'34'})
         },
         popSure(){
 
         },
         submitForm() {
+            let projectId = sessionStorage.getItem('projectId')
+            let startTime = sessionStorage.getItem('startTime')
             this.$refs.form.validate(myValidate(() => {
                 // 验证通过逻辑写在这
                 this.visible = true;
-                this.$message({
-                    message: '验证成功',
-                    center: true
-                });
+                let formList = [];
+                let firmClientIdentity = sessionStorage.getItem('firmClientIdentity')
+                let firmClientIdentitys = JSON.parse(firmClientIdentity);
+                if (firmClientIdentitys && firmClientIdentitys.length > 0){
+                    for (var i=0;i<firmClientIdentitys.length;i++){
+                        formList.push({"answerId":firmClientIdentitys[i].id,"emptyOne": "", "emptyTwo": "", "operationIds": "0,5,25,34,54,"+firmClientIdentitys[i].id,"type": ""})// 法人证件号码
+                    }
+                    if(this.form.documentType){
+                        formList.push({ "answerId":'48', "emptyOne": "1", "emptyTwo": this.form.documentType, "operationIds": "0,5,25,34,48","type": "1"})//证件类型
+                    }
+                    if(this.form.companyAddress){
+                        formList.push({ "answerId":'51', "emptyOne": "19", "emptyTwo": this.form.companyAddress, "operationIds": "0,5,25,34,51", "type": "3" })//公司地址
+                    }
+                    if(this.form.registeredCapital){
+                        formList.push({ "answerId":'52', "emptyOne": "7", "emptyTwo": this.form.registeredCapital, "operationIds": "0,5,25,34,52", "type": "3" })//注册资本
+                    }
+                    if(this.form.name){
+                        formList.push( {"answerId":'55',"emptyOne": "5", "emptyTwo": this.form.name, "operationIds": "0,5,25,34,55", "type": "3"})//法人姓名
+                    }
+                    if(this.form.phone){
+                        formList.push({"answerId":'56',"emptyOne": "5", "emptyTwo": this.form.phone, "operationIds": "0,5,25,34,56", "type": "3"})//联系电话
+                    }
+                    formList.push(
+                        { "answerId":'49', "emptyOne": "3", "emptyTwo": this.form.codeNumber, "operationIds": "0,5,25,34,49", "type": "3" },//代码证号
+                        { "answerId":'50', "emptyOne": "4", "emptyTwo": this.form.companyName, "operationIds": "0,5,25,34,50", "type": "3" },//公司名称
+                        {"answerId":'53',"emptyOne": "2", "emptyTwo": this.form.certificateType, "operationIds": "0,5,25,34,53", "type": "1"},//法人证件类型
+                    );
+                    let params= {
+                        parentId:'0,5,25,34',
+                        lcJudgmentRuleReq:formList,
+                        projectId:+projectId,
+                        startTime:startTime,
+                    }
+                    addOperation(params).then((data)=>{
+                        this.$message({
+                            message: '提交成功',
+                            type: 'success'
+                        });
+                    }).catch((error)=>{
+                    })
+                }else {
+                    this.$message.error('有必填项未填哦~');
+                }
             }, this.$refs));
         },
         phoneListen: phoneListen,
diff --git a/src/pages/manage/list/personal/currentAccount/deposit.vue b/src/pages/manage/list/personal/currentAccount/deposit.vue
index 2ad4bbb..4afd67b 100644
--- a/src/pages/manage/list/personal/currentAccount/deposit.vue
+++ b/src/pages/manage/list/personal/currentAccount/deposit.vue
@@ -45,6 +45,7 @@
 import { mapMutations } from 'vuex'
 import { mobPattern, namePattern, ratePattern, vercustomer  } from '@/utils/verify.js'
 import { ismoney, myValidate } from '@/utils/utilFunction.js'
+import { addOperation, getOperation } from '@/api/http';
 export default{
     name:'',
     props:{},
@@ -81,54 +82,82 @@ export default{
         }
     },
   mounted() {
+      this.getFormData()
       this.$refs.userName.focus()
   },
   methods: {
+      getFormData(){
+          let param= {
+              parentId: '0,5,26,57,63'
+          }
+          getOperation(param).then((data)=>{
+              console.log(data)
+              if(data.status == 200) {
+                  var list = data.data.judgmentRuleReqs
+                  for (var i = 0; i < list.length; i++) {
+                      if (list[i].answerId == '78') {sessionStorage.setItem('nomBusinessDepositCard', list[i].emptyTwo)} //卡号
+                      if (list[i].answerId == '79') {this.form.userName = list[i].emptyTwo} //客户姓名
+                      if (list[i].answerId == '80') {this.form.currency = list[i].emptyTwo} //币种
+                      if (list[i].answerId == '81') {this.form.goldLogo = list[i].emptyTwo} //钞汇标识
+                      if (list[i].answerId == '82') {this.form.money = list[i].emptyTwo} //金额
+                      if (list[i].answerId == '83') {this.form.annualInterest = list[i].emptyTwo} //年利率
+                      if (list[i].answerId == '84') {this.form.remark = list[i].emptyTwo} //摘要
+                  }
+              }
+          }).catch((error)=>{
+          })
+      },
     ...mapMutations({
         changeShowGoods: 'system/changeShowGoods'
     }),
     //提交表单
     submitForm(){
-        let ruleReqs = sessionStorage.getItem('ruleReqs')
-        let formList = JSON.parse(ruleReqs);
+        let projectId = sessionStorage.getItem('projectId')
+        let startTime = sessionStorage.getItem('startTime')
         this.$refs.form.validate(myValidate(() => {
             // 验证通过逻辑写在这
-            this.$emit("setDepositFinish");
-            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: 'success'
-            });
+            this.visible = true;
+            let formList = [];
+            let nomBusinessDepositCard = sessionStorage.getItem('nomBusinessDepositCard')
+            let nomBusinessDepositCards = JSON.parse(nomBusinessDepositCard);
+            if (nomBusinessDepositCards && nomBusinessDepositCards.length > 0){
+                for (var i=0;i<nomBusinessDepositCards.length;i++){
+                    formList.push({"answerId":nomBusinessDepositCards[i].id,"emptyOne": "", "emptyTwo": "", "operationIds": "0,5,26,57,63,78,"+nomBusinessDepositCards[i].id,"type": ""})// 卡号
+                }
+                if(this.form.currency){
+                    formList.push({ "answerId":'80', "emptyOne": "19", "emptyTwo": this.form.currency, "operationIds": "0,5,26,57,63,80", "type": "1" })//币种
+                }
+                if(this.form.money){
+                    formList.push({ "answerId":'82', "emptyOne": "7", "emptyTwo": this.form.money, "operationIds": "0,5,26,57,63,82", "type": "3" })//金额
+                }
+                if(this.form.remark){
+                    formList.push( {"answerId":'84',"emptyOne": "5", "emptyTwo": this.form.remark, "operationIds": "0,5,26,57,63,84", "type": "3"})//摘要
+                }
+                formList.push(
+                    { "answerId":'79', "emptyOne": "3", "emptyTwo": this.form.userName, "operationIds": "0,5,26,57,63,79", "type": "3" },//客户姓名
+                    { "answerId":'81', "emptyOne": "4", "emptyTwo": this.form.goldLogo, "operationIds": "0,5,26,57,63,81", "type": "1" },//钞汇标识
+                    {"answerId":'83',"emptyOne": "2", "emptyTwo": this.form.annualInterest, "operationIds": "0,5,26,57,63,83", "type": "3"},//年利率
+                );
+                let params= {
+                    parentId:'0,5,26,57,63',
+                    lcJudgmentRuleReq:formList,
+                    projectId:+projectId,
+                    startTime:startTime,
+                }
+                addOperation(params).then((data)=>{
+                    this.$message({
+                        message: '提交成功',
+                        type: 'success'
+                    });
+                }).catch((error)=>{
+                })
+            }else {
+                this.$message.error('有必填项未填哦~');
+            }
         }, this.$refs));
-    //   if(this.form.userName && this.form.goldLogo && this.form.annualInterest){
-    //     this.$emit("setDepositFinish");
-    //     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: 'success'
-    //     });
-    //   }else{
-    //     this.$message.error('有必填项未填哦~');
-    //   }
     },
     popUp(text) {
-        this.$store.commit('system/changePop',{show:true,text})
+        this.$store.commit('system/changePop',{show:true,text:'刷卡器',id:'63'})
     },
     ismoney: ismoney
   },
diff --git a/src/pages/manage/list/personal/currentAccount/openAccount.vue b/src/pages/manage/list/personal/currentAccount/openAccount.vue
index a8f9f35..d7c2fdb 100644
--- a/src/pages/manage/list/personal/currentAccount/openAccount.vue
+++ b/src/pages/manage/list/personal/currentAccount/openAccount.vue
@@ -254,14 +254,14 @@ export default {
         }
     },
   mounted(){
-     this.aaa()
+     this.getOptionsList()
      this.$refs.userNumber.focus()
   },
     methods:{
         ...mapMutations({
             changeShowGoods: 'system/changeShowGoods'
         }),
-        aaa(){
+        getOptionsList(){
             for(var i=8;i<14;i++){
                 this.getSubjectInfoData(i)
             }