diff --git a/jshERP-web/src/views/bill/dialog/ManyAccountModal.vue b/jshERP-web/src/views/bill/dialog/ManyAccountModal.vue index 6e0e6d0d..77467fb4 100644 --- a/jshERP-web/src/views/bill/dialog/ManyAccountModal.vue +++ b/jshERP-web/src/views/bill/dialog/ManyAccountModal.vue @@ -150,6 +150,7 @@ that.accountMoneyList.push(formData.threeAccountPrice) allPrice = allPrice + formData.threeAccountPrice } + debugger that.$emit('ok', that.accountIdList, that.accountMoneyList, allPrice); that.confirmLoading = false; that.close(); diff --git a/jshERP-web/src/views/bill/mixins/BillModalMixin.js b/jshERP-web/src/views/bill/mixins/BillModalMixin.js index 41cde44a..075ff00d 100644 --- a/jshERP-web/src/views/bill/mixins/BillModalMixin.js +++ b/jshERP-web/src/views/bill/mixins/BillModalMixin.js @@ -1,7 +1,7 @@ import { VALIDATE_NO_PASSED, validateFormAndTables } from '@/utils/JEditableTableUtil' import {findBySelectSup,findBySelectCus,findBySelectRetail,getMaterialByBarCode,findStockByDepotAndBarCode,getAccount,getPersonByNumType} from '@/api/api' import { getAction,putAction } from '@/api/manage' -import { getMpListShort, getNowFormatDateTime, changeListFmtMinus } from "@/utils/util" +import { getMpListShort, getNowFormatDateTime } from "@/utils/util" import Vue from 'vue' export const BillModalMixin = { @@ -152,7 +152,7 @@ export const BillModalMixin = { }, manyAccountModalFormOk(idList, moneyList, allPrice) { this.accountIdList = idList - this.accountMoneyList = changeListFmtMinus(moneyList) + this.accountMoneyList = moneyList let discountLastMoney = this.form.getFieldValue('discountLastMoney')-0 let otherMoney = this.form.getFieldValue('otherMoney')-0 let debt = (discountLastMoney + otherMoney - allPrice).toFixed(2) diff --git a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue index 1ddb00f9..3b5904c4 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue @@ -264,6 +264,11 @@ totalPrice += item.allPrice-0 } billMain.totalPrice = totalPrice + if(billMain.accountId === 0) { + billMain.accountId = '' + } + billMain.accountIdList = this.accountIdList.length>0 ? JSON.stringify(this.accountIdList) : "" + billMain.accountMoneyList = this.accountMoneyList.length>0 ? JSON.stringify(this.accountMoneyList) : "" if(this.fileList && this.fileList.length > 0) { billMain.fileName = this.fileList } diff --git a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue index 6525d8a3..fdf6e7b4 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue @@ -131,7 +131,7 @@ import { FormTypes } from '@/utils/JEditableTableUtil' import { JEditableTableMixin } from '@/mixins/JEditableTableMixin' import { BillModalMixin } from '../mixins/BillModalMixin' - import { getMpListShort} from "@/utils/util" + import { getMpListShort, changeListFmtMinus } from "@/utils/util" import { getAction } from '@/api/manage' import JUpload from '@/components/jeecg/JUpload' import JDate from '@/components/jeecg/JDate' @@ -269,6 +269,7 @@ if(billMain.accountId === 0) { billMain.accountId = '' } + this.accountMoneyList = changeListFmtMinus(this.accountMoneyList) billMain.accountIdList = this.accountIdList.length>0 ? JSON.stringify(this.accountIdList) : "" billMain.accountMoneyList = this.accountMoneyList.length>0 ? JSON.stringify(this.accountMoneyList) : "" if(this.fileList && this.fileList.length > 0) { diff --git a/jshERP-web/src/views/bill/modules/SaleBackModal.vue b/jshERP-web/src/views/bill/modules/SaleBackModal.vue index 1b3bedb1..19326a0d 100644 --- a/jshERP-web/src/views/bill/modules/SaleBackModal.vue +++ b/jshERP-web/src/views/bill/modules/SaleBackModal.vue @@ -133,7 +133,7 @@ import { FormTypes } from '@/utils/JEditableTableUtil' import { JEditableTableMixin } from '@/mixins/JEditableTableMixin' import { BillModalMixin } from '../mixins/BillModalMixin' - import { getMpListShort } from "@/utils/util" + import { getMpListShort,changeListFmtMinus } from "@/utils/util" import { getAction } from '@/api/manage' import JSelectMultiple from '@/components/jeecg/JSelectMultiple' import JUpload from '@/components/jeecg/JUpload' @@ -275,6 +275,7 @@ if(billMain.accountId === 0) { billMain.accountId = '' } + this.accountMoneyList = changeListFmtMinus(this.accountMoneyList) billMain.accountIdList = this.accountIdList.length>0 ? JSON.stringify(this.accountIdList) : "" billMain.accountMoneyList = this.accountMoneyList.length>0 ? JSON.stringify(this.accountMoneyList) : "" if(this.fileList && this.fileList.length > 0) {