From cd01e500f7b76bc58cab7134ec56ac91c61d1ea4 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Tue, 12 Dec 2023 16:16:53 +0800 Subject: [PATCH] =?UTF-8?q?[add]=20=E5=B9=B4=E5=BA=A6=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E8=AE=A1=E5=88=92=E4=B8=BB=E5=8A=A8=E4=B8=8A=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/api.js | 15 + src/common/lang/en-us.js | 21 + src/common/lang/zh-cn.js | 21 + src/router/workCenter/index.js | 20 +- src/views/Home.vue | 64 --- src/views/myTodo/MyTodo.vue | 12 +- .../AnnualRevisionPlanActivelyReport.vue | 396 ++++++++++++++++++ 7 files changed, 474 insertions(+), 75 deletions(-) create mode 100644 src/views/workCenter/annualRevisionPlanActivelyReport/AnnualRevisionPlanActivelyReport.vue diff --git a/src/api/api.js b/src/api/api.js index 9b688b1..17890a4 100644 --- a/src/api/api.js +++ b/src/api/api.js @@ -70,6 +70,16 @@ const enterprisePlanApprovalTurnTo = (params) => postAction('/process/es/initCha // 保存 const enterprisePlanApprovalSave = (params) => postAction('/process/es/initChange/save', params) +// 年度制修订计划（各部门主动上报） +// 根据流程id获取流程信息 +const activelyReportGetDataById = (taskId, params) => getAction(`/process/es/annualReport/handle/${taskId}`, params) +// 转办 +const activelyReportTurnTo = (params) => postAction('/process/es/annualReport/transfer', params) +// 同意 +const activelyReportAgree = (params) => postAction('/process/es/annualReport/agree', params) +// 拒绝 +const activelyReportReject = (params) => postAction('/process/es/annualReport/reject', params) + // 企标复审流程 // 保存 const enStandardRecheckSave = (params) => postAction('/process/es/recheck/save', params) @@ -201,6 +211,11 @@ export { enterprisePlanApprovalTurnTo, enterprisePlanApprovalSave, + activelyReportGetDataById, + activelyReportTurnTo, + activelyReportAgree, + activelyReportReject, + enStandardRecheckSave, enStandardRecheckTurnTo, enStandardRecheckAgree, diff --git a/src/common/lang/en-us.js b/src/common/lang/en-us.js index 761f47d..cc42f44 100644 --- a/src/common/lang/en-us.js +++ b/src/common/lang/en-us.js @@ -103,6 +103,27 @@ module.exports = { superintendent: '所长', relatedPersonnel: '相关人员' }, + // 年度制修订计划（各部门主动上报） + revisionPlanActivelyReport: { + revisionPlanDesc: '制修订计划说明', + revisionType: '制修订类型', + oldEnterpriseStandardNum: '原企标编号', + newEnterpriseStandardNum: '新企标编号', + oldEnterpriseStandardName: '原企标名称', + newEnterpriseStandardName: '新企标名称', + authDepartment: '授权部门', + enterpriseStandardCode: '企业标准代号', + suitUnit: '配合单位', + principalDrafter: '主起草人', + mainDraftingUnit: '主起草单位', + headOfMainDraftingUnit: '主起草单位负责人', + affiliatedWorkingGroup: '隶属工作组', + standardPusher: '标准推进人', + draftPlanFinishDate: '草稿计划完成日期', + exposureDraftPlanFinishDate: '征求意见稿计划完成日期', + planSubmissionDate: '计划报批日期', + changeState: '变更状态' + }, // 企标复审流程 esRecheck: { recheckDate: '复审日期', diff --git a/src/common/lang/zh-cn.js b/src/common/lang/zh-cn.js index eaa34db..61dd343 100644 --- a/src/common/lang/zh-cn.js +++ b/src/common/lang/zh-cn.js @@ -103,6 +103,27 @@ module.exports = { superintendent: '所长', relatedPersonnel: '相关人员' }, + // 年度制修订计划（各部门主动上报） + revisionPlanActivelyReport: { + revisionPlanDesc: '制修订计划说明', + revisionType: '制修订类型', + oldEnterpriseStandardNum: '原企标编号', + newEnterpriseStandardNum: '新企标编号', + oldEnterpriseStandardName: '原企标名称', + newEnterpriseStandardName: '新企标名称', + authDepartment: '授权部门', + enterpriseStandardCode: '企业标准代号', + suitUnit: '配合单位', + principalDrafter: '主起草人', + mainDraftingUnit: '主起草单位', + headOfMainDraftingUnit: '主起草单位负责人', + affiliatedWorkingGroup: '隶属工作组', + standardPusher: '标准推进人', + draftPlanFinishDate: '草稿计划完成日期', + exposureDraftPlanFinishDate: '征求意见稿计划完成日期', + planSubmissionDate: '计划报批日期', + changeState: '变更状态' + }, // 企标复审流程 esRecheck: { recheckDate: '复审日期', diff --git a/src/router/workCenter/index.js b/src/router/workCenter/index.js index 5904336..72f7e48 100644 --- a/src/router/workCenter/index.js +++ b/src/router/workCenter/index.js @@ -4,7 +4,17 @@ export default [ name: 'EnterpriseStandardInitChange', component: (resolve) => require(['@/views/workCenter/enterpriseStandardInitChange/EnterpriseStandardInitChange.vue'], resolve), meta: { - title: '企标计划立项/变更流程', + // title: '企标计划立项/变更流程', + hasNavBar: true, // 这个属性控制页面是否显示上面的导航栏 + hasBack: true // 这个属性控制页面上面的导航栏 是否有返回按钮 + } + }, + { + path: '/workCenter/annualRevisionPlanActivelyReport', + name: 'AnnualRevisionPlanActivelyReport', + component: (resolve) => require(['@/views/workCenter/annualRevisionPlanActivelyReport/AnnualRevisionPlanActivelyReport.vue'], resolve), + meta: { + // title: '年度制修订计划(各部门主动上报)', hasNavBar: true, // 这个属性控制页面是否显示上面的导航栏 hasBack: true // 这个属性控制页面上面的导航栏 是否有返回按钮 } @@ -14,7 +24,7 @@ export default [ name: 'EnterpriseStandardRecheck', component: (resolve) => require(['@/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheck.vue'], resolve), meta: { - title: '企标复审流程', + // title: '企标复审流程', hasNavBar: true, // 这个属性控制页面是否显示上面的导航栏 hasBack: true // 这个属性控制页面上面的导航栏 是否有返回按钮 } @@ -24,7 +34,7 @@ export default [ name: 'EnterpriseStandardAnnul', component: (resolve) => require(['@/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnul.vue'], resolve), meta: { - title: '企标废止流程', + // title: '企标废止流程', hasNavBar: true, // 这个属性控制页面是否显示上面的导航栏 hasBack: true // 这个属性控制页面上面的导航栏 是否有返回按钮 } @@ -34,7 +44,7 @@ export default [ name: 'EnterpriseStandardSealSave', component: (resolve) => require(['@/views/workCenter/enterpriseStandardSealSave/EnterpriseStandardSealSave.vue'], resolve), meta: { - title: '企标封存流程', + // title: '企标封存流程', hasNavBar: true, // 这个属性控制页面是否显示上面的导航栏 hasBack: true // 这个属性控制页面上面的导航栏 是否有返回按钮 } @@ -44,7 +54,7 @@ export default [ name: 'EnterpriseStandardStartUse', component: (resolve) => require(['@/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUse.vue'], resolve), meta: { - title: '已封存企标启用流程', + // title: '已封存企标启用流程', hasNavBar: true, // 这个属性控制页面是否显示上面的导航栏 hasBack: true // 这个属性控制页面上面的导航栏 是否有返回按钮 } diff --git a/src/views/Home.vue b/src/views/Home.vue index 5f865cf..efd36ed 100644 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -5,11 +5,6 @@ 退出登录 我的待办
- 跳转企标计划立项、变更流程审批 - 跳转企标复审流程 - 跳转企标废止流程 - 跳转企标封存流程 - 跳转已封存企标启用流程 @@ -22,65 +17,6 @@ export default { toMyTodo () { this.$router.push({ path: '/myTodo' }) }, - goEnterpriseStandardInitChange () { - this.$router.push({ - path: '/workCenter/enterpriseStandardInitChange', - query: { - // processInstanceId: '392773', - // taskId: '435061' - // 完成时间变更 - // processInstanceId: '435062', - // taskId: '435106' - // 工作终止变更 - // processInstanceId: '435107', - // taskId: '435135' - // 责任部门变更 - processInstanceId: '447619', - taskId: '475241', - nodeId: 'sid-AB70F1CA-8311-4639-B3DA-204EF3332B29' - } - }) - }, - goESRecheck () { - this.$router.push({ - path: '/workCenter/enterpriseStandardRecheck', - query: { - processInstanceId: '580001', - taskId: '580037', - nodeId: 'sid-72303DAD-0B49-471B-828E-66602468BE44' - } - }) - }, - goESAnnul () { - this.$router.push({ - path: '/workCenter/enterpriseStandardAnnul', - query: { - processInstanceId: '447681', - taskId: '492542', - nodeId: 'sid-9C90582D-F71F-4516-B54F-1E9F896C30D8' - } - }) - }, - goESSealSave () { - this.$router.push({ - path: '/workCenter/enterpriseStandardSealSave', - query: { - processInstanceId: '467582', - taskId: '492547', - nodeId: 'sid-9C90582D-F71F-4516-B54F-1E9F896C30D8' - } - }) - }, - goESStartUse () { - this.$router.push({ - path: '/workCenter/enterpriseStandardStartUse', - query: { - processInstanceId: '467650', - taskId: '492552', - nodeId: 'sid-9C90582D-F71F-4516-B54F-1E9F896C30D8' - } - }) - }, ...mapActions(['Logout']), logout () { const that = this diff --git a/src/views/myTodo/MyTodo.vue b/src/views/myTodo/MyTodo.vue index 02d5ce5..170429b 100644 --- a/src/views/myTodo/MyTodo.vue +++ b/src/views/myTodo/MyTodo.vue @@ -64,11 +64,11 @@ export default { break // 企标立项、变更计划 case '7': - path = '/workCenter/enterpriseStandardInitChange/planApprovalChangeFlow' + path = '/workCenter/enterpriseStandardInitChange' break // 年度制修订计划（各部门主动上报） case '8': - path = '/workCenter/annualRevisionPlanActivelyReport/revisionPlanActivelyReportFlow' + path = '/workCenter/annualRevisionPlanActivelyReport' break // 年度制修订计划（标准化发起） case '9': @@ -84,19 +84,19 @@ export default { break // 企标复审流程 case '12': - path = '/workCenter/enterpriseStandardRecheck/enterpriseStandardRecheckFlow' + path = '/workCenter/enterpriseStandardRecheck' break // 企标废止流程 case '13': - path = '/workCenter/enterpriseStandardAnnul/enterpriseStandardAnnulFlow' + path = '/workCenter/enterpriseStandardAnnul' break // 企标封存流程 case '14': - path = '/workCenter/enterpriseStandardSealSave/enterpriseStandardSealSaveFlow' + path = '/workCenter/enterpriseStandardSealSave' break // 已封存企标启用流程 case '15': - path = '/workCenter/enterpriseStandardStartUse/enterpriseStandardStartUseFlow' + path = '/workCenter/enterpriseStandardStartUse' break // 企标稽查计划 case '16': diff --git a/src/views/workCenter/annualRevisionPlanActivelyReport/AnnualRevisionPlanActivelyReport.vue b/src/views/workCenter/annualRevisionPlanActivelyReport/AnnualRevisionPlanActivelyReport.vue new file mode 100644 index 0000000..a33ce49 --- /dev/null +++ b/src/views/workCenter/annualRevisionPlanActivelyReport/AnnualRevisionPlanActivelyReport.vue @@ -0,0 +1,396 @@ + + + + +