diff --git a/jshERP-web/src/views/bill/PurchaseOrderList.vue b/jshERP-web/src/views/bill/PurchaseOrderList.vue
index f6513c63..d646d47d 100644
--- a/jshERP-web/src/views/bill/PurchaseOrderList.vue
+++ b/jshERP-web/src/views/bill/PurchaseOrderList.vue
@@ -179,6 +179,15 @@
{ title: '单据日期', dataIndex: 'operTimeStr',width:145},
{ title: '操作员', dataIndex: 'userName',width:80, ellipsis:true},
{ title: '金额合计', dataIndex: 'totalPrice',width:80},
+ { title: '含税合计', dataIndex: 'totalTaxLastMoney',width:80,
+ customRender:function (text,record,index) {
+ if(record.discountLastMoney) {
+ return (record.discountMoney + record.discountLastMoney).toFixed(2);
+ } else {
+ return record.totalPrice;
+ }
+ }
+ },
{ title: '状态', dataIndex: 'status', width: 80, align: "center",
scopedSlots: { customRender: 'customRenderStatus' }
},
diff --git a/jshERP-web/src/views/bill/SaleOrderList.vue b/jshERP-web/src/views/bill/SaleOrderList.vue
index 919e99e1..9e37e045 100644
--- a/jshERP-web/src/views/bill/SaleOrderList.vue
+++ b/jshERP-web/src/views/bill/SaleOrderList.vue
@@ -179,6 +179,15 @@
{ title: '单据日期', dataIndex: 'operTimeStr',width:145},
{ title: '操作员', dataIndex: 'userName',width:80, ellipsis:true},
{ title: '金额合计', dataIndex: 'totalPrice',width:80},
+ { title: '含税合计', dataIndex: 'totalTaxLastMoney',width:80,
+ customRender:function (text,record,index) {
+ if(record.discountLastMoney) {
+ return (record.discountMoney + record.discountLastMoney).toFixed(2);
+ } else {
+ return record.totalPrice;
+ }
+ }
+ },
{ title: '状态', dataIndex: 'status', width: 70, align: "center",
scopedSlots: { customRender: 'customRenderStatus' }
},
diff --git a/jshERP-web/src/views/bill/dialog/BillDetail.vue b/jshERP-web/src/views/bill/dialog/BillDetail.vue
index 25ea9c86..89222856 100644
--- a/jshERP-web/src/views/bill/dialog/BillDetail.vue
+++ b/jshERP-web/src/views/bill/dialog/BillDetail.vue
@@ -217,6 +217,25 @@
+
+
+
+ {{model.discount}}%
+
+
+
+
+ {{model.discountMoney}}
+
+
+
+
+ {{model.discountLastMoney}}
+
+
+
+
+
@@ -437,6 +456,25 @@
+
+
+
+ {{model.discount}}%
+
+
+
+
+ {{model.discountMoney}}
+
+
+
+
+ {{model.discountLastMoney}}
+
+
+
+
+
@@ -977,6 +1015,9 @@
{ title: '已入库', dataIndex: 'finishNumber'},
{ title: '单价', dataIndex: 'unitPrice'},
{ title: '金额', dataIndex: 'allPrice'},
+ { title: '税率(%)', dataIndex: 'taxRate'},
+ { title: '税额', dataIndex: 'taxMoney'},
+ { title: '价税合计', dataIndex: 'taxLastMoney'},
{ title: '备注', dataIndex: 'remark'}
],
purchaseInColumns: [
@@ -995,7 +1036,6 @@
{ title: '多属性', dataIndex: 'sku'},
{ title: '数量', dataIndex: 'operNumber'},
{ title: '单价', dataIndex: 'unitPrice'},
- { title: '含税单价', dataIndex: 'taxUnitPrice'},
{ title: '金额', dataIndex: 'allPrice'},
{ title: '税率(%)', dataIndex: 'taxRate'},
{ title: '税额', dataIndex: 'taxMoney'},
@@ -1018,7 +1058,6 @@
{ title: '多属性', dataIndex: 'sku'},
{ title: '数量', dataIndex: 'operNumber'},
{ title: '单价', dataIndex: 'unitPrice'},
- { title: '含税单价', dataIndex: 'taxUnitPrice'},
{ title: '金额', dataIndex: 'allPrice'},
{ title: '税率(%)', dataIndex: 'taxRate'},
{ title: '税额', dataIndex: 'taxMoney'},
@@ -1039,6 +1078,9 @@
{ title: '已入库', dataIndex: 'finishNumber'},
{ title: '单价', dataIndex: 'unitPrice'},
{ title: '金额', dataIndex: 'allPrice'},
+ { title: '税率(%)', dataIndex: 'taxRate'},
+ { title: '税额', dataIndex: 'taxMoney'},
+ { title: '价税合计', dataIndex: 'taxLastMoney'},
{ title: '备注', dataIndex: 'remark'}
],
saleOutColumns: [
@@ -1057,7 +1099,6 @@
{ title: '多属性', dataIndex: 'sku'},
{ title: '数量', dataIndex: 'operNumber'},
{ title: '单价', dataIndex: 'unitPrice'},
- { title: '含税单价', dataIndex: 'taxUnitPrice'},
{ title: '金额', dataIndex: 'allPrice'},
{ title: '税率(%)', dataIndex: 'taxRate'},
{ title: '税额', dataIndex: 'taxMoney'},
@@ -1080,7 +1121,6 @@
{ title: '多属性', dataIndex: 'sku'},
{ title: '数量', dataIndex: 'operNumber'},
{ title: '单价', dataIndex: 'unitPrice'},
- { title: '含税单价', dataIndex: 'taxUnitPrice'},
{ title: '金额', dataIndex: 'allPrice'},
{ title: '税率(%)', dataIndex: 'taxRate'},
{ title: '税额', dataIndex: 'taxMoney'},
diff --git a/jshERP-web/src/views/bill/mixins/BillModalMixin.js b/jshERP-web/src/views/bill/mixins/BillModalMixin.js
index 48d8f9d8..7646390b 100644
--- a/jshERP-web/src/views/bill/mixins/BillModalMixin.js
+++ b/jshERP-web/src/views/bill/mixins/BillModalMixin.js
@@ -319,7 +319,7 @@ export const BillModalMixin = {
onValueChange(event) {
let that = this
const { type, row, column, value, target } = event
- let param,snList,batchNumber,operNumber,unitPrice,taxUnitPrice,allPrice,taxRate,taxMoney,taxLastMoney
+ let param,snList,batchNumber,operNumber,unitPrice,allPrice,taxRate,taxMoney,taxLastMoney
switch(column.key) {
case "depotId":
if(row.barCode){
@@ -393,7 +393,6 @@ export const BillModalMixin = {
operNumber = snArr.length
taxRate = row.taxRate-0 //税率
unitPrice = row.unitPrice-0 //单价
- taxUnitPrice = row.taxUnitPrice-0
allPrice = (unitPrice*operNumber).toFixed(2)-0
taxMoney =((taxRate*0.01)*allPrice).toFixed(2)-0
taxLastMoney = (allPrice + taxMoney).toFixed(2)-0
@@ -411,7 +410,6 @@ export const BillModalMixin = {
operNumber = info.totalNum
taxRate = row.taxRate-0 //税率
unitPrice = row.unitPrice-0 //单价
- taxUnitPrice = row.taxUnitPrice-0
allPrice = (unitPrice*operNumber).toFixed(2)-0
taxMoney =((taxRate*0.01)*allPrice).toFixed(2)-0
taxLastMoney = (allPrice + taxMoney).toFixed(2)-0
@@ -427,7 +425,6 @@ export const BillModalMixin = {
operNumber = value-0
taxRate = row.taxRate-0 //税率
unitPrice = row.unitPrice-0 //单价
- taxUnitPrice = row.taxUnitPrice-0
allPrice = (unitPrice*operNumber).toFixed(2)-0
taxMoney =((taxRate*0.01)*allPrice).toFixed(2)-0
taxLastMoney = (allPrice + taxMoney).toFixed(2)-0
@@ -439,11 +436,10 @@ export const BillModalMixin = {
operNumber = row.operNumber-0 //数量
unitPrice = value-0 //单价
taxRate = row.taxRate-0 //税率
- taxUnitPrice = (unitPrice*(1+taxRate*0.01)).toFixed(2)-0
allPrice = (unitPrice*operNumber).toFixed(2)-0
taxMoney =((taxRate*0.01)*allPrice).toFixed(2)-0
taxLastMoney = (allPrice + taxMoney).toFixed(2)-0
- target.setValues([{rowKey: row.id, values: {taxUnitPrice: taxUnitPrice, allPrice: allPrice, taxMoney: taxMoney, taxLastMoney: taxLastMoney}}])
+ target.setValues([{rowKey: row.id, values: {allPrice: allPrice, taxMoney: taxMoney, taxLastMoney: taxLastMoney}}])
target.recalcAllStatisticsColumns()
that.autoChangePrice(target)
break;
@@ -452,10 +448,9 @@ export const BillModalMixin = {
taxRate = row.taxRate-0 //税率
allPrice = value-0
unitPrice = (allPrice/operNumber).toFixed(2)-0 //单价
- taxUnitPrice =(unitPrice*(1+taxRate*0.01)).toFixed(2)-0
taxMoney =((taxRate*0.01)*allPrice).toFixed(2)-0
taxLastMoney = (allPrice + taxMoney).toFixed(2)-0
- target.setValues([{rowKey: row.id, values: {unitPrice: unitPrice, taxUnitPrice: taxUnitPrice, taxMoney: taxMoney, taxLastMoney: taxLastMoney}}])
+ target.setValues([{rowKey: row.id, values: {unitPrice: unitPrice, taxMoney: taxMoney, taxLastMoney: taxLastMoney}}])
target.recalcAllStatisticsColumns()
that.autoChangePrice(target)
break;
@@ -464,10 +459,9 @@ export const BillModalMixin = {
allPrice = row.allPrice-0
unitPrice = row.unitPrice-0
taxRate = value-0 //税率
- taxUnitPrice =(unitPrice*(1+taxRate*0.01)).toFixed(2)-0
taxMoney =((taxRate*0.01)*allPrice).toFixed(2)-0
taxLastMoney = (allPrice + taxMoney).toFixed(2)-0
- target.setValues([{rowKey: row.id, values: {taxUnitPrice: taxUnitPrice, taxMoney: taxMoney, taxLastMoney: taxLastMoney}}])
+ target.setValues([{rowKey: row.id, values: {taxMoney: taxMoney, taxLastMoney: taxLastMoney}}])
target.recalcAllStatisticsColumns()
that.autoChangePrice(target)
break;
@@ -475,11 +469,10 @@ export const BillModalMixin = {
operNumber = row.operNumber-0 //数量
taxLastMoney = value-0
taxRate = row.taxRate-0 //税率
- taxUnitPrice = (taxLastMoney/operNumber).toFixed(2)-0
- unitPrice = (taxUnitPrice/(1+taxRate*0.01)).toFixed(2)-0
+ unitPrice = (taxLastMoney/operNumber/(1+taxRate*0.01)).toFixed(2)-0
allPrice = (unitPrice*operNumber).toFixed(2)-0
taxMoney =(taxLastMoney-allPrice).toFixed(2)-0
- target.setValues([{rowKey: row.id, values: {unitPrice: unitPrice, taxUnitPrice: taxUnitPrice, allPrice: allPrice, taxMoney: taxMoney}}])
+ target.setValues([{rowKey: row.id, values: {unitPrice: unitPrice, allPrice: allPrice, taxMoney: taxMoney}}])
target.recalcAllStatisticsColumns()
that.autoChangePrice(target)
break;
@@ -498,7 +491,6 @@ export const BillModalMixin = {
sku: mInfo.sku,
operNumber: 1,
unitPrice: mInfo.billPrice,
- taxUnitPrice: mInfo.billPrice,
allPrice: mInfo.billPrice,
taxRate: 0,
taxMoney: 0,
@@ -673,7 +665,6 @@ export const BillModalMixin = {
item.sku = mInfo.sku
item.operNumber = 1
item.unitPrice = mInfo.billPrice
- item.taxUnitPrice = mInfo.billPrice
item.allPrice = mInfo.billPrice
item.taxRate = 0
item.taxMoney = 0
diff --git a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
index e28b9342..cf55fd3e 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
@@ -244,10 +244,9 @@
validateRules: [{ required: true, message: '${title}不能为空' }]
},
{ title: '单价', key: 'unitPrice', width: '5%', type: FormTypes.inputNumber},
- { title: '含税单价', key: 'taxUnitPrice', width: '5%', type: FormTypes.normal },
{ title: '金额', key: 'allPrice', width: '5%', type: FormTypes.inputNumber, statistics: true },
{ title: '税率', key: 'taxRate', width: '4%', type: FormTypes.inputNumber,placeholder: '%'},
- { title: '税额', key: 'taxMoney', width: '4%', type: FormTypes.normal },
+ { 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 }
]
diff --git a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
index 4dae2931..3d654183 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
@@ -263,10 +263,9 @@
validateRules: [{ required: true, message: '${title}不能为空' }]
},
{ title: '单价', key: 'unitPrice', width: '4%', type: FormTypes.inputNumber},
- { title: '含税单价', key: 'taxUnitPrice', width: '5%', type: FormTypes.normal },
{ title: '金额', key: 'allPrice', width: '5%', type: FormTypes.inputNumber, statistics: true },
{ title: '税率', key: 'taxRate', width: '3%', type: FormTypes.inputNumber,placeholder: '%'},
- { title: '税额', key: 'taxMoney', width: '3%', type: FormTypes.normal },
+ { 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 }
]
diff --git a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
index 798fa958..414ad0b2 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
@@ -81,6 +81,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -161,6 +183,9 @@
},
{ title: '单价', key: 'unitPrice', width: '5%', type: FormTypes.inputNumber },
{ title: '金额', key: 'allPrice', width: '5%', type: FormTypes.inputNumber, statistics: true },
+ { 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}
]
},
@@ -200,7 +225,8 @@
this.model.operTime = this.model.operTimeStr
this.fileList = this.model.fileName
this.$nextTick(() => {
- this.form.setFieldsValue(pick(this.model,'organId', 'operTime', 'number', 'remark'))
+ this.form.setFieldsValue(pick(this.model,'organId', 'operTime', 'number', 'remark',
+ 'discount','discountMoney','discountLastMoney'))
});
// 加载子表数据
let params = {
diff --git a/jshERP-web/src/views/bill/modules/SaleBackModal.vue b/jshERP-web/src/views/bill/modules/SaleBackModal.vue
index abcd2287..163ac152 100644
--- a/jshERP-web/src/views/bill/modules/SaleBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleBackModal.vue
@@ -251,10 +251,9 @@
validateRules: [{ required: true, message: '${title}不能为空' }]
},
{ title: '单价', key: 'unitPrice', width: '5%', type: FormTypes.inputNumber},
- { title: '含税单价', key: 'taxUnitPrice', width: '5%', type: FormTypes.normal },
{ title: '金额', key: 'allPrice', width: '5%', type: FormTypes.inputNumber, statistics: true },
- { title: '税率', key: 'taxRate', width: '4%', type: FormTypes.inputNumber,placeholder: '%'},
- { title: '税额', key: 'taxMoney', width: '4%', type: FormTypes.normal },
+ { 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 }
]
diff --git a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue
index 349af168..7886008e 100644
--- a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue
@@ -87,6 +87,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -166,6 +188,9 @@
},
{ title: '单价', key: 'unitPrice', width: '5%', type: FormTypes.inputNumber},
{ title: '金额', key: 'allPrice', width: '5%', type: FormTypes.inputNumber, statistics: true },
+ { 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 }
]
},
diff --git a/jshERP-web/src/views/bill/modules/SaleOutModal.vue b/jshERP-web/src/views/bill/modules/SaleOutModal.vue
index 545d0153..dbeb383c 100644
--- a/jshERP-web/src/views/bill/modules/SaleOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleOutModal.vue
@@ -267,10 +267,9 @@
validateRules: [{ required: true, message: '${title}不能为空' }]
},
{ title: '单价', key: 'unitPrice', width: '4%', type: FormTypes.inputNumber},
- { title: '含税单价', key: 'taxUnitPrice', width: '5%', type: FormTypes.normal },
{ title: '金额', key: 'allPrice', width: '5%', type: FormTypes.inputNumber, statistics: true },
{ title: '税率', key: 'taxRate', width: '3%', type: FormTypes.inputNumber,placeholder: '%'},
- { title: '税额', key: 'taxMoney', width: '3%', type: FormTypes.normal },
+ { 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 }
]