Merge branch 'master' of ssh://git.czcyedu.com:222/huoran/FE_bankTeaching into master

3 years ago · f10104ea6c
parent 752c6fb4bb b2b80d17b1
commit f10104ea6c
20 changed files with 65 additions and 65 deletions
--- a/src/pages/manage/list/acceptanceDraft/invoice.vue
+++ b/src/pages/manage/list/acceptanceDraft/invoice.vue
@ -21,7 +21,7 @@

                        <el-form-item label="币种" prop="currencyType">
                            <el-select v-model="form.currencyType" placeholder="请选择" ref="currencyType">
-                                <el-option value="CYC人民币">CYC人民币</el-option>
+                                <el-option value="CNY人民币">CNY人民币</el-option>
                            </el-select>
                        </el-form-item>

@ -139,7 +139,7 @@ export default {
              // 非必填项
              accountName: '', // 出票人名称
              collectionName: '', // 收款人名称
-              currencyType: 'CYC人民币', // 币种
+              currencyType: 'CNY人民币', // 币种
              moneyOrderMoney: '', // 汇划费金额
              accountTradeName: '', // 出票人行名
              tradeAddress: '', // 出票行地址
@ -189,7 +189,7 @@ export default {
            myTable2: {
                // accountName: '', // 出票人名称
                // collectionName: '', // 收款人名称
-                // currencyType: 'CYC人民币', // 币种
+                // currencyType: 'CNY人民币', // 币种
                // moneyOrderMoney: '', // 汇划费金额
                // accountTradeName: '', // 出票人行名
                // tradeAddress: '', // 出票行地址
--- a/src/pages/manage/list/business/deposit.vue
+++ b/src/pages/manage/list/business/deposit.vue
@ -13,7 +13,7 @@
                        </el-form-item>
                        <el-form-item label="币种" prop="currency">
                            <el-select v-model="form.currency" placeholder="请选择" ref="currency">
-                                <el-option value="CYC人民币">CYC人民币</el-option>
+                                <el-option value="CNY人民币">CNY人民币</el-option>
                            </el-select>
                        </el-form-item>
                        <el-form-item label="存款金额" prop="depositNum">
@ -87,7 +87,7 @@ export default {
                username: '', // 账号
                depositNum: '', // 存款金额
                // 非必填项
-                currency: 'CYC人民币', // 币种
+                currency: 'CNY人民币', // 币种
                currencyMark: '钞户', // 钞汇标识
                interestRate: '', // 利率
                abstract: '', // 摘要
--- a/src/pages/manage/list/business/openAccount.vue
+++ b/src/pages/manage/list/business/openAccount.vue
@ -60,7 +60,7 @@
                        </el-form-item>
                        <el-form-item label="币种" prop="currencyType">
                            <el-select v-model="form.currencyType" placeholder="请选择" ref="currencyType">
-                                <el-option value="CYC人民币">CYC人民币</el-option>
+                                <el-option value="CNY人民币">CNY人民币</el-option>
                            </el-select>
                        </el-form-item>
                        <el-form-item label="计息方式" prop="calculateWay">
--- a/src/pages/manage/list/business/transfer.vue
+++ b/src/pages/manage/list/business/transfer.vue
@ -48,7 +48,7 @@
                        </el-form-item>
                        <el-form-item label="币种" prop="currencyType">
                            <el-select v-model="form.currencyType" placeholder="请选择" ref="currencyType">
-                                <el-option value="CYC人民币">CYC人民币</el-option>
+                                <el-option value="CNY人民币">CNY人民币</el-option>
                            </el-select>
                        </el-form-item>
                        <el-form-item label="支取方式" prop="payWay">
@ -114,7 +114,7 @@ export default {
                transinName: '', // 转入户名
                money: '', // 金额
                // 非必填项
-                currencyType: 'CYC人民币', // 币种
+                currencyType: 'CNY人民币', // 币种
                currencyMark: '钞户', // 钞汇标识
                certificateType: '转账支票', // 凭证类型
                signDate: '', // 签发日期
--- a/src/pages/manage/list/business/withdrawal.vue
+++ b/src/pages/manage/list/business/withdrawal.vue
@ -104,7 +104,7 @@ export default {
                money: '', // 金额
                // 非必填项
                issueDate: '', // 签发日期
-                currency: 'CYC人民币', // 币种
+                currency: 'CNY人民币', // 币种
                currencyMark: '钞户', // 钞汇标识
                certificateType: '现金支票', // 凭证类型
                payWay: '', // 支取方式
--- a/src/pages/manage/list/cityWide/cityWideIn.vue
+++ b/src/pages/manage/list/cityWide/cityWideIn.vue
@ -38,7 +38,7 @@
                    <el-col :span="10" :offset="1">
                        <el-form-item label="币种" prop="currency">
                            <el-select v-model="form.currency" placeholder="请选择" ref="currency">
-                                <el-option value="CYC人民币">CYC人民币</el-option>
+                                <el-option value="CNY人民币">CNY人民币</el-option>
                            </el-select>
                        </el-form-item>
                        <el-form-item label="提出场次" prop="proposeTime">
@ -111,7 +111,7 @@ export default {
                otherAccountNumber: '', // 他行收款账号
                voucherNumber: '', // 凭证号码
                // 非必填项
-                currency: 'CYC人民币', // 币种
+                currency: 'CNY人民币', // 币种
                proposeTime: '', // 提出场次
                insertDate: '', // 提入日期
                otherAccountUsername: '', // 他行收款户名
@ -167,7 +167,7 @@ export default {
            visible:false,
            myTable2: {
                // 非必填项配置
-                // currency: 'CYC人民币', // 币种
+                // currency: 'CNY人民币', // 币种
                // proposeTime: '', // 提出场次
                // insertDate: '', // 提入日期
                // otherAccountUsername: '', // 他行收款户名
--- a/src/pages/manage/list/cityWide/cityWideOut.vue
+++ b/src/pages/manage/list/cityWide/cityWideOut.vue
@ -40,7 +40,7 @@
                    <el-col :span="10" :offset="1">
                        <el-form-item label="币种" prop="currency">
                            <el-select v-model="form.currency" placeholder="请选择" ref="currency">
-                                <el-option value="CYC人民币">CYC人民币</el-option>
+                                <el-option value="CNY人民币">CNY人民币</el-option>
                            </el-select>
                        </el-form-item>
                        <el-form-item label="提出场次" prop="proposeTime">
@ -111,7 +111,7 @@ export default {
                otherAccountNumber: '', // 他行收款账号
                voucherNumber: '', // 凭证号码
                // 非必填项
-                currency: 'CYC人民币', // 币种
+                currency: 'CNY人民币', // 币种
                proposeTime: '', // 提出场次
                proposeDate: '', // 提出日期
                otherAccountUsername: '', // 其他收款户名
@ -164,7 +164,7 @@ export default {
            },
            myTable2: {
                // 非必填项配置
-                // currency: 'CYC人民币', // 币种
+                // currency: 'CNY人民币', // 币种
                // proposeTime: '', // 提出场次
                // proposeDate: '', // 提出日期
                // otherAccountUsername: '', // 其他收款户名
--- a/src/pages/manage/list/personal/callDeposits/accountClosed.vue
+++ b/src/pages/manage/list/personal/callDeposits/accountClosed.vue
@ -17,7 +17,7 @@
                    </el-form-item>
                    <el-form-item label="币种" prop="currency">
                        <el-select v-model="form.currency" placeholder="请选择" ref="currency">
-                            <el-option value="CYC人民币">CYC人民币</el-option>
+                            <el-option value="CNY人民币">CNY人民币</el-option>
                        </el-select>
                    </el-form-item>
                    <el-form-item label="通知类型" prop="noticeType">
--- a/src/pages/manage/list/personal/callDeposits/openAccount.vue
+++ b/src/pages/manage/list/personal/callDeposits/openAccount.vue
@ -14,7 +14,7 @@
                    </el-form-item>
                    <el-form-item label="币种" prop="currency">
                        <el-select v-model="form.currency" placeholder="请选择" ref="currency">
-                            <el-option value="CYC人民币">CYC人民币</el-option>
+                            <el-option value="CNY人民币">CNY人民币</el-option>
                        </el-select>
                    </el-form-item>
                    <el-form-item label="凭证类型" prop="voucherType">
--- a/src/pages/manage/list/personal/currentAccount/deposit.vue
+++ b/src/pages/manage/list/personal/currentAccount/deposit.vue
@ -14,7 +14,7 @@
                        </el-form-item>
                        <el-form-item label="币种" prop="currency">
                            <el-select v-model="form.currency" placeholder="请选择" ref="currency">
-                                <el-option value="CYC人民币">CYC人民币</el-option>
+                                <el-option value="CNY人民币">CNY人民币</el-option>
                            </el-select>
                        </el-form-item>
                        <el-form-item label="金额">
--- a/src/pages/manage/list/personal/currentAccount/settle.vue
+++ b/src/pages/manage/list/personal/currentAccount/settle.vue
@ -14,7 +14,7 @@
                    </el-form-item>
                    <el-form-item label="币种" prop="currency">
                        <el-select v-model="form.currency" placeholder="请选择" ref="currency">
-                            <el-option value="CYC人民币">CYC人民币</el-option>
+                            <el-option value="CNY人民币">CNY人民币</el-option>
                        </el-select>
                    </el-form-item>
                    <el-form-item label="金额">
--- a/src/pages/manage/list/personal/currentAccount/transferAccounts.vue
+++ b/src/pages/manage/list/personal/currentAccount/transferAccounts.vue
@ -14,7 +14,7 @@
                    </el-form-item>
                    <el-form-item label="币种" prop="currency">
                        <el-select v-model="form.currency" placeholder="请选择" ref="currency">
-                            <el-option value="CYC人民币">CYC人民币</el-option>
+                            <el-option value="CNY人民币">CNY人民币</el-option>
                        </el-select>
                    </el-form-item>
                    <el-form-item label="金额" prop="money">
--- a/src/pages/manage/list/personal/currentAccount/withdrawal.vue
+++ b/src/pages/manage/list/personal/currentAccount/withdrawal.vue
@ -14,7 +14,7 @@
                    </el-form-item>
                    <el-form-item label="币种" prop="currency">
                        <el-select v-model="form.currency" placeholder="请选择" ref="currency">
-                            <el-option value="CYC人民币">CYC人民币</el-option>
+                            <el-option value="CNY人民币">CNY人民币</el-option>
                        </el-select>
                    </el-form-item>
                    <el-form-item label="金额">
--- a/src/pages/manage/list/personal/timeDeposit/deposit.vue
+++ b/src/pages/manage/list/personal/timeDeposit/deposit.vue
@ -14,7 +14,7 @@
                    </el-form-item>
                    <el-form-item label="币种" prop="currency">
                        <el-select v-model="form.currency" placeholder="请选择" ref="currency">
-                            <el-option value="CYC人民币">CYC人民币</el-option>
+                            <el-option value="CNY人民币">CNY人民币</el-option>
                        </el-select>
                    </el-form-item>
                    <el-form-item label="金额" prop="money">
--- a/src/pages/manage/list/personal/timeDeposit/openAccount.vue
+++ b/src/pages/manage/list/personal/timeDeposit/openAccount.vue
@ -14,7 +14,7 @@
                    </el-form-item>
                    <el-form-item label="币种" prop="currency">
                        <el-select v-model="form.currency" placeholder="请选择" ref="currency">
-                            <el-option value="CYC人民币">CYC人民币</el-option>
+                            <el-option value="CNY人民币">CNY人民币</el-option>
                        </el-select>
                    </el-form-item>
                    <el-form-item label="凭证类型" prop="voucherType">
--- a/src/pages/manage/list/personal/timeDeposit/withdrawal.vue
+++ b/src/pages/manage/list/personal/timeDeposit/withdrawal.vue
@ -14,7 +14,7 @@
                    </el-form-item>
                    <el-form-item label="币种" prop="currencyType">
                        <el-select v-model="form.currencyType" placeholder="请选择" ref="currencyType">
-                            <el-option value="CYC人民币">CYC人民币</el-option>
+                            <el-option value="CNY人民币">CNY人民币</el-option>
                        </el-select>
                    </el-form-item>
                    <el-form-item label="定存编号" prop="depositNumber">
@ -113,7 +113,7 @@ export default{
                currencyType: '', // 币种

                // userName,  这是vuex里的
-                //     currency:'CYC人民币',
+                //     currency:'CNY人民币',
                //     goldLogo:'钞户',
                //     interest: '0.00',
                //     depositNubianmber: '0912',
--- a/src/pages/manage/list/personal/usefulPhrases/accountClosed.vue
+++ b/src/pages/manage/list/personal/usefulPhrases/accountClosed.vue
@ -19,7 +19,7 @@
                    </el-form-item>
                    <el-form-item label="币种" prop="currency">
                        <el-select v-model="form.currency" placeholder="请选择" ref="currency">
-                            <el-option value="CYC人民币">CYC人民币</el-option>
+                            <el-option value="CNY人民币">CNY人民币</el-option>
                        </el-select>
                    </el-form-item>
                    <el-form-item label="定存编号" prop="depositNumber">
--- a/src/pages/manage/list/personal/usefulPhrases/continueDeposit.vue
+++ b/src/pages/manage/list/personal/usefulPhrases/continueDeposit.vue
@ -30,7 +30,7 @@
                    </el-form-item>
                    <el-form-item label="币种" prop="currency">
                        <el-select v-model="form.currency" placeholder="请选择" ref="currency">
-                            <el-option value="CYC人民币">CYC人民币</el-option>
+                            <el-option value="CNY人民币">CNY人民币</el-option>
                        </el-select>
                    </el-form-item>
                    <el-form-item label="存期" prop="depositTerm">
--- a/src/pages/manage/list/personal/usefulPhrases/openAccount.vue
+++ b/src/pages/manage/list/personal/usefulPhrases/openAccount.vue
@ -14,7 +14,7 @@
                    </el-form-item>
                    <el-form-item label="币种" prop="currency">
                        <el-select v-model="form.currency" placeholder="请选择" ref="currency">
-                            <el-option value="CYC人民币">CYC人民币</el-option>
+                            <el-option value="CNY人民币">CNY人民币</el-option>
                        </el-select>
                    </el-form-item>
                    <el-form-item label="凭证类型" prop="voucherType">
@ -261,7 +261,7 @@ export default{
        // userName,
        // peopleNumber,
        // idNumber,
-        // currency:'CYC人民币',
+        // currency:'CNY人民币',
        // goldLogo:'钞户',
        ...mapMutations({
            changeShowGoods: 'system/changeShowGoods',
--- a/src/store/modules/system.js
+++ b/src/store/modules/system.js
@ -43,7 +43,7 @@ const allGoods = {
    442: {name:'法人身份证',src:require('@/assets/img/goods/idcard.png'),id:442},
    431: {name:'法人身份证复印件',src:require('@/assets/img/idCard-copy-sm.png'),id:431},

-    432: {name:'开立银行结算账户申请书',src:require('@/assets/img/goods/ApplicationBankSettlement.png'),id:432},
+    443: {name:'开立银行结算账户申请书',src:require('@/assets/img/goods/ApplicationBankSettlement.png'),id:432},

    434: {name:'统一社会信用代码证',src:require('@/assets/img/goods/营业执照.png'),id:434},
    435: {name:'统一社会信用代码证复印件',src:require('@/assets/img/goods/营业执照复印件.png'),id:435},
@ -774,7 +774,7 @@ export default {
                    // // nationality:'汉',//民族
                    // mailbox:'肥仔无处不在',//通讯地址
                    // phone:'13222223122',//联系电话
-                    currency:'CYC人民币',
+                    currency:'CNY人民币',
                    userName,
                    goldLogo:'钞户',
                    serviceCharge:'0.00',
@ -814,7 +814,7 @@ export default {
                dataFlow: {
                    idNumber,
                    userName,
-                    currency:'CYC人民币',
+                    currency:'CNY人民币',
                    goldLogo:'钞户',
                }
            },
@ -853,7 +853,7 @@ export default {
                dataFlow: {
                    // 客户姓名、币种、钞汇标识、定存编号（0912）、本金（开户时存的业务中的金额）、支取类别（现金）、支取方式（密码）
                    userName,
-                    currency:'CYC人民币',
+                    currency:'CNY人民币',
                    goldLogo:'钞户',
                    interest: '0.00',
                    depositNumber: '0912',
@ -895,7 +895,7 @@ export default {
                dataFlow: {
                    // 客户姓名、币种、钞汇标识、定存编号（0912）、本金（开户时存的业务中的金额）、支取类别（现金）、支取方式（密码）
                    userName,
-                    currency:'CYC人民币',
+                    currency:'CNY人民币',
                    goldLogo:'钞户',
                    interest: '5.75',
                    depositNumber: '0912',
@ -936,7 +936,7 @@ export default {
                dataFlowPassword: 0,
                dataFlow: {
                    // 身份证号码、客户号、客户姓名、币种（人民币）、钞汇标识（钞户）
-                    currency:'CYC人民币',
+                    currency:'CNY人民币',
                    goldLogo:'钞户',
                    userName,
                    peopleNumber,
@ -976,7 +976,7 @@ export default {
                    // 客户姓名、定存编号（0816）、币种、钞汇标识、存期（显示上一业务选中的存期）、月存金额
                    userName,
                    depositNumber: '0816',
-                    currency:'CYC人民币',
+                    currency:'CNY人民币',
                    goldLogo:'钞户',
                    depositTerm: '1年',
                    monthDeposit: 100,
@ -1015,7 +1015,7 @@ export default {
                    idNumber,
                    userName,
                    depositNumber: '0816',
-                    currency:'CYC人民币',
+                    currency:'CNY人民币',
                    goldLogo:'钞户',
                    capital: 100,
                    interestRate: 1.85,