diff --git a/src/api/report/com_add_customer_report.js b/src/api/report/com_add_customer_report.js new file mode 100644 index 0000000..9af34d0 --- /dev/null +++ b/src/api/report/com_add_customer_report.js @@ -0,0 +1,7 @@ +import { createAPI } from '@/utils/httpRequest.js' + +// 获取派工单的最新信息 +export const getReportTypeList = data => createAPI('report/getReportTypeList', 'POST', data) + +// 保存定制的报表功能 +export const addCustomerReport = data => createAPI('report/addCustomerReport', 'POST', data) diff --git a/src/api/report/com_edit_customer_report_search_column.js b/src/api/report/com_edit_customer_report_search_column.js new file mode 100644 index 0000000..b09306e --- /dev/null +++ b/src/api/report/com_edit_customer_report_search_column.js @@ -0,0 +1,14 @@ +import { createAPI } from '@/utils/httpRequest.js' + +// 获取查询列 +export const getSearchColumns = data => createAPI('report/getSearchColumnsByReportId', 'POST', data) + +// 获取派工单的最新信息 +export const getReportTypeList = data => createAPI('report/getReportTypeList', 'POST', data) + +// 自动处理sql的查询列 +export const autoProcessSearchColumn = data => createAPI('report/autoProcessSearchColumn', 'POST', data) + +// 保存定制的报表功能 +export const saveCustomerSearchColumns = data => createAPI('report/saveCustomerSearchColumns', 'POST', data) + diff --git a/src/api/report/com_run_customer_report.js b/src/api/report/com_run_customer_report.js new file mode 100644 index 0000000..870f163 --- /dev/null +++ b/src/api/report/com_run_customer_report.js @@ -0,0 +1,5 @@ +import { createAPI } from '@/utils/httpRequest.js' + +// 获取派工单的最新信息 +export const runCustomerReport = data => createAPI('report/runCustomerReport', 'POST', data) + diff --git a/src/api/report/com_show_customer_report_search_column.js b/src/api/report/com_show_customer_report_search_column.js new file mode 100644 index 0000000..69f58ab --- /dev/null +++ b/src/api/report/com_show_customer_report_search_column.js @@ -0,0 +1,11 @@ +import { createAPI } from '@/utils/httpRequest.js' + +// 获取查询列 +export const getSearchColumns = data => createAPI('report/getSearchColumnsByReportId', 'POST', data) + +// 自动处理sql的查询列 +export const autoProcessSearchColumn = data => createAPI('report/autoProcessSearchColumn', 'POST', data) + +// 保存定制的报表功能 +export const saveCustomerSearchColumns = data => createAPI('report/saveCustomerSearchColumns', 'POST', data) + diff --git a/src/api/report/com_update_customer_report.js b/src/api/report/com_update_customer_report.js new file mode 100644 index 0000000..93a262c --- /dev/null +++ b/src/api/report/com_update_customer_report.js @@ -0,0 +1,11 @@ +import { createAPI } from '@/utils/httpRequest.js' + +// 获取派工单的最新信息 +export const getReportTypeList = data => createAPI('report/getReportTypeList', 'POST', data) + +// 查询定制的报表功能 +export const getCustomerReportByReportId = data => createAPI('report/getCustomerReportByReportId', 'POST', data) + +// 保存定制的报表功能 +export const saveCustomerReport = data => createAPI('report/saveCustomerReport', 'POST', data) + diff --git a/src/api/report/report_manage.js b/src/api/report/report_manage.js index bf6fac9..0f3117b 100644 --- a/src/api/report/report_manage.js +++ b/src/api/report/report_manage.js @@ -1,7 +1,7 @@ import { createAPI } from '@/utils/httpRequest.js' // 获取派工单的最新信息 -export const getReportTypeList = data => createAPI('scheduling/getReportTypeList', 'POST', data) +export const getReportTypeList = data => createAPI('report/getReportTypeList', 'POST', data) // 获取派工单的最新信息 -export const getCurrentPageTables = data => createAPI('scheduling/getCustomerReportList', 'POST', data) +export const getCurrentPageTables = data => createAPI('report/getCustomerReportList', 'POST', data) diff --git a/src/assets/scss/global.scss b/src/assets/scss/global.scss index b0f4bfd..959067e 100644 --- a/src/assets/scss/global.scss +++ b/src/assets/scss/global.scss @@ -338,10 +338,35 @@ input.el-input__inner{ /*全局 el-table 下 el-input的样式 LR 2022-01-12*/ .customer-number-cell .cell{ - height: 25px !important; + height: 24px !important; padding: 0px; } +.customer-text-cell .cell{ + height: 24px !important; + padding: 0px; +} +/*table中input 修改样式*/ +div.table-number-input { + padding: 0px 0px; + height: 24px !important; +} +/*table中input*/ +div.table-number-input input.el-input__inner{ + padding: 0px 0px; + height: 24px !important; + text-align: right; +} + +div.table-text-input input.el-input__inner{ + padding: 0px 0px; + height: 24px !important; + text-align: center; +} + + + + /*a标签全局无下划线 2022-01-18 LR*/ a:hover{ text-decoration: none; diff --git a/src/views/modules/report/com_add_customer_report.vue b/src/views/modules/report/com_add_customer_report.vue new file mode 100644 index 0000000..363477f --- /dev/null +++ b/src/views/modules/report/com_add_customer_report.vue @@ -0,0 +1,151 @@ + + + + + diff --git a/src/views/modules/report/com_edit_customer_report_search_column.vue b/src/views/modules/report/com_edit_customer_report_search_column.vue new file mode 100644 index 0000000..ef2b668 --- /dev/null +++ b/src/views/modules/report/com_edit_customer_report_search_column.vue @@ -0,0 +1,337 @@ + + + + + diff --git a/src/views/modules/report/com_run_customer_report.vue b/src/views/modules/report/com_run_customer_report.vue new file mode 100644 index 0000000..f1bd5f8 --- /dev/null +++ b/src/views/modules/report/com_run_customer_report.vue @@ -0,0 +1,126 @@ + + + + + diff --git a/src/views/modules/report/com_show_customer_report_search_column.vue b/src/views/modules/report/com_show_customer_report_search_column.vue new file mode 100644 index 0000000..f694854 --- /dev/null +++ b/src/views/modules/report/com_show_customer_report_search_column.vue @@ -0,0 +1,239 @@ + + + + + diff --git a/src/views/modules/report/com_update_customer_report.vue b/src/views/modules/report/com_update_customer_report.vue new file mode 100644 index 0000000..47b1c9d --- /dev/null +++ b/src/views/modules/report/com_update_customer_report.vue @@ -0,0 +1,152 @@ + + + + + diff --git a/src/views/modules/report/report_manage.vue b/src/views/modules/report/report_manage.vue index dc16990..0d530b6 100644 --- a/src/views/modules/report/report_manage.vue +++ b/src/views/modules/report/report_manage.vue @@ -4,27 +4,26 @@ - + - + + :label="item.baseData" + :value="item.baseData"> - 新增 查询 + 新增 - + @@ -35,11 +34,24 @@ border ref="reportTable" highlight-current-row - @row-click="setCurrentRoutingRow" + @row-click="setCurrentReportRow" v-loading="dataListLoading" style="margin-top: -20px; width: 100%;"> + + + - - - + + + + + + + + + + + + + + +