From 752c6fb4bbc90964d6503db1845ba9765384a344 Mon Sep 17 00:00:00 2001
From: "luoJunYong.123" <you@example.com>
Date: Fri, 14 Jan 2022 18:12:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1678?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/counter/list/myConfig.js            |   2 +-
 .../personal/usefulPhrases/accountClosed.vue  | 102 ++++++++++++------
 .../usefulPhrases/continueDeposit.vue         |  38 +++++--
 .../personal/usefulPhrases/openAccount.vue    |  41 ++++---
 src/store/modules/system.js                   |   8 +-
 5 files changed, 135 insertions(+), 56 deletions(-)

diff --git a/src/pages/counter/list/myConfig.js b/src/pages/counter/list/myConfig.js
index 46d8e38..037257f 100644
--- a/src/pages/counter/list/myConfig.js
+++ b/src/pages/counter/list/myConfig.js
@@ -85,7 +85,7 @@ const myConfig = {
     },
     '178': {
         nbm: 178,
-        name: 'nomUsefulPhrasesContinueCard',
+        name: 'nomUsefulPhrasesContinuePassword',
         parentId: '285,287,5,26,59,156',
         isPassword: true
     },
diff --git a/src/pages/manage/list/personal/usefulPhrases/accountClosed.vue b/src/pages/manage/list/personal/usefulPhrases/accountClosed.vue
index 06d644f..a16329e 100644
--- a/src/pages/manage/list/personal/usefulPhrases/accountClosed.vue
+++ b/src/pages/manage/list/personal/usefulPhrases/accountClosed.vue
@@ -5,7 +5,7 @@
             <el-form ref="form" :model="form" label-width="120px" :rules="rules">
                 <el-col :span="10" :offset="1">
                     <el-form-item label="证件类型" prop="certificateType">
-                        <el-select disabled v-model="form.certificateType" placeholder="请选择" ref="certificateType">
+                        <el-select v-model="form.certificateType" placeholder="请选择" ref="certificateType">
                             <el-option label="身份证" value="身份证"> </el-option>
                         </el-select>
                     </el-form-item>
@@ -43,15 +43,18 @@
                 </el-col>
                 <el-col :span="10" :offset="1">
                     <el-form-item label="身份证" required>
-                        <div class="idCard" @click="popUp3('身份证扫描器')">
+                        <div class="idCard" @click="popUp3('身份证扫描仪')" v-if='!idNumberJudge'>
                             <p>请刷身份证</p>
                         </div>
+                        <div v-else>
+                            <el-input :value="form.idNumber" ref="idNumber"></el-input>
+                        </div>
                     </el-form-item>
                     <el-form-item label="客户姓名" prop="customerName">
                         <el-input ref="customerName" :value="form.customerName" @input="(val) => checkName(val, form, 'customerName')"></el-input>
                     </el-form-item>
                     <el-form-item label="钞汇标识" prop="currencyMark">
-                        <el-select disabled v-model="form.currencyMark" placeholder="请选择" ref="currencyMark">
+                        <el-select v-model="form.currencyMark" placeholder="请选择" ref="currencyMark">
                             <el-option  label="钞户" value="钞户"> </el-option>
                         </el-select>
                     </el-form-item>
@@ -59,7 +62,7 @@
                         <el-input :value="form.capital" @input="val => ismoney(val, form, 'capital')" ref="capital" ></el-input>
                     </el-form-item>
                     <el-form-item label="存期" prop="depositTerm">
-                        <el-select disabled v-model="form.depositTerm" placeholder="请选择" ref="depositTerm">
+                        <el-select v-model="form.depositTerm" placeholder="请选择" ref="depositTerm">
                             <el-option  label="1年" value="1年"> </el-option>
                             <el-option  label="3年" value="3年"> </el-option>
                             <el-option  label="5年" value="5年"> </el-option>
@@ -69,12 +72,15 @@
                         <el-input :value="form.totalMoney" @input="val => ismoney(val, form, 'totalMoney')" ref="totalMoney" ></el-input>
                     </el-form-item>
                     <el-form-item label="支取密码" required>
-                        <div class="idCard" @click="popUp2('密码器')">
-                            <p>请设置密码</p>
+                        <div v-if='!form.drawPassword' class="idCard" @click="popUp2('密码器')">
+                            <p>请输入密码</p>
+                        </div>
+                        <div v-else>
+                            <el-input :value="form.drawPassword" disabled ref="drawPassword" type="password"></el-input>
                         </div>
                     </el-form-item>
                     <!-- <el-form-item label="续存标识" required>
