From 5712af4ed0a915e3d3e3087fca9a8e8034ae71b5 Mon Sep 17 00:00:00 2001
From: "luoJunYong.123" <you@example.com>
Date: Thu, 10 Feb 2022 18:30:46 +0800
Subject: [PATCH] update

---
 src/components/case/index.vue                 |   5 -
 src/components/selectBusiness/index.vue       |  14 +-
 src/pages/counter/list/index.vue              |   4 +-
 .../manage/list/client/consumerClient.vue     |   7 +-
 .../manage/list/client/corporateClient.vue    |  20 ++-
 .../personal/callDeposits/accountClosed.vue   |  14 +-
 .../list/servicesAccount/passwordChange.vue   |   9 +-
 .../list/servicesAccount/passwordLost.vue     |   2 +-
 src/store/modules/system.js                   | 152 +++++++++++++-----
 9 files changed, 153 insertions(+), 74 deletions(-)

diff --git a/src/components/case/index.vue b/src/components/case/index.vue
index 14df3d2..9f9e4ba 100644
--- a/src/components/case/index.vue
+++ b/src/components/case/index.vue
@@ -238,10 +238,6 @@ export default {
         }
       }
     },
-    requires(newVal) {
-      console.log('new_requires')
-      console.log(newVal)
-    }
   },
   props: {
     sendSync: {
@@ -543,7 +539,6 @@ export default {
             "submitTime": this.actEndTime,
             "systemId": systemId,
         }
-          console.log(params)
         this.loading = true;
         submit(params).then((data)=>{
             if(data.status == 200){
diff --git a/src/components/selectBusiness/index.vue b/src/components/selectBusiness/index.vue
index 1615891..31b6a9c 100644
--- a/src/components/selectBusiness/index.vue
+++ b/src/components/selectBusiness/index.vue
@@ -95,11 +95,11 @@ export default {
                 },
                 {
                     myKey: '项目十三',
-                    text: ': 公司现金支票取款,转账'
+                    text: ': 公司现金支票取款'
                 },
                 {
                     myKey: '项目十四',
-                    text: ': 密码修改'
+                    text: ': 公司现金支票转账'
                 },
                 {
                     myKey: '项目十五',
@@ -115,23 +115,23 @@ export default {
                 },
                 {
                     myKey: '项目十八',
-                    text: ': 支票出售'
+                    text: ': 现金领用'
                 },
                 {
                     myKey: '项目十九',
-                    text: ': 现金领用'
+                    text: ': 现金上缴'
                 },
                 {
                     myKey: '项目二十',
-                    text: ': 现金上缴'
+                    text: ': 现金调入'
                 },
                 {
                     myKey: '项目二十一',
-                    text: ': 现金领用'
+                    text: ': 现金调出'
                 },
                 {
                     myKey: '项目二十二',
-                    text: ': 现金调出'
+                    text: ': '
                 },
                 {
                     myKey: '项目二十三',
diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue
index b6dec6b..de40aa6 100644
--- a/src/pages/counter/list/index.vue
+++ b/src/pages/counter/list/index.vue
@@ -1057,11 +1057,11 @@ export default {
         }
         if(sessionStorage.getItem('businessSelect')) {
             // 调试时注释掉
-            this.$store.commit('system/setBusinessSelect', JSON.parse(sessionStorage.getItem('businessSelect')))
+            // this.$store.commit('system/setBusinessSelect', JSON.parse(sessionStorage.getItem('businessSelect')))
         }
         window.addEventListener("beforeunload",()=>{    
             sessionStorage.setItem('businessKey', this.$store.state.system.businessKey)
-            sessionStorage.setItem('businessSelect', JSON.stringify(this.$store.state.system.businessSelect))
+            // sessionStorage.setItem('businessSelect', JSON.stringify(this.$store.state.system.businessSelect))
         })
         this.startPlay()
         console.log('startPlay')
diff --git a/src/pages/manage/list/client/consumerClient.vue b/src/pages/manage/list/client/consumerClient.vue
index 1d319d0..df64d1e 100644
--- a/src/pages/manage/list/client/consumerClient.vue
+++ b/src/pages/manage/list/client/consumerClient.vue
@@ -8,7 +8,7 @@
                 <el-form ref="form" :model="form" label-width="140px" :rules="rules">
                     <el-col :span="10"  :offset="1">
                         <el-form-item label="证件类型">
-                            <el-select v-model="form.idType" placeholder="请选择" ref="idType">
+                            <el-select v-model="form.idType" disabled placeholder="请选择" ref="idType">
                                 <el-option
                                 label="身份证"
                                 :value="83">
@@ -16,10 +16,11 @@
                             </el-select>
                         </el-form-item>
                         <el-form-item label="客户姓名" prop="userName">
-                            <el-input ref="userName" :value="form.userName" @input="(val) => checkName(val, form, 'userName')"></el-input>
+                            <el-input ref="userName" disabled :value="form.userName" @input="(val) => checkName(val, form, 'userName')"></el-input>
                         </el-form-item>
                         <el-form-item label="出生日期" prop="birthday">
                             <el-date-picker
+                                disabled
                                 v-model="form.birthday"
                                 type="date"
                                 placeholder="选择日期"
@@ -41,7 +42,7 @@
                         </div>
                         </el-form-item>
                         <el-form-item label="性别" prop="sex">
-                            <el-select v-model="form.sex" placeholder="请选择" ref='sex'>
+                            <el-select v-model="form.sex" disabled placeholder="请选择" ref='sex'>
                                 <!-- <el-option
                                 v-for="item in gender"
                                 :key="item.id"
diff --git a/src/pages/manage/list/client/corporateClient.vue b/src/pages/manage/list/client/corporateClient.vue
index 50bc5c4..d05ead0 100644
--- a/src/pages/manage/list/client/corporateClient.vue
+++ b/src/pages/manage/list/client/corporateClient.vue
@@ -152,11 +152,17 @@ export default {
                 if(sessionStorage.getItem('firmClientIdentity')) {
                     this.idNumberJudge = true
                     const { idNumber, userName } = this.dataFlow
-                    console.log('dataFlow---')
-                    console.log(idNumber)
                     this.form.idNumber = idNumber
                     this.form.name = userName
                 }
+                for(const key in this.dataFlow) {
+                    if(key === 'idNumber' || key === 'userName') {
+                        continue;
+                    }
+                    if(this.form.hasOwnProperty(key)) {
+                        this.form[key] = this.dataFlow[key]
+                    }
+                }
                 this.getFormData()
             }else {
                 this.isNeedBefore = true
@@ -208,7 +214,15 @@ export default {
         }),
         popUp(){// 唤起弹窗
             // this.$store.commit('system/changePop',{show:true,text:'身份证扫描仪',id:'34'})
-
+            // this.setDataFlow()
+            let tmpForm = {}
+            for(const key in this.form) {
+                if(this.form[key]) {
+                    tmpForm[key] = this.form[key]
+                }
+            }
+            this.setDataFlow({ ...tmpForm })
+            tmpForm = null
             this.$message.warning('请刷身份证');
             this.setPopId('34')
             sessionStorage.setItem('computerPath', this.$route.fullPath)
diff --git a/src/pages/manage/list/personal/callDeposits/accountClosed.vue b/src/pages/manage/list/personal/callDeposits/accountClosed.vue
index e89e22c..7ff8b9a 100644
--- a/src/pages/manage/list/personal/callDeposits/accountClosed.vue
+++ b/src/pages/manage/list/personal/callDeposits/accountClosed.vue
@@ -32,8 +32,8 @@
                     <el-form-item label="利息" prop="interest">
                         <el-input :value="form.interest" disabled @input="val => ismoney(val, form, 'interest')" ref="interest"></el-input>
                     </el-form-item>
-                    <el-form-item label="支取类别" prop="drawWay">
-                        <el-select v-model="form.drawWay" disabled placeholder="请选择" ref="drawWay">
+                    <el-form-item label="支取类别" prop="drawWayType">
+                        <el-select v-model="form.drawWayType" disabled placeholder="请选择" ref="drawWayType">
                             <el-option label="现金" :value="133"> </el-option>
                         </el-select>
                     </el-form-item>
@@ -140,7 +140,7 @@ export default{
                 breathDate: '', // 起息日期
                 customerNumber: '', // 客户号(未对标)
                 noticeType: '', // 通知类型(未对标)
-                drawWay: '', // 支取类别(未对标)
+                drawWayType: '', // 支取类别(未对标)
                 voucherType: '', // 凭证类型(未对标)
             },
             formName:{
@@ -164,7 +164,7 @@ export default{
                 breathDate: '起息日期', // 
                 customerNumber: '客户号', // (未对标)
                 noticeType: '通知类型', // (未对标)
-                drawWay: '支取类别', // (未对标)
+                drawWayType: '支取类别', // (未对标)
                 voucherType: '凭证类型', // (未对标)
             },
             rules: {
@@ -251,7 +251,7 @@ export default{
                       "subjectId": 45,
                 },
                 314: {
-                    prop: 'drawWay',//
+                    prop: 'drawWayType',//
                     type: '1',
                       "subjectId": 82,
                 },
@@ -293,8 +293,8 @@ export default{
                         this.form.capital = capital
                         this.form.interest = interest
                         this.form.totalMoney = totalMoney
-                        // this.form.drawWay = 93
-                        this.form.drawWay = 133
+                        // this.form.drawWayType = 93
+                        this.form.drawWayType = 133
                         this.form.idNumber = idNumber
                         this.form.clientNumber = peopleNumber
                         this.form.clientName = userName
diff --git a/src/pages/manage/list/servicesAccount/passwordChange.vue b/src/pages/manage/list/servicesAccount/passwordChange.vue
index 2874373..efd22a6 100644
--- a/src/pages/manage/list/servicesAccount/passwordChange.vue
+++ b/src/pages/manage/list/servicesAccount/passwordChange.vue
@@ -129,17 +129,18 @@ export default{
                 },
                 323: {
                     prop: 'voucherNumber',
-                    type: '3'
+                    type: '3',
+                    "subjectId": 44,
                 },
                 326: {
                     prop: 'newPayPassword', // 3
                     type: '3',
-                  "subjectId": '52',
+                  "subjectId": 52,
                 },
                 327: {
                     prop: 'maillingAddress', // 3
                     type: '3',
-                  "subjectId": '4',
+                  "subjectId": 4,
                 },
                 317: {
                     prop: 'certificateType', // 
@@ -156,7 +157,7 @@ export default{
                 325: {
                     prop: 'payPassword',  // 原支付密码
                     type: '3',
-                  "subjectId": '51',
+                  "subjectId": 51,
                 }
             },
         }
diff --git a/src/pages/manage/list/servicesAccount/passwordLost.vue b/src/pages/manage/list/servicesAccount/passwordLost.vue
index 0cf0ab4..28fa0d2 100644
--- a/src/pages/manage/list/servicesAccount/passwordLost.vue
+++ b/src/pages/manage/list/servicesAccount/passwordLost.vue
@@ -77,7 +77,7 @@ export default{
                 idNumber: '', // 身份证号码
                 voucherNumber: '', // 账号
                 // 非必填项
-                certificateType: '身份证', // 证件类型
+                certificateType: 83, // 证件类型
                 remark: '', // 备注
             },
             formName:{
diff --git a/src/store/modules/system.js b/src/store/modules/system.js
index c08bf01..fc0eb95 100644
--- a/src/store/modules/system.js
+++ b/src/store/modules/system.js
@@ -622,7 +622,7 @@ const myInitState =  {
             peopleNumber
         }
     },
-    '项目十三': {
+    '项目十三': {  // 公司现金支票取款
         id: 502,
         data: [ 442, 411 ],
         needs: [ 425, 15 ],
@@ -646,7 +646,7 @@ const myInitState =  {
 
         needsModule: {
             'business/withdrawal': false,
-            'business/transfer': false
+            
         },
         dataFlow: {
             // idNumber,
@@ -656,7 +656,7 @@ const myInitState =  {
             // goldLogo:13,
         }
     },
-    '项目十四': {
+    '项目十四': {  // 公司现金支票转账
         id: 503,
         data: [ 442, 412 ],
         needs: [ 426 ],
@@ -679,14 +679,14 @@ const myInitState =  {
         commonArr: [], // 普通凭证箱
 
         needsModule: {
-            'servicesAccount/passwordChange': false
+            'business/transfer': false
         },
         dataFlow: {
             idNumber,
             voucherNumber
         }
     },
-    '项目十五': {
+    '项目十五': {  // 密码修改
         id: 504,
         data: [ 13, 23, 16, 407  ], // 身份证原件、复印件、银行卡、特殊业务申请书
         needs: [ ],
@@ -709,7 +709,7 @@ const myInitState =  {
         commonArr: [], // 普通凭证箱
 
         needsModule: {
-            'servicesAccount/passwordLost': false
+            'servicesAccount/passwordChange': false
         },
         dataFlow: {
             idNumber,
@@ -717,7 +717,7 @@ const myInitState =  {
             userName
         }
     },
-    '项目十六': {
+    '项目十六': {  // 密码挂失
         id: 505,
         data: [ 13, 23, 16, 406  ], // 身份证原件、复印件、银行卡、密码挂失申请书
         needs: [ ],
@@ -738,8 +738,16 @@ const myInitState =  {
 
         importanceArr: [], // 重要空白凭证箱
         commonArr: [], // 普通凭证箱
+        needsModule: {
+            'servicesAccount/passwordLost': false
+        },
+        dataFlow: {
+            voucherNumber,
+            userName,
+            idNumber
+        }
     },
-    '项目十七': {
+    '项目十七': {  // 挂失解挂
         id: 506,
         data: [ 13, 23, 16, 468, 467 ], // 身份证原件、复印件、银行卡、密码挂失申请书回单、密码挂失申请书银行留存联
         needs: [ ],
@@ -762,21 +770,48 @@ const myInitState =  {
         commonArr: [], // 普通凭证箱,
 
         needsModule: {
-            'controlCash/cashRecipients': false
+            // 这个项目没出
+            
         },
     },
     
-    '项目十八': {
-        id: 507,
-        data: [ 13, 23, 15, 413 ], // 身份证原件、复印件、现金、支票领购单
-        needs: [ 411, 479 ],
+    // '项目十八': {  // 现金领用
+    //     id: 508,
+    //     data: [ 13, 23, 15, 413 ], // 身份证原件、复印件、现金、支票领购单
+    //     needs: [ 411, 479 ],
+    //     isStamp: {
+    //         '附件章': [ 23 ],
+    //         '业务专用章': [ 413, 479 ]
+    //     },
+    //     backPeople: [ 13, 480, 411, 481 ], // 少了身份证原件、支票领购单回单、现金支票、业务收费凭证回单
+    //     cultureArr: [ 23, 488, 488 ], // 少了复印件、支票领购单凭证联、业务收费凭证凭证联、
+
+    //     moneyBox: [ ], // 钱箱
+    //     needBackMoney: false, // 需要钱箱取钱
+    //     peopleSign: [ ], // 客户签字
+    //     cultureIn: [], // 传票栏
+    //     sealBox: [], // 印章盒
+    //     currencyDetector: [], // 验钞机
+    //     printer: [], // 打印机
+    //     resource: [], // 资料
+
+    //     importanceArr: [], // 重要空白凭证箱
+    //     commonArr: [], // 普通凭证箱
+
+    //     needsModule: {
+    //         'controlCash/cashRecipients': false
+            
+    //     },
+    // },
+    '项目十八': {  // 现金领用
+        id: 508,
+        data: [ ], //
+        needs: [ 438 ],
         isStamp: {
-            '附件章': [ 23 ],
-            '业务专用章': [ 413, 479 ]
+            '业务专用章': [ 438 ]
         },
-        backPeople: [ 13, 480, 411, 481 ], // 少了身份证原件、支票领购单回单、现金支票、业务收费凭证回单
-        cultureArr: [ 23, 488, 488 ], // 少了复印件、支票领购单凭证联、业务收费凭证凭证联、
-
+        backPeople: [ ],
+        cultureArr: [ 438 ],
         moneyBox: [ ], // 钱箱
         needBackMoney: false, // 需要钱箱取钱
         peopleSign: [ ], // 客户签字
@@ -788,13 +823,12 @@ const myInitState =  {
 
         importanceArr: [], // 重要空白凭证箱
         commonArr: [], // 普通凭证箱
-
         needsModule: {
-            'controlCash/cashTransferInto': false
+            'controlCash/cashRecipients': false
         },
     },
     '项目十九': {
-        id: 508,
+        id: 509,
         data: [ ], //
         needs: [ 438 ],
         isStamp: {
@@ -1581,7 +1615,7 @@ export default {
                     peopleNumber
                 }
             },
-            '项目十三': {
+            '项目十三': {  // 公司现金支票取款
                 id: 502,
                 data: [ 442, 411 ],
                 needs: [ 425, 15 ],
@@ -1605,7 +1639,7 @@ export default {
 
                 needsModule: {
                     'business/withdrawal': false,
-                    'business/transfer': false
+                    
                 },
                 dataFlow: {
                     // idNumber,
@@ -1615,7 +1649,7 @@ export default {
                     // goldLogo:13,
                 }
             },
-            '项目十四': {
+            '项目十四': {  // 公司现金支票转账
                 id: 503,
                 data: [ 442, 412 ],
                 needs: [ 426 ],
@@ -1638,14 +1672,14 @@ export default {
                 commonArr: [], // 普通凭证箱
 
                 needsModule: {
-                    'servicesAccount/passwordChange': false
+                    'business/transfer': false
                 },
                 dataFlow: {
                     idNumber,
                     voucherNumber
                 }
             },
-            '项目十五': {
+            '项目十五': {  // 密码修改
                 id: 504,
                 data: [ 13, 23, 16, 407  ], // 身份证原件、复印件、银行卡、特殊业务申请书
                 needs: [ ],
@@ -1668,7 +1702,7 @@ export default {
                 commonArr: [], // 普通凭证箱
 
                 needsModule: {
-                    'servicesAccount/passwordLost': false
+                    'servicesAccount/passwordChange': false
                 },
                 dataFlow: {
                     idNumber,
@@ -1676,7 +1710,7 @@ export default {
                     userName
                 }
             },
-            '项目十六': {
+            '项目十六': {  // 密码挂失
                 id: 505,
                 data: [ 13, 23, 16, 406  ], // 身份证原件、复印件、银行卡、密码挂失申请书
                 needs: [ ],
@@ -1697,8 +1731,16 @@ export default {
 
                 importanceArr: [], // 重要空白凭证箱
                 commonArr: [], // 普通凭证箱
+                needsModule: {
+                    'servicesAccount/passwordLost': false
+                },
+                dataFlow: {
+                    voucherNumber,
+                    userName,
+                    idNumber
+                }
             },
-            '项目十七': {
+            '项目十七': {  // 挂失解挂
                 id: 506,
                 data: [ 13, 23, 16, 468, 467 ], // 身份证原件、复印件、银行卡、密码挂失申请书回单、密码挂失申请书银行留存联
                 needs: [ ],
@@ -1721,21 +1763,48 @@ export default {
                 commonArr: [], // 普通凭证箱,
 
                 needsModule: {
-                    'controlCash/cashRecipients': false
+                    // 这个项目没出
+                    
                 },
             },
             
-            '项目十八': {
-                id: 507,
-                data: [ 13, 23, 15, 413 ], // 身份证原件、复印件、现金、支票领购单
-                needs: [ 411, 479 ],
+            // '项目十八': {  // 现金领用
+            //     id: 508,
+            //     data: [ 13, 23, 15, 413 ], // 身份证原件、复印件、现金、支票领购单
+            //     needs: [ 411, 479 ],
+            //     isStamp: {
+            //         '附件章': [ 23 ],
+            //         '业务专用章': [ 413, 479 ]
+            //     },
+            //     backPeople: [ 13, 480, 411, 481 ], // 少了身份证原件、支票领购单回单、现金支票、业务收费凭证回单
+            //     cultureArr: [ 23, 488, 488 ], // 少了复印件、支票领购单凭证联、业务收费凭证凭证联、
+
+            //     moneyBox: [ ], // 钱箱
+            //     needBackMoney: false, // 需要钱箱取钱
+            //     peopleSign: [ ], // 客户签字
+            //     cultureIn: [], // 传票栏
+            //     sealBox: [], // 印章盒
+            //     currencyDetector: [], // 验钞机
+            //     printer: [], // 打印机
+            //     resource: [], // 资料
+
+            //     importanceArr: [], // 重要空白凭证箱
+            //     commonArr: [], // 普通凭证箱
+
+            //     needsModule: {
+            //         'controlCash/cashRecipients': false
+                    
+            //     },
+            // },
+            '项目十八': {  // 现金领用
+                id: 508,
+                data: [ ], //
+                needs: [ 438 ],
                 isStamp: {
-                    '附件章': [ 23 ],
-                    '业务专用章': [ 413, 479 ]
+                    '业务专用章': [ 438 ]
                 },
-                backPeople: [ 13, 480, 411, 481 ], // 少了身份证原件、支票领购单回单、现金支票、业务收费凭证回单
-                cultureArr: [ 23, 488, 488 ], // 少了复印件、支票领购单凭证联、业务收费凭证凭证联、
-
+                backPeople: [ ],
+                cultureArr: [ 438 ],
                 moneyBox: [ ], // 钱箱
                 needBackMoney: false, // 需要钱箱取钱
                 peopleSign: [ ], // 客户签字
@@ -1747,13 +1816,12 @@ export default {
 
                 importanceArr: [], // 重要空白凭证箱
                 commonArr: [], // 普通凭证箱
-
                 needsModule: {
-                    'controlCash/cashTransferInto': false
+                    'controlCash/cashRecipients': false
                 },
             },
             '项目十九': {
-                id: 508,
+                id: 509,
                 data: [ ], //
                 needs: [ 438 ],
                 isStamp: {