diff --git a/scripts/package/function.mjs b/scripts/package/function.mjs index 7865d75..cbd161f 100644 --- a/scripts/package/function.mjs +++ b/scripts/package/function.mjs @@ -34,6 +34,23 @@ export const ScopeApp = 'moduleApps'; export const ScopeRoute = 'moduleRoutes'; export const appList = [ + { + name: 'spdm_CreateDemand', + zhCn: '新增待办', + en: 'Create Demand', + pages: [ + { + name: 'spdmCreateDemand', + zhCn: '新增待办', + en: 'Create Demand', + path: '/spdm/createDemand', + component: () => import('/@/spdm/views/index.vue'), + meta: { + icon: 'ele-Plus', + }, + }, + ], + }, { name: 'spdm_TaskSponsor', zhCn: '我提出的', @@ -2142,9 +2159,9 @@ export const navList = [ ]; export const menuList = [ - // { - // appName: 'spdmTaskList', - // }, + { + appName: 'spdm_CreateDemand', + }, { navName: 'spdmProject', }, diff --git a/scripts/package/i18n/en.ts b/scripts/package/i18n/en.ts index 84fd1ee..1372994 100644 --- a/scripts/package/i18n/en.ts +++ b/scripts/package/i18n/en.ts @@ -12,6 +12,7 @@ export default { tokenLogin: 'Token Login', }, moduleFuncs: { + spdm_CreateDemand: 'Create Demand', spdm_TaskSponsor: 'I Initiated', spdm_AllProject: 'All Project', spdm_ChargeProject: 'Charge Project', @@ -120,6 +121,7 @@ export default { erp_material: 'Material Management', }, moduleApps: { + spdm_CreateDemand: 'Create Demand', spdm_TaskSponsor: 'I Initiated', spdm_AllProject: 'All Project', spdm_ChargeProject: 'Charge Project', @@ -228,6 +230,7 @@ export default { erp_material: 'Material Management', }, moduleRoutes: { + spdmCreateDemand: 'Create Demand', spdmTaskSponsor: 'I Initiated', spdmAllProject: 'All Project', spdmChargeProject: 'Charge Project', diff --git a/scripts/package/i18n/zh-cn.ts b/scripts/package/i18n/zh-cn.ts index 1e2e3ca..4e54d72 100644 --- a/scripts/package/i18n/zh-cn.ts +++ b/scripts/package/i18n/zh-cn.ts @@ -20,6 +20,7 @@ export default { shutdown: '停止', }, moduleApps: { + spdm_CreateDemand: '新增待办', spdm_TaskSponsor: '我提出的', spdm_AllProject: '所有项目', spdm_ChargeProject: '负责项目', @@ -128,6 +129,7 @@ export default { erp_material: '物料管理', }, moduleRoutes: { + spdmCreateDemand: '新增待办', spdmTaskSponsor: '我提出的', spdmAllProject: '所有项目', spdmChargeProject: '负责项目', diff --git a/scripts/package/moduleMap.mjs b/scripts/package/moduleMap.mjs index 27db264..b55479b 100644 --- a/scripts/package/moduleMap.mjs +++ b/scripts/package/moduleMap.mjs @@ -1,4 +1,5 @@ export const appMap = { + spdm_CreateDemand: {"name":"moduleApps.spdm_CreateDemand","zhCn":"新增待办","en":"Create Demand","pages":[{"name":"spdmCreateDemand","zhCn":"新增待办","en":"Create Demand","path":"/spdm/createDemand","meta":{"icon":"ele-Plus"}}]}, spdm_TaskSponsor: {"name":"moduleApps.spdm_TaskSponsor","zhCn":"我提出的","en":"I Initiated","pages":[{"name":"spdmTaskSponsor","zhCn":"我提出的","en":"I Initiated","path":"/spdm/task/sponsor","meta":{"icon":"ele-Warning"}}]}, spdm_AllProject: {"name":"moduleApps.spdm_AllProject","zhCn":"所有项目","en":"All Project","pages":[{"name":"spdmAllProject","zhCn":"所有项目","en":"All Project","path":"/spdm/project/allProject","meta":{"icon":"ele-MessageBox"}}]}, spdm_ChargeProject: {"name":"moduleApps.spdm_ChargeProject","zhCn":"负责项目","en":"Charge Project","pages":[{"name":"spdmChargeProject","zhCn":"负责项目","en":"Charge Project","path":"/spdm/project/chargeProject","meta":{"icon":"ele-MessageBox"}}]}, @@ -124,6 +125,14 @@ export const navMap = { industrial_resource_bank: {"name":"moduleRoutes.industrial_resource_bank","zhCn":"工业资源库","en":"Industrial Resource Bank","subApps":["material_information_table","material_color_error","erp_material"],"meta":{"icon":"iconfont icon-quanjushezhi_o"}}, }; export const pageMap = { + "spdmCreateDemand": { + "path": "/spdm/createDemand", + "name": "moduleRoutes.spdmCreateDemand", + "meta": { + "icon": "ele-Plus", + "code": "spdm_CreateDemand_view" + } + }, "spdmTaskSponsor": { "path": "/spdm/task/sponsor", "name": "moduleRoutes.spdmTaskSponsor", diff --git a/scripts/package/sql/sys_app.sql b/scripts/package/sql/sys_app.sql index fe656fe..9147383 100644 --- a/scripts/package/sql/sys_app.sql +++ b/scripts/package/sql/sys_app.sql @@ -8,6 +8,7 @@ CREATE TABLE `sys_app` ( PRIMARY KEY (`app_id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '应用' ROW_FORMAT = DYNAMIC; +INSERT INTO `sys_app` VALUES (4776298884, 'spdm_CreateDemand'); INSERT INTO `sys_app` VALUES (144579506, 'spdm_TaskSponsor'); INSERT INTO `sys_app` VALUES (6815254491, 'spdm_AllProject'); INSERT INTO `sys_app` VALUES (4398838303, 'spdm_ChargeProject'); diff --git a/scripts/package/sql/sys_function.sql b/scripts/package/sql/sys_function.sql index dcd2e01..0b7c140 100644 --- a/scripts/package/sql/sys_function.sql +++ b/scripts/package/sql/sys_function.sql @@ -9,6 +9,11 @@ CREATE TABLE `sys_function` ( PRIMARY KEY (`function_id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '功能编码与应用' ROW_FORMAT = DYNAMIC; +INSERT INTO `sys_function` VALUES (9759586599, 'spdm_CreateDemand_view', 'spdm_CreateDemand'); +INSERT INTO `sys_function` VALUES (9720170990, 'spdm_CreateDemand_add', 'spdm_CreateDemand'); +INSERT INTO `sys_function` VALUES (1691141698, 'spdm_CreateDemand_edit', 'spdm_CreateDemand'); +INSERT INTO `sys_function` VALUES (8063211740, 'spdm_CreateDemand_del', 'spdm_CreateDemand'); +INSERT INTO `sys_function` VALUES (5655482597, 'spdm_CreateDemand_export', 'spdm_CreateDemand'); INSERT INTO `sys_function` VALUES (7885749576, 'spdm_TaskSponsor_view', 'spdm_TaskSponsor'); INSERT INTO `sys_function` VALUES (6370238649, 'spdm_TaskSponsor_add', 'spdm_TaskSponsor'); INSERT INTO `sys_function` VALUES (8240383195, 'spdm_TaskSponsor_edit', 'spdm_TaskSponsor'); diff --git a/src/i18n/pages/route/en.ts b/src/i18n/pages/route/en.ts index 84fd1ee..1372994 100644 --- a/src/i18n/pages/route/en.ts +++ b/src/i18n/pages/route/en.ts @@ -12,6 +12,7 @@ export default { tokenLogin: 'Token Login', }, moduleFuncs: { + spdm_CreateDemand: 'Create Demand', spdm_TaskSponsor: 'I Initiated', spdm_AllProject: 'All Project', spdm_ChargeProject: 'Charge Project', @@ -120,6 +121,7 @@ export default { erp_material: 'Material Management', }, moduleApps: { + spdm_CreateDemand: 'Create Demand', spdm_TaskSponsor: 'I Initiated', spdm_AllProject: 'All Project', spdm_ChargeProject: 'Charge Project', @@ -228,6 +230,7 @@ export default { erp_material: 'Material Management', }, moduleRoutes: { + spdmCreateDemand: 'Create Demand', spdmTaskSponsor: 'I Initiated', spdmAllProject: 'All Project', spdmChargeProject: 'Charge Project', diff --git a/src/i18n/pages/route/zh-cn.ts b/src/i18n/pages/route/zh-cn.ts index 1e2e3ca..4e54d72 100644 --- a/src/i18n/pages/route/zh-cn.ts +++ b/src/i18n/pages/route/zh-cn.ts @@ -20,6 +20,7 @@ export default { shutdown: '停止', }, moduleApps: { + spdm_CreateDemand: '新增待办', spdm_TaskSponsor: '我提出的', spdm_AllProject: '所有项目', spdm_ChargeProject: '负责项目', @@ -128,6 +129,7 @@ export default { erp_material: '物料管理', }, moduleRoutes: { + spdmCreateDemand: '新增待办', spdmTaskSponsor: '我提出的', spdmAllProject: '所有项目', spdmChargeProject: '负责项目', diff --git a/src/router/menus.ts b/src/router/menus.ts index fa7cf2f..d61dab4 100644 --- a/src/router/menus.ts +++ b/src/router/menus.ts @@ -7,6 +7,14 @@ export default [ "isKeepAlive": true } }, + { + "name": "moduleApps.spdm_CreateDemand", + "path": "/spdm/createDemand", + "meta": { + "icon": "ele-Plus", + "code": "spdm_CreateDemand_view" + } + }, { "name": "moduleRoutes.spdmProject", "path": "spdmProject", diff --git a/src/router/modules.ts b/src/router/modules.ts index 956fa39..e15f180 100644 --- a/src/router/modules.ts +++ b/src/router/modules.ts @@ -1,4 +1,10 @@ export default [ + { + path: '/spdm/createDemand', + name: 'moduleRoutes.spdmCreateDemand', + component: () => import('/@/spdm/views/index.vue'), + meta: {"icon":"ele-Plus","code":"spdm_CreateDemand_view"}, + }, { path: '/spdm/task/sponsor', name: 'moduleRoutes.spdmTaskSponsor', diff --git a/src/router/powers.ts b/src/router/powers.ts index 8218513..cfdae9d 100644 --- a/src/router/powers.ts +++ b/src/router/powers.ts @@ -9,7 +9,7 @@ export interface IPowerItem { children: {id: IFunctionId; label: string}[]; } -export const appIds = ["144579506","6815254491","4398838303","5456162595","9963439034","3027615800","5681445577","1492688104","6037428677","4023091864","9129218323","6871282497","8526152209","5988284884","9841720151","4824808941","33997053","6338569404","6750269544","3386375550","6410688706","8744862794","747911886","7416701100","7463969718","4203835289","9985416320","3660213810","167651000","41522868","8465959142","2062779304","8561499192","3422021869","6543176612","5657594819","6096129580","4049690968","9036849314","4025215109","336010321","8141363439","783704243","5393857209","9140689996","5564261369","9062418451","9834138201","2609888696","9497774410","5417278196","9825252973","7530892919","8948774791","6949491320","3864756744","7136560748","2139529914","4205893438","5567657410","9219082949","1571803661","5624612004","6070029483","4202140290","559205535","1695287815","7333859604","3871296952","2463495929","4144507044","2403013027","7047524643","5720273347","9881616713","4718403889","8204658823","729204224","1138339876","8226515287","8605380524","6831152950","1026986575","3954905558","9970934469","8061608947","329481180","1778930516","5311129373","2106207123","5074949919","2040620736","7022128605","9454240939","2319857176","7912465960","6773297662","1742337866","3582301296","8421983947","2060293387","1017759105","8212387559","3011366119","6499976114","4649260019"]; +export const appIds = ["4776298884","144579506","6815254491","4398838303","5456162595","9963439034","3027615800","5681445577","1492688104","6037428677","4023091864","9129218323","6871282497","8526152209","5988284884","9841720151","4824808941","33997053","6338569404","6750269544","3386375550","6410688706","8744862794","747911886","7416701100","7463969718","4203835289","9985416320","3660213810","167651000","41522868","8465959142","2062779304","8561499192","3422021869","6543176612","5657594819","6096129580","4049690968","9036849314","4025215109","336010321","8141363439","783704243","5393857209","9140689996","5564261369","9062418451","9834138201","2609888696","9497774410","5417278196","9825252973","7530892919","8948774791","6949491320","3864756744","7136560748","2139529914","4205893438","5567657410","9219082949","1571803661","5624612004","6070029483","4202140290","559205535","1695287815","7333859604","3871296952","2463495929","4144507044","2403013027","7047524643","5720273347","9881616713","4718403889","8204658823","729204224","1138339876","8226515287","8605380524","6831152950","1026986575","3954905558","9970934469","8061608947","329481180","1778930516","5311129373","2106207123","5074949919","2040620736","7022128605","9454240939","2319857176","7912465960","6773297662","1742337866","3582301296","8421983947","2060293387","1017759105","8212387559","3011366119","6499976114","4649260019"]; export const appIdMap = new Set(appIds); export const filterFunctionCodesIsApp = (codeList: string[]) => { @@ -19,6 +19,11 @@ export const filterFunctionCodesIsApp = (codeList: string[]) => { }; export default [ + { + id: '4776298884', + label: 'moduleApps.spdm_CreateDemand', + children: [{"id":"9759586599","label":"moduleFuncs.view"},{"id":"9720170990","label":"moduleFuncs.add"},{"id":"1691141698","label":"moduleFuncs.edit"},{"id":"8063211740","label":"moduleFuncs.del"},{"id":"5655482597","label":"moduleFuncs.export"}], + }, { id: '144579506', label: 'moduleApps.spdm_TaskSponsor', diff --git a/src/spdm/config.ts b/src/spdm/config.ts index 3184711..fbb7d1c 100644 --- a/src/spdm/config.ts +++ b/src/spdm/config.ts @@ -5,10 +5,10 @@ // export const CODE_ENV = 'production'; // 生产环境 // 测试环境 -export const SPDM_URL = 'http://192.168.65.161:3000'; // SPDM项目地址 -export const BASE_URL = '/spdmApi/honeycom-spdm'; // baseUrl -export const TENANT_NAME = 'lyric'; // 租户：利元亨 -export const CODE_ENV = 'test'; // 测试环境 +// export const SPDM_URL = 'http://192.168.65.161:3000'; // SPDM项目地址 +// export const BASE_URL = '/spdmApi/honeycom-spdm'; // baseUrl +// export const TENANT_NAME = 'lyric'; // 租户：利元亨 +// export const CODE_ENV = 'test'; // 测试环境 // // 利元亨内网环境 // export const SPDM_URL = 'http://192.168.30.147:7115'; // SPDM项目地址 @@ -17,8 +17,8 @@ export const CODE_ENV = 'test'; // 测试环境 // export const CODE_ENV = 'lyric-intranet'; // 利元亨内网环境 // // 本地环境 -// // export const SPDM_URL = 'http://192.168.65.64:3001'; // SPDM项目地址（李靖本地） -// export const SPDM_URL = 'http://192.168.65.61:3001'; // SPDM项目地址（董志欢本地） -// export const BASE_URL = '/spdmApi/honeycom-spdm'; // baseUrl -// export const TENANT_NAME = 'lyric'; // 租户：利元亨 -// export const CODE_ENV = 'local-dev'; // 本地开发环境 +// export const SPDM_URL = 'http://192.168.65.64:3001'; // SPDM项目地址（李靖本地） +export const SPDM_URL = 'http://192.168.65.61:3001'; // SPDM项目地址（董志欢本地） +export const BASE_URL = '/spdmApi/honeycom-spdm'; // baseUrl +export const TENANT_NAME = 'lyric'; // 租户：利元亨 +export const CODE_ENV = 'local-dev'; // 本地开发环境 diff --git a/src/spdm/function.mjs b/src/spdm/function.mjs index b988e74..b445908 100644 --- a/src/spdm/function.mjs +++ b/src/spdm/function.mjs @@ -1,4 +1,21 @@ export const appList = [ + { + name: 'spdm_CreateDemand', + zhCn: '新增待办', + en: 'Create Demand', + pages: [ + { + name: 'spdmCreateDemand', + zhCn: '新增待办', + en: 'Create Demand', + path: '/spdm/createDemand', + component: () => import('/@/spdm/views/index.vue'), + meta: { + icon: 'ele-Plus', + }, + }, + ], + }, { name: 'spdm_TaskSponsor', zhCn: '我提出的', @@ -638,9 +655,9 @@ export const navList = [ ]; export const menuList = [ - // { - // appName: 'spdmTaskList', - // }, + { + appName: 'spdm_CreateDemand', + }, { navName: 'spdmProject', }, diff --git a/src/spdm/moduleMap.mjs b/src/spdm/moduleMap.mjs index 08ffb88..919df8e 100644 --- a/src/spdm/moduleMap.mjs +++ b/src/spdm/moduleMap.mjs @@ -1,4 +1,12 @@ export const pageMap = { + spdmCreateDemand: { + path: '/spdm/createDemand', + name: 'moduleRoutes.spdmCreateDemand', + meta: { + icon: 'ele-Plus', + code: 'spdmProject_view', + }, + }, spdmProjectAllProject: { path: '/spdm/project/allProject', name: 'moduleRoutes.spdmProjectAllProject',