修改存储方式,修改开户与前台桌面的数据存储与获取历史存储与取消回到之前项目删掉存储与整理凭证图片

src/api/api.js

@@ -2,10 +2,10 @@ import axios from 'axios';
 import router from '../router';
 // 创建axios实例
 const service = axios.create({
-    baseURL: "http://39.108.250.202:9000/", // 中台测试服
+    // baseURL: "http://39.108.250.202:9000/", // 中台测试服
     // baseURL: "http://192.168.31.137:9000/", // 赓
     // baseURL: "http://192.168.31.151:9000/", // 榕
-    // baseURL: "http://192.168.31.125:9000/", // 坤
+    baseURL: "http://192.168.31.125:9000/", // 坤
     // baseURL: 'http://39.108.250.202:9000',
     timeout: 30000 // 请求超时时间
 })

src/api/http.js

@@ -15,3 +15,15 @@ export const submit= (params) => {
 export const getSubjectInfo= (params) => {
     return get( '/judgment/lcSubject/getSubjectInfo',params)
 }
+export const getQueryCache= () => {
+    return get( '/bank/bank/queryCache')
+}
+export const addOperation= (params) => {
+    return post( '/bank/bank/addOperation',params)
+}
+export const getOperation= (params) => {
+    return get( '/bank/bank/getOperation',params)
+}
+export const deleteCache= () => {
+    return get( '/bank/bank/deleteCache')
+}

src/components/case/index.vue

@@ -125,14 +125,14 @@
 import util from '@/libs/util'
 import Setting from '@/setting'
 // 引入封装好的接口
-import {getProjectBySystemId,getProjectDetail,submit} from "@/api/http.js";
+import {getProjectBySystemId,getProjectDetail,submit,getQueryCache,deleteCache} from "@/api/http.js";
 export default {
   data() {
     return {
       systemId: Setting.systemId,
       workbench: [],
       test: [],
-      caseVisible: false,
+      caseVisible: true,
       grade: "00",
       exampleData: "",
       codeid: "",
@@ -257,7 +257,7 @@ export default {
   methods: {
       getQueryVariable(name) {
           var reg = new RegExp('(^|&)'+name+'=([^&]*)(&|$)')
-          if( window.location.href.split('?')[1]){
+          if(window.location.href.split('?')[1]){
               var r = window.location.href.split('?')[1].match(reg)
               if (r != null){
                   return (r[2])
@@ -276,22 +276,54 @@ export default {
         if(data.status == 200){
           this.topicList = data.data.projects;
           this.projectId = this.topicList[0].projectId;
+            getQueryCache(params).then((data)=>{
+                if(data.data.status == 200){
+                    this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
+                        confirmButtonText: '确定',
+                        cancelButtonText: '取消',
+                        type: 'warning'
+                    }).then(() => {
+                        this.$message({
+                            type: 'success',
+                            message: '切换成功!'
+                        });
+                        this.projectId=data.data.projectId
+                        let params = {
+                            "projectId":data.data.projectId,
+                        }
+                        let dates = new Date().getTime();
+                        let date = new Date(dates)
+                        let y = date.getFullYear();
+                        let MM = date.getMonth() + 1;
+                        MM = MM < 10 ? ('0' + MM) : MM;
+                        let d = date.getDate();
+                        d = d < 10 ? ('0' + d) : d;
+                        let h = date.getHours();
+                        h = h < 10 ? ('0' + h) : h;
+                        let m = date.getMinutes();
+                        m = m < 10 ? ('0' + m) : m;
+                        let s = date.getSeconds();
+                        s = s < 10 ? ('0' + s) : s;
+                        let startTime = y + '-' + MM + '-' + d + ' ' + h + ':' + m + ':' + s;
+                        sessionStorage.setItem('startTime', startTime)
+                        sessionStorage.setItem('projectId', data.data.projectId)
+                        this.selectProjects(params)
+                    }).catch(() => {
+                        deleteCache().then((data)=>{
+                            this.$message({
+                                type: 'info',
+                                message: '已取消'
+                            });
+                        }).catch(() => {
+
+                        })
                         let params = {
                             "projectId":this.projectId,
                         }
-            getProjectDetail(params).then((data)=>{
-                if(data.status == 200){
-                    let token = sessionStorage.getItem('token')
-                    let cid = sessionStorage.getItem('cid')
-                    let systemId = sessionStorage.getItem('systemId')
-                    let formList = []
-                    sessionStorage.setItem('ruleReqs', JSON.stringify(formList))
-                    sessionStorage.setItem('formDataAccountVoucher', JSON.stringify(formList))
-                    sessionStorage.setItem('formDataAccountPassword', '')
-                    this.projectName = data.data.projectManage.projectName
-                    this.projectManage = data.data.projectManage;
-                    this.requires = data.data.projectJudgmentVos;
-                    // location.href = 'http://39.108.250.202/banksystem/#/index/list?'+'token='+token+'&cid='+cid+'&systemId='+systemId
+                        this.selectProjects(params)
+                    });
+                }else{
+
                 }
             }).catch((error)=>{
             })
@@ -308,30 +340,50 @@ export default {
       }).catch((error)=>{
       })
     },
+      selectProjects(params){
+          getProjectDetail(params).then((data)=>{
+              if(data.status == 200){
+                  this.projectName = data.data.projectManage.projectName
+                  this.projectManage = data.data.projectManage;
+                  this.requires = data.data.projectJudgmentVos;
+              }
+          }).catch((error)=>{
+          })
+      },
     //选择好题目
     selectProject(){
       let params = {
           "projectId":this.projectId,
       }
+      sessionStorage.setItem('projectId', this.projectId)
       getProjectDetail(params).then((data)=>{
         if(data.status == 200){
             let token = sessionStorage.getItem('token')
             let cid = sessionStorage.getItem('cid')
             let systemId = sessionStorage.getItem('systemId')
-            let formList = []
-            sessionStorage.setItem('ruleReqs', JSON.stringify(formList))
-            sessionStorage.setItem('formDataAccountVoucher', JSON.stringify(formList))
-            sessionStorage.setItem('formDataAccountPassword', '')
             this.projectName = data.data.projectManage.projectName;
             this.projectManage = data.data.projectManage;
             this.requires = data.data.projectJudgmentVos;
-            location.href = 'http://39.108.250.202/banksystem/#/index/list?'+'token='+token+'&cid='+cid+'&systemId='+systemId
-            // location.href = "http://192.168.31.254:8093/#/index/list?"+'token='+token+'&cid='+cid+'&systemId='+systemId
+            // location.href = 'http://39.108.250.202/banksystem/#/index/list?'+'token='+token+'&cid='+cid+'&systemId='+systemId
+            location.href = "http://192.168.31.254:8093/#/index/list?"+'token='+token+'&cid='+cid+'&systemId='+systemId
         }
       }).catch((error)=>{
       })
       //获取当前时间
-      let startTime = new Date().getTime();
+        let dates = new Date().getTime();
+        let date = new Date(dates)
+        let y = date.getFullYear();
+        let MM = date.getMonth() + 1;
+        MM = MM < 10 ? ('0' + MM) : MM;
+        let d = date.getDate();
+        d = d < 10 ? ('0' + d) : d;
+        let h = date.getHours();
+        h = h < 10 ? ('0' + h) : h;
+        let m = date.getMinutes();
+        m = m < 10 ? ('0' + m) : m;
+        let s = date.getSeconds();
+        s = s < 10 ? ('0' + s) : s;
+        let startTime = y + '-' + MM + '-' + d + ' ' + h + ':' + m + ':' + s;
       sessionStorage.setItem('startTime', startTime)
       this.day = '00';
       this.hour = '00';

src/pages/counter/list/index.vue

@@ -193,6 +193,7 @@
 import { mapState } from 'vuex';
 import Sortable from 'sortablejs'
 import manage from '../../manage/index';
+import { addOperation, getOperation } from '@/api/http';
 export default {
     name: 'index',
     components: {
@@ -228,39 +229,39 @@ export default {
           //身份证扫描仪//审核资料//验钞机//选择重要空白凭证
           auditGoodsShelf:[
               {name:'身份证', src:require('@/assets/img/goods/idcard.png'), id:13},
-            {name:'身份证复印件', src:require('@/assets/img/idCard-copy-sm.png'), id:23},
               {name:'开户申请书', src:require('@/assets/img/goods/khsqs.png'), id:14},
               {name:'现金', src:require('@/assets/img/goods/cash-sm.png'), id:15},
+              {name:'身份证复印件', src:require('@/assets/img/idCard-copy-sm.png'), id:23},
           ],
           //系统录入 //选择普通空白凭证
           systemInputGoodsShelf:[
               {name:'身份证', src:require('@/assets/img/goods/idcard.png'), id:13},
-            {name:'身份证复印件', src:require('@/assets/img/idCard-copy-sm.png'), id:23},
               {name:'开户申请书', src:require('@/assets/img/goods/khsqs.png'), id:14},
               {name:'现金', src:require('@/assets/img/goods/cash-sm.png'), id:15},
               {name:'银行卡', src:require('@/assets/img/goods/bankCard.png'), id:16},
+              {name:'身份证复印件', src:require('@/assets/img/idCard-copy-sm.png'), id:23},
           ],
           //打印资料 //客户签字 //印章盒
           printoutGoodsShelf:[
               {name:'身份证', src:require('@/assets/img/goods/idcard.png'), id:13},
-            {name:'身份证复印件', src:require('@/assets/img/idCard-copy-sm.png'), id:23},
               {name:'开户申请书', src:require('@/assets/img/goods/khsqs.png'), id:14},
               {name:'现金', src:require('@/assets/img/goods/cash-sm.png'), id:15},
               {name:'银行卡', src:require('@/assets/img/goods/bankCard.png'), id:16},
               {name:'存款凭条', src:require('@/assets/img/goods/ckpt.png'), id:17},
+              {name:'身份证复印件', src:require('@/assets/img/idCard-copy-sm.png'), id:23},
           ],
             //钱箱
             cashboxGoodsShelf:[
-                {name:'现金', src:require('@/assets/img/goods/cash-sm.png'), id:15},
                 {name:'身份证', src:require('@/assets/img/goods/idcard.png'), id:13},
+                {name:'现金', src:require('@/assets/img/goods/cash-sm.png'), id:15},
                 {name:'身份证复印件', src:require('@/assets/img/idCard-copy-sm.png'), id:23},
             ],
           // 总盒子里面的东西
           goodsShelfTotalData:[
               {name:'身份证', src:require('@/assets/img/goods/idcard.png'), id:13},
-              {name:'身份证复印件', src:require('@/assets/img/idCard-copy-sm.png'), id:23},
               {name:'开户申请书', src:require('@/assets/img/goods/khsqs.png'), id:14},
               {name:'现金', src:require('@/assets/img/goods/cash-sm.png'), id:15},
+              {name:'身份证复印件', src:require('@/assets/img/idCard-copy-sm.png'), id:23},
           ],
             // goods:[/* 物品栏物品 */
             // ],
@@ -336,6 +337,24 @@ export default {
             return this.$store.state.system.fullScreen;
         },
         showPop:function(){/* 展示弹框 */
+            if(this.$store.state.system.popText == '刷卡器'){
+                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.$store.state.system.popText == '密码器'){
+                let accountPasswordAll = sessionStorage.getItem('accountPasswordAll');
+                this.passwordForm.password = accountPasswordAll
+                this.passwordForm.passwordAgain = accountPasswordAll
+            }
             if(!this.showGoods) this.showGoods = this.$store.state.system.showPop
             if(!this.showGoods) this.checkList = []
             return this.$store.state.system.showPop;
@@ -370,27 +389,6 @@ export default {
         }
     },
     mounted(){
-        // Promise.resolve(2).then(value=>{
-        //  console.log(111,value)
-        //  return value
-        // })
-        // .then(value=>{
-        // console.log(222,value)
-        // return Promise.resolve(value)
-
-        // })
-        // .then(value=>{
-        // console.log(333,value)
-        // })
-        // .then(value=>{
-        // console.log(444,value)
-        // return Promise.reject(value)
-        // })
-        // .then(value=>{
-        // console.log(555,value)
-        // }).catch(err=>{
-        // console.log(666,err)
-        // })
         let that = this
         // 拖拽-物品栏
         new Sortable(this.$refs.goods, {
@@ -456,17 +454,6 @@ export default {
         });
     },
     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
-      //         }
-      //     }
-      // },
         toggleGoods() {
           this.showGoods = !this.showGoods;
         },
@@ -474,12 +461,114 @@ export default {
           this.nbm = nbm
             if(type == '普通凭证箱' || type == '系统'){
                 this.goodsShelfTotalData = this.systemInputGoodsShelf
+                let parentId = ''
+                if(type == '普通凭证箱'){
+                    parentId = '0,3'
+                }
+                if(type == '系统'){
+                    parentId = '0,5'
+                }
+                let param= {
+                    parentId: parentId
+                }
+                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{
+                        this.receptionList = []
+                    }
+                }).catch((error)=>{
+                })
             }else if(type == '身份证扫描仪' || type == '验钞机' || type == '资料' || type == '重要空白凭证箱'){
               this.goodsShelfTotalData = this.auditGoodsShelf
+                let parentId = ''
+                if(type == '重要空白凭证箱'){
+                    parentId = '0,2'
+                }
+                if(type == '资料'){
+                    parentId = '0,11'
+                }
+                if(type == '验钞机'){
+                    parentId = '0,9'
+                }
+                if(type == '身份证扫描仪'){
+                    parentId = '0,7'
+                }
+                let param= {
+                    parentId: parentId
+                }
+                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{
+                        this.receptionList = []
+                    }
+                }).catch((error)=>{
+                })
             }else if(type == '打印机' || type == '客户签字' ||  type == '印章盒'){
               this.goodsShelfTotalData = this.printoutGoodsShelf
+                let parentId = ''
+                if(type == '打印机'){
+                    parentId = '0,10'
+                }
+                if(type == '客户签字'){
+                    parentId = '0,12'
+                }
+                if(type == '印章盒'){
+                    parentId = '0,8'
+                }
+                let param= {
+                    parentId: parentId
+                }
+                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{
+                        this.receptionList = []
+                    }
+                }).catch((error)=>{
+                })
             }else if(type == '钱箱'){
-                this.goodsShelfTotalData = this.cashboxGoodsShelf
+                this.goodsShelfTotalData = this.cashboxGoodsShelf;
+                let param= {
+                    parentId: '0,1'
+                }
+                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{
+                        this.receptionList = []
+                    }
+                }).catch((error)=>{
+                })
             }
             this.$store.commit('system/changePop',{show:true,text:type})
         },
@@ -579,17 +668,43 @@ export default {
                 this.$store.commit('system/changeGoods',{push:arr})
                 clickList.length = 0
             }else{
-              if (this.id == '62'){
+              if (this.id == '62,1'){
+                  this.goodsShelfTotalData = this.auditGoodsShelf
+                  let accountVoucher = [];
+                  let accountPassword = '';
+                  if (this.receptionList.length){
+                      accountVoucher = this.receptionList
+                      sessionStorage.setItem('accountVoucher', JSON.stringify(accountVoucher))
+                  }
+                  if (this.passwordForm.passwordAgain){
+                      accountPassword = this.passwordForm.passwordAgain
+                      sessionStorage.setItem('accountPassword', accountPassword)
+                  }
+              }
+                if (this.id == '62,2'){
+                    this.goodsShelfTotalData = this.auditGoodsShelf
+                    let accountVoucherTwo = []
+                    let accountPasswordTwo = ''
+                    if (this.receptionList.length){
+                        accountVoucherTwo = this.receptionList
+                        sessionStorage.setItem('accountVoucherTwo', JSON.stringify(accountVoucherTwo))
+                    }
+                    if (this.passwordForm.passwordAgain){
+                        accountPasswordTwo = this.passwordForm.passwordAgain
+                        sessionStorage.setItem('accountPasswordTwo', accountPasswordTwo)
+                    }
+                }
+                if (this.id == '62,3'){
                     this.goodsShelfTotalData = this.auditGoodsShelf
-                  let formDataAccountVoucher = []
-                  let formDataAccountPassword = ''
+                    let accountVoucherThree = []
+                    let accountPasswordThree = ''
                     if (this.receptionList.length){
-                      formDataAccountVoucher = this.receptionList
-                      sessionStorage.setItem('formDataAccountVoucher', JSON.stringify(formDataAccountVoucher))
+                        accountVoucherThree = this.receptionList
+                        sessionStorage.setItem('accountVoucherThree', JSON.stringify(accountVoucherThree))
                     }
                     if (this.passwordForm.passwordAgain){
-                      formDataAccountPassword = this.passwordForm.passwordAgain
-                      sessionStorage.setItem('formDataAccountPassword', formDataAccountPassword)
+                        accountPasswordThree = this.passwordForm.passwordAgain
+                        sessionStorage.setItem('accountPasswordThree', accountPasswordThree)
                     }
                 }
             }
@@ -615,72 +730,178 @@ export default {
           }else{
             if (this.receptionList.length >0){
               this.$message.success(`${this.popText}操作成功！`)
-                if (this.nbm == 0){
-                    // let formList = []
-                    // let ruleReqs = sessionStorage.getItem('ruleReqs')
-                    // if (ruleReqs){formList = JSON.parse(ruleReqs);}else{formList = []}
-                    // for (var i=0;i<this.receptionList.length;i++){formList.push({"emptyOne": "", "emptyTwo": "", "operationIds": "0,4,"+this.receptionList[i].id,"type": ""})}
-                    // sessionStorage.setItem('ruleReqs', JSON.stringify(formList))
-                }else if (this.nbm == 1){
-                     let formList = []
-                     let ruleReqs = sessionStorage.getItem('ruleReqs')
-                     if (ruleReqs){formList = JSON.parse(ruleReqs);}else{formList = []}
-                     for (var i=0;i<this.receptionList.length;i++){formList.push({"emptyOne": "", "emptyTwo": "", "operationIds": "0,4,"+this.receptionList[i].id,"type": ""})}
-                     sessionStorage.setItem('ruleReqs', JSON.stringify(formList))
-                }else if (this.nbm == 2){
-                     let formList = []
-                     let ruleReqs = sessionStorage.getItem('ruleReqs')
-                     if (ruleReqs){formList = JSON.parse(ruleReqs);}else{formList = []}
-                     for (var i=0;i<this.receptionList.length;i++){formList.push({"emptyOne": "", "emptyTwo": "", "operationIds": "0,3,"+this.receptionList[i].id,"type": ""})}
-                     sessionStorage.setItem('ruleReqs', JSON.stringify(formList))
-                }else if (this.nbm == 3){
-                     let formList = []
-                     let ruleReqs = sessionStorage.getItem('ruleReqs')
-                     if (ruleReqs){formList = JSON.parse(ruleReqs);}else{formList = []}
-                     for (var i=0;i<this.receptionList.length;i++){formList.push({"emptyOne": "", "emptyTwo": "", "operationIds": "0,2,"+this.receptionList[i].id,"type": ""})}
-                     sessionStorage.setItem('ruleReqs', JSON.stringify(formList))
-                }else if (this.nbm == 4){
-                     let formList = []
-                     let ruleReqs = sessionStorage.getItem('ruleReqs')
-                     if (ruleReqs){formList = JSON.parse(ruleReqs);}else{formList = []}
-                     for (var i=0;i<this.receptionList.length;i++){formList.push({"emptyOne": "", "emptyTwo": "", "operationIds": "0,1,"+this.receptionList[i].id,"type": ""})}
-                     sessionStorage.setItem('ruleReqs', JSON.stringify(formList))
-                }else if (this.nbm == 5){
-                     let formList = []
-                     let ruleReqs = sessionStorage.getItem('ruleReqs')
-                     if (ruleReqs){formList = JSON.parse(ruleReqs);}else{formList = []}
-                     for (var i=0;i<this.receptionList.length;i++){formList.push({"emptyOne": "", "emptyTwo": "", "operationIds": "0,8,"+this.receptionList[i].id,"type": ""})}
-                     sessionStorage.setItem('ruleReqs', JSON.stringify(formList))
-                }else if (this.nbm == 6){
-                     let formList = []
-                     let ruleReqs = sessionStorage.getItem('ruleReqs')
-                     if (ruleReqs){formList = JSON.parse(ruleReqs);}else{formList = []}
-                     for (var i=0;i<this.receptionList.length;i++){formList.push({"emptyOne": "", "emptyTwo": "", "operationIds": "0,9,"+this.receptionList[i].id,"type": ""})}
-                     sessionStorage.setItem('ruleReqs', JSON.stringify(formList))
-                }else if (this.nbm == 7){
-                     let formList = []
-                     let ruleReqs = sessionStorage.getItem('ruleReqs')
-                     if (ruleReqs){formList = JSON.parse(ruleReqs);}else{formList = []}
-                     for (var i=0;i<this.receptionList.length;i++){formList.push({"emptyOne": "", "emptyTwo": "", "operationIds": "0,10,"+this.receptionList[i].id,"type": ""})}
-                     sessionStorage.setItem('ruleReqs', JSON.stringify(formList))
-                }else if (this.nbm == 9){
-                     let formList = []
-                     let ruleReqs = sessionStorage.getItem('ruleReqs')
-                     if (ruleReqs){formList = JSON.parse(ruleReqs);}else{formList = []}
-                     for (var i=0;i<this.receptionList.length;i++){formList.push({"emptyOne": "", "emptyTwo": "", "operationIds": "0,11,"+this.receptionList[i].id,"type": ""})}
-                     sessionStorage.setItem('ruleReqs', JSON.stringify(formList))
-                }else if (this.nbm == 10){
-                     let formList = []
-                     let ruleReqs = sessionStorage.getItem('ruleReqs')
-                     if (ruleReqs){formList = JSON.parse(ruleReqs);}else{formList = []}
-                     for (var i=0;i<this.receptionList.length;i++){formList.push({"emptyOne": "", "emptyTwo": "", "operationIds": "0,6,"+this.receptionList[i].id,"type": ""})}
-                     sessionStorage.setItem('ruleReqs', JSON.stringify(formList))
-                }else if (this.nbm == 11){
-                     let formList = []
-                     let ruleReqs = sessionStorage.getItem('ruleReqs')
-                     if (ruleReqs){formList = JSON.parse(ruleReqs);}else{formList = []}
-                     for (var i=0;i<this.receptionList.length;i++){formList.push({"emptyOne": "", "emptyTwo": "", "operationIds": "0,7,"+this.receptionList[i].id,"type": ""})}
-                     sessionStorage.setItem('ruleReqs', JSON.stringify(formList))
+                if (this.nbm == 0){ //用户
+                }else if (this.nbm == 1){ //传票箱
+                    let projectId = sessionStorage.getItem('projectId')
+                    let startTime = sessionStorage.getItem('startTime')
+                     for (var i=0;i<this.receptionList.length;i++){formList.push({"answerId":this.receptionList[i].id,"emptyOne": "", "emptyTwo": "", "operationIds": "0,4,"+this.receptionList[i].id,"type": ""})}
+                    let params= {
+                        parentId:'0,4',
+                        lcJudgmentRuleReq:formList,
+                        projectId:+projectId,
+                        startTime:startTime,
+                    }
+                    addOperation(params).then((data)=>{
+                        this.$message({
+                            message: '提交成功',
+                            type: 'success'
+                        });
+                    }).catch((error)=>{
+                    })
+                }else if (this.nbm == 2){ //普通凭证箱
+                    let projectId = sessionStorage.getItem('projectId')
+                    let startTime = sessionStorage.getItem('startTime')
+                     for (var i=0;i<this.receptionList.length;i++){formList.push({ "answerId":this.receptionList[i].id, "emptyOne": "", "emptyTwo": "", "operationIds": "0,3,"+this.receptionList[i].id, "type": "" })}
+                    let params= {
+                        parentId:'0,3',
+                        lcJudgmentRuleReq:formList,
+                        projectId:+projectId,
+                        startTime:startTime,
+                    }
+                    addOperation(params).then((data)=>{
+                        this.$message({
+                            message: '提交成功',
+                            type: 'success'
+                        });
+                    }).catch((error)=>{
+                    })
+                }else if (this.nbm == 3){ //重要空白凭证箱
+                    let projectId = sessionStorage.getItem('projectId')
+                    let startTime = sessionStorage.getItem('startTime')
+                    for (var i=0;i<this.receptionList.length;i++){formList.push({ "answerId":this.receptionList[i].id, "emptyOne": "", "emptyTwo": "", "operationIds": "0,2,"+this.receptionList[i].id, "type": "" })}
+                    let params= {
+                        parentId:'0,2',
+                        lcJudgmentRuleReq:formList,
+                        projectId:+projectId,
+                        startTime:startTime,
+                    }
+                    addOperation(params).then((data)=>{
+                        this.$message({
+                            message: '提交成功',
+                            type: 'success'
+                        });
+                    }).catch((error)=>{
+                    })
+                }else if (this.nbm == 4){ //钱箱
+                    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": "" })}
+                    let params= {
+                        parentId:'0,1',
+                        lcJudgmentRuleReq:formList,
+                        projectId:+projectId,
+                        startTime:startTime,
+                    }
+                    addOperation(params).then((data)=>{
+                        this.$message({
+                            message: '提交成功',
+                            type: 'success'
+                        });
+                    }).catch((error)=>{
+                    })
+                }else if (this.nbm == 5){ //印章盒
+                    let projectId = sessionStorage.getItem('projectId')
+                    let startTime = sessionStorage.getItem('startTime')
+                     for (var i=0;i<this.receptionList.length;i++){formList.push({"answerId":this.receptionList[i].id, "emptyOne": "", "emptyTwo": "", "operationIds": "0,8,"+this.receptionList[i].id,"type": ""})}
+                    let params= {
+                        parentId:'0,8',
+                        lcJudgmentRuleReq:formList,
+                        projectId:+projectId,
+                        startTime:startTime,
+                    }
+                    addOperation(params).then((data)=>{
+                        this.$message({
+                            message: '提交成功',
+                            type: 'success'
+                        });
+                    }).catch((error)=>{
+                    })
+                }else if (this.nbm == 6){ //验钞机
+                    let projectId = sessionStorage.getItem('projectId')
+                    let startTime = sessionStorage.getItem('startTime')
+                     for (var i=0;i<this.receptionList.length;i++){formList.push({"answerId":this.receptionList[i].id, "emptyOne": "", "emptyTwo": "", "operationIds": "0,9,"+this.receptionList[i].id,"type": ""})}
+                    let params= {
+                        parentId:'0,9',
+                        lcJudgmentRuleReq:formList,
+                        projectId:+projectId,
+                        startTime:startTime,
+                    }
+                    addOperation(params).then((data)=>{
+                        this.$message({
+                            message: '提交成功',
+                            type: 'success'
+                        });
+                    }).catch((error)=>{
+                    })
+                }else if (this.nbm == 7){ //打印机
+                    let projectId = sessionStorage.getItem('projectId')
+                    let startTime = sessionStorage.getItem('startTime')
+                     for (var i=0;i<this.receptionList.length;i++){formList.push({"answerId":this.receptionList[i].id, "emptyOne": "", "emptyTwo": "", "operationIds": "0,10,"+this.receptionList[i].id,"type": ""})}
+                    let params= {
+                        parentId:'0,10',
+                        lcJudgmentRuleReq:formList,
+                        projectId:+projectId,
+                        startTime:startTime,
+                    }
+                    addOperation(params).then((data)=>{
+                        this.$message({
+                            message: '提交成功',
+                            type: 'success'
+                        });
+                    }).catch((error)=>{
+                    })
+                }else if (this.nbm == 9){//资料
+                    let projectId = sessionStorage.getItem('projectId')
+                    let startTime = sessionStorage.getItem('startTime')
+                     for (var i=0;i<this.receptionList.length;i++){formList.push({"answerId":this.receptionList[i].id, "emptyOne": "", "emptyTwo": "", "operationIds": "0,11,"+this.receptionList[i].id,"type": ""})}
+                    let params= {
+                        parentId:'0,11',
+                        lcJudgmentRuleReq:formList,
+                        projectId:+projectId,
+                        startTime:startTime,
+                    }
+                    addOperation(params).then((data)=>{
+                        this.$message({
+                            message: '提交成功',
+                            type: 'success'
+                        });
+                    }).catch((error)=>{
+                    })
+                }else if (this.nbm == 10){ //刷卡器
+                    let projectId = sessionStorage.getItem('projectId')
+                    let startTime = sessionStorage.getItem('startTime')
+                     for (var i=0;i<this.receptionList.length;i++){formList.push({"answerId":this.receptionList[i].id, "emptyOne": "", "emptyTwo": "", "operationIds": "0,6,"+this.receptionList[i].id,"type": ""})}
+                    let params= {
+                        parentId:'0,6',
+                        lcJudgmentRuleReq:formList,
+                        projectId:+projectId,
+                        startTime:startTime,
+                    }
+                    addOperation(params).then((data)=>{
+                        this.$message({
+                            message: '提交成功',
+                            type: 'success'
+                        });
+                    }).catch((error)=>{
+                    })
+                }else if (this.nbm == 11){ //身份证扫描仪
+                    let projectId = sessionStorage.getItem('projectId')
+                    let startTime = sessionStorage.getItem('startTime')
+                     for (var i=0;i<this.receptionList.length;i++){formList.push({"answerId":this.receptionList[i].id, "emptyOne": "", "emptyTwo": "", "operationIds": "0,7,"+this.receptionList[i].id,"type": ""})}
+                    let params= {
+                        parentId:'0,7',
+                        lcJudgmentRuleReq:formList,
+                        projectId:+projectId,
+                        startTime:startTime,
+                    }
+                    addOperation(params).then((data)=>{
+                        this.$message({
+                            message: '提交成功',
+                            type: 'success'
+                        });
+                    }).catch((error)=>{
+                    })
                 }else{
 
                 }

src/pages/lobbyManager/list/index.vue

@@ -47,7 +47,9 @@
                 <img class="close" src="@/assets/svg/close.svg" alt="" @click="takeResultVisible = false">
             </div>
             <div class="result">
+                <div style='width: 136px;height: 136px;margin: auto'>
                     <img src="@/assets/img/finish.png" alt="">
+                </div>
                 <h6>取号成功</h6>
                 <p class="text">您选择了现金业务</p>
             </div>
@@ -61,7 +63,7 @@
             <p class="tips">- 请单击选中所需材料、双击可放大预览 -</p>
             <ul class="list">
                 <li :class="{checked: checkList.includes(1)}" @click="checkData(1)">
-                    <img src="@/assets/img/idCard-sm.png" alt="">
+                    <img style='width: 100%;height: 154px' src="@/assets/img/goods/accountApplyBook.jpg" alt="">
                     <p>开户申请书</p>
                 </li>
                 <li :class="{checked: checkList.includes(2)}" @click="checkData(2)">
@@ -69,7 +71,7 @@
                     <p>密码挂失申请书</p>
                 </li>
                 <li :class="{checked: checkList.includes(3)}" @click="checkData(3)">
-                    <img style="margin-top: 0" src="@/assets/img/open-account-apply-sm.png" alt="">
+                    <img style="margin-top: 0" src="@/assets/img/goods/businessSpecialApplication.png" alt="">
                     <p>特殊业务申请书</p>
                 </li>
                 <li :class="{checked: checkList.includes(4)}" @click="checkData(4)">
@@ -77,11 +79,11 @@
                     <p style="font-size: 12px">开立单位银行结算账户申请书</p>
                 </li>
                 <li :class="{checked: checkList.includes(1)}" @click="checkData(5)">
-                    <img src="@/assets/img/idCard-sm.png" alt="">
+                    <img src="@/assets/img/goods/CashCertificate.png" alt="">
                     <p>现金存款凭证</p>
                 </li>
                 <li :class="{checked: checkList.includes(2)}" @click="checkData(6)">
-                    <img src="@/assets/img/idCard-copy-sm.png" alt="">
+                    <img src="@/assets/img/goods/zzpt.png" alt="">
                     <p>转账凭证</p>
                 </li>
                 <li :class="{checked: checkList.includes(3)}" @click="checkData(7)">
@@ -266,7 +268,9 @@ export default {
                     margin-left: 50px;
                 }
                 img{
-                    margin: 0 45px;
+                    width: 100%;
+                    height: 154px;
+                    //margin: 0 45px;
                 }
                 p{
                     font-size: 22px;

src/pages/manage/list/ImportantCash/controlCash/index.vue

@@ -128,8 +128,8 @@ export default {
                 border-radius: 5px;
                 background: #CFDDFF;
                 text-align: center;
-                height: 68px;
-                line-height: 68px;
+                height: 40px;
+                line-height: 40px;
                 font-size: 18px;
                 color: #6191FF;
             }

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

@@ -134,8 +134,8 @@ export default {
                 border-radius: 5px;
                 background: #CFDDFF;
                 text-align: center;
-                height: 68px;
-                line-height: 68px;
+                height: 40px;
+                line-height: 40px;
                 font-size: 18px;
                 color: #6191FF;
             }

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

@@ -181,8 +181,8 @@ export default {
                 border-radius: 5px;
                 background: #CFDDFF;
                 text-align: center;
-                height: 68px;
-                line-height: 68px;
+                height: 40px;
+                line-height: 40px;
                 font-size: 18px;
                 color: #6191FF;
             }

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

@@ -169,8 +169,8 @@ export default {
                 border-radius: 5px;
                 background: #CFDDFF;
                 text-align: center;
-                height: 68px;
-                line-height: 68px;
+                height: 40px;
+                line-height: 40px;
                 font-size: 18px;
                 color: #6191FF;
             }

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

@@ -158,8 +158,8 @@ export default {
                 border-radius: 5px;
                 background: #CFDDFF;
                 text-align: center;
-                height: 68px;
-                line-height: 68px;
+                height: 40px;
+                line-height: 40px;
                 font-size: 18px;
                 color: #6191FF;
             }

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

@@ -222,8 +222,8 @@ export default {
         //     border-radius: 5px;
         //     background: #CFDDFF;
         //     text-align: center;
-        //     height: 68px;
-        //     line-height: 68px;
+        //     height: 40;
+        //     line-height: 40;
         //     font-size: 18px;
         //     color: #6191FF;
         // }

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

@@ -127,8 +127,8 @@ export default {
         border-radius: 5px;
         background: #CFDDFF;
         text-align: center;
-        height: 68px;
-        line-height: 68px;
+        height: 40px;
+        line-height: 40px;
         font-size: 18px;
         color: #6191FF;
     }

src/pages/manage/list/personal/accountService/accountService.vue

@@ -129,8 +129,8 @@ export default {
                 border-radius: 5px;
                 background: #CFDDFF;
                 text-align: center;
-                height: 68px;
-                line-height: 68px;
+                height: 40px;
+                line-height: 40px;
                 font-size: 18px;
                 color: #6191FF;
             }

src/pages/manage/list/personal/accountService/changePassword.vue

@@ -65,8 +65,8 @@ export default{
         border-radius: 5px;
         background: #CFDDFF;
         text-align: center;
-        height: 68px;
-        line-height: 68px;
+        height: 40px;
+        line-height: 40px;
         font-size: 18px;
         color: #6191FF;
         cursor: pointer;

src/pages/manage/list/personal/callDeposits/accountClosed.vue

@@ -102,8 +102,8 @@ export default{
         border-radius: 5px;
         background: #CFDDFF;
         text-align: center;
-        height: 68px;
-        line-height: 68px;
+        height: 40px;
+        line-height: 40px;
         font-size: 18px;
         color: #6191FF;
         cursor: pointer;

src/pages/manage/list/personal/callDeposits/callDeposits.vue

@@ -126,8 +126,8 @@ export default {
                 border-radius: 5px;
                 background: #CFDDFF;
                 text-align: center;
-                height: 68px;
-                line-height: 68px;
+                height: 40px;
+                line-height: 40px;
                 font-size: 18px;
                 color: #6191FF;
             }

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

@@ -92,8 +92,8 @@ export default{
         border-radius: 5px;
         background: #CFDDFF;
         text-align: center;
-        height: 68px;
-        line-height: 68px;
+        height: 40px;
+        line-height: 40px;
         font-size: 18px;
         color: #6191FF;
         cursor: pointer;

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

@@ -81,8 +81,8 @@ export default{
         border-radius: 5px;
         background: #CFDDFF;
         text-align: center;
-        height: 68px;
-        line-height: 68px;
+        height: 40px;
+        line-height: 40px;
         font-size: 18px;
         color: #6191FF;
         cursor: pointer;

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

@@ -94,8 +94,8 @@ export default{
         border-radius: 5px;
         background: #CFDDFF;
         text-align: center;
-        height: 68px;
-        line-height: 68px;
+        height: 40px;
+        line-height: 40px;
         font-size: 18px;
         color: #6191FF;
         cursor: pointer;

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

@@ -154,8 +154,8 @@ export default {
                 border-radius: 5px;
                 background: #CFDDFF;
                 text-align: center;
-                height: 68px;
-                line-height: 68px;
+                height: 40px;
+                line-height: 40px;
                 font-size: 18px;
                 color: #6191FF;
             }

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

@@ -173,7 +173,7 @@
     </div>
 </template>
 <script>
-import {getSubjectInfo} from "@/api/http.js";
+import {getSubjectInfo,addOperation,getOperation} from "@/api/http.js";
 export default {
     data(){
         return{
@@ -201,24 +201,95 @@ export default {
           formTwo:false,
           formThree:false,
           count:0,
-          currencySelectList:[],
+          currencySelectList:[
+              {
+                  options:'jk',
+                  itemId:'12'
+              },
+              {
+                  options:'出生',
+                  itemId:'13'
+              }
+          ],
           goldLogoSelectList:[],
           accountQualitySelectList:[],
           voucherTypeSelectList:[],
           accountTypeSelectList:[],
           drawWaySelectList:[],
+            num:0,
         }
     },
   mounted(){
+     this.aaa()
 
   },
     methods:{
+        aaa(){
+            for(var i=8;i<14;i++){
+                this.getSubjectInfoData(i)
+            }
+        },
+        getOperationData(){
+            let param= {
+                parentId: '0,5,26,57,62'
+            }
+            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 == '68') {this.form.userNumber = list[i].emptyTwo}
+                            if (list[i].answerId == '69') {this.form.userName = list[i].emptyTwo}
+                            if (list[i].answerId == '70') {this.form.currency = +list[i].emptyTwo}
+                            if (list[i].answerId == '71') {this.form.goldLogo = +list[i].emptyTwo}
+                            if (list[i].answerId == '72') {this.form.accountQuality = +list[i].emptyTwo}
+                            if (list[i].answerId == '73') {this.form.voucherType = +list[i].emptyTwo}
+                            if (list[i].answerId == '74') {this.form.accountType = +list[i].emptyTwo}
+                            if (list[i].answerId == '76') {this.form.drawWay = +list[i].emptyTwo}
+                            if (list[i].answerId == '77') {sessionStorage.setItem('accountPasswordAll', list[i].emptyTwo)}
+                            if (list[i].answerId == '270') {this.form.accountQualitysTwo = +list[i].emptyTwo}
+                            if (list[i].answerId == '271') {this.form.voucherTypesTwo = +list[i].emptyTwo}
+                            if (list[i].answerId == '272') {this.form.accountTypesTwo = +list[i].emptyTwo}
+                            if (list[i].answerId == '274') {this.form.drawWaysTwo = +list[i].emptyTwo}
+                            // if (list[i].answerId == '275') {sessionStorage.setItem('accountPasswordAll', list[i].emptyTwo);this.formTwo = true}
+                            if (list[i].answerId == '276') {this.form.accountQualitysThree = +list[i].emptyTwo}
+                            if (list[i].answerId == '277') {this.form.voucherTypesThree = +list[i].emptyTwo}
+                            if (list[i].answerId == '278') {this.form.accountTypesThree = +list[i].emptyTwo}
+                            if (list[i].answerId == '280') {this.form.drawWaysThree = +list[i].emptyTwo}
+                            // if (list[i].answerId == '281') {sessionStorage.setItem('accountPasswordThree', this.list[i].emptyTwo);this.formThree = true}
+                        }
+                    }
+            }).catch((error)=>{
+            })
+        },
+        getOperationWindowsData(){
+            let param= {
+                parentId: '0,5,26,57,62,75'
+            }
+            let dataList = [];
+            getOperation(param).then((data)=>{
+                if(data.status == 200){
+                    let list = data.data.judgmentRuleReqs;
+                    for(var i=0;i<list.length;i++){
+                        dataList.push(list[i])
+                    }
+                }else{
+                    dataList = []
+                }
+                sessionStorage.setItem('dataList',JSON.stringify(dataList))
+            }).catch((error)=>{
+            })
+        },
       getSubjectInfoData(item){
         let params= {
           subject_id:item
         }
           getSubjectInfo(params).then((data)=>{
           if(data.status == 200){
+              this.num = this.num+1
+              if(this.num == 6){
+                  this.getOperationData()
+                  this.getOperationWindowsData()
+              }
             this.selectList = data.data.items;
             if (item == '8'){
               this.currencySelectList = data.data.items;
@@ -233,6 +304,7 @@ export default {
             }else if (item == '13'){
               this.drawWaySelectList = data.data.items;
             }
+
           }
         }).catch((error)=>{
         })
@@ -252,16 +324,6 @@ export default {
           console.log(this.count)
           if(this.count == 1 || this.count == 2){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++) {
-            //         if(!this.detectionObjKeys(e,[])){/* 写入定义的二级卡字段 */
-            //             return this.$message('请把已有的二级卡填写完整再执行新增操作！')
-            //         }
-            //     }
-            // }
-            // let obj = {}/* 二级卡定义空属性 */
-            // this.second.push(obj)``
         },
       //点击提交表单
       formSubmit(){
@@ -270,58 +332,93 @@ export default {
       //确认提交
       popSure(){
           this.visible = false
-        let ruleReqs = sessionStorage.getItem('ruleReqs')
-        let formList = []
-        if (ruleReqs){
-          formList = JSON.parse(ruleReqs);
-        }else{
-          formList = []
-        }
-        let formDataAccountVoucher = sessionStorage.getItem('formDataAccountVoucher')
-          let formDataAccountPassword = sessionStorage.getItem('formDataAccountPassword')
-        let formExternalDataList = JSON.parse(formDataAccountVoucher);
-        console.log(formExternalDataList)
-          console.log(formDataAccountPassword)
+          let formList = [];
+          let formLists = [];
+          let projectId = sessionStorage.getItem('projectId')
+          let startTime = sessionStorage.getItem('startTime')
+          let accountVoucher = sessionStorage.getItem('accountVoucher')
+          let formExternalDataList = JSON.parse(accountVoucher);
           let voucherNumber = formExternalDataList
-        let paymentCode = formDataAccountPassword;
+          let accountVoucherTwo = sessionStorage.getItem('accountVoucherTwo')
+          let formExternalDataListTwo = JSON.parse(accountVoucherTwo);
+          let voucherNumberTwo = formExternalDataListTwo
+          let accountVoucherThree = sessionStorage.getItem('accountVoucherThree')
+          let formExternalDataListThree = JSON.parse(accountVoucherThree);
+          let voucherNumberThree = formExternalDataListThree
+          let accountPassword = sessionStorage.getItem('accountPassword')
+          let accountPasswordTwo = sessionStorage.getItem('accountPasswordTwo')
+          let accountPasswordThree = sessionStorage.getItem('accountPasswordThree')
+          let paymentCode = accountPassword;
+          let paymentCodeTwo = accountPasswordTwo;
+          let paymentCodeThree = accountPasswordThree;
           if(this.form.userName && this.form.currency && this.form.goldLogo && this.form.accountType && this.form.drawWay && this.form.voucherType && voucherNumber.length && paymentCode){
               for (var i=0;i<voucherNumber.length;i++){
-            formList.push({"emptyOne": "", "emptyTwo": "", "operationIds": "0,5,26,57,62,75,"+voucherNumber[i].id,"type": ""})
+                  formLists.push({"answerId":voucherNumber[i].id,"emptyOne": "", "emptyTwo": "", "operationIds": "0,5,26,57,62,75,"+voucherNumber[i].id,"type": ""})
+              }
+              let param= {
+                  parentId: '0,5,26,57,62,75',
+                  lcJudgmentRuleReq: formLists,
+                  projectId: +projectId,
+                  startTime: startTime,
               }
+              addOperation(param).then((data)=>{
+
+              }).catch((error)=>{
+              })
               formList.push(
-              {"emptyOne": "17", "emptyTwo": paymentCode, "operationIds": "0,5,26,57,62,77", "type": "3"},//支取密码
+                  {"answerId":'77',"emptyOne": "17", "emptyTwo": paymentCode, "operationIds": "0,5,26,57,62,77", "type": "3"},//支取密码
               )
-            if(this.formTwo == false || this.formTwo == true && (this.form.accountTypesTwo && this.form.drawWaysTwo && this.form.voucherTypesTwo)){
-                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
-            }else{
+              if(this.formTwo == true && (this.form.accountTypesTwo && this.form.drawWaysTwo && this.form.voucherTypesTwo)){
+                  if (this.form.accountTypesTwo){formList.push({"answerId":'272',"emptyOne": "12", "emptyTwo": this.form.accountTypesTwo,"operationIds": "0,5,26,57,62,272","type": "1"})}//账户类型2
+                  if (this.form.drawWaysTwo){formList.push({"answerId":'274',"emptyOne": "13", "emptyTwo": this.form.drawWaysTwo,"operationIds": "0,5,26,57,62,274","type": "1"})} //支取方式2
+                  if (this.form.voucherTypesTwo){formList.push({"answerId":'271',"emptyOne": "11", "emptyTwo": this.form.voucherTypesTwo,"operationIds": "0,5,26,57,62,271","type": "1"})} //凭证类型2
+                  formList.push(
+                      {"answerId":'275',"emptyOne": "17", "emptyTwo": paymentCodeTwo, "operationIds": "0,5,26,57,62,275", "type": "3"},//支取密码
+                  )
+                  for (var i=0;i<voucherNumberTwo.length;i++){
+                      formLists.push({"answerId":voucherNumberTwo[i].id,"emptyOne": "", "emptyTwo": "", "operationIds": "0,5,26,57,62,273,"+voucherNumberTwo[i].id,"type": ""})
+                  }
+              }else if(this.formTwo == true){
                   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{
+              if(this.formThree == true && (this.form.accountTypesThree && this.form.drawWaysThree && this.form.voucherTypesThree)){
+                  if (this.form.accountTypesThree){formList.push({"answerId":'278',"emptyOne": "12", "emptyTwo": this.form.accountTypesThree, "operationIds": "0,5,26,57,62,278","type": "1"})}//账户类型3
+                  if (this.form.drawWaysThree){formList.push({"answerId":'280',"emptyOne": "13", "emptyTwo": this.form.drawWaysThree, "operationIds": "0,5,26,57,62,280","type": "1"})}//支取方式3
+                  if (this.form.voucherTypesThree){formList.push({"answerId":'277',"emptyOne": "11", "emptyTwo": this.form.voucherTypesThree, "operationIds": "0,5,26,57,62,277","type": "1"})}//凭证类型3
+                  formList.push(
+                      {"answerId":'281',"emptyOne": "17", "emptyTwo": paymentCodeThree, "operationIds": "0,5,26,57,62,281", "type": "3"},//支取密码
+                  )
+                  for (var i=0;i<voucherNumberThree.length;i++){
+                      formLists.push({"answerId":voucherNumberThree[i].id,"emptyOne": "", "emptyTwo": "", "operationIds": "0,5,26,57,62,279,"+voucherNumberThree[i].id,"type": ""})
+                  }
+              }else if(this.formThree == true){
                   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
+              if (this.form.userNumber){formList.push({"answerId":'68',"emptyOne": "6", "emptyTwo": this.form.userNumber, "operationIds": "0,5,26,57,62,68","type": "3"})}//客户号
+              if (this.form.accountQuality){formList.push({"answerId":'72',"emptyOne": "10", "emptyTwo": this.form.accountQuality, "operationIds": "0,5,26,57,62,72","type": "1"})}//账户性质1
+              if (this.form.accountQualitysTwo){formList.push({"answerId":'270',"emptyOne": "10", "emptyTwo": this.form.accountQualitysTwo, "operationIds": "0,5,26,57,62,270","type": "1"})}//账户性质2
+              if (this.form.accountQualitysThree){formList.push({"answerId":'276',"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"},//币种
-              {"emptyOne": "9", "emptyTwo": this.form.goldLogo, "operationIds": "0,5,26,57,62,71", "type": "1"},//钞汇标识
-              {"emptyOne": "12", "emptyTwo": this.form.accountType, "operationIds": "0,5,26,57,62,74", "type": "1"}, //账户类型
-              {"emptyOne": "13", "emptyTwo": this.form.drawWay, "operationIds": "0,5,26,57,62,76", "type": "1"}, //支取方式
-              {"emptyOne": "11", "emptyTwo": this.form.voucherType, "operationIds": "0,5,26,57,62,73", "type": "1"} //凭证类型
+                  {"answerId":'69',"emptyOne": "7", "emptyTwo": this.form.userName, "operationIds": "0,5,26,57,62,69", "type": "3"},//用户名称
+                  {"answerId":'70',"emptyOne": "8", "emptyTwo": this.form.currency, "operationIds": "0,5,26,57,62,70", "type": "1"},//币种
+                  {"answerId":'71',"emptyOne": "9", "emptyTwo": this.form.goldLogo, "operationIds": "0,5,26,57,62,71","type": "1"},//钞汇标识
+                  {"answerId":'74',"emptyOne": "12", "emptyTwo": this.form.accountType, "operationIds": "0,5,26,57,62,74","type": "1"}, //账户类型
+                  {"answerId":'76',"emptyOne": "13", "emptyTwo": this.form.drawWay, "operationIds": "0,5,26,57,62,76", "type": "1"}, //支取方式
+                  {"answerId":'73',"emptyOne": "11", "emptyTwo": this.form.voucherType, "operationIds": "0,5,26,57,62,73", "type": "1"} //凭证类型
               )
-          sessionStorage.setItem('ruleReqs', JSON.stringify(formList))
+              let params= {
+                  parentId:'0,5,26,57,62',
+                  lcJudgmentRuleReq:formList,
+                  projectId:+projectId,
+                  startTime:startTime,
+              }
+              addOperation(params).then((data)=>{
                   this.$message({
                       message: '提交成功',
                       type: 'success'
                   });
+              }).catch((error)=>{
+              })
           }else{
               this.$message.error('有必填项未填哦~');
           }
@@ -349,22 +446,22 @@ export default {
             });
         },
       popUp(){
-        this.$store.commit('system/changePop',{show:true,text:'刷卡器',id:'62'})
+        this.$store.commit('system/changePop',{show:true,text:'刷卡器',id:'62,1'})
       },
       popUps(){
-        this.$store.commit('system/changePop',{show:true,text:'密码器',id:'62'})
+        this.$store.commit('system/changePop',{show:true,text:'密码器',id:'62,1'})
       },
       popUpTwo(){
-        this.$store.commit('system/changePop',{show:true,text:'刷卡器',id:'62'})
+        this.$store.commit('system/changePop',{show:true,text:'刷卡器',id:'62,2'})
       },
       popUpsTwo(){
-        this.$store.commit('system/changePop',{show:true,text:'密码器',id:'62'})
+        this.$store.commit('system/changePop',{show:true,text:'密码器',id:'62,2'})
       },
       popUpThree(){
-        this.$store.commit('system/changePop',{show:true,text:'刷卡器',id:'62'})
+        this.$store.commit('system/changePop',{show:true,text:'刷卡器',id:'62,3'})
       },
       popUpsThree(){
-        this.$store.commit('system/changePop',{show:true,text:'密码器',id:'62'})
+        this.$store.commit('system/changePop',{show:true,text:'密码器',id:'62,3'})
       },
     }
 };
@@ -377,8 +474,8 @@ export default {
         border-radius: 5px;
         background: #CFDDFF;
         text-align: center;
-        height: 68px;
-        line-height: 68px;
+        height: 40px;
+        line-height: 40px;
         font-size: 18px;
         color: #6191FF;
         cursor: pointer;

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

@@ -111,8 +111,8 @@ export default{
         border-radius: 5px;
         background: #CFDDFF;
         text-align: center;
-        height: 68px;
-        line-height: 68px;
+        height: 40px;
+        line-height: 40px;
         font-size: 18px;
         color: #6191FF;
         cursor: pointer;

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

@@ -105,8 +105,8 @@ export default{
         border-radius: 5px;
         background: #CFDDFF;
         text-align: center;
-        height: 68px;
-        line-height: 68px;
+        height: 40px;
+        line-height: 40px;
         font-size: 18px;
         color: #6191FF;
         cursor: pointer;

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

@@ -106,8 +106,8 @@ export default{
         border-radius: 5px;
         background: #CFDDFF;
         text-align: center;
-        height: 68px;
-        line-height: 68px;
+        height: 40px;
+        line-height: 40px;
         font-size: 18px;
         color: #6191FF;
         cursor: pointer;

src/pages/manage/list/personal/timeDeposit/deposit.vue

@@ -93,8 +93,8 @@ export default{
         border-radius: 5px;
         background: #CFDDFF;
         text-align: center;
-        height: 68px;
-        line-height: 68px;
+        height: 40px;
+        line-height: 40px;
         font-size: 18px;
         color: #6191FF;
         cursor: pointer;

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

@@ -77,8 +77,8 @@ export default{
         border-radius: 5px;
         background: #CFDDFF;
         text-align: center;
-        height: 68px;
-        line-height: 68px;
+        height: 40px;
+        line-height: 40px;
         font-size: 18px;
         color: #6191FF;
         cursor: pointer;

src/pages/manage/list/personal/timeDeposit/timeDeposit.vue

@@ -139,8 +139,8 @@ export default {
                 border-radius: 5px;
                 background: #CFDDFF;
                 text-align: center;
-                height: 68px;
-                line-height: 68px;
+                height: 40px;
+                line-height: 40px;
                 font-size: 18px;
                 color: #6191FF;
             }

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

@@ -79,8 +79,8 @@ export default{
         border-radius: 5px;
         background: #CFDDFF;
         text-align: center;
-        height: 68px;
-        line-height: 68px;
+        height: 40px;
+        line-height: 40px;
         font-size: 18px;
         color: #6191FF;
         cursor: pointer;

src/pages/manage/list/personal/usefulPhrases/accountClosed.vue

@@ -102,8 +102,8 @@ export default{
         border-radius: 5px;
         background: #CFDDFF;
         text-align: center;
-        height: 68px;
-        line-height: 68px;
+        height: 40px;
+        line-height: 40px;
         font-size: 18px;
         color: #6191FF;
         cursor: pointer;

src/pages/manage/list/personal/usefulPhrases/continueDeposit.vue

@@ -68,8 +68,8 @@ export default{
         border-radius: 5px;
         background: #CFDDFF;
         text-align: center;
-        height: 68px;
-        line-height: 68px;
+        height: 40px;
+        line-height: 40px;
         font-size: 18px;
         color: #6191FF;
         cursor: pointer;

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

@@ -92,8 +92,8 @@ export default{
         border-radius: 5px;
         background: #CFDDFF;
         text-align: center;
-        height: 68px;
-        line-height: 68px;
+        height: 40px;
+        line-height: 40px;
         font-size: 18px;
         color: #6191FF;
         cursor: pointer;

src/pages/manage/list/personal/usefulPhrases/usefulPhrases.vue

@@ -133,8 +133,8 @@ export default {
                 border-radius: 5px;
                 background: #CFDDFF;
                 text-align: center;
-                height: 68px;
-                line-height: 68px;
+                height: 40px;
+                line-height: 40px;
                 font-size: 18px;
                 color: #6191FF;
             }

src/styles/layout/index.scss

@@ -18,15 +18,14 @@ body {
 
     .el-input .el-input__inner{
         border: 2px solid #EDEDED;
-        height: 68px!important;
+        //height: 68px!important;
         font-size: 18px;
     }
     .el-date-editor.el-input, .el-date-editor.el-input__inner,.el-select{
         width: 100%;
     }
     .el-form-item__label{
-        line-height: 68px;
+        //line-height: 68px;
         font-size: 18px;
     }
-    
 } 

src/styles/system.css

@@ -44,8 +44,8 @@
   border-radius: 5px;
   background: #CFDDFF;
   text-align: center;
-  height: 68px;
-  line-height: 68px;
+  height: 40px;
+  line-height: 40px;
   font-size: 18px;
   color: #6191FF;
 }

src/styles/system.scss

@@ -38,8 +38,8 @@
     border-radius: 5px;
     background: #CFDDFF;
     text-align: center;
-    height: 68px;
-    line-height: 68px;
+    height: 40px;
+    line-height: 40px;
     font-size: 18px;
     color: #6191FF;
 }