From fe49442b88e82134071e1c6a76294d13c4263cb0 Mon Sep 17 00:00:00 2001 From: rui_li <877258667@qq.com> Date: Thu, 28 Apr 2022 09:25:52 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A0=B7=E5=BC=8F=202022-04-?= =?UTF-8?q?28=20sxm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/yieldReport/com_transform_part.js | 22 + src/api/yieldReport/order_transform_part.js | 4 + src/assets/scss/global.scss | 4 + src/views/common/theme.vue | 9 +- src/views/main-navbar-update-password.vue | 5 +- src/views/main-navbar.vue | 2 +- src/views/modules/common/file-list-view.vue | 2 +- src/views/modules/report/report_manage.vue | 2 + .../modules/report/user_customer_report.vue | 2 +- .../yieldReport/com_transform_part.vue | 334 ++++++++++++++ .../yieldReport/order_transform_part.vue | 421 ++++++++++++++++++ 11 files changed, 801 insertions(+), 6 deletions(-) create mode 100644 src/api/yieldReport/com_transform_part.js create mode 100644 src/api/yieldReport/order_transform_part.js create mode 100644 src/views/modules/yieldReport/com_transform_part.vue create mode 100644 src/views/modules/yieldReport/order_transform_part.vue 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/assets/scss/global.scss b/src/assets/scss/global.scss index 959067e..97e2d69 100644 --- a/src/assets/scss/global.scss +++ b/src/assets/scss/global.scss @@ -378,5 +378,9 @@ a:hover{ top: -0.5px; } +.sl .el-form-item { + margin-bottom: 5px; +} + diff --git a/src/views/common/theme.vue b/src/views/common/theme.vue index 4a8c9bc..ce35f22 100644 --- a/src/views/common/theme.vue +++ b/src/views/common/theme.vue @@ -1,5 +1,5 @@ + + + + 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 @@ + + + + +