purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决单据明细中重复商品进行批次发货遇到的问题

Browse Source
This commit is contained in:
季圣华
2022-05-28 22:37:01 +08:00
parent d453c659cc
commit f0ecf2b7c2
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jshERP-web/src/views/bill/modules/PurchaseInModal.vue
View File

@@ -280,7 +280,8 @@
{ title: '税率', key: 'taxRate', width: '3%', type: FormTypes.inputNumber,placeholder: '%'}, { title: '税率', key: 'taxRate', width: '3%', type: FormTypes.inputNumber,placeholder: '%'},
{ title: '税额', key: 'taxMoney', width: '5%', type: FormTypes.inputNumber, readonly: true, statistics: true }, { title: '税额', key: 'taxMoney', width: '5%', type: FormTypes.inputNumber, readonly: true, statistics: true },
{ title: '价税合计', key: 'taxLastMoney', width: '5%', type: FormTypes.inputNumber, statistics: true }, { title: '价税合计', key: 'taxLastMoney', width: '5%', type: FormTypes.inputNumber, statistics: true },
{ title: '备注', key: 'remark', width: '5%', type: FormTypes.input } { title: '备注', key: 'remark', width: '5%', type: FormTypes.input },
{ title: '关联id', key: 'linkId', width: '5%', type: FormTypes.hidden },
] ]
}, },
confirmLoading: false, confirmLoading: false,
@@ -425,6 +426,7 @@
info.taxMoney = (info.allPrice*taxRate/100).toFixed(2)-0 info.taxMoney = (info.allPrice*taxRate/100).toFixed(2)-0
info.taxLastMoney = (info.allPrice + info.taxMoney).toFixed(2)-0 info.taxLastMoney = (info.allPrice + info.taxMoney).toFixed(2)-0
} }
info.linkId = info.id
allTaxLastMoney += info.taxLastMoney allTaxLastMoney += info.taxLastMoney
listEx.push(info) listEx.push(info)
this.changeColumnShow(info) this.changeColumnShow(info)

4
jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
View File

@@ -212,7 +212,8 @@
{ title: '税率', key: 'taxRate', width: '3%', type: FormTypes.inputNumber,placeholder: '%'}, { title: '税率', key: 'taxRate', width: '3%', type: FormTypes.inputNumber,placeholder: '%'},
{ title: '税额', key: 'taxMoney', width: '5%', type: FormTypes.inputNumber, readonly: true, statistics: true }, { title: '税额', key: 'taxMoney', width: '5%', type: FormTypes.inputNumber, readonly: true, statistics: true },
{ title: '价税合计', key: 'taxLastMoney', width: '5%', type: FormTypes.inputNumber, statistics: true }, { title: '价税合计', key: 'taxLastMoney', width: '5%', type: FormTypes.inputNumber, statistics: true },
{ title: '备注', key: 'remark', width: '5%', type: FormTypes.input} { title: '备注', key: 'remark', width: '5%', type: FormTypes.input},
{ title: '关联id', key: 'linkId', width: '5%', type: FormTypes.hidden },
] ]
}, },
confirmLoading: false, confirmLoading: false,
@@ -334,6 +335,7 @@
info.taxLastMoney = info.allPrice info.taxLastMoney = info.allPrice
discountLastMoney += info.allPrice discountLastMoney += info.allPrice
} }
info.linkId = info.id
} }
this.$nextTick(() => { this.$nextTick(() => {
this.form.setFieldsValue({ this.form.setFieldsValue({

4
jshERP-web/src/views/bill/modules/SaleOutModal.vue
View File

@@ -284,7 +284,8 @@
{ title: '税率', key: 'taxRate', width: '3%', type: FormTypes.inputNumber,placeholder: '%'}, { title: '税率', key: 'taxRate', width: '3%', type: FormTypes.inputNumber,placeholder: '%'},
{ title: '税额', key: 'taxMoney', width: '5%', type: FormTypes.inputNumber, readonly: true, statistics: true }, { title: '税额', key: 'taxMoney', width: '5%', type: FormTypes.inputNumber, readonly: true, statistics: true },
{ title: '价税合计', key: 'taxLastMoney', width: '5%', type: FormTypes.inputNumber, statistics: true }, { title: '价税合计', key: 'taxLastMoney', width: '5%', type: FormTypes.inputNumber, statistics: true },
{ title: '备注', key: 'remark', width: '5%', type: FormTypes.input } { title: '备注', key: 'remark', width: '5%', type: FormTypes.input },
{ title: '关联id', key: 'linkId', width: '5%', type: FormTypes.hidden },
] ]
}, },
confirmLoading: false, confirmLoading: false,
@@ -431,6 +432,7 @@
info.taxMoney = (info.allPrice*taxRate/100).toFixed(2)-0 info.taxMoney = (info.allPrice*taxRate/100).toFixed(2)-0
info.taxLastMoney = (info.allPrice + info.taxMoney).toFixed(2)-0 info.taxLastMoney = (info.allPrice + info.taxMoney).toFixed(2)-0
} }
info.linkId = info.id
allTaxLastMoney += info.taxLastMoney allTaxLastMoney += info.taxLastMoney
listEx.push(info) listEx.push(info)
this.changeColumnShow(info) this.changeColumnShow(info)