Commit f682cee8 authored by 季圣华's avatar 季圣华
Browse files

解决单据中多账户展示的bug

parent be6ef2aa
...@@ -95,16 +95,20 @@ ...@@ -95,16 +95,20 @@
edit (idStr, moneyStr) { edit (idStr, moneyStr) {
this.form.resetFields(); this.form.resetFields();
this.model = Object.assign({}, {}); this.model = Object.assign({}, {});
let idList = [], moneyList = []
if(idStr && idStr.indexOf(',')>-1) { if(idStr && idStr.indexOf(',')>-1) {
let idList = idStr.split(",") idList = idStr.split(",")
if(idList[0]) {this.model.oneAccountId = idList[0]-0} moneyList = moneyStr.split(",")
if(idList[1]) {this.model.twoAccountId = idList[1]-0} } else {
if(idList[2]) {this.model.threeAccountId = idList[2]-0} idList = idStr
let moneyList = moneyStr.split(",") moneyList = moneyStr
if(moneyList[0]) {this.model.oneAccountPrice = Math.abs(moneyList[0])}
if(moneyList[1]) {this.model.twoAccountPrice = Math.abs(moneyList[1])}
if(moneyList[2]) {this.model.threeAccountPrice = Math.abs(moneyList[2])}
} }
if(idList[0]) {this.model.oneAccountId = idList[0]-0}
if(idList[1]) {this.model.twoAccountId = idList[1]-0}
if(idList[2]) {this.model.threeAccountId = idList[2]-0}
if(moneyList[0]) {this.model.oneAccountPrice = Math.abs(moneyList[0])}
if(moneyList[1]) {this.model.twoAccountPrice = Math.abs(moneyList[1])}
if(moneyList[2]) {this.model.threeAccountPrice = Math.abs(moneyList[2])}
this.visible = true; this.visible = true;
this.$nextTick(() => { this.$nextTick(() => {
this.form.setFieldsValue(pick(this.model,'oneAccountId','oneAccountPrice', this.form.setFieldsValue(pick(this.model,'oneAccountId','oneAccountPrice',
...@@ -122,8 +126,9 @@ ...@@ -122,8 +126,9 @@
if (!err) { if (!err) {
let allPrice = 0 let allPrice = 0
that.confirmLoading = true; that.confirmLoading = true;
that.accountIdList = []
that.accountMoneyList = []
let formData = Object.assign(this.model, values); let formData = Object.assign(this.model, values);
console.log(formData)
if(formData.oneAccountId!==undefined) { if(formData.oneAccountId!==undefined) {
that.accountIdList.push(formData.oneAccountId) that.accountIdList.push(formData.oneAccountId)
} }
...@@ -146,6 +151,7 @@ ...@@ -146,6 +151,7 @@
allPrice = allPrice + formData.threeAccountPrice allPrice = allPrice + formData.threeAccountPrice
} }
that.$emit('ok', that.accountIdList, that.accountMoneyList, allPrice); that.$emit('ok', that.accountIdList, that.accountMoneyList, allPrice);
that.confirmLoading = false;
that.close(); that.close();
} }
}) })
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment