diff --git a/src/api/workCenter.js b/src/api/workCenter.js index d9de7bb2..fbe95ea1 100644 --- a/src/api/workCenter.js +++ b/src/api/workCenter.js @@ -294,6 +294,22 @@ const saveInspectRectify = (params) => postAction('/process/esInspectRectifyFlow // 企标稽查整改业务数据 const getInspectRectifyDataById = (params) => getAction('/esinspectreport/processEsInspectRectify/queryByProjectId', params) +/* 权限申请流程 */ +// 生成项目id +const getPermissionApplyProjectId = (params) => getAction('/process/esPermissionApplyFlow/getProjectId', params) +// 详情信息 +const getPermissionApplyDetail = (params) => getAction('/process/esPermissionApplyFlow/queryDetailByProjectId', params) +// 发起 +const startPermissionApply = (params) => postAction('/process/esPermissionApplyFlow/flowStart', params) +// 审批 +const approvalPermissionApply = (params) => postAction('/process/esPermissionApplyFlow/flowApproval', params) +// 转办 +const transferPermissionApply = (params) => getAction('/process/esPermissionApplyFlow/flowTransfer', params) +// 保存 +const savePermissionApply = (params) => postAction('/process/esPermissionApplyFlow/flowSave', params) +// 权限申请流程业务数据 +const getPermissionApplyDataById = (params) => getAction('/espermissionapply/processEsPermissionApply/queryByProjectId', params) + export { getProcessNodeList, @@ -441,5 +457,13 @@ export { approvalInspectRectify, transferInspectRectify, saveInspectRectify, - getInspectRectifyDataById + getInspectRectifyDataById, + + getPermissionApplyProjectId, + getPermissionApplyDetail, + startPermissionApply, + approvalPermissionApply, + transferPermissionApply, + savePermissionApply, + getPermissionApplyDataById } diff --git a/src/enums/commonEnums.js b/src/enums/commonEnums.js index aca53861..fc87b148 100644 --- a/src/enums/commonEnums.js +++ b/src/enums/commonEnums.js @@ -198,7 +198,13 @@ export const ProcessKey = { // 稽查延期申请流程 INSPECTION_EXTENSION_REQUEST_PROCESS: { text: 'inspect_delay_apply_process', value: 'inspect_delay_apply_process' }, // 企标稽查整改 - ES_INSPECTION_RECTIFICATION: { text: 'inspect_rectify', value: 'inspect_rectify' } + ES_INSPECTION_RECTIFICATION: { text: 'inspect_rectify', value: 'inspect_rectify' }, + // 权限申请流程 + PERMISSION_APPLY: { text: 'permission_apply_process', value: 'permission_apply_process' }, + // 标准宣贯流程 + STANDARD_PROMOTION: { text: 'standard_declare', value: 'standard_declare' }, + // 会后管理流程 + POST_MEETING_MANAGE: { text: 'permission_apply_process', value: 'permission_apply_process' } } // 标准性质 @@ -290,6 +296,24 @@ export const EsInspectionRectification = new EsEnums({ directorToExamine: { text: '稽查负责人审核', value: 'responsible_approval', btn: 6 } }) +// 权限申请流程 +export const PermissionApply = new EsEnums({ + initiate: { text: '发起人申请', value: 'initiator_start', btn: 6 }, + leaderApproval: { text: '发起人领导审批', value: 'leader_approval', btn: 27 }, + standardApproval: { text: '标准化审批', value: 'standard_approval', btn: 27 } +}) + +// 标准宣贯流程 +export const StandardPromotion = new EsEnums({ + initiate: { text: '发起并归档', value: 'initiator_start', btn: 6 } +}) + +// 会后管理流程 +export const PostMeetingManage = new EsEnums({ + initiate: { text: '法规工程师发起', value: 'initiator_start', btn: 6 }, + leaderApproval: { text: '参会人员上传材料', value: 'leader_approval', btn: 7 } +}) + // 项目评估结果类型 export const EvaluationResultType = new EsEnums({ accordWith: { text: '符合', value: '1' }, diff --git a/src/views/workCenter/NewProcess.vue b/src/views/workCenter/NewProcess.vue index d558a435..9f8188ee 100644 --- a/src/views/workCenter/NewProcess.vue +++ b/src/views/workCenter/NewProcess.vue @@ -97,10 +97,10 @@ export default { title: this.$t('workCenter.newProcess.auditExtensionApplicationProcess'), path: '/workCenter/InspectionExtensionRequestProcess' }, - { // 企标稽查整改 - title: this.$t('workCenter.newProcess.enterpriseStandardInspectionAndRectification'), - path: '/workCenter/EnterpriseStandardInspectionRectification' - }, + // { // 企标稽查整改 + // title: this.$t('workCenter.newProcess.enterpriseStandardInspectionAndRectification'), + // path: '/workCenter/EnterpriseStandardInspectionRectification' + // }, { // 权限申请流程 title: this.$t('workCenter.newProcess.permissionApplicationProcess'), path: '/workCenter/PermissionApplicationProcess' diff --git a/src/views/workCenter/enterpriseStandardInspectionPlan/EnterpriseStandardInspectionPlanFlow.vue b/src/views/workCenter/enterpriseStandardInspectionPlan/EnterpriseStandardInspectionPlanFlow.vue index 938edf7a..e567e4c2 100644 --- a/src/views/workCenter/enterpriseStandardInspectionPlan/EnterpriseStandardInspectionPlanFlow.vue +++ b/src/views/workCenter/enterpriseStandardInspectionPlan/EnterpriseStandardInspectionPlanFlow.vue @@ -55,7 +55,7 @@
{{ $t('basicServiceInformation') }}
- +
@@ -426,19 +426,15 @@ export default { */ handleSubmit () { if (this.loading) return - this.loading = true - let fn - switch (this.currentNode) { - case EsInspectionPlan.initiate.value: - fn = startInspectPlan - break - default: - fn = approvalInspectPlan - break + // 发起流程并且没有被驳回,调发起接口,否则调审批接口 + if (this.currentNode === EsInspectionPlan.initiate.value && this.$route.query.taskId) { + this.handleAgree() + return } + this.loading = true this.getPageParams().then(res => { console.log(res) - return fn && fn(res) + return startInspectPlan(res) }).then(res => { if (res.success) { this.$message.success(res.message) diff --git a/src/views/workCenter/enterpriseStandardInspectionPlan/modules/InspectionPlanDrawer.vue b/src/views/workCenter/enterpriseStandardInspectionPlan/modules/InspectionPlanDrawer.vue index 1d75f0f5..7632e9db 100644 --- a/src/views/workCenter/enterpriseStandardInspectionPlan/modules/InspectionPlanDrawer.vue +++ b/src/views/workCenter/enterpriseStandardInspectionPlan/modules/InspectionPlanDrawer.vue @@ -16,7 +16,7 @@ @@ -105,6 +105,7 @@ import UserSelection from '@comp/selection/UserSelection' import { getWorkGroupTreeList } from '@api/api' import WorkGroupSelection from '@comp/selection/WorkGroupSelection' import { addInspectPlanTable, editInspectPlanTable } from '@api/workCenter' +import { StandardSource } from '@/enums/commonEnums' export default { name: 'InspectionPlanDrawer', @@ -118,6 +119,7 @@ export default { components: { WorkGroupSelection, UserSelection, StandardSelection }, data () { return { + StandardSource, width: 800, title: this.$t('workCenter.esInspectionPlan.inspectionPlan'), visible: false, diff --git a/src/views/workCenter/enterpriseStandardInspectionPlan/modules/InspectionPlanTable.vue b/src/views/workCenter/enterpriseStandardInspectionPlan/modules/InspectionPlanTable.vue index e78b9863..7735aba0 100644 --- a/src/views/workCenter/enterpriseStandardInspectionPlan/modules/InspectionPlanTable.vue +++ b/src/views/workCenter/enterpriseStandardInspectionPlan/modules/InspectionPlanTable.vue @@ -2,13 +2,13 @@
- {{ $t('newlyAdded') }} + {{ $t('newlyAdded') }} - {{ $t('import') }} + {{ $t('import') }} - {{ $t('batchDelete') }} + {{ $t('batchDelete') }}
{ console.log(res) - // 如果是审批,就默认pass为true - if (pass && res.map) { - res.map.pass = pass - } - return fn && fn(res) + return startInspectProcess(res) }).then(res => { if (res.success) { this.$message.success(res.message) diff --git a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessContent.vue b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessContent.vue index 97f83065..d614ce62 100644 --- a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessContent.vue +++ b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessContent.vue @@ -11,7 +11,7 @@
- {{ $t('newlyAdded') }} + {{ $t('newlyAdded') }}
- {{ $t('newlyAdded') }} + {{ $t('newlyAdded') }}
- {{ $t('newlyAdded') }} + {{ $t('newlyAdded') }}
- {{ $t('newlyAdded') }} + {{ $t('newlyAdded') }}
{ console.log(res) return saveInspectRectify(res) @@ -370,7 +370,7 @@ export default { */ handleSubmit () { if (this.loading) return - // this.loading = true + this.loading = true this.getPageParams().then(res => { console.log(res) res.map.pass = true diff --git a/src/views/workCenter/inspectionExtensionRequestProcess/InspectionExtensionRequestProcess.vue b/src/views/workCenter/inspectionExtensionRequestProcess/InspectionExtensionRequestProcess.vue index 604ee891..456528ff 100644 --- a/src/views/workCenter/inspectionExtensionRequestProcess/InspectionExtensionRequestProcess.vue +++ b/src/views/workCenter/inspectionExtensionRequestProcess/InspectionExtensionRequestProcess.vue @@ -371,24 +371,15 @@ export default { */ handleSubmit () { if (this.loading) return - this.loading = true - let fn - let pass - switch (this.currentNode) { - case InspectionExtensionRequestProcess.initiate.value: - fn = startInspectExtension - break - default: - fn = approvalInspectExtension - pass = true - break + // 发起流程并且没有被驳回,调发起接口,否则调审批接口 + if (this.currentNode === InspectionExtensionRequestProcess.initiate.value && this.$route.query.taskId) { + this.handleAgree() + return } + this.loading = true this.getPageParams().then(res => { - if (pass) { - res.map.pass = pass - } console.log(res) - return fn && fn(res) + return startInspectExtension(res) }).then(res => { if (res.success) { this.$message.success(res.message) diff --git a/src/views/workCenter/inspectionExtensionRequestProcess/modules/ExtensionRequestTable.vue b/src/views/workCenter/inspectionExtensionRequestProcess/modules/ExtensionRequestTable.vue index c4b6b6b3..c96118d6 100644 --- a/src/views/workCenter/inspectionExtensionRequestProcess/modules/ExtensionRequestTable.vue +++ b/src/views/workCenter/inspectionExtensionRequestProcess/modules/ExtensionRequestTable.vue @@ -2,7 +2,7 @@
- {{ $t('newlyAdded') }} + {{ $t('newlyAdded') }}
- +