更改实训项目无内容的话提交按钮不可点击

src/components/case/index.vue

@@ -36,7 +36,7 @@
                        @click="reload" :disabled="popContainer && (assessmentId!='' && assessmentId!='null' && assessmentId!=null)">
                 重新开始
             </el-button>
-            <el-button class="submit-btn" style="margin-right:7px" @click="Submit()" :disabled="popContainer">提交</el-button>
+            <el-button class="submit-btn" style="margin-right:7px" @click="Submit()" :disabled="popContainer || requires.length == 0">提交</el-button>
           </div>
         </div>
       </el-header>

src/pages/counter/list/index.vue

@@ -1399,7 +1399,7 @@ export default {
                         sessionStorage.setItem('nomClientIdentity', JSON.stringify(this.receptionList))
                     }
                     console.log(sessionStorage.getItem('nomClientIdentity'))
-                }else if (this.$store.state.system.id == '34'){
+                }else if (this.$store.state.system.id == '34' && this.popText === '身份证扫描仪' ){
                     this.nbm = 34
                     // this.goodsShelfTotalData = this.auditGoodsShelf
                     if (this.receptionList.length >0){

src/pages/manage/index/index.vue

@@ -47,10 +47,13 @@ export default {
         }
     },
     created() {
-
+        if(sessionStorage.getItem('computerPath')) {
+            this.$router.push(sessionStorage.getItem('computerPath'))
+        }
     },
     methods: {
         close(){
+            sessionStorage.setItem('computerPath', this.$route.fullPath)
             this.$router.push('/counter/list/')
         },
         handleFullscreen(){
@@ -61,7 +64,7 @@ export default {
             this.fullscreen = false
             this.$store.commit('system/changeFullscreen',false)
         },
-    }
+    },
 };
 </script>
 

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

@@ -18,9 +18,12 @@
                             <el-input v-model="form.registeredCapital" ref="registeredCapital"></el-input>
                         </el-form-item>
                         <el-form-item label="法人证件号码" required>
-                            <div class="idCard" @click="popUp">
+                            <div class="idCard" @click="popUp1('身份证扫描仪')" v-if='!form.idNumberJudge'>
                                 <p>请刷身份证</p>
                             </div>
+                            <div v-else>
+                                <el-input :value="form.idNumber" disabled ref="idNumber"></el-input>
+                            </div>
                         </el-form-item>
                         <el-form-item label="联系电话" :rules="rules.phone" prop="phone">
                             <el-input :value="form.phone" @input="(val) => phoneListen(val, form, 'phone')"  maxlength="12" ref='phone'></el-input>
@@ -47,40 +50,7 @@
             <el-button @click="submitForm" type="primary" class="submitBtn">提交</el-button>
         </div>
         
-
+        <my-dialog v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" />
-        <!-- <el-dialog
-            style="margin-top:10vh"
-            :visible.sync="visible"
-            :modal="false"
-            width="40%"
-            :close-on-click-modal="false" 
-            :show-close="false" 
-            custom-class="data-dia"
-        >
-            <div slot="title" class="dia-header">
-                <div class="data-title" @click="success = true">提交</div>
-            </div>
-            <div class="popBody" v-if="!authorization&&!success">
-                <h2>本业务需要授权</h2>
-            </div>
-            <div class="popBody" v-if="authorization&&!success">
-                <el-form ref="form2" :model="disForm" label-width="80px">
-                     <el-form-item label="授权柜员">
-                        <el-input disabled v-model="disForm.name"></el-input>
-                    </el-form-item>
-                    <el-form-item label="授权柜员">
-                        <el-input type="password" disabled v-model="disForm.pass"></el-input>
-                    </el-form-item>
-                </el-form>
-            </div>
-            <div class="popBody" v-if="success">
-                <h2>完成表单form</h2>
-            </div>
-            <div class="popBtns">
-                <el-button class="close btn" @click="[visible = false,authorization=false,success=false]">取 消</el-button>
-                <el-button class="sure btn" type="primary" @click="popSure">确 定</el-button>
-            </div>
-        </el-dialog> -->
     </div>
 
     <need-before v-else :moduleName='needBefore' :unNeed="unNeed" class="wrap" />
