From 6446210c93e5a3f53988e275166c95cbd613cccb Mon Sep 17 00:00:00 2001 From: chenshuichuan <1154693969@qq.com> Date: Sat, 13 Jul 2024 16:42:40 +0800 Subject: [PATCH] add person work report --- src/api/mes/organization.js | 41 +++ src/api/system/dict/data.js | 13 + src/page_record/reportForm.vue | 496 ++++++++++++++++++++++----------- src/page_report/reportForm.vue | 297 ++++++++++++++++++++ src/pages.json | 7 +- src/pages/index.vue | 2 + src/pages/report.vue | 111 +++++--- src/utils/dateUtil.ts | 14 + 8 files changed, 768 insertions(+), 213 deletions(-) create mode 100644 src/api/mes/organization.js create mode 100644 src/page_report/reportForm.vue diff --git a/src/api/mes/organization.js b/src/api/mes/organization.js new file mode 100644 index 0000000..dd381ac --- /dev/null +++ b/src/api/mes/organization.js @@ -0,0 +1,41 @@ +import request from '@/utils/request' + +// 查询本人工位列表 +export function getOrgList(data) { + return request({ + url: '/admin-api/mes/app/org-worker/getOrgList', + method: 'get', + params:data + }) +} +// 查询他人工位列表 +export function getOtherOrgList(data) { + return request({ + url: '/admin-api/mes/app/org-worker/getOtherOrgList', + method: 'get', + params:data + }) +} +// 查询工人列表 +export function getOtherPersonalUser(data) { + return request({ + url: '/admin-api/mes/app/org-worker/getOtherPersonalUser', + method: 'get', + params:data + }) +} +// 查询产品列表 +export function getProductList() { + return request({ + url: '/admin-api/mes/app/org-worker/getProductList', + method: 'get' + }) +} +// 创建生产报工单 +export function createReport(data) { + return request({ + url: '/admin-api/mes/app/org-worker/createReport', + method: 'post', + data: data + }) +} \ No newline at end of file diff --git a/src/api/system/dict/data.js b/src/api/system/dict/data.js index 6c9eb79..f33cee3 100644 --- a/src/api/system/dict/data.js +++ b/src/api/system/dict/data.js @@ -50,3 +50,16 @@ export function delData(dictCode) { method: 'delete' }) } +//{text: '制浆', value: 'zhijiang'}, +export const processTypes = [ + {text: '成型', value: 'chengxing'}, + {text: '烘干', value: 'honggan'}, {text: '转移', value: 'zhuanyi'}, + {text: '加湿', value: 'jiashi'}, {text: '热压', value: 'reya'}, + {text: '切边', value: 'qiebian'}, {text: '品检', value: 'pinjian'}, + {text: '打包', value: 'dabao'}, {text: '贴标', value: 'tiebiao'}, + {text: '塑封', value: 'sufeng'}, {text: '品印', value: 'pinyin'} +] +export const groupTypes = [ + {text: '白班', value: 1}, {text: '夜班', value: 2}, + {text: '长白班', value: 3} +] \ No newline at end of file diff --git a/src/page_record/reportForm.vue b/src/page_record/reportForm.vue index 210f08c..c39b8f3 100644 --- a/src/page_record/reportForm.vue +++ b/src/page_record/reportForm.vue @@ -1,178 +1,336 @@ - diff --git a/src/page_report/reportForm.vue b/src/page_report/reportForm.vue new file mode 100644 index 0000000..c70dda2 --- /dev/null +++ b/src/page_report/reportForm.vue @@ -0,0 +1,297 @@ + + + + + diff --git a/src/pages.json b/src/pages.json index f3e42e7..d99f151 100644 --- a/src/pages.json +++ b/src/pages.json @@ -63,10 +63,13 @@ ], "subPackages": [ { - "root": "page_record", + "root": "page_report", "pages": [ { - "path": "reportForm" + "path": "reportForm", + "style": { + "navigationBarTitleText": "生产报工" + } } ] }, diff --git a/src/pages/index.vue b/src/pages/index.vue index 7f4699c..6f45561 100644 --- a/src/pages/index.vue +++ b/src/pages/index.vue @@ -1,5 +1,7 @@