修复bug

d

@@ -0,0 +1,32 @@
+diff.astextplain.textconv=astextplain
+filter.lfs.clean=git-lfs clean -- %f
+filter.lfs.smudge=git-lfs smudge -- %f
+filter.lfs.process=git-lfs filter-process
+filter.lfs.required=true
+http.sslbackend=openssl
+http.sslcainfo=C:/Program Files/Git/mingw64/etc/ssl/certs/ca-bundle.crt
+core.autocrlf=true
+core.fscache=true
+core.symlinks=false
+pull.rebase=false
+credential.https://dev.azure.com.usehttppath=true
+init.defaultbranch=master
+filter.lfs.smudge=git-lfs smudge -- %f
+filter.lfs.process=git-lfs filter-process
+filter.lfs.required=true
+filter.lfs.clean=git-lfs clean -- %f
+credential.http://121.37.12.51:13000.provider=generic
+user.email=728837162@qq.com
+user.name=wangchenguang
+user.password=huoran.123
+credential.helper=wincred
+core.repositoryformatversion=0
+core.filemode=false
+core.bare=false
+core.logallrefupdates=true
+core.symlinks=false
+core.ignorecase=true
+remote.origin.url=http://121.37.12.51:13000/huoran/FE_bankTeaching
+remote.origin.fetch=+refs/heads/*:refs/remotes/origin/*
+branch.master.remote=origin
+branch.master.merge=refs/heads/master

src/components/case/index.vue

@@ -158,6 +158,7 @@ import Setting from '@/setting'
 // 引入封装好的接口
 import {getProjectBySystemId,getProjectDetail,submit,getQueryCache,deleteCache,checkTest,checkTest2} from "@/api/http.js";
 import { mapMutations } from 'vuex'
+import { async } from 'q';
 export default {
   props: {
     sendSync: {
@@ -245,7 +246,8 @@ export default {
       popContainer:false,
       timestamp:'',
       curSystemId: '',
-      reportId: ''
+      reportId: '',
+      submitType: false
     }
   },
   created() {
@@ -608,6 +610,7 @@ export default {
     //选择好题目
     selectProject(){
       this.lockIt = false
+      this.submitType = false
       this.$router.push('/index/list')
 
       this.$nextTick(() => {
@@ -689,7 +692,7 @@ export default {
               });
         });
     },
-    sureSubmit(judge){
+    async sureSubmit(judge){
         // 初始化vuex中的state
         // this.initState();
         this.actEndTime = new Date().getTime();
@@ -734,7 +737,10 @@ export default {
                   firstLoad2 = sessionStorage.getItem('firstLoad2')
                 }
                 
-                this.lockIt = true
+                 this.lockIt = true
+                if (this.assessmentId) {
+                  this.submitType = true
+                }
                 if(firstLoad) {
                   sessionStorage.setItem('firstLoad', firstLoad)
                 }
@@ -857,6 +863,7 @@ export default {
         }
     },
     reload() {
+        this.submitType = false
         this.lockIt = false
         this.clearStore()
         let token = sessionStorage.getItem('token')
@@ -906,6 +913,7 @@ export default {
       return param < 10 ? "0" + param : param;
     },
     toggleCase() {
+      if (this.submitType) return 
       if(!this.lockIt) {
         this.$emit('update:showIt', !this.showIt)
       }else {

src/components/checkPhoto/index.vue

@@ -118,7 +118,7 @@
             <h3 class="text-md" style="left: 120px;top: 370px;">人民币</h3>
             <h3 class="text-md" style="left: 260px;top: 370px;">{{ dataFlow.voucherNumber }}</h3>
         </template>  
-        <template v-else-if="imgSrcId==468" >
+        <template v-else-if="imgSrcId==468 || imgSrcId==467" >
             <h3 class="text-xl" style="left: 325px;top: 103px;">√</h3>
             <h3 class="text-lg" style="left: 160px;top: 175px;">{{ dataFlow.userName }}</h3>
             <h3 class="text-lg" style="left: 490px;top: 175px;">{{ dataFlow.idNumber }}</h3>

src/components/dialog/index.vue

@@ -105,7 +105,7 @@ const obj = {
     'servicesAccount/passwordChange': '密码修改',
     'servicesAccount/passwordLost': '密码挂失登记',
     'servicesAccount/relieveLost': '挂失解挂登记',
-    
+    'business/transfer':'转账',
     'controlCash/cashTransferInto': '现金上缴',
     'spacial': '提交'
 }

src/components/dialogTwo/index.vue

@@ -24,7 +24,7 @@
             </div>
             <div class="popBody" v-else-if="flow === 2">
                 <el-form ref="form2" :model="disForm" label-width="200px" >
-                        <el-form-item label="授权柜员">
+                        <el-form-item label="授权柜员号">
                         <el-input disabled v-model.trim="disForm.name"></el-input>
                     </el-form-item>
                     <el-form-item label="授权柜员">

src/pages/counter/list/index.vue

@@ -951,6 +951,7 @@ export default {
             goodState: 'system/goodState',
             getSelectList: 'system/getSelectList',
             needBackMoney: 'system/needBackMoney',
+            businessId:"system.businessId"
         }),
 
         
@@ -1534,7 +1535,7 @@ export default {
                     this.controlGoodsDblClickFn = null
                 }
                 if (this.finishSealedArr.includes(item.id)) return false // 盖章过的不能双击放大
-                const judge = item.name.includes('本联') || item.name.includes('凭证联') || (item.name.includes('回单') && !item.name.includes('密码挂失申请书回单'))
+                const judge = item.name.includes('本联') || item.name.includes('凭证联') || (item.name.includes('回单') && !item.name.includes('客户回单'))
                 || (item.name.includes('复印件') && !item.name.includes('身份证复印件') ) || item.name.includes('（二）') || item.name.includes('（三）')
                 if(!(judge)) {
                     this.clickNum2 = 0;  

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

@@ -240,17 +240,40 @@ export default {
         }),
         getSum() {
             return (val, num) => {
-                return val.substr(0, val.length-1) * num;
+                if (val.indexOf('角') == -1) {
+                    return val.substr(0, val.length-1) * num;
+                }else {
+                    
+                    return val.substr(0, val.length-1) /10  * num;
+                }
+                
             }
         },
+        // 用于计算总金额
         allSum() {
             const one = this.tableData.reduce((pre, item) => {
                 return pre + item.moneyType.substr(0, item.moneyType.length-1) * item.moneyNumber
             }, 0)
             const two = this.tableData2.reduce((pre, item) => {
-                return pre + item.moneyType.substr(0, item.moneyType.length-1) * item.moneyNumber
+                if (item.moneyType.indexOf('角') == -1) {
+                    return pre + item.moneyType.substr(0, item.moneyType.length-1) * item.moneyNumber
+                }else {
+                    return pre +  item.moneyType.substr(0, item.moneyType.length-1) /10 * item.moneyNumber
+                }
             }, 0)
-            return one + two
+            let allSum
+            const allNum = one + two
+            const splitStr = allNum.toString().split('.')[1]
+            if(splitStr) {
+                if(splitStr.length >= 2) {
+                    allSum = allNum.toFixed(1)
+                }else {
+                    allSum = allNum
+                }
+            }else {
+                allSum = allNum
+            }
+            return allSum 
         }
     },
     watch: {

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

@@ -52,7 +52,7 @@
                         </el-form-item>
                         <el-form-item label="支取方式" prop="payWay">
                             <el-select v-model.trim="form.payWay" disabled placeholder="请选择" ref="payWay">
-                                <el-option label="印签" :value="114"> </el-option>
+                                <el-option label="印鉴" :value="114"> </el-option>
                             </el-select>
                         </el-form-item>
                         <el-form-item label="转入户名" prop="transinName">

src/pages/manage/list/cityWide/cityWideOut.vue

@@ -184,7 +184,7 @@ export default {
                 ],
                 billType: [
                     { 
-                        required: true, 
+                        required: false, 
                         message: '请选择票据类型',
                         trigger: 'blur'
                     }

src/store/modules/system.js

@@ -77,8 +77,8 @@ const allGoods = {
     477: {name:'特殊业务申请书回单',src:require('@/assets/img/goods/businessSpecialApplication.png'),id:477},
     406: {name:'密码挂失申请书',src:require('@/assets/img/goods/businessReportMissUser.png'),id:406},
     466: {name:'密码挂失申请书凭证联',src:require('@/assets/img/goods/businessReportMissUser.png'),id:466},
-    468: {name:'密码挂失申请书回单',src:require('@/assets/img/goods/businessReportMissUser.png'),id:468},
+    468: {name:'客户回单',src:require('@/assets/img/goods/businessReportMissUser2.png'),id:468},
-    467: {name:'密码挂失申请书银行留存联',src:require('@/assets/img/goods/businessReportMissUser.png'),id:467},
+    467: {name:'密码挂失申请书银行留存联',src:require('@/assets/img/goods/businessReportMissUser3.png'),id:467},
     413: {name:'支票领购单',src:require('@/assets/img/goods/CheckCoupons.png'),id:413},
     480: {name:'支票领购单回单',src:require('@/assets/img/goods/CheckCoupons.png'),id:480},
     488: {name:'支票领购单凭证联',src:require('@/assets/img/goods/CheckCoupons.png'),id:488},
@@ -2991,7 +2991,23 @@ export default {
             const arr = []
             if(state.businessKey !== '') {
                 for(const item of state.businessSelect[state.businessKey].data) {
-                    arr.push(allGoods[item])
+                    if (state.businessKey == '业务七') {
+                        if(item !==23) {
+                            arr.push(allGoods[item])
+                        }
+                    }else if(state.businessKey == '业务十一') {
+                        if (item ==432) {
+                            arr.push({
+                                id: 432,
+                                name: '开户银行结算账户申请书',
+                                src: 'static/img/ApplicationBankSettlement.1e0ce8b4.png'
+                            })
+                        }else {
+                            arr.push(allGoods[item])
+                        }
+                    } else {
+                        arr.push(allGoods[item])
+                    }
                 }
                 // 找到银行卡item
                 const item = arr.find(item => item.id === 16)
@@ -3004,6 +3020,7 @@ export default {
                     }
                 }
             }
+            console.log('arr=',arr)
             return arr
         },