解决代码冲突

20240205
e 3 years ago
parent f2feceb57d
commit b2b80d17b1
  1. 6
      src/pages/manage/list/acceptanceDraft/invoice.vue
  2. 4
      src/pages/manage/list/business/deposit.vue
  3. 2
      src/pages/manage/list/business/openAccount.vue
  4. 4
      src/pages/manage/list/business/transfer.vue
  5. 2
      src/pages/manage/list/business/withdrawal.vue
  6. 6
      src/pages/manage/list/cityWide/cityWideIn.vue
  7. 6
      src/pages/manage/list/cityWide/cityWideOut.vue
  8. 2
      src/pages/manage/list/personal/callDeposits/accountClosed.vue
  9. 2
      src/pages/manage/list/personal/callDeposits/openAccount.vue
  10. 2
      src/pages/manage/list/personal/currentAccount/deposit.vue
  11. 2
      src/pages/manage/list/personal/currentAccount/settle.vue
  12. 2
      src/pages/manage/list/personal/currentAccount/transferAccounts.vue
  13. 2
      src/pages/manage/list/personal/currentAccount/withdrawal.vue
  14. 32
      src/pages/manage/list/personal/timeDeposit/deposit.vue
  15. 2
      src/pages/manage/list/personal/timeDeposit/openAccount.vue
  16. 4
      src/pages/manage/list/personal/timeDeposit/withdrawal.vue
  17. 2
      src/pages/manage/list/personal/usefulPhrases/accountClosed.vue
  18. 2
      src/pages/manage/list/personal/usefulPhrases/continueDeposit.vue
  19. 30
      src/pages/manage/list/personal/usefulPhrases/openAccount.vue
  20. 16
      src/store/modules/system.js

