From f10d16855abe3df2c0f886be1b40922b7f33d433 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Mon, 20 May 2024 16:13:09 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90pad=E5=89=8D=E7=AB=AF=E3=80=91?= =?UTF-8?q?=E9=9D=99=E6=80=81=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/currenDescriptions/index.vue | 8 +- fe/PC/src/layout/index.vue | 2 +- fe/PC/src/router/index.js | 448 +++++++----------- fe/PC/src/styles/padMain.scss | 10 + .../padManage/isPadForTransferLibJob_new.vue | 247 +++++++++- 5 files changed, 411 insertions(+), 304 deletions(-) diff --git a/fe/PC/src/components/currenDescriptions/index.vue b/fe/PC/src/components/currenDescriptions/index.vue index e682f9b5d..8ccd0b4e8 100644 --- a/fe/PC/src/components/currenDescriptions/index.vue +++ b/fe/PC/src/components/currenDescriptions/index.vue @@ -12,7 +12,7 @@ :label="item.label" v-for="(item, index) in tabsDesTions" :key="index" - :labelStyle="{'text-align': 'right','padding-right':'10px'}" + :labelStyle="labelStyle" > {{ propsData[item.prop] | formatOnlyDate @@ -127,6 +127,12 @@ export default { } }, props: { + labelStyle:{ + type: Object, + default: () => { + return {'text-align': 'right','padding-right':'10px'} + } + }, title: { type: String, default: '' diff --git a/fe/PC/src/layout/index.vue b/fe/PC/src/layout/index.vue index 7878e3cdb..f970dcf1a 100644 --- a/fe/PC/src/layout/index.vue +++ b/fe/PC/src/layout/index.vue @@ -57,7 +57,7 @@ export default { data() { return { // 不显示框架页面 - isOnlyAppMainPages:['isPadForTransferLibJob','isPadForKittingPack'] + isOnlyAppMainPages:['isPadForTransferLibJob','isPadForTransferLibJob_new','isPadForKittingPack'] } }, methods: { diff --git a/fe/PC/src/router/index.js b/fe/PC/src/router/index.js index fcae55fd8..965d85e3e 100644 --- a/fe/PC/src/router/index.js +++ b/fe/PC/src/router/index.js @@ -172,6 +172,22 @@ export const constantRoutes = [ } }] }, + { + path: '/', + component: Layout, + redirect: '/isPadForTransferLibJob_new', + hidden: true, + children: [{ + path: 'isPadForTransferLibJob_new', + component: () => import('@/views/padManage/isPadForTransferLibJob_new'), + name: 'isPadForTransferLibJob_new', + meta: { + keepAlive : true, + title: '业务库移', + icon: '系统首页', + } + }] + }, // 【平板】 Kitting组包 { path: '/', @@ -221,294 +237,150 @@ export const constantRoutes = [ // } // }] // }, - { - path: '/', - component: Layout, - redirect: '/gridlayout', - hidden: true, - children: [{ - path: 'IssueRequestZS', - component: () => import('@/views/materialIssueManage/ZS/IssueRequestZS.vue'), - name: 'IssueRequestZS', - meta: { - keepAlive : true, - title: '注塑申请', - icon: '成品发运任务', - } - }] - }, - { - path: '/', - component: Layout, - redirect: '/gridlayout', - hidden: true, - children: [{ - path: 'IssueJobZS', - component: () => import('@/views/materialIssueManage/ZS/IssueJobZS.vue'), - name: 'IssueJobZS', - meta: { - keepAlive : true, - title: '注塑任务', - icon: '成品发运任务', - } - }] - }, - { - path: '/', - component: Layout, - redirect: '/gridlayout', - hidden: true, - children: [{ - path: 'IssueNoteZS', - component: () => import('@/views/materialIssueManage/ZS/IssueNoteZS.vue'), - name: 'IssueNoteZS', - meta: { - keepAlive : true, - title: '注塑记录', - icon: '成品发运任务', - } - }] - }, - { - path: '/', - component: Layout, - redirect: '/gridlayout', - hidden: true, - children: [{ - path: 'IssueRequestPT', - component: () => import('@/views/materialIssueManage/PT/IssueRequestPT.vue'), - name: 'IssueRequestPT', - meta: { - keepAlive : true, - title: '人工发料申请(喷涂)', - icon: '成品发运任务', - } - }] - }, - { - path: '/', - component: Layout, - redirect: '/gridlayout', - hidden: true, - children: [{ - path: 'IssueJobPT', - component: () => import('@/views/materialIssueManage/PT/IssueJobPT.vue'), - name: 'IssueJobPT', - meta: { - keepAlive : true, - title: '人工发料任务(喷涂)', - icon: '成品发运任务', - } - }] - }, - { - path: '/', - component: Layout, - redirect: '/gridlayout', - hidden: true, - children: [{ - path: 'IssueNotePT', - component: () => import('@/views/materialIssueManage/PT/IssueNotePT.vue'), - name: 'IssueNotePT', - meta: { - keepAlive : true, - title: '人工发料记录(喷涂)', - icon: '成品发运任务', - } - }] - }, - { - path: '/', - component: Layout, - redirect: '/gridlayout', - hidden: true, - children: [{ - path: 'IssueRequestZP', - component: () => import('@/views/materialIssueManage/ZP/IssueRequestZP.vue'), - name: 'IssueRequestZP', - meta: { - keepAlive : true, - title: '装配申请', - icon: '成品发运任务', - } - }] - }, - { - path: '/', - component: Layout, - redirect: '/gridlayout', - hidden: true, - children: [{ - path: 'IssueJobZP', - component: () => import('@/views/materialIssueManage/ZP/IssueJobZP.vue'), - name: 'IssueJobZP', - meta: { - keepAlive : true, - title: '装配任务', - icon: '成品发运任务', - } - }] - }, - { - path: '/', - component: Layout, - redirect: '/gridlayout', - hidden: true, - children: [{ - path: 'IssueNoteZP', - component: () => import('@/views/materialIssueManage/ZP/IssueNoteZP.vue'), - name: 'IssueNoteZP', - meta: { - keepAlive : true, - title: '装配记录', - icon: '成品发运任务', - } - }] - }, - { - path: '/', - component: Layout, - redirect: '/gridlayout', - hidden: true, - children: [{ - path: 'automaticRequestZS', - component: () => import('@/views/materialIssueManage/automaticZS/automaticRequestZS.vue'), - name: 'automaticRequestZS', - meta: { - keepAlive : true, - title: '自动叫料(注塑)申请', - icon: '成品发运任务', - } - }] - }, - { - path: '/', - component: Layout, - redirect: '/gridlayout', - hidden: true, - children: [{ - path: 'automaticJobZS', - component: () => import('@/views/materialIssueManage/automaticZS/automaticJobZS.vue'), - name: 'automaticJobZS', - meta: { - keepAlive : true, - title: '自动叫料(注塑)任务', - icon: '成品发运任务', - } - }] - }, - { - path: '/', - component: Layout, - redirect: '/gridlayout', - hidden: true, - children: [{ - path: 'automaticNoteZS', - component: () => import('@/views/materialIssueManage/automaticZS/automaticNoteZS.vue'), - name: 'automaticNoteZS', - meta: { - keepAlive : true, - title: '自动叫料(注塑)记录', - icon: '成品发运任务', - } - }] - }, - { - path: '/', - component: Layout, - redirect: '/gridlayout', - hidden: true, - children: [{ - path: 'automaticRequestPT', - component: () => import('@/views/materialIssueManage/automaticPT/automaticRequestPT.vue'), - name: 'automaticRequestPT', - meta: { - keepAlive : true, - title: '自动叫料(喷涂)申请', - icon: '成品发运任务', - } - }] - }, - { - path: '/', - component: Layout, - redirect: '/gridlayout', - hidden: true, - children: [{ - path: 'automaticJobPT', - component: () => import('@/views/materialIssueManage/automaticPT/automaticJobPT.vue'), - name: 'automaticJobPT', - meta: { - keepAlive : true, - title: '自动叫料(喷涂)任务', - icon: '成品发运任务', - } - }] - }, - { - path: '/', - component: Layout, - redirect: '/gridlayout', - hidden: true, - children: [{ - path: 'automaticNotePT', - component: () => import('@/views/materialIssueManage/automaticPT/automaticNotePT.vue'), - name: 'automaticNotePT', - meta: { - keepAlive : true, - title: '自动叫料(喷涂)记录', - icon: '成品发运任务', - } - }] - }, - { - path: '/', - component: Layout, - redirect: '/gridlayout', - hidden: true, - children: [{ - path: 'automaticRequestZP', - component: () => import('@/views/materialIssueManage/automaticZP/automaticRequestZP.vue'), - name: 'automaticRequestZP', - meta: { - keepAlive : true, - title: '自动叫料(装配)申请', - icon: '成品发运任务', - } - }] - }, - { - path: '/', - component: Layout, - redirect: '/gridlayout', - hidden: true, - children: [{ - path: 'automaticJobZP', - component: () => import('@/views/materialIssueManage/automaticZP/automaticJobZP.vue'), - name: 'automaticJobZP', - meta: { - keepAlive : true, - title: '自动叫料(装配)任务', - icon: '成品发运任务', - } - }] - }, - { - path: '/', - component: Layout, - redirect: '/gridlayout', - hidden: true, - children: [{ - path: 'automaticNoteZP', - component: () => import('@/views/materialIssueManage/automaticZP/automaticNoteZP.vue'), - name: 'automaticNoteZP', - meta: { - keepAlive : true, - title: '自动叫料(装配)记录', - icon: '成品发运任务', - } - }] - }, + // { + // path: '/', + // component: Layout, + // redirect: '/gridlayout', + // hidden: true, + // children: [{ + // path: 'automaticRequestZS', + // component: () => import('@/views/materialIssueManage/automaticZS/automaticRequestZS.vue'), + // name: 'automaticRequestZS', + // meta: { + // keepAlive : true, + // title: '自动叫料(注塑)申请', + // icon: '成品发运任务', + // } + // }] + // }, + // { + // path: '/', + // component: Layout, + // redirect: '/gridlayout', + // hidden: true, + // children: [{ + // path: 'automaticJobZS', + // component: () => import('@/views/materialIssueManage/automaticZS/automaticJobZS.vue'), + // name: 'automaticJobZS', + // meta: { + // keepAlive : true, + // title: '自动叫料(注塑)任务', + // icon: '成品发运任务', + // } + // }] + // }, + // { + // path: '/', + // component: Layout, + // redirect: '/gridlayout', + // hidden: true, + // children: [{ + // path: 'automaticNoteZS', + // component: () => import('@/views/materialIssueManage/automaticZS/automaticNoteZS.vue'), + // name: 'automaticNoteZS', + // meta: { + // keepAlive : true, + // title: '自动叫料(注塑)记录', + // icon: '成品发运任务', + // } + // }] + // }, + // { + // path: '/', + // component: Layout, + // redirect: '/gridlayout', + // hidden: true, + // children: [{ + // path: 'automaticRequestPT', + // component: () => import('@/views/materialIssueManage/automaticPT/automaticRequestPT.vue'), + // name: 'automaticRequestPT', + // meta: { + // keepAlive : true, + // title: '自动叫料(喷涂)申请', + // icon: '成品发运任务', + // } + // }] + // }, + // { + // path: '/', + // component: Layout, + // redirect: '/gridlayout', + // hidden: true, + // children: [{ + // path: 'automaticJobPT', + // component: () => import('@/views/materialIssueManage/automaticPT/automaticJobPT.vue'), + // name: 'automaticJobPT', + // meta: { + // keepAlive : true, + // title: '自动叫料(喷涂)任务', + // icon: '成品发运任务', + // } + // }] + // }, + // { + // path: '/', + // component: Layout, + // redirect: '/gridlayout', + // hidden: true, + // children: [{ + // path: 'automaticNotePT', + // component: () => import('@/views/materialIssueManage/automaticPT/automaticNotePT.vue'), + // name: 'automaticNotePT', + // meta: { + // keepAlive : true, + // title: '自动叫料(喷涂)记录', + // icon: '成品发运任务', + // } + // }] + // }, + // { + // path: '/', + // component: Layout, + // redirect: '/gridlayout', + // hidden: true, + // children: [{ + // path: 'automaticRequestZP', + // component: () => import('@/views/materialIssueManage/automaticZP/automaticRequestZP.vue'), + // name: 'automaticRequestZP', + // meta: { + // keepAlive : true, + // title: '自动叫料(装配)申请', + // icon: '成品发运任务', + // } + // }] + // }, + // { + // path: '/', + // component: Layout, + // redirect: '/gridlayout', + // hidden: true, + // children: [{ + // path: 'automaticJobZP', + // component: () => import('@/views/materialIssueManage/automaticZP/automaticJobZP.vue'), + // name: 'automaticJobZP', + // meta: { + // keepAlive : true, + // title: '自动叫料(装配)任务', + // icon: '成品发运任务', + // } + // }] + // }, + // { + // path: '/', + // component: Layout, + // redirect: '/gridlayout', + // hidden: true, + // children: [{ + // path: 'automaticNoteZP', + // component: () => import('@/views/materialIssueManage/automaticZP/automaticNoteZP.vue'), + // name: 'automaticNoteZP', + // meta: { + // keepAlive : true, + // title: '自动叫料(装配)记录', + // icon: '成品发运任务', + // } + // }] + // }, ] diff --git a/fe/PC/src/styles/padMain.scss b/fe/PC/src/styles/padMain.scss index bd0849d69..ba0b4aab9 100644 --- a/fe/PC/src/styles/padMain.scss +++ b/fe/PC/src/styles/padMain.scss @@ -20,10 +20,20 @@ padding: 10px 10px 0 10px; box-shadow: 1px 1px 5px #ddd; flex-shrink: 0; + display: flex; + justify-content: space-between; ::v-deep .el-form-item{ margin-bottom: 10px; } + + .pageToTop{ + width: 30px; + height: 30px; + flex-shrink: 0; + margin-left: 15px; + padding: 0; + } } .padListCard{ diff --git a/fe/PC/src/views/padManage/isPadForTransferLibJob_new.vue b/fe/PC/src/views/padManage/isPadForTransferLibJob_new.vue index 6ec38c640..184e646aa 100644 --- a/fe/PC/src/views/padManage/isPadForTransferLibJob_new.vue +++ b/fe/PC/src/views/padManage/isPadForTransferLibJob_new.vue @@ -1,26 +1,245 @@ \ No newline at end of file