diff --git a/src/api/workCenter.js b/src/api/workCenter.js index 219305c6..af1b60f1 100644 --- a/src/api/workCenter.js +++ b/src/api/workCenter.js @@ -58,75 +58,73 @@ const standardizationInitGetDataById = (taskId, params) => getAction(`/process/e // 企标更改流程 // 保存 -const enStandardChangeSave = (params) => postAction('', params) +const enStandardChangeSave = (params) => postAction('/process/es/change/save', params) // 发起 -const enStandardChangeApproval = (params) => postAction('', params) +const enStandardChangeApproval = (params) => postAction('/process/es/change/start', params) // 转办 -const enStandardChangeTurnTo = (params) => postAction('', params) +const enStandardChangeTurnTo = (params) => postAction('/process/es/change/transfer', params) // 同意 -const enStandardChangeAgree = (params) => postAction('', params) +const enStandardChangeAgree = (params) => postAction('/process/es/change/agree', params) // 拒绝 -const enStandardChangeReject = (params) => postAction('', params) +const enStandardChangeReject = (params) => postAction('/process/es/change/reject', params) // 根据id查流程数据 -const enStandardChangeGetDataById = (params) => getAction('', params) +const enStandardChangeGetDataById = (taskId, params) => getAction(`/process/es/change/handle/${taskId}`, params) // 企标复审流程 -// 根据id查询流程数据 -const enStandardRecheckGetDataById = (params) => getAction('', params) // 保存 -const enStandardRecheckSave = (params) => postAction('', params) +const enStandardRecheckSave = (params) => postAction('/process/es/recheck/save', params) // 发起 -const enStandardRecheckApproval = (params) => postAction('', params) +const enStandardRecheckApproval = (params) => postAction('/process/es/recheck/start', params) // 转办 -const enStandardRecheckTurnTo = (params) => postAction('', params) -// 提交 -const enStandardRecheckSubmit = (params) => postAction('', params) +const enStandardRecheckTurnTo = (params) => postAction('/process/es/recheck/transfer', params) // 同意 -const enStandardRecheckAgree = (params) => postAction('', params) +const enStandardRecheckAgree = (params) => postAction('/process/es/recheck/agree', params) // 驳回 -const enStandardRecheckReject = (params) => postAction('', 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 = (params) => getAction('', params) // 保存 -const enStandardAnnulSave = (params) => postAction('', params) +const enStandardAnnulSave = (params) => postAction('/process/es/abolish/save', params) // 发起 -const enStandardAnnulApproval = (params) => postAction('', params) +const enStandardAnnulApproval = (params) => postAction('/process/es/abolish/start', params) // 转办 -const enStandardAnnulTurnTo = (params) => postAction('', params) +const enStandardAnnulTurnTo = (params) => postAction('/process/es/abolish/transfer', params) // 同意 -const enStandardAnnulAgree = (params) => postAction('', params) +const enStandardAnnulAgree = (params) => postAction('/process/es/abolish/agree', params) // 驳回 -const enStandardAnnulReject = (params) => postAction('', params) +const enStandardAnnulReject = (params) => postAction('/process/es/abolish/reject', params) +// 根据id查询流程数据--办理 +const enStandardAnnulGetDataById = (taskId, params) => getAction(`/process/es/abolish/handle/${taskId}`, params) // 企标封存流程 -// 根据id查询流程数据--办理 -const enStandardSealSaveGetDataById = (params) => getAction('', params) // 保存 -const enStandardSealSaveSave = (params) => postAction('', params) +const enStandardSealSaveSave = (params) => postAction('/process/es/archive/save', params) // 发起 -const enStandardSealSaveApproval = (params) => postAction('', params) +const enStandardSealSaveApproval = (params) => postAction('/process/es/archive/start', params) // 转办 -const enStandardSealSaveTurnTo = (params) => postAction('', params) +const enStandardSealSaveTurnTo = (params) => postAction('/process/es/archive/transfer', params) // 同意 -const enStandardSealSaveAgree = (params) => postAction('', params) +const enStandardSealSaveAgree = (params) => postAction('/process/es/archive/agree', params) // 驳回 -const enStandardSealSaveReject = (params) => postAction('', params) +const enStandardSealSaveReject = (params) => postAction('/process/es/archive/reject', params) +// 根据id查询流程数据--办理 +const enStandardSealSaveGetDataById = (taskId, params) => getAction(`/process/es/archive/handle/${taskId}`, params) // 已封存企标启用流程 -// 根据id查询流程数据--办理 -const enStandardStartUseGetDataById = (params) => getAction('', params) // 保存 -const enStandardStartUseSave = (params) => postAction('', params) +const enStandardStartUseSave = (params) => postAction('/process/es/enable/save', params) // 发起 -const enStandardStartUseApproval = (params) => postAction('', params) +const enStandardStartUseApproval = (params) => postAction('/process/es/enable/start', params) // 转办 -const enStandardStartUseTurnTo = (params) => postAction('', params) +const enStandardStartUseTurnTo = (params) => postAction('/process/es/enable/transfer', params) // 同意 -const enStandardStartUseAgree = (params) => postAction('', params) +const enStandardStartUseAgree = (params) => postAction('/process/es/enable/agree', params) // 驳回 -const enStandardStartUseReject = (params) => postAction('', params) +const enStandardStartUseReject = (params) => postAction('/process/es/enable/reject', params) +// 根据id查询流程数据--办理 +const enStandardStartUseGetDataById = (taskId, params) => getAction(`/process/es/enable/handle/${taskId}`, params) // 流程中心 // 待办-转办 @@ -189,7 +187,6 @@ export { enStandardRecheckSave, enStandardRecheckApproval, enStandardRecheckTurnTo, - enStandardRecheckSubmit, enStandardRecheckAgree, enStandardRecheckReject, diff --git a/src/enums/commonEnums.js b/src/enums/commonEnums.js index c7e26480..97fabee6 100644 --- a/src/enums/commonEnums.js +++ b/src/enums/commonEnums.js @@ -157,10 +157,15 @@ export const ProcessKey = { ES_ANNUAL_INIT: { text: 'es-annual-init', value: 'es-annual-init' }, // 企标制修订流程 // 企标更改流程 + ES_CHANGE: { text: 'es-change', value: 'es-change' }, // 企标复审流程 + ES_RECHECK: { text: 'es-recheck', value: 'es-recheck' }, // 企标废止流程 + ES_ABOLISH: { text: 'es-abolish', value: 'es-abolish' }, // 企标封存流程 + ES_ARCHIVE: { text: 'es-archive', value: 'es-archive' }, // 已封存企标启用流程 + ES_ENABLE: { text: 'es-enable', value: 'es-enable' }, // 标准法规入库/变更流程 FB_ENTRY_CHANGE: { text: 'fb-entry-change', value: 'fb-entry-change' } } diff --git a/src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue b/src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue index dcf7b438..54b921a4 100644 --- a/src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue +++ b/src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue @@ -78,7 +78,7 @@
- +
@@ -113,8 +113,6 @@ import InternalDetailPage from '@/components/InternalDetailPage' import ProcessDetailList from '@/components/ProcessDetailList' import PersonnelInfo from '@/components/PersonnelInfo' import UserSelectModal from '@/components/selection/UserSelectModal' -import { USER_INFO } from '@/store/mutation-types' -import Vue from 'vue' import pick from 'lodash.pick' import { enStandardChangeSave, @@ -127,50 +125,7 @@ import { import MainDrafterInitBaseInfo from './modules/MainDrafterInitBaseInfo' import ApproveBaseInfo from './modules/ApproveBaseInfo' import { WorkCenterMixin } from '@/mixins/WorkCenterMixin' - -// 人员信息 -const personalInfo = [ // 人员信息的数据 - { - id: 1, - nodeName: '主起草人发起', - nodeRoleName: '发起人', - canChoose: false, - userList: Vue.ls.get(USER_INFO).realname + '(' + Vue.ls.get(USER_INFO).username + ')', - fieldName: 'mainDraftUser' - }, - { - id: 2, - nodeName: '相关人员校对', - nodeRoleName: '相关人员', - canChoose: true, - chooseType: 'checkbox', - fieldName: 'relatedUser' - }, - { - id: 3, - nodeName: '起草人主管级领导审批', - nodeRoleName: '起草人主管级领导', - canChoose: true, - chooseType: 'radio', - fieldName: 'mainDraftUserLeader' - }, - { - id: 4, - nodeName: '标准化审批', - nodeRoleName: '标准化', - canChoose: true, - chooseType: 'radio', - fieldName: 'standardizationUser' - }, - { - id: 5, - nodeName: '起草人主管级上一级领导审批', - nodeRoleName: '起草人主管级上一级领导', - canChoose: true, - chooseType: 'radio', - fieldName: 'mainDraftUserLeaderLeader' - } -] +import { ProcessKey } from '../../../enums/commonEnums' export default { name: 'EnterpriseStandardChangeFlow', @@ -190,7 +145,7 @@ export default { }, mounted () { // 获取人员信息结构 - this.getPersonInfoStructure() + this.getPersonInfoStructure(ProcessKey.ES_CHANGE.value) if (this.$route.query.taskId) { this.currentNodeName = this.$route.query.taskName // 有流程id说明是从流程中心来的,需要初始化数据 diff --git a/src/views/workCenter/enterpriseStandardChange/modules/BaseInfoForm.vue b/src/views/workCenter/enterpriseStandardChange/modules/BaseInfoForm.vue index 17f380e4..889b2a94 100644 --- a/src/views/workCenter/enterpriseStandardChange/modules/BaseInfoForm.vue +++ b/src/views/workCenter/enterpriseStandardChange/modules/BaseInfoForm.vue @@ -1,344 +1,348 @@