diff --git a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue index 636529ca..c3c63897 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue @@ -280,7 +280,8 @@ { title: '税率', key: 'taxRate', width: '3%', type: FormTypes.inputNumber,placeholder: '%'}, { title: '税额', key: 'taxMoney', width: '5%', type: FormTypes.inputNumber, readonly: true, 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, @@ -425,6 +426,7 @@ info.taxMoney = (info.allPrice*taxRate/100).toFixed(2)-0 info.taxLastMoney = (info.allPrice + info.taxMoney).toFixed(2)-0 } + info.linkId = info.id allTaxLastMoney += info.taxLastMoney listEx.push(info) this.changeColumnShow(info) diff --git a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue index b2f8f5b5..6d9bea28 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue @@ -212,7 +212,8 @@ { title: '税率', key: 'taxRate', width: '3%', type: FormTypes.inputNumber,placeholder: '%'}, { title: '税额', key: 'taxMoney', width: '5%', type: FormTypes.inputNumber, readonly: true, 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, @@ -334,6 +335,7 @@ info.taxLastMoney = info.allPrice discountLastMoney += info.allPrice } + info.linkId = info.id } this.$nextTick(() => { this.form.setFieldsValue({ diff --git a/jshERP-web/src/views/bill/modules/SaleOutModal.vue b/jshERP-web/src/views/bill/modules/SaleOutModal.vue index 19d88ee5..9b6538f6 100644 --- a/jshERP-web/src/views/bill/modules/SaleOutModal.vue +++ b/jshERP-web/src/views/bill/modules/SaleOutModal.vue @@ -284,7 +284,8 @@ { title: '税率', key: 'taxRate', width: '3%', type: FormTypes.inputNumber,placeholder: '%'}, { title: '税额', key: 'taxMoney', width: '5%', type: FormTypes.inputNumber, readonly: true, 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, @@ -431,6 +432,7 @@ info.taxMoney = (info.allPrice*taxRate/100).toFixed(2)-0 info.taxLastMoney = (info.allPrice + info.taxMoney).toFixed(2)-0 } + info.linkId = info.id allTaxLastMoney += info.taxLastMoney listEx.push(info) this.changeColumnShow(info)