diff --git a/src/api/api.js b/src/api/api.js index cfd0193..9b688b1 100644 --- a/src/api/api.js +++ b/src/api/api.js @@ -70,6 +70,18 @@ const enterprisePlanApprovalTurnTo = (params) => postAction('/process/es/initCha // 保存 const enterprisePlanApprovalSave = (params) => postAction('/process/es/initChange/save', params) +// 企标复审流程 +// 保存 +const enStandardRecheckSave = (params) => postAction('/process/es/recheck/save', params) +// 转办 +const enStandardRecheckTurnTo = (params) => postAction('/process/es/recheck/transfer', params) +// 同意 +const enStandardRecheckAgree = (params) => postAction('/process/es/recheck/agree', params) +// 驳回 +const enStandardRecheckReject = (params) => postAction('/process/es/recheck/reject', params) +// 根据id查询流程数据 +const enStandardRecheckGetDataById = (taskId, params) => getAction(`/process/es/recheck/handle/${taskId}`, params) + // 企标废止流程 // 根据id查询流程数据--办理 const enStandardAnnulGetDataById = (taskId, params) => getAction(`/process/es/abolish/handle/${taskId}`, params) @@ -189,6 +201,12 @@ export { enterprisePlanApprovalTurnTo, enterprisePlanApprovalSave, + enStandardRecheckSave, + enStandardRecheckTurnTo, + enStandardRecheckAgree, + enStandardRecheckReject, + enStandardRecheckGetDataById, + enStandardAnnulGetDataById, enStandardAnnulTurnTo, enStandardAnnulAgree, diff --git a/src/common/lang/en-us.js b/src/common/lang/en-us.js index 148d089..761f47d 100644 --- a/src/common/lang/en-us.js +++ b/src/common/lang/en-us.js @@ -103,6 +103,15 @@ module.exports = { superintendent: '所长', relatedPersonnel: '相关人员' }, + // 企标复审流程 + esRecheck: { + recheckDate: '复审日期', + recheck: '复审', + standGood: '继续有效', + revise: '修订', + annul: '废止', + sealSave: '封存' + }, // 企标废止流程 esAnnul: { standardType: '标准类型', diff --git a/src/common/lang/zh-cn.js b/src/common/lang/zh-cn.js index 6cf4219..eaa34db 100644 --- a/src/common/lang/zh-cn.js +++ b/src/common/lang/zh-cn.js @@ -103,6 +103,15 @@ module.exports = { superintendent: '所长', relatedPersonnel: '相关人员' }, + // 企标复审流程 + esRecheck: { + recheckDate: '复审日期', + recheck: '复审', + standGood: '继续有效', + revise: '修订', + annul: '废止', + sealSave: '封存' + }, // 企标废止流程 esAnnul: { standardType: '标准类型', diff --git a/src/enums/commonEnums.js b/src/enums/commonEnums.js index 7f998e1..c61b6ca 100644 --- a/src/enums/commonEnums.js +++ b/src/enums/commonEnums.js @@ -105,6 +105,23 @@ export const EsInitChangeNodes = new EsEnums({ mainDrafterCopy: { text: '主起草人抄送', value: 'sid-08D0381A-5C20-4708-9D73-C7EB5C51DB02' } }) +// 企标复审-复审 +export const Recheck = { + STAND_GOOD: { text: '继续有效', value: '1' }, + REVISE: { text: '修订', value: '2' }, + ANNUL: { text: '废止', value: '3' }, + SEAL_SAVE: { text: '封存', value: '4' } +} + +// 企标复审流程 +export const EsRecheckNodes = new EsEnums({ + standardizationSelectContact: { text: '标准化工程师选择联络人', value: 'sid-9E19F873-6E54-427A-938F-0DBADD1DD7E5' }, + initiatorStart: { text: '发起人发起', value: 'sid-2E53F267-8541-40FB-974D-D8DDD03191CB' }, + drafterEnterOption: { text: '起草人填写意见', value: 'sid-72303DAD-0B49-471B-828E-66602468BE44' }, + drafterMinisterApproval: { text: '起草人部长审批', value: 'sid-18EE1480-C281-4569-93F6-F94F204B71ED' }, + standardizationApproval: { text: '标准化审批', value: 'sid-6BF8F285-0A2A-449C-A108-24024A922723' } +}) + // 下发人员类型 export const SenderType = { moduleOwner: { text: '模块负责人', value: '1' }, diff --git a/src/router/workCenter/index.js b/src/router/workCenter/index.js index af8c1c4..5904336 100644 --- a/src/router/workCenter/index.js +++ b/src/router/workCenter/index.js @@ -9,6 +9,16 @@ export default [ hasBack: true // 这个属性控制页面上面的导航栏 是否有返回按钮 } }, + { + path: '/workCenter/enterpriseStandardRecheck', + name: 'EnterpriseStandardRecheck', + component: (resolve) => require(['@/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheck.vue'], resolve), + meta: { + title: '企标复审流程', + hasNavBar: true, // 这个属性控制页面是否显示上面的导航栏 + hasBack: true // 这个属性控制页面上面的导航栏 是否有返回按钮 + } + }, { path: '/workCenter/enterpriseStandardAnnul', name: 'EnterpriseStandardAnnul', diff --git a/src/views/Home.vue b/src/views/Home.vue index 33c5854..5f865cf 100644 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -6,6 +6,7 @@ 我的待办 跳转企标计划立项、变更流程审批 + 跳转企标复审流程 跳转企标废止流程 跳转企标封存流程 跳转已封存企标启用流程 @@ -40,13 +41,23 @@ export default { } }) }, + 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: '350016', - taskId: '350059', - nodeId: 'sid-B4157F9F-73E5-48F5-855D-AF87C0DB91C6' + processInstanceId: '447681', + taskId: '492542', + nodeId: 'sid-9C90582D-F71F-4516-B54F-1E9F896C30D8' } }) }, @@ -55,8 +66,8 @@ export default { path: '/workCenter/enterpriseStandardSealSave', query: { processInstanceId: '467582', - taskId: '467648', - nodeId: 'sid-0BC5B3BC-ED99-4061-84B4-7320E25DE326' + taskId: '492547', + nodeId: 'sid-9C90582D-F71F-4516-B54F-1E9F896C30D8' } }) }, @@ -65,8 +76,8 @@ export default { path: '/workCenter/enterpriseStandardStartUse', query: { processInstanceId: '467650', - taskId: '467716', - nodeId: 'sid-0BC5B3BC-ED99-4061-84B4-7320E25DE326' + taskId: '492552', + nodeId: 'sid-9C90582D-F71F-4516-B54F-1E9F896C30D8' } }) }, diff --git a/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnul.vue b/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnul.vue index c32a4ee..d6020d2 100644 --- a/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnul.vue +++ b/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnul.vue @@ -100,7 +100,7 @@ type="textarea" rows="1" autosize - v-model="baseInfoForm.replacedByStandardNumber" />、 + v-model="baseInfoForm.replacedByStandardNumber" /> {{ $t('turnTo') }} - - - - - - - {{ $t('agree') }} - - - - - - - {{ $t('reject') }} - - @@ -763,15 +747,31 @@ {{ $t('submit') }} - - - - - - - - {{ $t('determine') }} - + + + + + + + {{ $t('determine') }} + + + + + + + + + {{ $t('agree') }} + + + + + + + {{ $t('reject') }} + + diff --git a/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheck.vue b/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheck.vue new file mode 100644 index 0000000..b46c454 --- /dev/null +++ b/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheck.vue @@ -0,0 +1,410 @@ + + + + + + {{ $t('processInformation') }} + + + + + + + + + + + + + {{ $t('basicServiceInformation') }} + + + + + + + + + + + + + + + + + + + + + {{ $t('processApprovalInformation') }} + + + + + + + + + + + + + {{ $t('turnTo') }} + + + + + + + + + {{ $t('save') }} + + + + + + + {{ $t('submit') }} + + + + + + + + + {{ $t('agree') }} + + + + + + + {{ $t('reject') }} + + + + + + + + + +