@ -21,7 +21,7 @@
<el-form-item label="币种" prop="currencyType"> <el-form-item label="币种" prop="currencyType">
<el-select v-model="form.currencyType" placeholder="请选择" ref="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-select>
</el-form-item> </el-form-item>
@ -139,7 +139,7 @@ export default {
// //
accountName: '', // accountName: '', //
collectionName: '', // collectionName: '', //
currencyType: 'CYC人民币', // currencyType: 'CNY人民币', //
moneyOrderMoney: '', // moneyOrderMoney: '', //
accountTradeName: '', // accountTradeName: '', //
tradeAddress: '', // tradeAddress: '', //
@ -189,7 +189,7 @@ export default {
myTable2: { myTable2: {
// accountName: '', // // accountName: '', //
// collectionName: '', // // collectionName: '', //
// currencyType: 'CYC', // // currencyType: 'CNY', //
// moneyOrderMoney: '', // // moneyOrderMoney: '', //
// accountTradeName: '', // // accountTradeName: '', //
// tradeAddress: '', // // tradeAddress: '', //

@ -13,7 +13,7 @@
</el-form-item> </el-form-item>
<el-form-item label="币种" prop="currency"> <el-form-item label="币种" prop="currency">
<el-select v-model="form.currency" placeholder="请选择" ref="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-select>
</el-form-item> </el-form-item>
<el-form-item label="存款金额" prop="depositNum"> <el-form-item label="存款金额" prop="depositNum">
@ -87,7 +87,7 @@ export default {
username: '', // username: '', //
depositNum: '', // depositNum: '', //
// //
currency: 'CYC人民币', // currency: 'CNY人民币', //
currencyMark: '钞户', // currencyMark: '钞户', //
interestRate: '', // interestRate: '', //
abstract: '', // abstract: '', //

@ -60,7 +60,7 @@
</el-form-item> </el-form-item>
<el-form-item label="币种" prop="currencyType"> <el-form-item label="币种" prop="currencyType">
<el-select v-model="form.currencyType" placeholder="请选择" ref="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-select>
</el-form-item> </el-form-item>
<el-form-item label="计息方式" prop="calculateWay"> <el-form-item label="计息方式" prop="calculateWay">

@ -48,7 +48,7 @@
</el-form-item> </el-form-item>
<el-form-item label="币种" prop="currencyType"> <el-form-item label="币种" prop="currencyType">
<el-select v-model="form.currencyType" placeholder="请选择" ref="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-select>
</el-form-item> </el-form-item>
<el-form-item label="支取方式" prop="payWay"> <el-form-item label="支取方式" prop="payWay">
@ -114,7 +114,7 @@ export default {
transinName: '', // transinName: '', //
money: '', // money: '', //
// //
currencyType: 'CYC人民币', // currencyType: 'CNY人民币', //
currencyMark: '钞户', // currencyMark: '钞户', //
certificateType: '转账支票', // certificateType: '转账支票', //
signDate: '', // signDate: '', //

@ -104,7 +104,7 @@ export default {
money: '', // money: '', //
// //
issueDate: '', // issueDate: '', //
currency: 'CYC人民币', // currency: 'CNY人民币', //
currencyMark: '钞户', // currencyMark: '钞户', //
certificateType: '现金支票', // certificateType: '现金支票', //
payWay: '', // payWay: '', //

@ -38,7 +38,7 @@
<el-col :span="10" :offset="1"> <el-col :span="10" :offset="1">
<el-form-item label="币种" prop="currency"> <el-form-item label="币种" prop="currency">
<el-select v-model="form.currency" placeholder="请选择" ref="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-select>
</el-form-item> </el-form-item>
<el-form-item label="提出场次" prop="proposeTime"> <el-form-item label="提出场次" prop="proposeTime">
@ -111,7 +111,7 @@ export default {
otherAccountNumber: '', // otherAccountNumber: '', //
voucherNumber: '', // voucherNumber: '', //
// //
currency: 'CYC人民币', // currency: 'CNY人民币', //
proposeTime: '', // proposeTime: '', //
insertDate: '', // insertDate: '', //
otherAccountUsername: '', // otherAccountUsername: '', //
@ -167,7 +167,7 @@ export default {
visible:false, visible:false,
myTable2: { myTable2: {
// //
// currency: 'CYC', // // currency: 'CNY', //
// proposeTime: '', // // proposeTime: '', //
// insertDate: '', // // insertDate: '', //
// otherAccountUsername: '', // // otherAccountUsername: '', //

@ -40,7 +40,7 @@
<el-col :span="10" :offset="1"> <el-col :span="10" :offset="1">
<el-form-item label="币种" prop="currency"> <el-form-item label="币种" prop="currency">
<el-select v-model="form.currency" placeholder="请选择" ref="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-select>
</el-form-item> </el-form-item>
<el-form-item label="提出场次" prop="proposeTime"> <el-form-item label="提出场次" prop="proposeTime">
@ -111,7 +111,7 @@ export default {
otherAccountNumber: '', // otherAccountNumber: '', //
voucherNumber: '', // voucherNumber: '', //
// //
currency: 'CYC人民币', // currency: 'CNY人民币', //
proposeTime: '', // proposeTime: '', //
proposeDate: '', // proposeDate: '', //
otherAccountUsername: '', // otherAccountUsername: '', //
@ -164,7 +164,7 @@ export default {
}, },
myTable2: { myTable2: {
// //
// currency: 'CYC', // // currency: 'CNY', //
// proposeTime: '', // // proposeTime: '', //
// proposeDate: '', // // proposeDate: '', //
// otherAccountUsername: '', // // otherAccountUsername: '', //

@ -17,7 +17,7 @@
</el-form-item> </el-form-item>
<el-form-item label="币种" prop="currency"> <el-form-item label="币种" prop="currency">
<el-select v-model="form.currency" placeholder="请选择" ref="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-select>
</el-form-item> </el-form-item>
<el-form-item label="通知类型" prop="noticeType"> <el-form-item label="通知类型" prop="noticeType">

@ -14,7 +14,7 @@
</el-form-item> </el-form-item>
<el-form-item label="币种" prop="currency"> <el-form-item label="币种" prop="currency">
<el-select v-model="form.currency" placeholder="请选择" ref="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-select>
</el-form-item> </el-form-item>
<el-form-item label="凭证类型" prop="voucherType"> <el-form-item label="凭证类型" prop="voucherType">

@ -14,7 +14,7 @@
</el-form-item> </el-form-item>
<el-form-item label="币种" prop="currency"> <el-form-item label="币种" prop="currency">
<el-select v-model="form.currency" placeholder="请选择" ref="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-select>
</el-form-item> </el-form-item>
<el-form-item label="金额"> <el-form-item label="金额">

@ -14,7 +14,7 @@
</el-form-item> </el-form-item>
<el-form-item label="币种" prop="currency"> <el-form-item label="币种" prop="currency">
<el-select v-model="form.currency" placeholder="请选择" ref="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-select>
</el-form-item> </el-form-item>
<el-form-item label="金额"> <el-form-item label="金额">

@ -14,7 +14,7 @@
</el-form-item> </el-form-item>
<el-form-item label="币种" prop="currency"> <el-form-item label="币种" prop="currency">
<el-select v-model="form.currency" placeholder="请选择" ref="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-select>
</el-form-item> </el-form-item>
<el-form-item label="金额" prop="money"> <el-form-item label="金额" prop="money">

@ -14,7 +14,7 @@
</el-form-item> </el-form-item>
<el-form-item label="币种" prop="currency"> <el-form-item label="币种" prop="currency">
<el-select v-model="form.currency" placeholder="请选择" ref="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-select>
</el-form-item> </el-form-item>
<el-form-item label="金额"> <el-form-item label="金额">

@ -14,7 +14,7 @@
</el-form-item> </el-form-item>
<el-form-item label="币种" prop="currency"> <el-form-item label="币种" prop="currency">
<el-select v-model="form.currency" placeholder="请选择" ref="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-select>
</el-form-item> </el-form-item>
<el-form-item label="金额" prop="money"> <el-form-item label="金额" prop="money">
@ -124,20 +124,20 @@ export default{
}, },
formName:{ formName:{
// //
customerName: '客户姓名', // customerName: '客户姓名', //
currency: '币种', // currency: '币种', //
currencyMark: '钞汇标识', // currencyMark: '钞汇标识', //
depositTerm: '存期', // depositTerm: '存期', //
extendPeriod: '续存', // extendPeriod: '续存', //
certificateDeposit: '存款类别', // certificateDeposit: '存款类别', //
valueDate: '起息日', // valueDate: '起息日', //
voucherNumber: '凭证号码', // voucherNumber: '凭证号码', //
drawPassword: '支付密码', // drawPassword: '支付密码', //
// //
money: '金额', // money: '金额', //
interestRate: '利率', // interestRate: '利率', //
withdrawingWay: '支取方式', // withdrawingWay: '支取方式', //
abstract: '摘要' // abstract: '摘要' //
}, },
rules: { rules: {
customerName: vercustomer , customerName: vercustomer ,
@ -150,7 +150,7 @@ export default{
], ],
voucherNumber: [ voucherNumber: [
{ {
required: true, required: true,
message: '请输入凭证号码', message: '请输入凭证号码',
trigger: 'blur' trigger: 'blur'
} }
@ -308,7 +308,7 @@ export default{
// //
this.visible = true; this.visible = true;
}, this.$refs)); }, this.$refs));
}, },
submitForm2() { submitForm2() {
let nomtimeDeposit1 = sessionStorage.getItem('nomtimeDeposit1') let nomtimeDeposit1 = sessionStorage.getItem('nomtimeDeposit1')

@ -14,7 +14,7 @@
</el-form-item> </el-form-item>
<el-form-item label="币种" prop="currency"> <el-form-item label="币种" prop="currency">
<el-select v-model="form.currency" placeholder="请选择" ref="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-select>
</el-form-item> </el-form-item>
<el-form-item label="凭证类型" prop="voucherType"> <el-form-item label="凭证类型" prop="voucherType">

@ -14,7 +14,7 @@
</el-form-item> </el-form-item>
<el-form-item label="币种" prop="currencyType"> <el-form-item label="币种" prop="currencyType">
<el-select v-model="form.currencyType" placeholder="请选择" ref="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-select>
</el-form-item> </el-form-item>
<el-form-item label="定存编号" prop="depositNumber"> <el-form-item label="定存编号" prop="depositNumber">
@ -113,7 +113,7 @@ export default{
currencyType: '', // currencyType: '', //
// userName, vuex // userName, vuex
// currency:'CYC', // currency:'CNY',
// goldLogo:'', // goldLogo:'',
// interest: '0.00', // interest: '0.00',
// depositNubianmber: '0912', // depositNubianmber: '0912',

@ -19,7 +19,7 @@
</el-form-item> </el-form-item>
<el-form-item label="币种" prop="currency"> <el-form-item label="币种" prop="currency">
<el-select v-model="form.currency" placeholder="请选择" ref="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-select>
</el-form-item> </el-form-item>
<el-form-item label="定存编号" prop="depositNumber"> <el-form-item label="定存编号" prop="depositNumber">

@ -30,7 +30,7 @@
</el-form-item> </el-form-item>
<el-form-item label="币种" prop="currency"> <el-form-item label="币种" prop="currency">
<el-select v-model="form.currency" placeholder="请选择" ref="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-select>
</el-form-item> </el-form-item>
<el-form-item label="存期" prop="depositTerm"> <el-form-item label="存期" prop="depositTerm">

@ -14,7 +14,7 @@
</el-form-item> </el-form-item>
<el-form-item label="币种" prop="currency"> <el-form-item label="币种" prop="currency">
<el-select v-model="form.currency" placeholder="请选择" ref="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-select>
</el-form-item> </el-form-item>
<el-form-item label="凭证类型" prop="voucherType"> <el-form-item label="凭证类型" prop="voucherType">
@ -125,19 +125,19 @@ export default{
formName:{ formName:{
// //
// identityCard: '', // // identityCard: '', //
customerName: '客户姓名', // customerName: '客户姓名', //
currency: '币种', // currency: '币种', //
currencyMark: '钞汇标识', // currencyMark: '钞汇标识', //
voucherType: '凭证类型', // voucherType: '凭证类型', //
monthDeposit: '月存金额', // monthDeposit: '月存金额', //
depositTerm: '存期', // depositTerm: '存期', //
extendDepositTarget: '续存标识', // extendDepositTarget: '续存标识', //
voucherNumber: '凭证号码', // voucherNumber: '凭证号码', //
drawPassword: '支付密码', // drawPassword: '支付密码', //
// //
clientNumber: '客户号', // clientNumber: '客户号', //
certificateType: '证件类型', // certificateType: '证件类型', //
customerManage: '客户经理', // customerManage: '客户经理', //
}, },
rules: { rules: {
customerName: vercustomer, customerName: vercustomer,
@ -214,7 +214,7 @@ export default{
"subjectId": 8, "subjectId": 8,
}, },
163: { 163: {
prop: 'currencyMark',// prop: 'currencyMark',//
type: '1', type: '1',
"subjectId": 9, "subjectId": 9,
}, },
@ -248,7 +248,7 @@ export default{
// userName, // userName,
// peopleNumber, // peopleNumber,
// idNumber, // idNumber,
// currency:'CYC', // currency:'CNY',
// goldLogo:'', // goldLogo:'',
...mapMutations({ ...mapMutations({
changeShowGoods: 'system/changeShowGoods', changeShowGoods: 'system/changeShowGoods',

@ -43,7 +43,7 @@ const allGoods = {
442: {name:'法人身份证',src:require('@/assets/img/goods/idcard.png'),id:442}, 442: {name:'法人身份证',src:require('@/assets/img/goods/idcard.png'),id:442},
431: {name:'法人身份证复印件',src:require('@/assets/img/idCard-copy-sm.png'),id:431}, 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}, 434: {name:'统一社会信用代码证',src:require('@/assets/img/goods/营业执照.png'),id:434},
435: {name:'统一社会信用代码证复印件',src:require('@/assets/img/goods/营业执照复印件.png'),id:435}, 435: {name:'统一社会信用代码证复印件',src:require('@/assets/img/goods/营业执照复印件.png'),id:435},
@ -773,7 +773,7 @@ export default {
// // nationality:'汉',//民族 // // nationality:'汉',//民族
// mailbox:'肥仔无处不在',//通讯地址 // mailbox:'肥仔无处不在',//通讯地址
// phone:'13222223122',//联系电话 // phone:'13222223122',//联系电话
currency:'CYC人民币', currency:'CNY人民币',
userName, userName,
goldLogo:'钞户', goldLogo:'钞户',
serviceCharge:'0.00', serviceCharge:'0.00',
@ -813,7 +813,7 @@ export default {
dataFlow: { dataFlow: {
idNumber, idNumber,
userName, userName,
currency:'CYC人民币', currency:'CNY人民币',
goldLogo:'钞户', goldLogo:'钞户',
} }
}, },
@ -852,7 +852,7 @@ export default {
dataFlow: { dataFlow: {
// 客户姓名、币种、钞汇标识、定存编号(0912)、本金(开户时存的业务中的金额)、支取类别(现金)、支取方式(密码) // 客户姓名、币种、钞汇标识、定存编号(0912)、本金(开户时存的业务中的金额)、支取类别(现金)、支取方式(密码)
userName, userName,
currency:'CYC人民币', currency:'CNY人民币',
goldLogo:'钞户', goldLogo:'钞户',
interest: '0.00', interest: '0.00',
depositNumber: '0912', depositNumber: '0912',
@ -894,7 +894,7 @@ export default {
dataFlow: { dataFlow: {
// 客户姓名、币种、钞汇标识、定存编号(0912)、本金(开户时存的业务中的金额)、支取类别(现金)、支取方式(密码) // 客户姓名、币种、钞汇标识、定存编号(0912)、本金(开户时存的业务中的金额)、支取类别(现金)、支取方式(密码)
userName, userName,
currency:'CYC人民币', currency:'CNY人民币',
goldLogo:'钞户', goldLogo:'钞户',
interest: '5.75', interest: '5.75',
depositNumber: '0912', depositNumber: '0912',
@ -935,7 +935,7 @@ export default {
dataFlowPassword: 0, dataFlowPassword: 0,
dataFlow: { dataFlow: {
// 身份证号码、客户号、客户姓名、币种(人民币)、钞汇标识(钞户) // 身份证号码、客户号、客户姓名、币种(人民币)、钞汇标识(钞户)
currency:'CYC人民币', currency:'CNY人民币',
goldLogo:'钞户', goldLogo:'钞户',
userName, userName,
peopleNumber, peopleNumber,
@ -975,7 +975,7 @@ export default {
// 客户姓名、定存编号(0816)、币种、钞汇标识、存期(显示上一业务选中的存期)、月存金额 // 客户姓名、定存编号(0816)、币种、钞汇标识、存期(显示上一业务选中的存期)、月存金额
userName, userName,
depositNumber: '0816', depositNumber: '0816',
currency:'CYC人民币', currency:'CNY人民币',
goldLogo:'钞户', goldLogo:'钞户',
depositTerm: '1年', depositTerm: '1年',
monthDeposit: 100, monthDeposit: 100,
@ -1012,7 +1012,7 @@ export default {
dataFlow: { dataFlow: {
userName, userName,
depositNumber: '0816', depositNumber: '0816',
currency:'CYC人民币', currency:'CNY人民币',
goldLogo:'钞户', goldLogo:'钞户',
capital: 100, capital: 100,
interestRate: 1.85, interestRate: 1.85,

Loading…
Cancel
Save