diff --git a/src/api/reportforms/SalesDepartmentIncomeReport.js b/src/api/reportforms/SalesDepartmentIncomeReport.js index 78809da5..6ccc4dc2 100644 --- a/src/api/reportforms/SalesDepartmentIncomeReport.js +++ b/src/api/reportforms/SalesDepartmentIncomeReport.js @@ -46,7 +46,7 @@ export const postIncomingDetailExport = data => { }); }; -/** 详情导出 */ +/** 报表列表 -- 新 */ export const postDeptIncomingPageNew = data => { return request({ url: '/api/logpm-report/reportIncoming/deptIncomingPageNew', @@ -54,3 +54,13 @@ export const postDeptIncomingPageNew = data => { data, }); }; + +/** 报表导出 -- 新 */ +export const postDeptIncomingExportNew = data => { + return request({ + url: '/api/logpm-report/reportIncoming/deptIncomingExportNew', + method: 'post', + data, + responseType: 'blob', + }); +}; diff --git a/src/views/distribution/artery/TripartiteTransfer.vue b/src/views/distribution/artery/TripartiteTransfer.vue index 1fa2fc3c..0158f45c 100644 --- a/src/views/distribution/artery/TripartiteTransfer.vue +++ b/src/views/distribution/artery/TripartiteTransfer.vue @@ -330,6 +330,7 @@ type="datetime" placeholder="到达时间" size="default" + value-format="YYYY-MM-DD hh:mm:ss" /> diff --git a/src/views/reportforms/SalesDepartmentIncomeReportNew.vue b/src/views/reportforms/SalesDepartmentIncomeReportNew.vue new file mode 100644 index 00000000..846e8dda --- /dev/null +++ b/src/views/reportforms/SalesDepartmentIncomeReportNew.vue @@ -0,0 +1,645 @@ + + + + + + + + + + + + + + + { + delete details.query.month; + delete details.query.timeArr; + } + " + /> + + + + { + delete details.query.year; + delete details.query.timeArr; + } + " + /> + + + + { + delete details.query.year; + delete details.query.month; + } + " + /> + + + + + + + + + + + + + + + + + + + + + + + 搜 索 + 清 空 + + + + + + + + + 导出 + + + + + + + + + + + + + + + + {{ row[column.property] }} + + + + + + + 勾选数量: {{ selectionList.length }} + + + + + + + + + + + + +