-                        <el-select disabled v-model="form.identification" placeholder="请选择">
+                        <el-select v-model="form.identification" placeholder="请选择">
                             <el-option label="不续存" value="不续存"> </el-option>
                             <el-option label="续存1年" value="续存1年"> </el-option>
                             <el-option label="续存3年" value="续存3年"> </el-option>
@@ -116,13 +122,16 @@ export default{
     },
     data(){
         return{
+            idNumberJudge: false,
             cardNumberJudge: false,
             visible: false,
             needBefore: '',
             form:{
                 // 必填项
+                idNumber: '', // 身份证号码
                 currency: '', // 币种
                 voucherNumber: '', // 凭证号码
+                drawPassword: '', // 支取密码
                 // 非必填项
                 certificateType: '', // 证件类型
                 customerName: '', // 客户姓名
@@ -137,8 +146,10 @@ export default{
             },
             formName:{
                 // 必填项
+                idNumber: '身份证号码', // 
                 currency: '币种', // 
                 voucherNumber: '凭证号码', // 
+                drawPassword: '支取密码',
                 // 非必填项
                 certificateType: '证件类型', // 
                 customerName: '客户姓名', // 
@@ -149,7 +160,7 @@ export default{
                 depositTerm: '存期', // 
                 interest: '利息', // 
                 totalMoney: '总金额', // 
-                signDate:'', // 
+                signDate:'起息日期', // 
             },
             rules: {
                 customerName: vercustomer,
@@ -222,6 +233,20 @@ export default{
                 },
             },
             myTable2: {
+                180: {
+                    prop: 'idNumber',
+                    type: '3',
+                    // "subjectId": 44,
+                },
+                181: {
+                    prop: 'voucherNumber',
+                    type: '3',
+                    // "subjectId": 44,
+                },
+                192: {
+                    prop: 'drawPassword',
+                    type: '3',
+                },
                 182: {
                     prop: 'customerName',//客户姓名
                     type: '3',
@@ -237,6 +262,14 @@ export default{
     },
     mounted() {
         this.getFormData()
+
+        if(this.form.idNumber) {
+            this.idNumberJudge = true
+        }
+        if(this.form.voucherNumber) {
+            this.cardNumberJudge = true
+        }
+
         this.$refs.customerName.focus()
     },
     methods: {
@@ -251,9 +284,9 @@ export default{
         getFormData(){
             const parentId = '285,287,5,26,59,157'
             const cards = {    
-                180: 'nomUsefulPhrasesClosed',
-                181: 'nomUsefulPhrasesClosed2',
-                192: 'nomUsefulPhrasesClosedPassword'
+                // 180: 'nomUsefulPhrasesClosed',
+                // 181: 'nomUsefulPhrasesClosed2',
+                // 192: 'nomUsefulPhrasesClosedPassword'
             }
             autoPlay2(parentId, this.form,  this.myTable2, this.myTable, cards)
         },
@@ -278,17 +311,17 @@ export default{
             const nomUsefulPhrasesClosed2 = sessionStorage.getItem('nomUsefulPhrasesClosed2')
             const nomUsefulPhrasesClosedPassword = sessionStorage.getItem('nomUsefulPhrasesClosedPassword')
             const cards = [
-                {
-                    180: nomUsefulPhrasesClosed
-                },
-                {
-                    181: nomUsefulPhrasesClosed2,
+                // {
+                //     180: nomUsefulPhrasesClosed
+                // },
+                // {
+                //     181: nomUsefulPhrasesClosed2,
                     
-                }, 
-                {
-                    192: nomUsefulPhrasesClosedPassword,
-                    "subjectId": 32,
-                }
+                // }, 
+                // {
+                //     192: nomUsefulPhrasesClosedPassword,
+                //     "subjectId": 32,
+                // }
             ]
             autoPlay(parentId, this.form, this.myTable2, this.myTable, cards)
             this.setNeedsModule(moduleName)
@@ -309,27 +342,36 @@ export default{
         })
     },
     watch: {
-      dataFlowCard(newVal) {
-          this.cardNumberJudge = true
-            this.$nextTick(() => {
-                this.$refs.voucherNumber.focus()
-            })
-            const { currency, userName, depositNumber, goldLogo, capital, interestRate, interest, totalMoney, signDate } = this.dataFlow
+        dataFlowCard(newVal) {
+            this.cardNumberJudge = true
+            const { currency, userName, depositNumber, goldLogo, capital, interestRate, interest, totalMoney, signDate, voucherNumber } = this.dataFlow
+            console.log(interestRate)
             this.form.currency = currency
             this.form.customerName = userName
+            this.form.depositNumber = depositNumber
             this.form.currencyMark = goldLogo
-            this.form.currencyMark = currencyMark
             this.form.capital = capital
             this.form.interestRate = interestRate
             this.form.interest = interest
             this.form.totalMoney = totalMoney
             this.form.signDate = signDate
+            this.form.voucherNumber = voucherNumber
+            this.$nextTick(() => {
+                this.$refs.voucherNumber.focus()
+            })
         },
         dataFlowPassword(newVal) {
-            this.form.drawPassword = '******'
+            const nomUsefulPhrasesClosedPassword = sessionStorage.getItem('nomUsefulPhrasesClosedPassword')
+            console.log(nomUsefulPhrasesClosedPassword)
+            this.form.drawPassword = nomUsefulPhrasesClosedPassword
         },
         dataFlowId(newVal) {
-            // 
+            this.idNumberJudge = true
+            const { idNumber } = this.dataFlow
+            this.form.idNumber = idNumber
+            this.$nextTick(() => {
+                this.$refs.idNumber.focus
+            })
         }
     }
 }
diff --git a/src/pages/manage/list/personal/usefulPhrases/continueDeposit.vue b/src/pages/manage/list/personal/usefulPhrases/continueDeposit.vue
index 423fab2..53a831c 100644
--- a/src/pages/manage/list/personal/usefulPhrases/continueDeposit.vue
+++ b/src/pages/manage/list/personal/usefulPhrases/continueDeposit.vue
@@ -52,7 +52,7 @@
             </el-form>
         </el-row>
         <el-button @click="submitForm" type="primary" class="submitBtn">提交</el-button>
-        <my-dialog v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" />
+        <my-dialog v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" :needAuth="false" />
     </div>
     <need-before v-else :moduleName='needBefore'>
     </need-before>
@@ -107,7 +107,9 @@ export default{
                 // 非必填项
                 depositNumber: '定存编号', // 
                 moneyTarget: '钞汇标识', // 
-                monthDeposit: '月存金额' // 
+                monthDeposit: '月存金额', //
+                
+
             },
             rules: {
                 customerName: vercustomer,
@@ -144,6 +146,10 @@ export default{
                 },
             },
             myTable2: {
+                171: {
+                    prop: 'voucherNumber',
+                    type: '3',
+                },
                 172: {
                     prop: 'customerName',//客户姓名
                     type: '3',
@@ -159,11 +165,19 @@ export default{
                     type: '1',
                       "subjectId": 27,
                 },
+                178: {
+                    prop: 'drawPassword',
+                    type: '3'
+                }
             },
         }
     },
     mounted() {
         this.getFormData()
+        if(this.form.voucherNumber) {
+            this.cardNumberJudge = true
+        }
+
         this.$refs.customerName.focus()
     },
     methods: {
@@ -211,13 +225,13 @@ export default{
             let nomUsefulPhrasesContinuePassword = sessionStorage.getItem('nomUsefulPhrasesContinuePassword')
             const parentId = '285,287,5,26,59,156'
             const cards = [
-                {
-                    171: nomUsefulPhrasesContinueCard,
-                },
-                {
-                    178: nomUsefulPhrasesContinuePassword,
-                    "subjectId": 17,
-                }
+                // {
+                //     171: nomUsefulPhrasesContinueCard,
+                // },
+                // {
+                //     178: nomUsefulPhrasesContinuePassword,
+                //     "subjectId": 17,
+                // }
             ]
             autoPlay(parentId, this.form, this.myTable2, this.myTable)
         },
@@ -241,12 +255,16 @@ export default{
       dataFlowCard(newVal) {
           // this.form.cardNumber = this.idCardNumber
           this.cardNumberJudge = true
+          const { voucherNumber } = this.dataFlow
+          this.form.voucherNumber = voucherNumber
           this.$nextTick(() => {
               this.$refs.voucherNumber.focus()
           })
       },
       dataFlowPassword(newVal) {
-        this.form.drawPassword = '******'
+        let nomUsefulPhrasesContinuePassword = sessionStorage.getItem('nomUsefulPhrasesContinuePassword')
+        console.log(nomUsefulPhrasesContinuePassword)
+        this.form.drawPassword = nomUsefulPhrasesContinuePassword
       },
       dataFlowId(newVal) {
           // 身份证号码、客户姓名、币种（人民币）、钞汇标识（钞户）
diff --git a/src/pages/manage/list/personal/usefulPhrases/openAccount.vue b/src/pages/manage/list/personal/usefulPhrases/openAccount.vue
index 0f89f24..91351ce 100644
--- a/src/pages/manage/list/personal/usefulPhrases/openAccount.vue
+++ b/src/pages/manage/list/personal/usefulPhrases/openAccount.vue
@@ -41,9 +41,12 @@
                 </el-col>
                 <el-col :span="10" :offset="1">
                     <el-form-item label="身份证" required>
-                        <div class="idCard" @click="popUp1('身份证扫描器')">
+                        <div class="idCard" @click="popUp1('身份证扫描仪')" v-if='!form.idNumberJudge'>
                             <p>请刷身份证</p>
                         </div>
+                        <div v-else>
+                            <el-input :value="form.idNumber" ref="idNumber"></el-input>
+                        </div>
                     </el-form-item>
                     <el-form-item label="客户姓名" prop="customerName">
                         <el-input ref="customerName" :value="form.customerName" @input="(val) => checkName(val, form, 'customerName')"></el-input>
@@ -105,9 +108,11 @@ export default{
             visible: false,
             needBefore: '',
             cardNumberJudge: false,
+            idNumberJudge: false,
             form:{
                 // 必填项
                 // identityCard: '', // 身份证
+                idNumber: '',
                 customerName: '', // 客户姓名
                 currency: '', // 币种
                 currencyMark: '', // 钞汇标识
@@ -242,6 +247,14 @@ export default{
     },
     mounted() {
         this.getFormData()
+
+        if(this.form.idNumber) {
+            this.idNumberJudge = true
+        }
+        if(this.form.voucherNumber) {
+            this.cardNumberJudge = true
+        }
+
         this.$refs.clientNumber.focus()
     },
     methods: {
@@ -288,16 +301,16 @@ export default{
             let nomUsefulPhrasesOpenPassword = sessionStorage.getItem('nomUsefulPhrasesOpenPassword')
             const parentId = '285,287,5,26,59,155'
             const cards = [
-                {
-                    1399: nomUsefulPhrasesOpenCard2
-                },
-                {
-                    166: nomUsefulPhrasesOpenCard
-                },
-                {
-                    167: nomUsefulPhrasesOpenPassword,
-                    "subjectId": 17,
-                }
+                // {
+                //     1399: nomUsefulPhrasesOpenCard2
+                // },
+                // {
+                //     166: nomUsefulPhrasesOpenCard
+                // },
+                // {
+                //     167: nomUsefulPhrasesOpenPassword,
+                //     "subjectId": 17,
+                // }
             ]
             autoPlay(parentId, this.form, this.myTable2, this.myTable, cards)
         },
@@ -319,13 +332,14 @@ export default{
     },
     watch: {
       dataFlowId(newVal) {
+          this.idNumberJudge = true
           // 身份证号码、客户姓名、币种（人民币）、钞汇标识（钞户）
           const { idNumber, userName, peopleNumber, currency, goldLogo } = this.dataFlow
           console.log(peopleNumber)
           console.log(this.dataFlow)
           console.log(goldLogo)
           this.form.clientNumber = peopleNumber
-          // this.form.idNumber = idNumber
+          this.form.idNumber = idNumber
           this.form.customerName = userName
           this.form.currency = currency
           this.form.currencyMark = goldLogo
@@ -338,7 +352,8 @@ export default{
           })
       },
       dataFlowPassword(newVal) {
-        this.form.drawPassword = '******'
+        let nomUsefulPhrasesOpenPassword = sessionStorage.getItem('nomUsefulPhrasesOpenPassword')
+        this.form.drawPassword = nomUsefulPhrasesOpenPassword
       }
     }
 }
diff --git a/src/store/modules/system.js b/src/store/modules/system.js
index ded5829..be4a414 100644
--- a/src/store/modules/system.js
+++ b/src/store/modules/system.js
@@ -88,6 +88,7 @@ const idNumber = '441325466661230215'
 const userName = '小白'
 const capital = 100
 const peopleNumber = '111222'
+const voucherNumber = '159753'
 
 const myInitState = {
     '': {
@@ -979,6 +980,7 @@ export default {
                     goldLogo:'钞户',
                     depositTerm: '1年',
                     monthDeposit: 100,
+                    voucherNumber
                 }
             },
             '项目八': {
@@ -1004,12 +1006,13 @@ export default {
 
                 // 以下为数据流:
                 needsModule: {
-                    'usefulPhrases/continueDeposit': false
+                    'usefulPhrases/accoumtClosed': false
                 },
                 dataFlowCard: 0,
                 dataFlowId: 0,
                 dataFlowPassword: 0,
                 dataFlow: {
+                    idNumber,
                     userName,
                     depositNumber: '0816',
                     currency:'CYC人民币',
@@ -1019,7 +1022,8 @@ export default {
                     depositTerm: '1年',
                     interest: 1.6,
                     totalMoney: 101.6,
-                    signDate: 3
+                    signDate: 3,
+                    voucherNumber
                 }
             },
             '项目九': {