diff --git a/src/components/checkPhoto/index.vue b/src/components/checkPhoto/index.vue
index bd0987f..97b8071 100644
--- a/src/components/checkPhoto/index.vue
+++ b/src/components/checkPhoto/index.vue
@@ -147,6 +147,44 @@
郭平安
{{ ('' + dataFlow.transMoney).padStart(8, 0).padEnd(10, 0) }}
+
+
+
{{ mapNumber(getYear2(0, 'drawDate')) }}
+ 年
+ {{ mapNumber(getYear2(1, 'drawDate')) }}
+ 月
+ {{ mapNumber(getYear2(2, 'drawDate')) }}
+ 日
+
+
+ 商业银行
+ 12802851701099
+
+ 六品居股份有限公司
+
+ {{ transMoney(dataFlow.transMoney) }}
+ {{ ('' + dataFlow.transMoney).padStart(8, 0).padEnd(10, 0) }}
+
+
+
{{ mapNumber(getYear2(0, 'expireDate')) }}
+ 年
+ {{ mapNumber(getYear2(1, 'expireDate')) }}
+ 月
+ {{ mapNumber(getYear2(2, 'expireDate')) }}
+ 日
+
+
+
+
+
+
+
+ {{ dataFlow.oldDepositNumber }}
+ {{ dataFlow.newDepositNumber }}
+ 部分支取
+ {{ transMoney(dataFlow.transMoney) }}
+ {{ dataFlow.transMoney }}
+
@@ -206,8 +244,6 @@ export default {
d = d < 10 ? ('0' + d) : d;
return y + '-' + m + '-' + d;
})()
-
- console.log(this.dataFlow.sex)
},
methods: {
closeIt() {
@@ -227,7 +263,7 @@ export default {
})
return newStr
})
- }
+ },
},
computed: {
@@ -247,6 +283,21 @@ export default {
}
},
+ getYear2() {
+ return (index, name) => {
+ // 看该业务是否指定日期
+ const { [name]: tmpName } = this.dataFlow
+
+ if(!tmpName) {
+ const tmpDate = this.nowDate.split('-')[index]
+ return tmpDate
+ }else {
+ const tmpDate = tmpName.split('-')[index]
+ return tmpDate
+ }
+
+ }
+ },
// 业务需求将钱币显示为大写,比如 千 -> 仟 这个方法可以做到 这里是要连起来的 具体看用在哪
transMoney() {
return (str) => {
@@ -295,25 +346,32 @@ export default {
return (str) => {
let myStr = str + ''
let strEnd = ''
- if(str.length === 4) {
+ if(myStr.length === 4) {
for(const val of myStr) {
strEnd += myMap.get(val)
}
}else {
- if(str.charAt(0) == '0') {
- strEnd = myMap.get(str.charAt(1))
+ if(myStr.charAt(0) == '0') {
+ strEnd = myMap.get(myStr.charAt(1))
+ }else if(myStr.charAt(0) == '1') {
+ // console.log('Wok')
+ strEnd = '拾'
+ if(myStr.charAt(1) != '0') {
+ strEnd = strEnd + myMap.get(myStr.charAt(1))
+ }
}else {
- strEnd = myMap.get(str.charAt(0)) + '拾'
- if(str.charAt(1) != '0') {
- strEnd += myMap.get(str.charAt(1))
+ strEnd = myMap.get(myStr.charAt(0)) + '拾'
+ if(myStr.charAt(1) != '0') {
+ strEnd += myMap.get(myStr.charAt(1))
}
}
}
-
return strEnd
}
},
+
+
// 众口难调,有些图片就是要大div加上boxshadow才出效果,因为要填字不得不放大
needBoxShadow() {
const needShadow = [ 411, 412, 14 ]
@@ -327,7 +385,7 @@ export default {
\ No newline at end of file
diff --git a/src/components/dialogTwo/index.vue b/src/components/dialogTwo/index.vue
index 9fcac69..cf7047d 100644
--- a/src/components/dialogTwo/index.vue
+++ b/src/components/dialogTwo/index.vue
@@ -61,7 +61,7 @@
diff --git a/src/pages/manage/list/business/deposit.vue b/src/pages/manage/list/business/deposit.vue
index 07b545a..e36bdaf 100644
--- a/src/pages/manage/list/business/deposit.vue
+++ b/src/pages/manage/list/business/deposit.vue
@@ -123,18 +123,7 @@ export default {
second:[// 二级卡数组
],
- // if(this.form.currency){
- // formList.push({ "answerId":'242', "emptyOne": "19", "emptyTwo": this.form.currency, "operationIds": parentId + ',242', "type": "1" })//客户号
- // }
- // if(this.form.goldLogo){
- // formList.push({ "answerId":'243', "emptyOne": "7", "emptyTwo": this.form.goldLogo, "operationIds": parentId + ',243', "type": "3" })//统计代码
- // }
- // if(this.form.interestRate){
- // formList.push( {"answerId":'245',"emptyOne": "5", "emptyTwo": this.form.interestRate, "operationIds": parentId + ",245", "type": "3"})//外汇核准号
- // }
- // if(this.form.abstract){
- // formList.push( {"answerId":'246',"emptyOne": "5", "emptyTwo": this.form.abstract, "operationIds": parentId + ",246", "type": "3"})//外汇证号
- // }
+ // 配置
myTable2: {
242: {
prop: 'currency',
@@ -191,9 +180,13 @@ export default {
}),
getBlur() {
if(this.form.username) {
- this.form.currency = 12
- this.form.interestRate = 0.30
- this.form.goldLogo = 13
+ const { currency, interestRate, goldLogo } = this.dataFlow
+ // this.form.currency = 12
+ // this.form.interestRate = 0.30
+ // this.form.goldLogo = 13
+ this.form.currency = currency
+ this.form.interestRate = interestRate
+ this.form.goldLogo = goldLogo
}
},
getFormData(){
diff --git a/src/pages/manage/list/business/openAccount.vue b/src/pages/manage/list/business/openAccount.vue
index 9aa7568..14ccc9d 100644
--- a/src/pages/manage/list/business/openAccount.vue
+++ b/src/pages/manage/list/business/openAccount.vue
@@ -13,18 +13,12 @@
-
-
-
-
+
-
+
-
-
-
-
+
@@ -34,15 +28,14 @@
-
-
+
- checkHanzi(val, form, 'clientNumber')" ref="clientNumber">
+ checkHanzi(val, form, 'clientNumber')" ref="clientNumber">
- checkHanzi(val, form, 'foreignCurrencyCertificate')" ref="foreignCurrencyCertificate">
+ checkHanzi(val, form, 'foreignCurrencyCertificate')" ref="foreignCurrencyCertificate">
@@ -52,10 +45,7 @@
-
-
-
-
+
@@ -65,9 +55,7 @@
-
-
-
+
@@ -76,7 +64,7 @@
- checkName(val, form, 'foreignCurrencyBumber')" ref="foreignCurrencyBumber">
+ checkName(val, form, 'foreignCurrencyBumber')" ref="foreignCurrencyBumber">
@@ -293,13 +281,15 @@ export default {
},
mixins: [ TipsBefore ],
created() {
- if(this.isNeedBefore) {
-
- return
- }
- const { peopleNumber, userName } = this.dataFlow
- this.form.customerName = userName
- this.form.customerNumber = peopleNumber
+ // if(this.isNeedBefore) {
+ // return
+ // }
+ if(this.dataFlow.corporateClient) {
+ const { peopleNumber, userName } = this.dataFlow
+ this.form.customerName = userName
+ this.form.customerNumber = peopleNumber
+ }
+
this.getFormData()
},
methods: {
@@ -316,10 +306,13 @@ export default {
submitForm(){
// let projectId = sessionStorage.getItem('projectId')
// let startTime = sessionStorage.getItem('startTime')
+ if(!this.form.customerName) {
+ this.setTipsOperate('请先完成 客户信息 -> 公司客户信息建立');
+ return;
+ }
this.$refs.form.validate(myValidate(() => {
// 验证通过逻辑写在这
this.visible = true;
-
}, this.$refs));
},
submitForm2(){
diff --git a/src/pages/manage/list/business/transfer.vue b/src/pages/manage/list/business/transfer.vue
index 69438d4..9c1f2fa 100644
--- a/src/pages/manage/list/business/transfer.vue
+++ b/src/pages/manage/list/business/transfer.vue
@@ -268,10 +268,11 @@ export default {
// payWay: '印鉴', // 支取方式
// abstract: '', // 摘要
if(this.form.transoutNum) {
- this.form.certificateType = 12
+ const { currency } = this.dataFlow
this.form.currencyMark = 13
this.form.signDate = '2021-01-05'
this.form.certificateType = 115
+ this.form.currencyType = currency
this.form.payWay = 114
}
},
diff --git a/src/pages/manage/list/cityWide/cityWideIn.vue b/src/pages/manage/list/cityWide/cityWideIn.vue
index b1ee0eb..8b06b62 100644
--- a/src/pages/manage/list/cityWide/cityWideIn.vue
+++ b/src/pages/manage/list/cityWide/cityWideIn.vue
@@ -13,7 +13,7 @@
-
+
@@ -25,13 +25,7 @@
-
-
+
@@ -105,7 +99,7 @@ export default {
otherAccountNumber: '', // 他行收款账号
voucherNumber: '', // 凭证号码
// 非必填项
- currency: '12', // 币种
+ currency: 12, // 币种
proposeTime: 1, // 提出场次
insertDate: '', // 提入日期
otherAccountUsername: '', // 他行收款户名
diff --git a/src/pages/manage/list/cityWide/cityWideOut.vue b/src/pages/manage/list/cityWide/cityWideOut.vue
index e7b8328..c098e24 100644
--- a/src/pages/manage/list/cityWide/cityWideOut.vue
+++ b/src/pages/manage/list/cityWide/cityWideOut.vue
@@ -13,7 +13,7 @@
-
+
@@ -25,7 +25,7 @@
-
+
@@ -106,7 +106,7 @@ export default {
otherAccountNumber: '', // 他行收款账号
voucherNumber: '', // 凭证号码
// 非必填项
- currency: '12', // 币种
+ currency: 12, // 币种
proposeTime: 1, // 提出场次
proposeDate: '', // 提出日期
otherAccountUsername: '', // 其他收款户名
@@ -319,12 +319,12 @@ export default {
let startTime = sessionStorage.getItem('startTime')
const formList = []
formList.push({"answerId":'347',"emptyOne": 54, "emptyTwo": this.form.shroffAccountNumber, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id +",287,5,29,345,346","type": "3"})
- formList.push({"answerId":'348',"emptyOne": 8, "emptyTwo": this.form.currency, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id +",287,5,29,345,346","type": "3"})
+ formList.push({"answerId":'348',"emptyOne": 8, "emptyTwo": +this.form.currency, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id +",287,5,29,345,346","type": "3"})
formList.push({"answerId":'349',"emptyOne": 14, "emptyTwo": this.form.money, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id +",287,5,29,345,346","type": "3"})
formList.push({"answerId":'350',"emptyOne": 55, "emptyTwo": this.form.proposeTime, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id +",287,5,29,345,346","type": "3"})
formList.push({"answerId":'351',"emptyOne": 56, "emptyTwo": this.form.proposeDate, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id +",287,5,29,345,346","type": "3"})
- formList.push({"answerId":'352',"emptyOne": 57, "emptyTwo": this.form.billType, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id +",287,5,29,345,346","type": "3"})
+ formList.push({"answerId":'352',"emptyOne": 57, "emptyTwo": +this.form.billType, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id +",287,5,29,345,346","type": "3"})
formList.push({"answerId":'353',"emptyOne": 58, "emptyTwo": this.form.shroffAccountUsername, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id +",287,5,29,345,346","type": "3"})
formList.push({"answerId":'354',"emptyOne": 59, "emptyTwo": this.form.otherAccountNumber, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id +",287,5,29,345,346","type": "3"})
diff --git a/src/pages/manage/list/client/corporateClient.vue b/src/pages/manage/list/client/corporateClient.vue
index eed00ed..6492138 100644
--- a/src/pages/manage/list/client/corporateClient.vue
+++ b/src/pages/manage/list/client/corporateClient.vue
@@ -295,6 +295,8 @@ export default {
// this.setDataFlow({ ...this.form })
this.setNeedsModule(moduleName)
this.setDataFlow({ userName: this.form.name })
+ // 说明已经操作过公司业务
+ this.setDataFlow({ [moduleName]: true })
}).catch((error)=>{
this.setTipsOperate('服务器繁忙哦,提交失败。')
})
diff --git a/src/pages/manage/list/personal/callDeposits/accountClosed.vue b/src/pages/manage/list/personal/callDeposits/accountClosed.vue
index b5c7dbb..387efef 100644
--- a/src/pages/manage/list/personal/callDeposits/accountClosed.vue
+++ b/src/pages/manage/list/personal/callDeposits/accountClosed.vue
@@ -64,7 +64,7 @@
-
+
@@ -163,10 +163,10 @@ export default{
totalMoney: '总金额', //
certificateType: '证件类型', //
breathDate: '起息日期', //
- customerNumber: '客户号', // (未对标)
- noticeType: '通知类型', // (未对标)
- drawWayType: '支取类别', // (未对标)
- voucherType: '凭证类型', // (未对标)
+ customerNumber: '客户号',
+ noticeType: '通知类型',
+ drawWayType: '支取类别',
+ voucherType: '凭证类型',
},
rules: {
clientName: {
@@ -399,7 +399,6 @@ export default{
},
popUp3(text) {
// this.$store.commit('system/changePop',{show:true,text, id: '394'})
-
this.setTipsOperate('请在密码器输入密码');
this.setPopId('394')
sessionStorage.setItem('computerPath', this.$route.fullPath)
@@ -434,16 +433,6 @@ export default{
{
key: '392,13'
}
- // {
- // 302: nomCallDepositCard
- // },
- // {
- // 392: nomCallDepositCard2
- // },
- // {
- // 394: nomCallDepositClosedPassword,
- // "subjectId": 17,
- // }
]
autoPlay(parentId, this.form, this.myTable2, this.myTable, cards)
},
diff --git a/src/pages/manage/list/personal/currentAccount/accountCancellation.vue b/src/pages/manage/list/personal/currentAccount/accountCancellation.vue
index 8b038b2..d9faa25 100644
--- a/src/pages/manage/list/personal/currentAccount/accountCancellation.vue
+++ b/src/pages/manage/list/personal/currentAccount/accountCancellation.vue
@@ -116,6 +116,7 @@ export default{
created() {
// 混入函数判定,如果不需要则不执行初始化代码
+ // 如果输入过密码,则密码存储在sessionStorage中,拿到这个密码。
if(sessionStorage.getItem('nomCurrentCancellPassword')) {
this.form.drawPassword = sessionStorage.getItem('nomCurrentCancellPassword')
}
diff --git a/src/pages/manage/list/personal/timeDeposit/withdrawal.vue b/src/pages/manage/list/personal/timeDeposit/withdrawal.vue
index 2df0991..37a849f 100644
--- a/src/pages/manage/list/personal/timeDeposit/withdrawal.vue
+++ b/src/pages/manage/list/personal/timeDeposit/withdrawal.vue
@@ -90,6 +90,7 @@ export default{
MyDialog
},
created() {
+
if(this.form.depositNumber) {
this.form.depositNumber = '0912'
}
@@ -133,8 +134,11 @@ export default{
// this.form.withdrawWay = withdrawWay
}
}
-
+ if(!this.form.withdrawWay) {
+ this.form.withdrawWay = 125
+ }
this.getFormData()
+
},
data(){
return{
@@ -484,7 +488,7 @@ export default{
},
watch: {
'form.withdrawWay': {
- handler(newVal) {
+ handler(newVal, oldVal) {
// 这里的数据流withdrawWay纯粹用来判断,因为业务四和五就这个不一样
// const { withdrawWay } = this.dataFlow
if(newVal === 126) {
@@ -501,7 +505,10 @@ export default{
if(sessionStorage.getItem('newVoucherNumber')) {
this.form.newVoucherNumber = sessionStorage.getItem('newVoucherNumber')
}
- this.form.withdrawAmount = ''
+ if(oldVal === 126) {
+ this.form.withdrawAmount = ''
+ }
+
this.form.interest = '0.00'
this.rules.newVoucherNumber = [
{
diff --git a/src/store/modules/system.js b/src/store/modules/system.js
index c0a3cb7..3798246 100644
--- a/src/store/modules/system.js
+++ b/src/store/modules/system.js
@@ -12,10 +12,10 @@ const allGoods = {
428: {name:'定期存单',src:require('@/assets/img/goods/储蓄存单.png'),id:428},
439: {name:'预留印鉴卡',src:require('@/assets/img/goods/预留印鉴卡.png'),id:439},
412: {name:'转账支票',src:require('@/assets/img/goods/sy-zzzp.png'),id:412},
- 30: {name:'银行承兑汇票',src:require('@/assets/img/goods/银行承兑汇票.png'),id:30},
+ 584: {name:'银行承兑汇票',src:require('@/assets/img/goods/银行承兑汇票.png'),id:584},
582: {name:'银行承兑汇票一联',src:require('@/assets/img/goods/银行承兑汇票.png'),id:582},
581: {name:'银行承兑汇票二联',src:require('@/assets/img/goods/银行承兑汇票.png'),id:581},
- 580: {name:'银行承兑汇票三联',src:require('@/assets/img/goods/银行承兑汇票.png'),id:580},
+ 580: {name:'银行承兑汇票三联(解讫通知)',src:require('@/assets/img/goods/银行承兑汇票.png'),id:580},
583: {name:'银行承兑汇票四联',src:require('@/assets/img/goods/银行承兑汇票.png'),id:583},
411: {name:'现金支票',src:require('@/assets/img/goods/xjzp.png'),id:411},
425: {name:'取款凭条',src:require('@/assets/img/goods/qkpt.png'),id:425},
@@ -137,7 +137,7 @@ const sex = 2 // 1为男,2为女。
const allDataFlow = {
peopleNumber,
userName,
- idType: 83,
+ idType: '83',
idNumber,//证件号码
sex,//性别 1为男,
birthday,//出生日期
@@ -179,6 +179,7 @@ const allDataFlow = {
// 票据号码
ticketNumber: '00242986',
'corporateClient': false,
+
}
// 因为vuex中的数据是缓存在sessionStorage中的,所以重新开始业务需要刷新所有的业务,所以一刷新我们就将这个初始状态替换到vuex中去。
@@ -267,7 +268,7 @@ const myInitState = {
dataFlow: {
peopleNumber,
userName,//用户名字
- idType: 83,
+ idType: '83',
idNumber,//证件号码
sex,//性别
birthday,//出生日期
@@ -370,6 +371,9 @@ const myInitState = {
capital, // 不知道是多少
withdrawType: 124, // 支取类别
withdrawWay: 125, // 支取方式
+ transMoney: 8000,
+ oldDepositNumber: '568812090',
+ newDepositNumber: '568812136',
}
},
'业务五': {
@@ -413,7 +417,8 @@ const myInitState = {
capital, // 不知道是多少
withdrawType: 124, // 支取类别
withdrawWay: 126, // 支取方式
-
+ oldDepositNumber: '568812136',
+ newDepositNumber: '568812136',
}
},
'业务六': {
@@ -726,7 +731,8 @@ const myInitState = {
'business/deposit': false
},
dataFlow: {
- transMoney: 800000
+ transMoney: 800000,
+ interestRate: 0.00
}
},
'业务十三': { // 公司现金支票取款
@@ -1335,7 +1341,9 @@ const myInitState = {
collectingCompany: '开卷教育有限公司',
transMoney: 200000,
assignDate: '2022-12-29',
- ticketNumber: '00242966'
+ ticketNumber: '00242966',
+ drawDate: '2022-06-30', // 出票日期
+ expireDate: '2022-12-29', // 到期日期
}
},
// 577, 银行承兑汇票签发
@@ -1372,7 +1380,12 @@ export default {
voucherTypeSelectList: [],
accountTypeSelectList: [],
chargeWayList: [],
- idTypeList: [] // 身份证选项
+ billTypeSelect: [],
+ isTranslate: [], // 是否转让
+ idTypeList: [], // 身份证选项
+ accountManagementList: [],
+ outAccountWayList: [],
+ calculateWayList: []
},
// (要保存的业务数据):
@@ -1411,8 +1424,6 @@ export default {
},
// dataFlowGo: 0,
dataFlow: {
- // 这里后面会通过Object.assign(allDataFlow, 这个dataFlow)的方式,用来将当前业务信息和其他业务信息覆盖掉。这样当前信息就是该业务独有的信息。
- // 后面如果业务案例有变化,直接在这里改就行了。其他许多依赖的组件的数据都是从这里拿的。
// peopleNumber,
// userName,//用户名字
// idType: '身份证',
@@ -1462,7 +1473,7 @@ export default {
dataFlow: {
peopleNumber,
userName,//用户名字
- idType: 83,
+ idType: '83',
idNumber,//证件号码
sex,//性别
birthday,//出生日期
@@ -1565,6 +1576,9 @@ export default {
capital, // 不知道是多少
withdrawType: 124, // 支取类别
withdrawWay: 125, // 支取方式
+ transMoney: 8000,
+ oldDepositNumber: '568812090',
+ newDepositNumber: '568812136',
}
},
'业务五': {
@@ -1608,7 +1622,8 @@ export default {
capital, // 不知道是多少
withdrawType: 124, // 支取类别
withdrawWay: 126, // 支取方式
-
+ oldDepositNumber: '568812136',
+ newDepositNumber: '568812136',
}
},
'业务六': {
@@ -1921,7 +1936,8 @@ export default {
'business/deposit': false
},
dataFlow: {
- transMoney: 800000
+ transMoney: 800000,
+ interestRate: '0.00'
}
},
'业务十三': { // 公司现金支票取款
@@ -2530,10 +2546,14 @@ export default {
collectingCompany: '开卷教育有限公司',
transMoney: 200000,
assignDate: '2022-12-29',
- ticketNumber: '00242966'
+ ticketNumber: '00242966',
+ drawDate: '2022-06-30', // 出票日期
+ expireDate: '2022-12-29', // 到期日期
}
- },
+ },
+ // 577, 银行承兑汇票签发
},
+ // 初始化公共数据
allDataFlow: { ...allDataFlow },
goods:[// 物品栏的物品
{
@@ -2573,67 +2593,37 @@ export default {
startPlay(state) {
// 开始时调用,获取下拉框的东西。
- getSubjectInfo({
- subject_id:19
- }).then((data)=>{
- if(data.status == 200){
- state.selectList.idTypeList = data.data.items;
- }
- }).catch((error)=>{})
-
- for(let item=8;item<14;item++){
- let params= {
- subject_id:item
- }
-
- if (item == '8'){
- getSubjectInfo(params).then((data)=>{
- if(data.status == 200){
- state.selectList.currencySelectList = data.data.items;
- }
- }).catch((error)=>{})
-
- }else if (item == '9'){
- getSubjectInfo(params).then((data)=>{
- if(data.status == 200){
- state.selectList.goldLogoSelectList = data.data.items;
- }
- }).catch((error)=>{})
- }else if (item == '10'){
- getSubjectInfo(params).then((data)=>{
- if(data.status == 200){
- state.selectList.accountQualitySelectList = data.data.items;
- }
- }).catch((error)=>{})
-
- }else if (item == '11'){
- getSubjectInfo(params).then((data)=>{
- if(data.status == 200){
- state.selectList.voucherTypeSelectList = data.data.items;
- }
- }).catch((error)=>{})
- }else if (item == '12'){
- getSubjectInfo(params).then((data)=>{
- if(data.status == 200){
- state.selectList.accountTypeSelectList = data.data.items;
- }
- }).catch((error)=>{})
- }else if (item == '13'){
- getSubjectInfo(params).then((data)=>{
- if(data.status == 200){
- state.selectList.chargeWayList = data.data.items;
- }
- }).catch((error)=>{})
- }
+ // 38
+ // accountManagementList
+
+ const mapObj = {
+ 38: 'accountManagementList',
+ 19: 'idTypeList',
+ 8: 'currencySelectList',
+ 9:'goldLogoSelectList',
+ 10: 'accountQualitySelectList',
+ 11: 'voucherTypeSelectList',
+ 12: 'accountTypeSelectList',
+ 13: 'chargeWayList',
+ 57: 'billTypeSelect',
+ 76: 'isTranslate',
+ 40: 'outAccountWayList',
+ 39: 'calculateWayList',
+
}
- getSubjectInfo({
- subject_id: 57
- }).then((data) => {
- if(data.status == 200){
- state.selectList.billTypeSelect = data.data.items;
- }
- })
+ for(const key in mapObj) {
+ getSubjectInfo({
+ subject_id:key
+ }).then((data)=>{
+ const name = mapObj[key]
+ if(data.status == 200 && state.selectList[name].length===0){
+ state.selectList[name].push(...data.data.items);
+ }
+ }).catch((error)=>{})
+ }
+
+
},
setPopId(state, id) {
state.id = id
@@ -2872,6 +2862,12 @@ export default {
judgeDelete = false
stampSuccess = '456'
}
+ if(id === 584) {
+ state.businessSelect[state.businessKey].data.push(582,581,580,583)
+ judgeDelete = false
+ stampSuccess = '584'
+ }
+ // 584
}else if(seal === '私章转讫章') {
if(id === 412) {
state.businessSelect[state.businessKey].data.push(476, 474)
@@ -3043,7 +3039,7 @@ export default {
dataFlow(state) {
return Object.assign(state.allDataFlow, state.businessSelect[state.businessKey].dataFlow)
},
- //
+ // 拿到物品栏中的物品
goods2(state) {
// 调试容错采用if-else
const arr = []
@@ -3051,8 +3047,10 @@ export default {
for(const item of state.businessSelect[state.businessKey].data) {
arr.push(allGoods[item])
}
+ // 找到银行卡item
const item = arr.find(item => item.id === 16)
if(item) {
+ // 如果是业务一,则物品栏中的银行卡名字为一类银行卡
if(state.businessKey === '业务一') {
item.name = '一类银行卡'
}else {
diff --git a/src/utils/utilFunction.js b/src/utils/utilFunction.js
index 53d7fc1..2494cc2 100644
--- a/src/utils/utilFunction.js
+++ b/src/utils/utilFunction.js
@@ -98,7 +98,6 @@ const inputListen2 = function(val, row, prop) {
return;
}
if(Number(val) || Number(val)===0) {
- console.log(val)
row[prop] = val
}
}
@@ -211,8 +210,6 @@ const autoPlay = (parentId, form, myTable2, myTable, cards=[]) => {
// projectId:+projectId,
startTime:startTime,
}
- // console.log('---提交的addOperation')
- // console.log(params)
addOperation(params).then((data)=>{
// Message.success({
// center: true,
@@ -235,17 +232,21 @@ const autoPlay2 = (parentId=11, form, myTable2, myTable, cardArr, callback) =>
parentId
}
getOperation(param).then((data)=>{
- console.log('---拿到的data')
- console.log(data)
if(data.status == 200) {
-
var list = data.data.judgmentRuleReqs
// const tmpObj = Object.assign(myTable, myTable2) ...巨坑,把后面的属性给到前面了
const tmpObj = {...myTable, ...myTable2}
for (var i = 0; i < list.length; i++) {
const { answerId, emptyTwo } = list[i]
if(!cardArr) {
- form[tmpObj[answerId].prop] = emptyTwo
+ if(Number(emptyTwo)) {
+ const tmpNumber = (+emptyTwo).toFixed(2)
+ // console.log('kao000')
+ // console.log(tmpNumber)
+ form[tmpObj[answerId].prop] = tmpNumber
+ }else {
+ form[tmpObj[answerId].prop] = emptyTwo
+ }
} else {
if(cardArr[answerId]) {
try{
@@ -257,6 +258,7 @@ const autoPlay2 = (parentId=11, form, myTable2, myTable, cardArr, callback) =>
}else {
if(Number(emptyTwo)) {
+
form[tmpObj[answerId].prop] = +emptyTwo
}else {
form[tmpObj[answerId].prop] = emptyTwo