diff --git a/src/assets/img/company-finance.png b/src/assets/img/company-finance.png index 470edbf..a772d57 100644 Binary files a/src/assets/img/company-finance.png and b/src/assets/img/company-finance.png differ diff --git a/src/assets/img/credit-dep.png b/src/assets/img/credit-dep.png index ee884e6..9d9c00a 100644 Binary files a/src/assets/img/credit-dep.png and b/src/assets/img/credit-dep.png differ diff --git a/src/assets/img/international.png b/src/assets/img/international.png index d545350..0ea6787 100644 Binary files a/src/assets/img/international.png and b/src/assets/img/international.png differ diff --git a/src/assets/img/personal-finance.png b/src/assets/img/personal-finance.png index 0eadd4e..f8e3404 100644 Binary files a/src/assets/img/personal-finance.png and b/src/assets/img/personal-finance.png differ diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue index 67a3ae8..73c4a1e 100644 --- a/src/pages/counter/list/index.vue +++ b/src/pages/counter/list/index.vue @@ -2010,6 +2010,15 @@ export default { let startTime = sessionStorage.getItem('startTime') let formList = []; if(this.needBackMoney) { + const cash = this.cashboxGoodsShelf2 + const val = [] + cash.map(e => { + if (e.num) { + const unit = e.name.replace(/\d*/, '') // 货币单位 + const count = e.name.replace(/\D/, '') + val.push((unit === '元' ? count : '0.' + count) + '-' + e.num) + } + }) this.tipsDialog = true // {"answerId":'40',"emptyOne": "19", "emptyTwo": this.form.idType, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id +",287,5,25,33,40", "type": "1"} let params= { @@ -2018,9 +2027,9 @@ export default { { "answerId":565, "emptyOne": "104", - "emptyTwo": this.backMoneyTotal + '', + "emptyTwo": val.join(), "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id +",287,1,"+565, - "type": "3" + "type": "6" } ], projectId:+projectId, diff --git a/src/pages/index/list/index.vue b/src/pages/index/list/index.vue index 17d9901..c175336 100644 --- a/src/pages/index/list/index.vue +++ b/src/pages/index/list/index.vue @@ -17,7 +17,7 @@ -