diff --git a/src/api/yieldReport/com_transform_part.js b/src/api/yieldReport/com_transform_part.js new file mode 100644 index 0000000..d52a042 --- /dev/null +++ b/src/api/yieldReport/com_transform_part.js @@ -0,0 +1,22 @@ +import { createAPI } from '@/utils/httpRequest.js' + +// 获取转换物料的BOM信息 +export const getTransformOrderBomData = data => createAPI('scheduling/getTransformOrderBomData', 'POST', data) + +//获取转换物料的扫描卷信息 +export const getTransformRollTable = data => createAPI('scheduling/getTransformRollTable', 'POST', data) + +//扫描转换料号的卷信息 +export const scanTransformPartRollNo = data => createAPI('scheduling/scanTransformPartRollNo', 'POST', data) + +//转换卷的物料 +export const transformRollPart = data => createAPI('scheduling/transformRollPart', 'POST', data) + + + + + + + + + diff --git a/src/api/yieldReport/order_transform_part.js b/src/api/yieldReport/order_transform_part.js new file mode 100644 index 0000000..193075a --- /dev/null +++ b/src/api/yieldReport/order_transform_part.js @@ -0,0 +1,4 @@ +import { createAPI } from '@/utils/httpRequest.js' + +// 获取可以转换的工单 +export const searchSapTransformOrder = data => createAPI('scheduling/searchSapTransformOrder', 'POST', data) diff --git a/src/views/modules/report/report_manage.vue b/src/views/modules/report/report_manage.vue index 047569e..eb86e65 100644 --- a/src/views/modules/report/report_manage.vue +++ b/src/views/modules/report/report_manage.vue @@ -234,6 +234,8 @@ export default { this.reportTypeList = data.rows; //选则第一个 this.pageData.reportType = data.rows[0].baseData; + //加载当前报表数据 + this.refreshPageTables(); }) }, diff --git a/src/views/modules/report/user_customer_report.vue b/src/views/modules/report/user_customer_report.vue index 01841e6..b219a66 100644 --- a/src/views/modules/report/user_customer_report.vue +++ b/src/views/modules/report/user_customer_report.vue @@ -235,7 +235,7 @@ export default { // } // }) // //设置路径 - customerReport.setAttribute('href', window.location.origin+'/#/customer-report-show?reportId='+currentRow.reportId); + customerReport.setAttribute('href', window.location.origin+'/#/customer_report_show?reportId='+currentRow.reportId); //跳转页面 customerReport.click(); }, diff --git a/src/views/modules/yieldReport/com_transform_part.vue b/src/views/modules/yieldReport/com_transform_part.vue new file mode 100644 index 0000000..c619f0e --- /dev/null +++ b/src/views/modules/yieldReport/com_transform_part.vue @@ -0,0 +1,334 @@ + + + + + diff --git a/src/views/modules/yieldReport/order_transform_part.vue b/src/views/modules/yieldReport/order_transform_part.vue new file mode 100644 index 0000000..fcdd19c --- /dev/null +++ b/src/views/modules/yieldReport/order_transform_part.vue @@ -0,0 +1,421 @@ + + + + +