@@ -93,24 +63,27 @@ import { addOperation, getOperation } from '@/api/http';
 import { phoneListen, checkRequired, myValidate, checkHanzi, checkName } from '@/utils/utilFunction.js'
 import MyTitle from '@/components/myTitle'
 import NeedBefore from '@/components/needBefore'
+import MyDialog from '@/components/dialog'
 
 const moduleName = 'corporateClient'
 export default {
     name: 'index',
     components: {
         MyTitle,
-        NeedBefore
+        NeedBefore,
+        MyDialog
     },
     data() {
         return {
             unNeed: false,
             isNeedBefore: '',
             needBefore: '',
-
+            idNumberJudge: false,
             visible:false,// 表单
             authorization:false,// 切授权
             success:false,// 切成功
             form:{
+                idNumber: '',
                 name: '',
                 phone: '',
                 documentType: '',
@@ -120,6 +93,17 @@ export default {
                 companyAddress: '',
                 certificateType: ''
             },
+            formName:{
+                idNumber: '法人证件号码',
+                name: '法人姓名',
+                phone: '联系电话',
+                documentType: '证件类型',
+                companyName: '公司名称',
+                registeredCapital: '注册资本',
+                codeNumber: '代码证号',
+                companyAddress: '公司地址',
+                certificateType: '法人证件类型'
+            },
             rules: {
                 companyName: [
                     { 
@@ -158,7 +142,10 @@ export default {
         // firmClientIdentity
         if(this.inMyWork(moduleName)) {
             if(this.needsModule(moduleName) === '') {
-                
+                this.getFormData()
+            }else {
+                this.isNeedBefore = true
+                this.needBefore = this.needsModule(moduleName)
             }
         }else {
             this.isNeedBefore = true
@@ -178,21 +165,29 @@ export default {
                     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} //代码证号
+                        else if (list[i].answerId == '49') {this.form.codeNumber = list[i].emptyTwo} //代码证号
-                        if (list[i].answerId == '50') {this.form.companyName = list[i].emptyTwo} //公司名称
+                        else if (list[i].answerId == '50') {this.form.companyName = list[i].emptyTwo} //公司名称
-                        if (list[i].answerId == '51') {this.form.companyAddress = list[i].emptyTwo} //公司地址
+                        else if (list[i].answerId == '51') {this.form.companyAddress = list[i].emptyTwo} //公司地址
-                        if (list[i].answerId == '52') {this.form.registeredCapital = list[i].emptyTwo} //注册资本
+                        else if (list[i].answerId == '52') {this.form.registeredCapital = list[i].emptyTwo} //注册资本
-                        if (list[i].answerId == '53') {this.form.certificateType = list[i].emptyTwo} //法人证件类型
+                        else if (list[i].answerId == '53') {this.form.certificateType = list[i].emptyTwo} //法人证件类型
-                        if (list[i].answerId == '54') {sessionStorage.setItem('firmClientIdentity', list[i].emptyTwo)} //法人证件号码
+                        // else if (list[i].answerId == '54') {sessionStorage.setItem('firmClientIdentity', list[i].emptyTwo)} //法人证件号码
-                        if (list[i].answerId == '55') {this.form.name = list[i].emptyTwo} //法人姓名
+                        else if (list[i].answerId == '54') {
-                        if (list[i].answerId == '56') {this.form.phone = list[i].emptyTwo} //联系电话
+                            console.log('54id')
+                            console.log(list[i].emptyTwo)
+                            this.idNumberJudge = true
+                            this.form.idNumber = list[i].emptyTwo
+                        }
+                        else if (list[i].answerId == '55') {this.form.name = list[i].emptyTwo} //法人姓名
+                        else if (list[i].answerId == '56') {this.form.phone = list[i].emptyTwo} //联系电话
                     }
                 }
             }).catch((error)=>{
             })
         },
         ...mapMutations({
-            changeShowGoods: 'system/changeShowGoods'
+            changeShowGoods: 'system/changeShowGoods',
+            setDataFlow: 'system/setDataFlow',
+            setNeedsModule: 'system/setNeedsModule'
         }),
         popUp(){// 唤起弹窗
             this.$store.commit('system/changePop',{show:true,text:'身份证扫描仪',id:'34'})
@@ -201,56 +196,63 @@ export default {
 
         },
         submitForm() {
-            let projectId = sessionStorage.getItem('projectId')
+            
-            let startTime = sessionStorage.getItem('startTime')
             this.$refs.form.validate(myValidate(() => {
                 // 验证通过逻辑写在这
                 this.visible = 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":54,"emptyOne": "", "emptyTwo": firmClientIdentity, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,25,34,54","type": ""})// 法人证件号码
-                    }
-                    if(this.form.documentType){
-                        formList.push({ "answerId":'48', "emptyOne": "19", "emptyTwo": this.form.documentType, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,25,34,48","type": "1"})//证件类型
-                    }
-                    if(this.form.companyAddress){
-                        formList.push({ "answerId":'51', "emptyOne": "22", "emptyTwo": this.form.companyAddress, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,25,34,51", "type": "3" })//公司地址
-                    }
-                    if(this.form.registeredCapital){
-                        formList.push({ "answerId":'52', "emptyOne": "23", "emptyTwo": this.form.registeredCapital, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,25,34,52", "type": "3" })//注册资本
-                    }
-                    if(this.form.name){
-                        formList.push( {"answerId":'55',"emptyOne": "25", "emptyTwo": this.form.name, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,25,34,55", "type": "3"})//法人姓名
-                    }
-                    if(this.form.phone){
-                        formList.push({"answerId":'56',"emptyOne": "5", "emptyTwo": this.form.phone, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,25,34,56", "type": "3"})//联系电话
-                    }
-                    formList.push(
-                        { "answerId":'49', "emptyOne": "20", "emptyTwo": this.form.codeNumber, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,25,34,49", "type": "3" },//代码证号
-                        { "answerId":'50', "emptyOne": "21", "emptyTwo": this.form.companyName, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,25,34,50", "type": "3" },//公司名称
-                        {"answerId":'53',"emptyOne": "24", "emptyTwo": this.form.certificateType, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,25,34,53", "type": "1"},//法人证件类型
-                    );
-                    let params= {
-                        parentId:this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,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));
         },
+        submitForm2() {
+            let projectId = sessionStorage.getItem('projectId')
+            let startTime = sessionStorage.getItem('startTime')
+            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":54,"emptyOne": "", "emptyTwo": firmClientIdentity, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,25,34,54","type": ""})// 法人证件号码
+                // }
+                formList.push({"answerId":54,"emptyOne": "", "emptyTwo": this.form.idNumber, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,25,34,54","type": ""})// 法人证件号码
+                if(this.form.documentType){
+                    formList.push({ "answerId":'48', "emptyOne": "19", "emptyTwo": this.form.documentType, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,25,34,48","type": "1"})//证件类型
+                }
+                if(this.form.companyAddress){
+                    formList.push({ "answerId":'51', "emptyOne": "22", "emptyTwo": this.form.companyAddress, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,25,34,51", "type": "3" })//公司地址
+                }
+                if(this.form.registeredCapital){
+                    formList.push({ "answerId":'52', "emptyOne": "23", "emptyTwo": this.form.registeredCapital, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,25,34,52", "type": "3" })//注册资本
+                }
+                if(this.form.name){
+                    formList.push( {"answerId":'55',"emptyOne": "25", "emptyTwo": this.form.name, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,25,34,55", "type": "3"})//法人姓名
+                }
+                if(this.form.phone){
+                    formList.push({"answerId":'56',"emptyOne": "5", "emptyTwo": this.form.phone, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,25,34,56", "type": "3"})//联系电话
+                }
+                formList.push(
+                    { "answerId":'49', "emptyOne": "20", "emptyTwo": this.form.codeNumber, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,25,34,49", "type": "3" },//代码证号
+                    { "answerId":'50', "emptyOne": "21", "emptyTwo": this.form.companyName, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,25,34,50", "type": "3" },//公司名称
+                    {"answerId":'53',"emptyOne": "24", "emptyTwo": this.form.certificateType, "operationIds": this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + "285,287,5,25,34,53", "type": "1"},//法人证件类型
+                );
+                let params= {
+                    parentId:this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,5,25,34',
+                    lcJudgmentRuleReq:formList,
+                    projectId:+projectId,
+                    startTime:startTime,
+                }
+                addOperation(params).then((data)=>{
+                    // this.$message({
+                    //     message: '提交成功',
+                    //     type: 'success'
+                    // });
+
+                    // this.setDataFlow({ ...this.form })
+                    this.setNeedsModule(moduleName)
+                }).catch((error)=>{
+                })
+            }else {
+                this.$message.error('有必填项未填哦~');
+            }
+        },
         phoneListen: phoneListen,
         checkHanzi: checkHanzi,
         checkName: checkName

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

@@ -204,16 +204,10 @@ export default{
                 ]
             },
             myTable: {
-                // clientName: '', // 客户姓名
+                302: {
-                // currencyMark: '钞户', // 钞汇标识
+                    prop: 'voucherNumber',
-                // depositNumber: '', // 定存编号
+                    prop: '3'
-                // capital: '', // 本金
+                },
-                // interestRate: '', // 利率
-                // depositDate: '', // 存期
-                // interest: '', // 利息
-                // totalMoney: '', // 总金额
-                // certificateType: '', //证件类型
-                // breathDate: '', // 起息日期
                 303: {
                     prop: 'voucherType',
                     type: '1',
@@ -280,6 +274,14 @@ export default{
                     prop: 'certificateType',//
                     type: '1',
                       "subjectId": 19,
+                },
+                392: {
+                    prop: 'idNumber',
+                    type: '3'
+                },
+                394: {
+                    prop: 'drawPassword',
+                    type: '3'
                 }
             },
             myTable2: {

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

@@ -53,6 +53,7 @@ export default {
     data() {
         return {
             text:'',/* 顶部文字 */
+            cacheVal: '',
             textObj:{
                 '1':'开户',
                 '2':'支取销户',
@@ -68,15 +69,21 @@ export default {
         }
     },
     created() {
-        this.handleSelect('1')
+        if(sessionStorage.getItem('callDepositsIndex')) {
+            this.handleSelect(sessionStorage.getItem('callDepositsIndex'))
+        }else {
+            this.handleSelect('1')
+        }
     },
     methods: {
         handleSelect(val){
             this.text = this.textObj[val]
             this.activeIndex = val
+            this.cacheVal = val
         },
-        
+    },
-
+    destroyed() {
+        sessionStorage.setItem('callDepositsIndex', this.cacheVal)
     }
 };
 </script>

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

@@ -192,6 +192,14 @@ export default{
                 
             },
             myTable2: {
+                291: {
+                    prop: 'idNumber',// 身份证号码
+                    type: '3',
+                },
+                297: {
+                    prop: 'voucherNumber', // 银行卡号
+                    type: '3'
+                },
                 293: {
                     prop: 'customerName',//客户姓名
                     type: '3',
@@ -227,6 +235,10 @@ export default{
                     type: '1',
                     "subjectId": 48,
                 },
+                301: {
+                    prop: 'drawPassword',
+                    type: '3'
+                },
                 // : {
                 //     prop: 'noticeType',//通知类型 后台没有这个
                 //     type: '1'

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

@@ -82,6 +82,7 @@ export default {
             text:'',/* 顶部文字 */
             // 存款完才能取款，否则会提示
             depositFinish: false,
+            cacheVal: '',
             textObj:{
                 '1':'开户',
                 '2':'存款',
@@ -105,16 +106,20 @@ export default {
         }
     },
     created() {
-        this.handleSelect('1')
+        if(sessionStorage.getItem('currentAccountIndex')) {
+            this.handleSelect(sessionStorage.getItem('currentAccountIndex'))
+        }else {
+            this.handleSelect('1')
+        }
     },
     destroyed() {
-        // sessionStorage.setItem('currentAccountIndex', )
+        sessionStorage.setItem('currentAccountIndex', this.cacheVal)
     },
     methods: {
         handleSelect(val){
-            console.log(typeof(val),this.activeIndex,'xuanze');
             this.text = this.textObj[val]
             this.activeIndex = val
+            this.cacheVal  = val
         },
         setDepositFinish() {
             this.depositFinish = true;

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

@@ -65,6 +65,7 @@ export default {
     data() {
         return {
             text:'',/* 顶部文字 */
+            cacheVal: '',
             textObj:{
                 '1':'开户',
                 '2':'存款',
@@ -82,17 +83,21 @@ export default {
         }
     },
     created() {
-        this.handleSelect('1')
+        if(sessionStorage.getItem('timeDepositIndex')) {
+            this.handleSelect(sessionStorage.getItem('timeDepositIndex'))
+        }else {
+            this.handleSelect('1')
+        }
     },
     methods: {
         handleSelect(val){
-            console.log(typeof(val),this.activeIndex,'xuanze');
-            
             this.text = this.textObj[val]
             this.activeIndex = val
+            this.cacheVal = val
         },
-        
+    },
-
+    destroyed() {
+        sessionStorage.setItem('timeDepositIndex', this.cacheVal)
     }
 };
 </script>

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

@@ -64,6 +64,7 @@ export default {
     data() {
         return {
             text:'',/* 顶部文字 */
+            cacheVal: '',
             textObj:{
                 '1':'开户',
                 '2':'续存',
@@ -81,15 +82,21 @@ export default {
         }
     },
     created() {
-        this.handleSelect('1')
+        if(sessionStorage.getItem('usefulPhrasesIndex')) {
+            this.handleSelect(sessionStorage.getItem('usefulPhrasesIndex'))
+        }else {
+            this.handleSelect('1')
+        }
     },
     methods: {
         handleSelect(val){
             this.text = this.textObj[val]
             this.activeIndex = val
+            this.cacheVal = val
         },
-        
+    },
-
+    destroyed() {
+        sessionStorage.setItem('usefulPhrasesIndex', this.cacheVal)
     }
 };
 </script>

src/store/modules/system.js

@@ -1144,6 +1144,24 @@ export default {
 
                 importanceArr: [], // 重要空白凭证箱
                 commonArr: [], // 普通凭证箱
+
+                needsModule: {
+                    'corporateClient': false
+                },
+                dataFlow: {
+                    // 凭证类型（存单）、客户号（根据案例展示）、客户姓名、币种（CNY人民币）、钞汇标识（钞户）、通知类型（根据案例展示）、定存编号（根据开户时的定存编号展示）、本金（开户时存的金额）、利息（2.8）、、总金额（利息+本金）、支取类别（现金）、支取金额（等于总金额）证件类型（身份证）
+                    // 身份证号码、客户号（根据案例展示）、客户姓名、币种（人民币）、钞汇标识（钞户）
+                    
+                    // depositNumber: '0816',
+                    
+                    // capital: 100,
+                    // interestRate: 1.85,
+                    // depositTerm: '1年',
+                    // interest: 1.6,
+                    // totalMoney: 101.6,
+                    // signDate: '2001-03-01',
+                    // voucherNumber
+                }
             },
             '项目十二': {
                 id: '',