应付单列表
-
+
+
+
+
+
+
@@ -68,7 +73,7 @@ export default {
default: () => ({})
}
},
- dicts: ['payment_bill_type', 'payment_method'],
+ dicts: ['payment_bill_type', 'product_type','payment_method'],
data() {
return {
attachments: [],
diff --git a/oms_web/oms_vue/src/views/approve/finance/payment/index.vue b/oms_web/oms_vue/src/views/approve/finance/payment/index.vue
index 1b00a8ba..204a0898 100644
--- a/oms_web/oms_vue/src/views/approve/finance/payment/index.vue
+++ b/oms_web/oms_vue/src/views/approve/finance/payment/index.vue
@@ -10,6 +10,17 @@
+
+
+
搜索
重置
@@ -35,6 +46,11 @@
+
+
+ {{ parseTime(scope.row.applyTime) }}
+
+
@@ -126,6 +142,7 @@ export default {
projectName: null,
processKey: 'finance_payment',
},
+ dateRange: [],
detailDialogVisible: false,
detailLoading: false,
form: {},
@@ -151,7 +168,7 @@ export default {
methods: {
getList() {
this.loading = true;
- listPaymentApprove(this.queryParams).then(response => {
+ listPaymentApprove(this.addDateRange(this.queryParams, this.dateRange, 'ApplyTime')).then(response => {
this.paymentList = response.rows;
this.total = response.total;
this.loading = false;
@@ -162,6 +179,7 @@ export default {
this.getList();
},
resetQuery() {
+ this.dateRange = [];
this.resetForm("queryForm");
this.handleQuery();
},
diff --git a/oms_web/oms_vue/src/views/approve/finance/paymentRefund/approved/index.vue b/oms_web/oms_vue/src/views/approve/finance/paymentRefund/approved/index.vue
index e5789320..663990f0 100644
--- a/oms_web/oms_vue/src/views/approve/finance/paymentRefund/approved/index.vue
+++ b/oms_web/oms_vue/src/views/approve/finance/paymentRefund/approved/index.vue
@@ -10,6 +10,17 @@
+
+
+
搜索
重置
@@ -23,6 +34,11 @@
+
+
+ {{ parseTime(scope.row.applyTime) }}
+
+
@@ -99,6 +115,7 @@ export default {
projectName: null,
processKey: 'finance_refund',
},
+ dateRange: [],
detailDialogVisible: false,
detailLoading: false,
form: {},
@@ -113,7 +130,7 @@ export default {
methods: {
getList() {
this.loading = true;
- listPaymentApproved(this.queryParams).then(response => {
+ listPaymentApproved(this.addDateRange(this.queryParams, this.dateRange, 'ApplyTime')).then(response => {
this.paymentList = response.rows;
this.total = response.total;
this.loading = false;
@@ -124,6 +141,7 @@ export default {
this.getList();
},
resetQuery() {
+ this.dateRange = [];
this.resetForm("queryForm");
this.handleQuery();
},
diff --git a/oms_web/oms_vue/src/views/approve/finance/paymentRefund/components/PaymentRefundDetail.vue b/oms_web/oms_vue/src/views/approve/finance/paymentRefund/components/PaymentRefundDetail.vue
index 0ddcbb63..4bcc9a13 100644
--- a/oms_web/oms_vue/src/views/approve/finance/paymentRefund/components/PaymentRefundDetail.vue
+++ b/oms_web/oms_vue/src/views/approve/finance/paymentRefund/components/PaymentRefundDetail.vue
@@ -6,25 +6,30 @@
- {{ data.totalPriceWithTax }}
- {{ data.totalPriceWithoutTax }}
- {{ data.taxAmount }}
-
+ {{ data.totalPriceWithTax }}
+ {{ data.totalPriceWithoutTax }}
+ {{ data.taxAmount }}
+
{{ data.payBankNumber }}
{{ data.payName }}
{{ data.payBankOpenAddress }}
{{ data.bankNumber }}
- {{ data.remark }}
+
-
退款明细列表
+
应付单信息
+
+
+
+
+
diff --git a/oms_web/oms_vue/src/views/approve/finance/paymentRefund/index.vue b/oms_web/oms_vue/src/views/approve/finance/paymentRefund/index.vue
index 268d7d48..5ab3bf18 100644
--- a/oms_web/oms_vue/src/views/approve/finance/paymentRefund/index.vue
+++ b/oms_web/oms_vue/src/views/approve/finance/paymentRefund/index.vue
@@ -10,6 +10,17 @@
+
+
+
搜索
重置
@@ -35,6 +46,11 @@
+
+
+ {{ parseTime(scope.row.applyTime) }}
+
+
@@ -126,6 +142,7 @@ export default {
projectName: null,
processKey: 'finance_refund',
},
+ dateRange: [],
detailDialogVisible: false,
detailLoading: false,
form: {},
@@ -151,7 +168,7 @@ export default {
methods: {
getList() {
this.loading = true;
- listPaymentApprove(this.queryParams).then(response => {
+ listPaymentApprove(this.addDateRange(this.queryParams, this.dateRange, 'ApplyTime')).then(response => {
this.paymentList = response.rows;
this.total = response.total;
this.loading = false;
@@ -162,6 +179,7 @@ export default {
this.getList();
},
resetQuery() {
+ this.dateRange = [];
this.resetForm("queryForm");
this.handleQuery();
},
diff --git a/oms_web/oms_vue/src/views/finance/payable/index.vue b/oms_web/oms_vue/src/views/finance/payable/index.vue
index ed2810a7..1a7464a2 100644
--- a/oms_web/oms_vue/src/views/finance/payable/index.vue
+++ b/oms_web/oms_vue/src/views/finance/payable/index.vue
@@ -122,7 +122,7 @@
-
+
@@ -396,6 +396,35 @@ export default {
this.getList(); // Refresh the list
});
},
+ getSummaries(param) {
+ const { columns, data } = param;
+ const sums = [];
+ columns.forEach((column, index) => {
+ if (index === 0) {
+ sums[index] = '合计';
+ return;
+ }
+ const values = data.map(item => Number(item[column.property]));
+ if (column.property === 'planAmount' || column.property === 'totalPriceWithTax') {
+ if (!values.every(value => isNaN(value))) {
+ sums[index] = values.reduce((prev, curr) => {
+ const value = Number(curr);
+ if (!isNaN(value)) {
+ return prev + curr;
+ } else {
+ return prev;
+ }
+ }, 0);
+ sums[index] = sums[index].toFixed(2);
+ } else {
+ sums[index] = 'N/A';
+ }
+ } else {
+ sums[index] = '';
+ }
+ });
+ return sums;
+ },
getPaymentDateStyle(dateStr) {
if (!dateStr) return {};
diff --git a/oms_web/oms_vue/src/views/finance/payment/index.vue b/oms_web/oms_vue/src/views/finance/payment/index.vue
index d9cb7f49..c52db33d 100644
--- a/oms_web/oms_vue/src/views/finance/payment/index.vue
+++ b/oms_web/oms_vue/src/views/finance/payment/index.vue
@@ -138,7 +138,7 @@
-
+
@@ -474,7 +474,36 @@ export default {
this.getList();
this.$modal.msgSuccess("撤销成功");
}).catch(() => {});
- }
+ },
+ getSummaries(param) {
+ const { columns, data } = param;
+ const sums = [];
+ columns.forEach((column, index) => {
+ if (index === 0) {
+ sums[index] = '合计';
+ return;
+ }
+ const values = data.map(item => Number(item[column.property]));
+ if (column.property === 'totalPriceWithTax') {
+ if (!values.every(value => isNaN(value))) {
+ sums[index] = values.reduce((prev, curr) => {
+ const value = Number(curr);
+ if (!isNaN(value)) {
+ return prev + curr;
+ } else {
+ return prev;
+ }
+ }, 0);
+ sums[index] = sums[index].toFixed(2);
+ } else {
+ sums[index] = 'N/A';
+ }
+ } else {
+ sums[index] = '';
+ }
+ });
+ return sums;
+ }
}
};
diff --git a/oms_web/oms_vue/src/views/finance/receipt/components/ReceiptDialog.vue b/oms_web/oms_vue/src/views/finance/receipt/components/ReceiptDialog.vue
index a91acc25..e23e8b06 100644
--- a/oms_web/oms_vue/src/views/finance/receipt/components/ReceiptDialog.vue
+++ b/oms_web/oms_vue/src/views/finance/receipt/components/ReceiptDialog.vue
@@ -57,7 +57,7 @@
发票含税金额
- {{ receiptData.ticketPriceWithTax }}
+ {{ attachment.priceWithTax||receiptData.ticketPriceWithTax }}
未税金额
@@ -65,15 +65,15 @@
发票未税金额
- {{ receiptData.ticketPriceWithoutTax }}
+ {{ attachment.priceWithoutTax||receiptData.ticketPriceWithoutTax }}
税额
- {{ receiptData.taxAmount }}
+ {{ receiptData.taxAmount }}
发票税额
- {{ receiptData.ticketAmount }}
+ {{ attachment.taxAmount || receiptData.ticketAmount }}
备注
@@ -114,7 +114,7 @@
-
+
- {{ receiptData.totalPriceWithTax }}
+ {{ this.uploadType !== 'red_rush' ? receiptData.totalPriceWithTax : -receiptData.totalPriceWithTax}}
- {{ receiptData.totalPriceWithoutTax }}
+ {{ this.uploadType !== 'red_rush'? receiptData.totalPriceWithoutTax : -receiptData.totalPriceWithoutTax }}
- {{ receiptData.taxAmount }}
+ {{ this.uploadType !== 'red_rush' ? receiptData.taxAmount : -receiptData.taxAmount }}
@@ -193,7 +193,7 @@