From 24a3cbbc31b8fbff1c6a3c9b9e4360dc82a05f4e Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期六, 06 五月 2023 07:56:01 +0800
Subject: [PATCH] 1.上云路由整合
---
src/views/reportManager/logisticsCheck.vue | 349 +++++++++++----------
src/store/modules/permission.js | 4
src/router/index.js | 602 +++++++++++++++++++++++++++++++++++++
3 files changed, 782 insertions(+), 173 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index 195c63b..5141d87 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -30,6 +30,7 @@
* a base page that does not have permission requirements
* all roles can be accessed
*/
+// 鍏敤妯″潡
export const commonRoutes = [
/*
* 鐪嬫澘閮ㄥ垎璺敱
@@ -83,7 +84,8 @@
}
// { path: '*', redirect: '/404', hidden: true }
]
-export const asyncRoutes = [
+// 涓婁簯妯″潡
+export const asyncRoutesCloud = [
// 1.绯荤粺绠＄悊锛堝熀纭�璁剧疆绫伙級
{
path: '/systemSetting',
@@ -705,6 +707,604 @@
// }
]
+// 鏈笂浜戞ā鍧�
+export const asyncRoutes = [
+ // {
+ // path: '/gtt',
+ // component: Layout,
+ // redirect: '/gtt/back',
+ // name: '鍩虹璁剧疆',
+ // code: '1001',
+ // meta: { code: '1001', title: '鍩虹璁剧疆', icon: 'tree' },
+ // alwaysShow: true, // 褰揷hildren鍙湁涓�涓椂锛屼篃鏄剧ず鐖惰彍鍗�
+ // children: [{
+ // path: 'back',
+ // name: 'YYQDCancel',
+ // code: '1011',
+ // component: () => import('@/views/gantt_back/gantt_back'),
+ // meta: { code: '1011', title: '鐢ㄦ埛娓呭崟', icon: '', keepAlive: true }
+ // }, {
+ // path: 'zdpc2',
+ // name: 'YYQDCancel',
+ // code: '1012',
+ // component: () => import('@/views/gantt_back/zdpc2'),
+ // meta: { code: '1012', title: '鑷姩鎺掔▼2', icon: '', keepAlive: true }
+ // }]
+ // },
+ {
+ path: '/basicSettings',
+ component: Layout,
+ redirect: '/basicSettings/organizationList',
+ name: '鍩虹璁剧疆',
+ code: '1001',
+ meta: { code: '1001', title: '鍩虹璁剧疆', icon: 'tree2' },
+ alwaysShow: true, // 褰揷hildren鍙湁涓�涓椂锛屼篃鏄剧ず鐖惰彍鍗�
+ children: [
+ {
+ path: 'organizationList',
+ name: 'organizationListCancel',
+ code: '1010',
+ component: () => import('@/views/basicSettings/organizationList'),
+ meta: { code: '1010', title: '缁勭粐鏋舵瀯', icon: '', keepAlive: true }
+ }, {
+ path: 'userList',
+ name: 'userListCancel',
+ code: '1011',
+ component: () => import('@/views/basicSettings/userList'),
+ meta: { code: '1011', title: '鐢ㄦ埛娓呭崟', icon: '', keepAlive: true }
+ }, {
+ path: 'roleList',
+ name: 'roleListCancel',
+ code: '1012',
+ component: () => import('@/views/basicSettings/roleList'),
+ meta: { code: '1012', title: '瑙掕壊娓呭崟', icon: '', keepAlive: true }
+ }, {
+ path: 'contactUnitList',
+ name: 'contactUnitListCancel',
+ code: '1013',
+ component: () => import('@/views/basicSettings/contactUnitList'),
+ meta: { code: '1013', title: '寰�鏉ュ崟浣�', icon: '', keepAlive: true }
+ }, {
+ path: 'installationLampSetting',
+ name: 'installationLampSettingCancel',
+ code: '1014',
+ component: () => import('@/views/basicSettings/installationLampSetting'),
+ meta: { code: '1014', title: '瀹夌伅璁剧疆', icon: '', keepAlive: true }
+ }
+ ]
+ },
+ {
+ path: '/deviceManager',
+ component: Layout,
+ redirect: '/deviceManager/deviceType',
+ name: '璁惧绠＄悊',
+ code: '1002',
+ meta: { code: '1002', title: '璁惧绠＄悊', icon: 'example' },
+ alwaysShow: true,
+ children: [
+ {
+ path: 'deviceType',
+ name: 'deviceTypeCancel',
+ code: '1020',
+ component: () => import('@/views/deviceManager/deviceType'),
+ meta: { code: '1020', title: '璁惧绫诲瀷', icon: '', keepAlive: true }
+ },
+ {
+ path: 'deviceGroup',
+ name: 'deviceGroupCancel',
+ code: '1021',
+ component: () => import('@/views/deviceManager/deviceGroup'),
+ meta: { code: '1021', title: '璁惧缁�', icon: '', keepAlive: true }
+ }, {
+ path: 'deviceList',
+ name: 'deviceListCancel',
+ code: '1022',
+ component: () => import('@/views/deviceManager/deviceList'),
+ meta: { code: '1022', title: '璁惧娓呭崟', icon: '', keepAlive: true }
+ },
+ {
+ path: 'checkStandard',
+ name: 'checkStandardCancel',
+ code: '1023',
+ component: () => import('@/views/deviceManager/checkStandard'),
+ meta: { code: '1023', title: '鐐规鏍囧噯', icon: '', keepAlive: true }
+ },
+ {
+ path: 'checkPosition',
+ name: 'checkPositionCancel',
+ code: '1024',
+ component: () => import('@/views/deviceManager/checkPosition'),
+ meta: { code: '1024', title: '鐐规閮ㄤ綅', icon: '', keepAlive: true }
+ },
+ {
+ path: 'maintainStandard',
+ name: 'maintainStandardCancel',
+ code: '1025',
+ component: () => import('@/views/deviceManager/maintainStandard'),
+ meta: { code: '1025', title: '淇濆吇鏍囧噯', icon: '', keepAlive: true }
+ },
+ {
+ path: 'maintainPosition',
+ name: 'maintainPositionCancel',
+ code: '1026',
+ component: () => import('@/views/deviceManager/maintainPosition'),
+ meta: { code: '1026', title: '淇濆吇閮ㄤ綅', icon: '', keepAlive: true }
+ },
+ {
+ path: 'checkRecord',
+ name: 'checkRecordCancel',
+ code: '1027',
+ component: () => import('@/views/deviceManager/checkRecord'),
+ meta: { code: '1027', title: '鐐规璁板綍', icon: '', keepAlive: true }
+ },
+ {
+ path: 'maintainRecord',
+ name: 'maintainRecordCancel',
+ code: '1028',
+ component: () => import('@/views/deviceManager/maintainRecord'),
+ meta: { code: '1028', title: '淇濆吇璁板綍', icon: '', keepAlive: true }
+ },
+ {
+ path: 'repairRecord',
+ code: '1029',
+ name: 'repairRecordCancel',
+ component: () => import('@/views/deviceManager/repairRecord'),
+ meta: { code: '1029', title: '缁翠慨璁板綍', icon: '', keepAlive: true }
+ },
+ {
+ path: 'repairRequestRecord',
+ name: 'repairRequestRecordCancel',
+ code: '1019',
+ component: () => import('@/views/deviceManager/repairRequestRecord'),
+ meta: { code: '1019', title: '璁惧鐢宠缁翠慨璁板綍', icon: '', keepAlive: true }
+ }
+ ]
+ },
+ {
+ path: '/gzgl',
+ component: Layout,
+ redirect: '/gzgl/gzlx',
+ name: '宸ヨ绠＄悊',
+ code: '1003',
+ meta: { code: '1003', title: '宸ヨ绠＄悊', icon: 'component' },
+ alwaysShow: true,
+ children: [
+ {
+ path: 'gzlx',
+ name: 'GZLXCancel',
+ code: '1030',
+ component: () => import('@/views/gzgl/gzlx'),
+ meta: { code: '1030', title: '宸ヨ绫诲瀷', icon: '', keepAlive: true }
+ }, {
+ path: 'sjxj',
+ name: 'SJXJCancel',
+ code: '1039',
+ component: () => import('@/views/gzgl/sjxj'),
+ meta: { code: '1039', title: '涓婃満涓嬫満', icon: '', keepAlive: true }
+ }, {
+ path: 'ckrk',
+ name: 'CKRKCancel',
+ code: '1040',
+ component: () => import('@/views/gzgl/ckrk'),
+ meta: { code: '1040', title: '鍑哄簱鍏ュ簱', icon: '', keepAlive: true }
+ }, {
+ path: 'gzqd',
+ name: 'GZQDCancel',
+ code: '1031',
+ component: () => import('@/views/gzgl/gzqd'),
+ meta: { code: '1031', title: '宸ヨ娓呭崟', icon: '', keepAlive: true }
+ }, {
+ path: 'djbz',
+ name: 'DJBZCancel',
+ code: '1032',
+ component: () => import('@/views/gzgl/djbz'),
+ meta: { code: '1032', title: '鐐规鏍囧噯', icon: '', keepAlive: true }
+ }, {
+ path: 'djbw',
+ name: 'DJBWCancel',
+ code: '1033',
+ component: () => import('@/views/gzgl/djbw'),
+ meta: { code: '1033', title: '鐐规閮ㄤ綅', icon: '', keepAlive: true }
+ }, {
+ path: 'bybz',
+ name: 'BYBZCancel',
+ code: '1034',
+ component: () => import('@/views/gzgl/bybz'),
+ meta: { code: '1034', title: '淇濆吇鏍囧噯', icon: '', keepAlive: true }
+ }, {
+ path: 'bybw',
+ name: 'BYBWCancel',
+ code: '1035',
+ component: () => import('@/views/gzgl/bybw'),
+ meta: { code: '1035', title: '淇濆吇閮ㄤ綅', icon: '', keepAlive: true }
+ }, {
+ path: 'djjl',
+ name: 'DJJLCancel',
+ code: '1036',
+ component: () => import('@/views/gzgl/djjl'),
+ meta: { code: '1036', title: '鐐规璁板綍', icon: '', keepAlive: true }
+ }, {
+ path: 'byjl',
+ name: 'BYJLCancel',
+ code: '1037',
+ component: () => import('@/views/gzgl/byjl'),
+ meta: { code: '1037', title: '淇濆吇璁板綍', icon: '', keepAlive: true }
+ }, {
+ path: 'gzwx',
+ name: 'GZWXCancel',
+ code: '1038',
+ component: () => import('@/views/gzgl/gzwx'),
+ meta: { code: '1038', title: '宸ヨ缁翠慨', icon: '', keepAlive: true }
+ }
+ ]
+ },
+ {
+ path: '/materialManager',
+ component: Layout,
+ redirect: '/materialManager/storehouseDefine',
+ name: '鐗╂枡绠＄悊',
+ code: '1004',
+ meta: { code: '1004', title: '鐗╂枡绠＄悊', icon: 'table' },
+ alwaysShow: true,
+ children: [
+ {
+ path: 'storehouseDefine',
+ name: 'storehouseDefineCancel',
+ code: '1050',
+ component: () => import('@/views/materialManager/storehouseDefine'),
+ meta: { code: '1050', title: '浠撳簱瀹氫箟', icon: '', keepAlive: true }
+ },
+ {
+ path: 'locationDefine',
+ name: 'locationDefineCancel',
+ code: '1051',
+ component: () => import('@/views/materialManager/locationDefine'),
+ meta: { code: '1051', title: '搴撲綅瀹氫箟', icon: '', keepAlive: true }
+ }, {
+ path: 'containerType',
+ name: 'containerTypeCancel',
+ code: '1052',
+ component: () => import('@/views/materialManager/containerType'),
+ meta: { code: '1052', title: '瀹瑰櫒绫诲瀷', icon: '', keepAlive: true }
+ }, {
+ path: 'containerList',
+ name: 'containerListCancel',
+ code: '1053',
+ component: () => import('@/views/materialManager/containerList'),
+ meta: { code: '1053', title: '瀹瑰櫒娓呭崟', icon: '', keepAlive: true }
+ }, {
+ path: 'inOutboundRecord',
+ name: 'inOutboundRecordCancel',
+ code: '1054',
+ component: () => import('@/views/materialManager/inOutboundRecord'),
+ meta: { code: '1054', title: '鍑哄叆搴撹褰�', icon: '', keepAlive: true }
+ }, {
+ path: 'inventoryQuery',
+ name: 'inventoryQueryCancel',
+ code: '1055',
+ component: () => import('@/views/materialManager/inventoryQuery'),
+ meta: { code: '1055', title: '搴撳瓨鏌ヨ', icon: '', keepAlive: true }
+ }
+ ]
+ },
+ {
+ path: '/makeModel',
+ component: Layout,
+ redirect: '/makeModel/InventoryList',
+ name: '鍒堕�犳ā鍨�',
+ code: '1005',
+ meta: { code: '1005', title: '鍒堕�犳ā鍨�', icon: 'icu' },
+ alwaysShow: true,
+ children: [
+ {
+ path: 'materialType',
+ name: 'materialTypeCancel',
+ code: '1060',
+ component: () => import('@/views/makeModel/materialType'),
+ meta: { code: '1060', title: '鐗╂枡绫诲瀷', icon: '', keepAlive: true }
+ },
+ {
+ path: 'InventoryList',
+ name: 'InventoryListCancel',
+ code: '1061',
+ component: () => import('@/views/makeModel/InventoryList'),
+ meta: { code: '1061', title: '瀛樿揣妗ｆ', icon: '', keepAlive: true }
+ }, {
+ path: 'materialList',
+ name: 'materialListCancel',
+ code: '1062',
+ component: () => import('@/views/makeModel/materialList'),
+ meta: { code: '1062', title: '鐗╂枡娓呭崟', icon: '', keepAlive: true }
+ },
+ {
+ path: 'processRoute',
+ name: 'processRouteCancel',
+ code: '1063',
+ component: () => import('@/views/makeModel/processRoute'),
+ meta: { code: '1063', title: '宸ヨ壓璺嚎', icon: '', keepAlive: true }
+ }, {
+ path: 'processDefine',
+ name: 'processDefineCancel',
+ code: '1064',
+ component: () => import('@/views/makeModel/processDefine'),
+ meta: { code: '1064', title: '宸ュ簭瀹氫箟', icon: '', keepAlive: true }
+ },
+ {
+ path: 'meterPrice',
+ name: 'meterPriceCancel',
+ code: '1065',
+ component: () => import('@/views/makeModel/meterPrice'),
+ meta: { code: '1065', title: '鑺傛媿宸ヤ环', icon: '', keepAlive: true }
+ }
+ ]
+ },
+ {
+ path: '/produceManager',
+ component: Layout,
+ redirect: '/produceManager/produceOrder',
+ name: '鐢熶骇绠＄悊',
+ code: '1006',
+ meta: { code: '1006', title: '鐢熶骇绠＄悊', icon: 'production' },
+ alwaysShow: true,
+ children: [
+ {
+ path: 'produceOrder',
+ name: 'produceOrderCancel',
+ code: '1070',
+ component: () => import('@/views/produceManager/produceOrder'),
+ meta: { code: '1070', title: 'ERP鐢熶骇璁㈠崟', icon: '', keepAlive: true }
+ }, {
+ path: 'workOrder',
+ name: 'workOrderCancel',
+ code: '1071',
+ component: () => import('@/views/produceManager/workOrder'),
+ meta: { code: '1071', title: 'MES宸ュ崟', icon: '', keepAlive: true }
+ }, {
+ path: 'workOrderDispatch',
+ name: 'workOrderDispatchCancel',
+ code: '1072',
+ component: () => import('@/views/produceManager/workOrderDispatch'),
+ meta: { code: '1072', title: '宸ュ崟娲惧伐', icon: '', keepAlive: true }
+ }, {
+ path: 'produceStartOrder',
+ name: 'produceStartOrderCancel',
+ code: '1073',
+ component: () => import('@/views/produceManager/produceStartOrder'),
+ meta: { code: '1073', title: '鐢熶骇寮�鎶ュ伐', icon: '', keepAlive: true }
+ }, {
+ path: 'workOrderBatchClose',
+ name: 'workOrderBatchCloseCancel',
+ code: '1074',
+ component: () => import('@/views/produceManager/workOrderBatchClose'),
+ meta: { code: '1074', title: 'MES宸ュ崟鎵归噺鍏抽棴', icon: '', keepAlive: true }
+ }, {
+ path: 'capacityPlanning',
+ name: 'capacityPlanningCancel',
+ code: '1075',
+ component: () => import('@/views/produceManager/capacityPlanning'),
+ meta: { code: '1075', title: '浜ц兘瑙勫垝', icon: '', keepAlive: true }
+ }, {
+ path: 'AutoScheduling',
+ name: 'AutoSchedulingCancel',
+ code: '1076',
+ component: () => import('@/views/produceManager/AutoScheduling'),
+ meta: { code: '1076', title: '鑷姩鎺掔▼', icon: '', keepAlive: true }
+ }
+ ]
+ },
+ {
+ path: '/qualityManager',
+ component: Layout,
+ redirect: '/qualityManager/defectDefine',
+ name: '璐ㄩ噺绠＄悊',
+ code: '1007',
+ meta: { code: '1007', title: '璐ㄩ噺绠＄悊', icon: 'quality' },
+ alwaysShow: true,
+ children: [
+ {
+ path: 'qualityStandard',
+ name: 'qualityStandardCancel',
+ code: '1080',
+ component: () => import('@/views/qualityManager/qualityStandard'),
+ meta: { code: '1080', title: '璐ㄦ鏍囧噯', icon: '', keepAlive: true }
+ }, {
+ path: 'defectDefine',
+ name: 'defectDefineCancel',
+ code: '1081',
+ component: () => import('@/views/qualityManager/defectDefine'),
+ meta: { code: '1081', title: '缂洪櫡瀹氫箟', icon: '', keepAlive: true }
+ }, {
+ path: 'processCheck',
+ name: 'processCheckCancel',
+ code: '1082',
+ component: () => import('@/views/qualityManager/processCheck'),
+ meta: { code: '1082', title: '宸ュ簭妫�楠�', icon: '', keepAlive: true }
+ }, {
+ path: 'logisticsCheck',
+ name: 'logisticsCheckCancel',
+ code: '1083',
+ component: () => import('@/views/qualityManager/logisticsCheck'),
+ meta: { code: '1083', title: '鐗╂祦妫�楠�', icon: '', keepAlive: true }
+ }, {
+ path: 'defectStatistics',
+ name: 'defectStatisticsCancel',
+ code: '1084',
+ component: () => import('@/views/qualityManager/defectStatistics'),
+ meta: { code: '1084', title: '缂洪櫡缁熻', icon: '', keepAlive: true }
+ },
+ {
+ path: 'processCheckStandard',
+ name: 'processCheckStandardCancel',
+ code: '1085',
+ component: () => import('@/views/qualityManager/processCheckStandard'),
+ meta: { code: '1085', title: '宸ュ簭妫�楠屾爣鍑�', icon: '', keepAlive: true }
+ },
+ {
+ path: 'processCheckItem',
+ name: 'processCheckItemCancel',
+ code: '1086',
+ component: () => import('@/views/qualityManager/processCheckItem'),
+ meta: { code: '1086', title: '宸ュ簭妫�楠岄」鐩�', icon: '', keepAlive: true }
+ }, {
+ path: 'processCheckRecord',
+ name: 'processCheckRecordCancel',
+ code: '1087',
+ component: () => import('@/views/qualityManager/processCheckRecord'),
+ meta: { code: '1087', title: '宸ュ簭妫�楠岃褰�', icon: '', keepAlive: true }
+ }, {
+ path: 'qualityPlaning',
+ name: 'ZJFACancel',
+ code: '1088',
+ component: () => import('@/views/qualityManager/qualityPlaning'),
+ meta: { code: '1088', title: '璐ㄦ鏂规', icon: '', keepAlive: true }
+ }
+ ]
+ },
+ {
+ path: '/reportManager',
+ component: Layout,
+ redirect: '/reportManager/groupSalaryList',
+ name: '鎶ヨ〃绠＄悊',
+ code: '1008',
+ meta: { code: '1008', title: '鎶ヨ〃绠＄悊', icon: 'bbgl' },
+ alwaysShow: true,
+ children: [
+ {
+ path: 'groupSalaryList',
+ name: 'groupSalaryListCancel',
+ code: '1090',
+ component: () => import('@/views/reportManager/groupSalaryList'),
+ meta: { code: '1090', title: '鐝粍宸ヨ祫缁熻', icon: '', keepAlive: true }
+ }, {
+ path: 'personSalaryList',
+ name: 'personSalaryListCancel',
+ code: '1091',
+ component: () => import('@/views/reportManager/personSalaryList'),
+ meta: { code: '1091', title: '浜哄憳宸ヨ祫', icon: '', keepAlive: true }
+ }, {
+ path: 'subcontractingOperation',
+ name: 'subcontractingOperationCancel',
+ code: '1092',
+ component: () => import('@/views/reportManager/subcontractingOperation'),
+ meta: { code: '1092', title: '濮斿宸ュ簭', icon: '', keepAlive: true }
+ }, {
+ path: 'defectDetailList',
+ name: 'defectDetailListCancel',
+ code: '1093',
+ component: () => import('@/views/reportManager/defectDetailList'),
+ meta: { code: '1093', title: '涓嶈壇鏄庣粏', icon: '', keepAlive: true }
+ }, {
+ path: 'abnormalQualityList',
+ name: 'abnormalQualityListCancel',
+ code: '1094',
+ component: () => import('@/views/reportManager/abnormalQualityList'),
+ meta: { code: '1094', title: '鍝佽川寮傚父', icon: '', keepAlive: true }
+ }, {
+ path: 'repairDetailList',
+ name: 'repairDetailListCancel',
+ code: '1095',
+ component: () => import('@/views/reportManager/repairDetailList'),
+ meta: { code: '1095', title: '缁翠慨鏄庣粏', icon: '', keepAlive: true }
+ }, {
+ path: 'installationLampList',
+ name: 'installationLampListCancel',
+ code: '1096',
+ component: () => import('@/views/reportManager/installationLampList'),
+ meta: { code: '1096', title: '瀹夌伅鎶ヨ〃', icon: '', keepAlive: true }
+ }, {
+ path: 'logisticsCheck',
+ name: 'logisticsCheckCancel',
+ code: '1097',
+ component: () => import('@/views/reportManager/logisticsCheck'),
+ meta: { code: '1097', title: '鐗╂祦妫�楠屾姤琛�', icon: '', keepAlive: true }
+ }
+ ]
+ },
+ {
+ path: '/systemSettings',
+ component: Layout,
+ redirect: '/systemSettings/bmgz',
+ name: '绯荤粺璁剧疆',
+ code: '1009',
+ meta: { code: '1009', title: '绯荤粺璁剧疆', icon: 'xtsz' },
+ alwaysShow: true,
+ children: [
+ {
+ path: 'codingRules',
+ name: 'codingRulesCancel',
+ code: '1101',
+ component: () => import('@/views/systemSettings/codingRules'),
+ meta: { code: '1101', title: '缂栫爜瑙勫垯', icon: '', keepAlive: true }
+ }, {
+ path: 'passwordEdit',
+ name: 'passwordEditCancel',
+ code: '1102',
+ component: () => import('@/views/systemSettings/passwordEdit'),
+ meta: { code: '1102', title: '瀵嗙爜淇敼', icon: '', keepAlive: true }
+ }, {
+ path: 'systemLog',
+ name: 'systemLogCancel',
+ code: '1103',
+ component: () => import('@/views/systemSettings/systemLog'),
+ meta: { code: '1103', title: '绯荤粺鏃ュ織', icon: '', keepAlive: true }
+ }, {
+ path: 'sopUpload',
+ name: 'sopUploadCancel',
+ code: '1104',
+ component: () => import('@/views/systemSettings/sopUpload'),
+ meta: { code: '1104', title: 'SOP涓婁紶', icon: '', keepAlive: true }
+ }, {
+ path: 'shopNotice',
+ name: 'shopNoticeCancel',
+ code: '1105',
+ component: () => import('@/views/systemSettings/shopNotice'),
+ meta: { code: '1105', title: '杞﹂棿鍏憡', icon: '', keepAlive: true }
+ }
+ ]
+ },
+ {
+ path: '/purchasesManager',
+ component: Layout,
+ redirect: '/purchasesManager/purchasesList',
+ name: '閲囪喘绠＄悊',
+ code: '1000',
+ meta: { code: '1000', title: '閲囪喘绠＄悊', icon: 'cggl' },
+ alwaysShow: true,
+ children: [
+ {
+ path: 'purchasesList',
+ name: 'CGDDCancel',
+ code: '1201',
+ component: () => import('@/views/purchasesManager/purchasesList'),
+ meta: { code: '1201', title: '閲囪喘璁㈠崟', icon: '', keepAlive: true }
+ }, {
+ path: 'arrivalNoticeList',
+ name: 'arrivalNoticeListCancel',
+ code: '1202',
+ component: () => import('@/views/purchasesManager/arrivalNoticeList'),
+ meta: { code: '1202', title: '閲囪喘鏀惰揣鍗�', icon: '', keepAlive: true }
+ }, {
+ path: 'salesStatisticsList',
+ name: 'salesStatisticsCancel',
+ code: '1203',
+ component: () => import('@/views/purchasesManager/salesStatisticsList'),
+ meta: { code: '1203', title: '閿�鍞鍗�', icon: '', keepAlive: true }
+ }, {
+ path: 'goodsStatisticsList',
+ name: 'goodsStatisticsListCancel',
+ code: '1204',
+ component: () => import('@/views/purchasesManager/goodsStatisticsList'),
+ meta: { code: '1204', title: '閿�璐у崟', icon: '', keepAlive: true }
+ }, {
+ path: 'InventoryLedgerList',
+ name: 'InventoryLedgerListCancel',
+ code: '1205',
+ component: () => import('@/views/purchasesManager/InventoryLedgerList'),
+ meta: { code: '1205', title: '搴撳瓨鍙拌处', icon: '', keepAlive: true }
+ }
+ ]
+ }
+]
const createRouter = () => new Router({
// mode: 'history', // require service support
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 320b391..706fed9 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -1,4 +1,4 @@
-import { asyncRoutes, commonRoutes } from '@/router'
+import { asyncRoutes, asyncRoutesCloud, commonRoutes } from '@/router'
import Layout from '@/layout'
import { getCookie } from '@/utils/auth'
@@ -103,7 +103,7 @@
let newRoutes
if (getCookie('cloud')) {
const arr = menu.map(i => i.code)
- newRoutes = asyncRoutes.filter(i => {
+ newRoutes = asyncRoutesCloud.filter(i => {
if (arr.includes(i.code)) {
return i
}
diff --git a/src/views/reportManager/logisticsCheck.vue b/src/views/reportManager/logisticsCheck.vue
index 8855b95..8898259 100644
--- a/src/views/reportManager/logisticsCheck.vue
+++ b/src/views/reportManager/logisticsCheck.vue
@@ -17,7 +17,7 @@
<el-form-item label="妫�楠岀被鍨�" style=" display: flex;">
<!-- <el-input v-model="form.checktypecode" placeholder="璇疯緭鍏�" style="width: 200px" />-->
- <el-select v-model="form.style" style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-select v-model="form.checktypecode" style="width: 200px" placeholder="璇烽�夋嫨">
<el-option
v-for="item in checktypeArr"
:key="item.code"
@@ -120,16 +120,37 @@
fixed
label="搴忓彿"
/>
+ <!-- <el-table-column-->
+ <!-- prop="check_type"-->
+ <!-- label="妫�楠岀被鍨�"-->
+ <!-- width="160"-->
+ <!-- sortable="custom"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div>{{ checktypeArr.find(i=>i.code===row.check_type).name }}</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column> -->
<el-table-column
- prop="wo_code"
+ prop="check_typename"
label="妫�楠岀被鍨�"
- width="160"
+ width="110"
sortable="custom"
/>
<el-table-column
+ prop="sampmethod"
+ label="鎶芥牱鏂瑰紡"
+ width="110"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.sampmethod==='FIXED'">鍥烘椂鎶芥</div>
+ <div v-if="row.sampmethod==='SCARE'">姣斾緥鎶芥</div>
+ </template>
+ </el-table-column>
+ <el-table-column
prop="partcode"
label="鐗╂枡缂栫爜"
- width="160"
+ width="110"
show-tooltip-when-overflow
sortable="custom"
/>
@@ -142,7 +163,7 @@
/>
<el-table-column
prop="partspec"
- label="浜у搧瑙勬牸"
+ label="瑙勬牸鍨嬪彿"
width="120"
show-tooltip-when-overflow
sortable="custom"
@@ -158,67 +179,80 @@
width="110"
show-tooltip-when-overflow
sortable="custom"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.hbatchno">{{ row.hbatchno }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="hbarcode"
label="鏉＄爜缂栧彿"
- width="110"
+ width="160"
show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
prop="customer_name"
label="寰�鏉ュ崟浣�"
- width="160"
+ min-width="160"
show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
- prop="plan_qty"
- label="浠诲姟鏁伴噺"
- width="110"
- show-tooltip-when-overflow
- sortable="custom"
- />
- <el-table-column
- prop="repair_qty"
- label="缁翠慨鏁伴噺"
- width="110"
- show-tooltip-when-overflow
- sortable="custom"
- />
- <el-table-column
- prop="bad_qty"
- label="鎶ュ簾鏁伴噺"
- width="110"
- sortable="custom"
- />
- <el-table-column
- prop="defect_code"
- label="缂洪櫡浠ｇ爜"
- width="110"
- show-tooltip-when-overflow
- sortable="custom"
- />
- <el-table-column
- prop="defect_name"
- label="鎵规鏉＄爜"
- width="110"
- show-tooltip-when-overflow
- sortable="custom"
- />
- <el-table-column
- prop="lm_user"
- label="妫�楠屼汉鍛�"
+ prop="username"
+ label="璐ㄦ浜哄憳"
width="110"
sortable="custom"
/>
<el-table-column
prop="lm_date"
- label="妫�楠屾椂闂�"
+ label="璐ㄦ鏃堕棿"
width="160"
sortable="custom"
/>
+ <el-table-column
+ prop="check_result"
+ label="妫�楠岀粨鏋�"
+ width="110"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.check_result==='OK'" style="display: flex;align-items: center">
+ <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
+ 鍚堟牸
+ </div>
+ <div v-if="row.check_result==='NG'" style="display: flex;align-items: center">
+ <i class="el-icon-error" style="color: red;margin-right: 2px" />
+ 涓嶅悎鏍�
+ </div>
+ </template>
+ </el-table-column>
+
+ <el-table-column
+ label="妫�楠屾槑缁�"
+ width="120"
+ fixed="right"
+ >
+ <template slot-scope="{row}">
+ <div class="operationClass">
+ <el-tooltip class="item" effect="dark" content="鏌ョ湅" placement="top">
+ <i
+ class="el-icon-view"
+ :style="{color:$store.state.settings.theme}"
+ style="margin-right:15px;cursor: pointer;"
+ @click="edit('edit',row)"
+ />
+ </el-tooltip>
+ <!-- <el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">-->
+ <!-- <i class="el-icon-edit-outline" @click="edit('edit',row)" />-->
+ <!-- </el-tooltip>-->
+ <!-- <el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">-->
+ <!-- <i class="el-icon-delete" @click="del(row)" />-->
+ <!-- </el-tooltip>-->
+ </div>
+ </template>
+ </el-table-column>
</el-table>
</div>
@@ -236,7 +270,7 @@
<el-dialog
v-el-drag-dialog
- :title="operation==='add'?'鏂板':'浜哄憳鏄庣粏'"
+ :title="operation==='add'?'鏂板':'妫�楠屾槑缁�'"
:visible.sync="dialogVisible"
width="800px"
:close-on-click-modal="false"
@@ -244,16 +278,89 @@
@closed="handleClose"
@close="handleClose"
>
- <div style="height: 300px;width: 100%;background-color: aliceblue;padding:20px">
- <el-tag
- v-for="tag in tagArr"
- :key="tag.name"
- type="success"
- style="margin-right: 15px;min-width: 80px;text-align: center"
+
+ <el-table
+ ref="tableDataRef2"
+ class="tableFixed"
+ :data="dialogTableData"
+ height="500"
+ style="height:500px"
+ border
+ :row-class-name="tableRowClassName"
+ highlight-current-row
+ :header-cell-style="this.$headerCellStyle"
+ :cell-style="this.$cellStyle"
+ >
+ <el-table-column
+ type="index"
+ width="50"
+ fixed
+ label="搴忓彿"
+ />
+
+ <el-table-column
+ prop="stepcheckitem_code"
+ width="150"
+ label="妫�楠岄」鐩�"
>
- {{ tag }}
- </el-tag>
- </div>
+ <template slot-scope="{row}">
+ <el-select
+ v-if="row.isVisible===1"
+ v-model="row.stepcheckitem_code"
+ filterable
+ placeholder="璇烽�夋嫨"
+ style="width: 100%;"
+ >
+ <!-- @change="val=>tableChange(val,row)"-->
+ <el-option
+ v-for="item in CheckItemSelectArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ <div v-else>{{
+ CheckItemSelectAllArr.find(i => i.code === row.stepcheckitem_code).name
+ }}
+ </div>
+ </template>
+ </el-table-column>
+
+ <el-table-column
+ prop="stepcheckitem_desc"
+ label="鏍囧噯瑕佹眰"
+ show-tooltip-when-overflow
+ >
+ <template slot-scope="{row}">
+ <el-input
+ v-if="row.isVisible===1"
+ v-model="row.stepcheckitem_desc"
+ placeholder="璇疯緭鍏�"
+ />
+ <div v-else>{{ row.stepcheckitem_desc ? row.stepcheckitem_desc : '/' }}</div>
+ </template>
+ </el-table-column>
+
+ <!-- 杩欓噷鍐檉or寰幆閬嶅巻璇彞-->
+
+ <el-table-column
+ v-if="operation!=='check'"
+ label="鎿嶄綔"
+ width="120"
+ fixed="right"
+ >
+ <template slot-scope="{row}">
+ <div class="operationClass">
+ <el-button v-if="row.isVisible===1" v-waves type="text" @click="saveZjlbRow(row)">纭</el-button>
+ <el-button v-if="row.isVisible===1&&isCancel" v-waves type="text" @click="cancelZjlbRow(row)">鍙栨秷
+ </el-button>
+ <el-button v-if="row.isVisible!==1" v-waves type="text" @click="editZjlbRow(row)">缂栬緫</el-button>
+ <el-button v-if="row.isVisible!==1" v-waves type="text" @click="delZjlbRow(row)">鍒犻櫎</el-button>
+ </div>
+ </template>
+ </el-table-column>
+ </el-table>
+
<span slot="footer" class="dialog-footer">
<div class="footerButton">
<el-button v-waves @click="dialogVisible=false">杩� 鍥�</el-button>
@@ -263,30 +370,20 @@
</span>
</el-dialog>
- <!--瀵煎叆缁勪欢-->
- <import-picker
- ref="importPickerFunc"
- class="importPickerClass"
- :shows.sync="shows"
- :title="title_value"
- :colos="colos"
- :code="code"
- />
-
</div>
</template>
<script>
import Pagination from '@/components/Pagination'
-import { getCookie } from '@/utils/auth'
+
import ImportPicker from '@/components/ImportPicker'
-import { handleDatetime, validateCode } from '@/utils/global'
+import { handleDatetime } from '@/utils/global'
import {
- GroupSalaryReportSearchUser, MaintenanceDetailsReportExcelSearch, LogisticsCheckSearch
+ MaintenanceDetailsReportExcelSearch, LogisticsCheckSearch
} from '@/api/reportManager'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
-import { MesOrderStepReportSelectUserGroup } from '@/api/produceManager'
+import { PurchSupplierSelect } from '@/api/basicInfo'
export default {
name: 'Zzjg',
@@ -327,40 +424,13 @@
total: 10,
tableData: [],
dialogVisible: false,
- tagArr: [], //
- dialogForm: {
- OrgType: '',
- OrgCode: '',
- OrgName: '',
- SupUnit: ''// 涓婄骇鍗曚綅
- },
+
operation: '',
- dialogFormRules: {
- OrgType: [
- { required: true, message: '璇疯緭鍏ラ�夋嫨绫诲瀷', trigger: ['blur', 'change'] }
- ],
- OrgCode: [
- { required: true, validator: validateCode, trigger: ['blur', 'change'] }
- ],
- OrgName: [
- { required: true, message: '璇疯緭鍏ュ悕绉�', trigger: ['blur', 'change'] }
- ]
-
- },
-
- title_value: '鏁版嵁瀵煎叆 / 鐐规閮ㄤ綅',
- code: '4',
- shows: false
+ dialogTableData: []
}
},
- watch: {
- shows() {
- if (!this.shows) {
- this.getLogisticsCheckSearch()
- }
- }
- },
+
created() {
this.handleRequest()
},
@@ -446,14 +516,7 @@
search() {
this.getLogisticsCheckSearch()
},
- // 瀵煎叆鎸夐挳
- upload() {
- this.shows = true
- this.$refs.importPickerFunc.newDataFunc()
- },
- colos() {
- this.shows = false
- },
+
// 閲嶇疆
reset() {
this.form.checktypecode = ''
@@ -469,77 +532,22 @@
},
// 鏂板鎸夐挳
- add(operation) {
- this.operation = operation
- this.dialogVisible = true
- },
+ // add(operation) {
+ // this.operation = operation
+ // this.dialogVisible = true
+ // },
// 淇敼鎸夐挳
async edit(operation, row) {
this.operation = operation
this.dialogVisible = true
-
- const res = await GroupSalaryReportSearchUser({ id: row.id })
- this.tagArr = res.data.map(r => r.checkuser)
- // this.tagArr = ['妤兼潕淇�', '寮犱笁', '鏉庡洓']
- // this.$nextTick(() => {
- // this.dialogForm.OrgCode = row.org_code
- // this.dialogForm.OrgName = row.org_name
- // this.dialogForm.SupUnit = row.parent_id
- // })
- },
- // 鍒犻櫎鎸夐挳
- async del(row) {
- // this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
- // confirmButtonText: '纭畾',
- // cancelButtonText: '鍙栨秷',
- // type: 'warning'
- // }).then(() => {
- // DeleteOrganization({ orgid: row.code }).then(res => {
- // if (res.code === '200') {
- // this.$message.success('鍒犻櫎鎴愬姛!')
- // if (this.form.page > 1 && this.tableData.length === 1) {
- // this.form.page--
- // }
- // this.getLogisticsCheckSearch()
- // }
- // })
- // }).catch(() => {
- // this.$message.info('宸插彇娑堝垹闄�')
- // })
},
// 瀵硅瘽妗嗗叧闂簨浠�
handleClose() {
- this.dialogForm.OrgType = ''
- this.dialogForm.OrgCode = ''
- this.dialogForm.OrgName = ''
- this.dialogForm.SupUnit = ''
- this.$refs.dialogForm.clearValidate()
+
},
// 瀵硅瘽妗嗗彇娑�
dialogVisibleCancel() {
this.dialogVisible = false
- },
- // 瀵硅瘽妗嗙‘璁�
- dialogVisibleConfirm() {
- this.$refs.dialogForm.validate(valid => {
- if (valid) {
- const data = {
- OrganCode: this.dialogForm.OrgCode,
- OrganName: this.dialogForm.OrgName,
- OperType: this.operation === 'add' ? 'Add' : 'Update',
- Operator: getCookie('admin')
- }
- // AddUpdateOrganization(data).then(res => {
- // if (res.code === '200') {
- // this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
- // this.dialogVisible = false
- // this.getLogisticsCheckSearch()
- // } else {
- // this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
- // }
- // })
- }
- })
},
// 鑾峰彇椤甸潰楂樺害
getHeight() {
@@ -677,11 +685,12 @@
justify-content: center;
}
-.tableFixed{
- ::v-deep .el-table__fixed-right{
+.tableFixed {
+ ::v-deep .el-table__fixed-right {
height: 100% !important;
}
- ::v-deep .el-table__fixed{
+
+ ::v-deep .el-table__fixed {
height: 100% !important;
}
}
--
Gitblit v1.9.3