[update] 联调企标计划立项、变更流程
This commit is contained in:
@@ -27,6 +27,8 @@ const enterprisePlanApprovalSave = (params) => postAction('/process/es/initChang
|
||||
const getEnStandardNo = (params) => postAction('/process/es/initChange/getStandardNo', params)
|
||||
// 根据流程id获取流程信息
|
||||
const getProcessDataById = (taskId, params) => getAction(`/process/es/initChange/handle/${taskId}`, params)
|
||||
// 草稿的办理回显数据
|
||||
const getProcessDataDraft = (params) => getAction('/process/es/initChange/draftHandle', params)
|
||||
|
||||
// 年度制修订计划(各部门主动上报)
|
||||
// 发起
|
||||
@@ -235,6 +237,7 @@ export {
|
||||
enterprisePlanApprovalSave,
|
||||
getEnStandardNo,
|
||||
getProcessDataById,
|
||||
getProcessDataDraft,
|
||||
|
||||
activelyReportApproval,
|
||||
activelyReportSave,
|
||||
|
||||
@@ -291,3 +291,17 @@ export const ProcurementProcessNodes = new EsEnums({
|
||||
export const ProjectComplianceEvaluationProcessNode = new EsEnums({
|
||||
initiate: { text: '法规工程师发起', value: '1', btn: ['save', 'pre', 'next', 'submit'] }
|
||||
})
|
||||
|
||||
// 企标立项、变更流程
|
||||
export const EsInitChangeNodes = new EsEnums({
|
||||
mainDrafterStart: { text: '主起草人发起', value: 'sid-7120EF36-78C3-4DB0-8B49-91178F79C24B' },
|
||||
contactCheck: { text: '部所联络人校对', value: 'sid-BB1FF9A5-89DF-4356-AB16-9D68B8FABC04' },
|
||||
expertApproval: { text: '专家审批', value: 'sid-ABE29414-15C7-4798-B690-E53055F6CA75' },
|
||||
leaderApproval: { text: '主管级领导审批', value: 'sid-A58C400F-BA13-4125-9B00-45EB45F1A559' },
|
||||
leaderLeaderApproval: { text: '主管级上一级领导审批', value: 'sid-298A57B6-6658-47C0-94EB-76E3A5790258' },
|
||||
standardizationApproval: { text: '标准化审批', value: 'sid-06CB29CE-E39F-4CD2-A534-18546DC8C6FB' },
|
||||
newDraftUnitLeaderLeaderSend: { text: '新起草部门主管级上一级领导下发', value: 'sid-AB70F1CA-8311-4639-B3DA-204EF3332B29' },
|
||||
newDraftUnitLeaderConfirm: { text: '新起草部门主管级领导确认', value: 'sid-A26EC37C-7C93-4987-9833-363C4E25EC50' },
|
||||
relevantPersonnelWillSign: { text: '相关人员会签', value: 'sid-7BFD2753-B6CD-4637-8D4B-819903511925' },
|
||||
mainDrafterCopy: { text: '主起草人抄送', value: 'sid-08D0381A-5C20-4708-9D73-C7EB5C51DB02' }
|
||||
})
|
||||
|
||||
@@ -164,10 +164,10 @@
|
||||
</merge-base-info>
|
||||
|
||||
<!-- 部分节点需要选人 -->
|
||||
<a-form v-if="formInline.applicationCategory === ApplicationCategory.CHANGE.value && [6, 7].includes(currentNode)" class="user-form" :form="userForm">
|
||||
<a-form v-if="formInline.applicationCategory === ApplicationCategory.CHANGE.value && [7, 8].includes(currentNode)" class="user-form" :form="userForm">
|
||||
<a-row :gutter="24">
|
||||
<!-- 所长,节点6需要选所长 -->
|
||||
<a-col :span="12" v-if="currentNode === 6">
|
||||
<a-col :span="12" v-if="currentNode === 7">
|
||||
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('workCenter.enterpriseInitChangePlan.superintendent')">
|
||||
<user-selection :placeholder="$t('pleaseSelect') + $t('workCenter.enterpriseInitChangePlan.superintendent')"
|
||||
type="radio"
|
||||
@@ -176,7 +176,7 @@
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<!-- 相关人员,节点7需要选相关人员 -->
|
||||
<a-col :span="12" v-if="currentNode === 7">
|
||||
<a-col :span="12" v-if="currentNode === 8">
|
||||
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('workCenter.enterpriseInitChangePlan.relatedPersonnel')">
|
||||
<user-selection :placeholder="$t('pleaseSelect') + $t('workCenter.enterpriseInitChangePlan.relatedPersonnel')"
|
||||
type="checkbox"
|
||||
@@ -219,7 +219,7 @@
|
||||
<a-button type="primary" :loading="loading" @click="handleStart" icon="upload">{{ $t('submit') }}</a-button>
|
||||
</template>
|
||||
<!-- 变更的新起草部门主管级上一级领导下发节点 -->
|
||||
<template v-else-if="formInline.applicationCategory === ApplicationCategory.CHANGE.value && [6, 7].includes(currentNode)">
|
||||
<template v-else-if="formInline.applicationCategory === ApplicationCategory.CHANGE.value && [7, 8].includes(currentNode)">
|
||||
<!-- 转办 -->
|
||||
<a-button type="primary" ghost :loading="loading" @click="handleTurnTo" icon="arrow-up">{{ $t('turnTo') }}</a-button>
|
||||
<!-- 保存 -->
|
||||
@@ -227,7 +227,7 @@
|
||||
<!-- 提交 -->
|
||||
<a-button type="primary" :loading="loading" @click="handleSubmit" icon="upload">{{ $t('submit') }}</a-button>
|
||||
</template>
|
||||
<template v-else-if="formInline.applicationCategory === ApplicationCategory.CHANGE.value && currentNode === 9">
|
||||
<template v-else-if="formInline.applicationCategory === ApplicationCategory.CHANGE.value && currentNode === 10">
|
||||
<!-- 确定, 谁发起的谁点确定抄送消息 -->
|
||||
<a-button type="primary" :loading="loading" @click="handleDetermine" icon="upload">{{ $t('determine') }}</a-button>
|
||||
</template>
|
||||
@@ -268,11 +268,12 @@ import ProcessDetailList from '@/components/ProcessDetailList'
|
||||
import JobEndBaseInfo from './modules/JobEndBaseInfo'
|
||||
import DutyDepartChangeBaseInfo from './modules/DutyDepartChangeBaseInfo'
|
||||
import MergeBaseInfo from './modules/MergeBaseInfo'
|
||||
import { ProjectType, ApplicationCategory, ProcessKey } from '@/enums/commonEnums'
|
||||
import { ProjectType, ApplicationCategory, ProcessKey, EsInitChangeNodes } from '@/enums/commonEnums'
|
||||
import Vue from 'vue'
|
||||
import { USER_INFO } from '@/store/mutation-types'
|
||||
import pick from 'lodash.pick'
|
||||
import { WorkCenterMixin } from '@/mixins/WorkCenterMixin'
|
||||
import { getProcessDataDraft } from '../../../api/workCenter'
|
||||
|
||||
export default {
|
||||
name: 'PlanApprovalFlow',
|
||||
@@ -304,32 +305,55 @@ export default {
|
||||
return true
|
||||
}
|
||||
}
|
||||
// 项目类别下拉框数据
|
||||
// projectTypeOptions () {
|
||||
// if (this.formInline.applicationCategory === ApplicationCategory.INITIATION.value) {
|
||||
// return [
|
||||
// { value: ProjectType.ENACT.value, label: this.$t('workCenter.enterpriseInitChangePlan.formulate') },
|
||||
// { value: ProjectType.MODIFY.value, label: this.$t('workCenter.enterpriseInitChangePlan.revise') }
|
||||
// ]
|
||||
// } else if (this.formInline.applicationCategory === ApplicationCategory.CHANGE.value) {
|
||||
// return [
|
||||
// { value: ProjectType.COMPLETE_TIME_CHANGE.value, label: this.$t('workCenter.enterpriseInitChangePlan.completionTimeChange') },
|
||||
// { value: ProjectType.WORK_TERMINATE.value, label: this.$t('workCenter.enterpriseInitChangePlan.terminationOfWork') },
|
||||
// { value: ProjectType.RESPONSIBLE_DEPT_CHANGE.value, label: this.$t('workCenter.enterpriseInitChangePlan.dutyDepartChange') },
|
||||
// { value: ProjectType.MERGE.value, label: this.$t('workCenter.enterpriseInitChangePlan.merge') },
|
||||
// ]
|
||||
// } else {
|
||||
// return []
|
||||
// }
|
||||
// }
|
||||
},
|
||||
mounted () {
|
||||
// 初始化流程节点
|
||||
const nodeId = this.$route.query.nodeId
|
||||
if (nodeId) {
|
||||
if (nodeId === EsInitChangeNodes.mainDrafterStart.value) {
|
||||
this.currentNode = 1
|
||||
} else if (nodeId === EsInitChangeNodes.contactCheck.value) {
|
||||
this.currentNode = 2
|
||||
} else if (nodeId === EsInitChangeNodes.expertApproval.value) {
|
||||
this.currentNode = 3
|
||||
} else if (nodeId === EsInitChangeNodes.leaderApproval.value) {
|
||||
this.currentNode = 4
|
||||
} else if (nodeId === EsInitChangeNodes.leaderLeaderApproval.value) {
|
||||
this.currentNode = 5
|
||||
} else if (nodeId === EsInitChangeNodes.standardizationApproval.value) {
|
||||
this.currentNode = 6
|
||||
} else if (nodeId === EsInitChangeNodes.newDraftUnitLeaderLeaderSend.value) {
|
||||
this.currentNode = 7
|
||||
} else if (nodeId === EsInitChangeNodes.newDraftUnitLeaderConfirm.value) {
|
||||
this.currentNode = 8
|
||||
} else if (nodeId === EsInitChangeNodes.relevantPersonnelWillSign.value) {
|
||||
this.currentNode = 9
|
||||
} else if (nodeId === EsInitChangeNodes.mainDrafterCopy.value) {
|
||||
this.currentNode = 10
|
||||
} else {
|
||||
// 预留加签节点
|
||||
this.currentNode = 999
|
||||
}
|
||||
}
|
||||
// 查询流程定义列表,通过查出的数据获取到流程定义id,如果已经发起过流程,用这个id和流程实例id去查人员信息数据
|
||||
this.getPersonInfoStructure(ProcessKey.ES_INIT_CHANGE.value)
|
||||
// 根据流程节点初始化是否可以编辑
|
||||
if (this.currentNode === 1) {
|
||||
this.disabled = false
|
||||
} else {
|
||||
this.disabled = true
|
||||
}
|
||||
if (this.$route.query.taskId) {
|
||||
this.currentNodeName = this.$route.query.taskName
|
||||
// 有流程id说明是从流程中心来的,需要初始化数据
|
||||
this.getProcessData(this.$route.query.taskId)
|
||||
this.getProcessData('todo', { taskId: this.$route.query.taskId })
|
||||
}
|
||||
if (this.$route.query.draftId) {
|
||||
// 有草稿id,说明是从流程中心-草稿来的,需要初始化数据
|
||||
this.getProcessData('draft', { draftId: this.$route.query.draftId, projectId: this.$route.query.projectId })
|
||||
}
|
||||
if (this.$route.query.taskName) {
|
||||
// 说明是已发起流程
|
||||
this.currentNodeName = this.$route.query.taskName
|
||||
} else {
|
||||
this.currentNodeName = '主起草人发起'
|
||||
}
|
||||
@@ -349,6 +373,7 @@ export default {
|
||||
onlyLook: false, // 是否仅查看
|
||||
currentNode: 1, // 当前节点
|
||||
currentNodeName: '', // 当前节点名称
|
||||
currentNodeId: '', // 当前节点id
|
||||
model: [],
|
||||
processInfoForm: this.$form.createForm(this),
|
||||
labelCol: {
|
||||
@@ -477,16 +502,27 @@ export default {
|
||||
}
|
||||
},
|
||||
// 根据流程id获取数据并回显
|
||||
getProcessData (taskId) {
|
||||
getProcessData (type, param) {
|
||||
this.loading = true
|
||||
getProcessDataById(taskId).then(res => {
|
||||
let func
|
||||
let params = {}
|
||||
if (type === 'todo') {
|
||||
func = getProcessDataById
|
||||
params = param.taskId
|
||||
} else {
|
||||
func = getProcessDataDraft
|
||||
params = param
|
||||
}
|
||||
func(params).then(res => {
|
||||
if (res.success) {
|
||||
this.model = res.result
|
||||
this.$nextTick(() => {
|
||||
// 初始化流程信息
|
||||
this.processInfoForm.setFieldsValue(pick(this.model.common, 'prcName', 'dueTime', 'prcMes'))
|
||||
// 初始化流程审批信息,todo:需要判断是不是草稿进来的,草稿进来的才回显审批信息
|
||||
// this.approvalInfoForm.setFieldsValue(pick(this.model[0], 'commitText', 'commitFile'))
|
||||
// 初始化流程审批信息,草稿进来的才回显审批信息
|
||||
if (type === 'draft') {
|
||||
this.approvalInfoForm.setFieldsValue(pick(this.model.common, 'commitText', 'commitFile'))
|
||||
}
|
||||
})
|
||||
// 初始化业务基本信息的申请类型和项目类别,分开赋值是因为项目类别会没有下拉数据无法回显
|
||||
const baseInfoForm = {}
|
||||
@@ -507,52 +543,19 @@ export default {
|
||||
// 变更的责任部门变更
|
||||
this.resetPersonInfoStructure('3')
|
||||
}
|
||||
// 初始化流程节点,此流程因为节点名称有重复,需要在此处根据applicationCatsegory做一些判断
|
||||
const taskName = this.$route.query.taskName
|
||||
if (taskName) {
|
||||
if (taskName === '主起草人发起') {
|
||||
this.currentNode = 1
|
||||
} else if (taskName === '部所联络人校对') {
|
||||
this.currentNode = 2
|
||||
} else if (taskName === '专家审批' || taskName === '主起草人主管级领导审批') {
|
||||
this.currentNode = 3
|
||||
} else if (taskName === '发起人主管级领导审批' || taskName === '主起草人主管级上级领导审批') {
|
||||
this.currentNode = 4
|
||||
} else if (taskName === '发起人主管级上级领导审批' || (taskName === '标准化审批' && this.formInline.applicationCategory === this.ApplicationCategory.CHANGE.value)) {
|
||||
this.currentNode = 5
|
||||
} else if ((taskName === '标准化审批' && this.formInline.applicationCategory === this.ApplicationCategory.INITIATION.value) || taskName === '新起草部门主管级上一级领导下发主管级领导') {
|
||||
this.currentNode = 6
|
||||
} else if (taskName === '新起草部门主管级领导确认新起草人') {
|
||||
this.currentNode = 7
|
||||
} else if (taskName === '相关人员会签') {
|
||||
this.currentNode = 8
|
||||
} else if (taskName === '抄送主起草人确认') {
|
||||
this.currentNode = 9
|
||||
} else {
|
||||
// 预留加签节点
|
||||
this.currentNode = 999
|
||||
}
|
||||
}
|
||||
if (this.currentNode === 1) {
|
||||
this.initPersonInfoData(true)
|
||||
} else {
|
||||
// 不是第一个节点需要处理人员信息都不可选
|
||||
// 如果不是第一个节点,人员信息全部不可选
|
||||
this.initPersonInfoData(false)
|
||||
}
|
||||
console.log(this.currentNode)
|
||||
// 根据流程节点初始化是否可以编辑
|
||||
if (this.currentNode === 1) {
|
||||
this.disabled = false
|
||||
} else {
|
||||
this.disabled = true
|
||||
}
|
||||
// 初始化业务基本信息中组件内容
|
||||
if (this.formInline.applicationCategory === ApplicationCategory.INITIATION.value) {
|
||||
// 是立项
|
||||
this.$nextTick(() => {
|
||||
this.$nextTick(() => {
|
||||
const param = this.model.dataList[0]
|
||||
param.enStandardSystem = param.enStandardSystem.split(',').map(item => { return { value: item } })
|
||||
param.enStandardSystem = param.enStandardSystem ? param.enStandardSystem.split(',').map(item => { return { value: item } }) : []
|
||||
this.$refs.approvalBaseInfo.formInline = param
|
||||
})
|
||||
})
|
||||
@@ -638,7 +641,7 @@ export default {
|
||||
let arr = []
|
||||
// 业务基本信息-立项表单
|
||||
if (this.$refs.approvalBaseInfo) {
|
||||
const approvalBaseInfo = this.$refs.approvalBaseInfo.formInline
|
||||
const approvalBaseInfo = Object.assign({}, this.$refs.approvalBaseInfo.formInline)
|
||||
// 企标体系处理成逗号分隔
|
||||
if (approvalBaseInfo.enStandardSystem && approvalBaseInfo.enStandardSystem.length > 0) {
|
||||
approvalBaseInfo.enStandardSystem = approvalBaseInfo.enStandardSystem.map(item => item.value).join(',')
|
||||
@@ -707,6 +710,8 @@ export default {
|
||||
this.loading = true
|
||||
const param = {} // 传给后端的参数
|
||||
param.common = { ...processInfoForm, ...approvalInfoForm } // 流程信息和流程审批信息
|
||||
param.common.taskId = this.$route.query.taskId || null
|
||||
param.common.processInstanceId = this.model.common ? this.model.common.processInstanceId : null
|
||||
param.dataList = arr // 业务基础信息数组
|
||||
param.flowUser = personnelObj // 人员信息
|
||||
// 保存到草稿
|
||||
@@ -804,15 +809,6 @@ export default {
|
||||
haveErr = true
|
||||
}
|
||||
})
|
||||
} else {
|
||||
// 校验特定节点需要填写人的必填
|
||||
// this.userForm.validateFields((userErr, userValues) => {
|
||||
// if (valid && !err && !approvalErr && !userErr) {
|
||||
// this.loading = true
|
||||
// const param = this.$refs.changeBaseInfo.dataSource
|
||||
// console.log(param)
|
||||
// }
|
||||
// })
|
||||
}
|
||||
if (haveErr) {
|
||||
return
|
||||
@@ -900,8 +896,8 @@ export default {
|
||||
if (this.loading) return
|
||||
const param = {} // 需要传给后端的数据
|
||||
this.approvalInfoForm.validateFields((err, values) => {
|
||||
if (this.formInline.projectType === this.ProjectType.RESPONSIBLE_DEPT_CHANGE.value && this.currentNode === 5) {
|
||||
// 责任部门变更,节点5需要校验业务基本信息的必填,新起草单位负责人就是新起草部门主管级上一级领导
|
||||
if (this.formInline.projectType === this.ProjectType.RESPONSIBLE_DEPT_CHANGE.value && this.currentNode === 6) {
|
||||
// 责任部门变更,节点6需要校验业务基本信息的必填,新起草单位负责人就是新起草部门主管级上一级领导
|
||||
this.$refs.changeBaseInfo.$refs.ruleForm.validate(valid => {
|
||||
if (!err && valid) {
|
||||
// 校验完成
|
||||
|
||||
@@ -247,7 +247,6 @@
|
||||
<!-- 标准等级分类 -->
|
||||
<div class="box-title-text form-flex-item">
|
||||
<div class="title-text">
|
||||
<span class="required">*</span>
|
||||
<span class="title-text-text" :title="$t('workCenter.enterpriseInitChangePlan.standardGradeClassification')">
|
||||
{{ $t('workCenter.enterpriseInitChangePlan.standardGradeClassification') }}
|
||||
</span>
|
||||
@@ -756,7 +755,7 @@ export default {
|
||||
// 标准等级分类
|
||||
enStandardClassification: [
|
||||
{
|
||||
required: true,
|
||||
required: false,
|
||||
message: this.$t('workCenter.enterpriseInitChangePlan.standardGradeClassification') + this.$t('cannotEmpty'),
|
||||
trigger: 'change'
|
||||
}
|
||||
|
||||
+1
-1
@@ -180,7 +180,7 @@ export default {
|
||||
}
|
||||
},
|
||||
mounted () {
|
||||
if (this.currentNode === 5) {
|
||||
if (this.currentNode === 6) {
|
||||
this.rules.newMainDraftingUser[0].required = true
|
||||
this.rules.newMainDraftingUnit[0].required = true
|
||||
this.rules.newMainDraftingUnitResponsiblePerson[0].required = true
|
||||
|
||||
@@ -110,16 +110,71 @@ export default {
|
||||
methods: {
|
||||
// 办理
|
||||
handleTransact (record) {
|
||||
// 跳转到对应流程页面
|
||||
let path = ''
|
||||
switch (record.processType) {
|
||||
case '':
|
||||
path = ''
|
||||
// 跳转到对应流程页面
|
||||
switch (record.prcType + '') {
|
||||
// 标准法规入库/变更流程
|
||||
case '1':
|
||||
path = '/workCenter/StandardEntryOrChangeProcess'
|
||||
break
|
||||
// 标准征求意见流程
|
||||
case '2':
|
||||
path = '/workCenter/StandardConsultationProcess'
|
||||
break
|
||||
// 法规采购流程
|
||||
case '6':
|
||||
path = '/workCenter/StandardProcurementProcess'
|
||||
break
|
||||
// 企标立项、变更计划
|
||||
case '7':
|
||||
path = '/workCenter/enterpriseStandardInitChange/planApprovalChangeFlow'
|
||||
break
|
||||
// 年度制修订计划(各部门主动上报)
|
||||
case '8':
|
||||
path = '/workCenter/annualRevisionPlanActivelyReport/revisionPlanActivelyReportFlow'
|
||||
break
|
||||
// 年度制修订计划(标准化发起)
|
||||
case '9':
|
||||
path = '/workCenter/annualRevisionPlanStandardizationInit/revisionPlanStandardizationInitFlow'
|
||||
break
|
||||
// 企标制修订流程
|
||||
case '10':
|
||||
path = '/workCenter/enterpriseStandardRevision/enterpriseStandardRevisionFlow'
|
||||
break
|
||||
// 企标更改流程
|
||||
case '11':
|
||||
path = '/workCenter/enterpriseStandardChange/enterpriseStandardChangeFlow'
|
||||
break
|
||||
// 企标复审流程
|
||||
case '12':
|
||||
path = '/workCenter/enterpriseStandardRecheck/enterpriseStandardRecheckFlow'
|
||||
break
|
||||
// 企标废止流程
|
||||
case '13':
|
||||
path = '/workCenter/enterpriseStandardAnnul/enterpriseStandardAnnulFlow'
|
||||
break
|
||||
// 企标封存流程
|
||||
case '14':
|
||||
path = '/workCenter/enterpriseStandardSealSave/enterpriseStandardSealSaveFlow'
|
||||
break
|
||||
// 已封存企标启用流程
|
||||
case '15':
|
||||
path = '/workCenter/enterpriseStandardStartUse/enterpriseStandardStartUseFlow'
|
||||
break
|
||||
// 企标稽查计划
|
||||
case '16':
|
||||
path = '/workCenter/EnterpriseStandardInspectionPlan'
|
||||
break
|
||||
}
|
||||
this.$router.push({
|
||||
path: path,
|
||||
query: {
|
||||
currentNode: record.currentNode
|
||||
draftId: record.id, // 草稿id
|
||||
projectId: record.projectId,
|
||||
taskName: record.taskName,
|
||||
taskId: record.taskId, // 任务id
|
||||
processInstanceId: record.processInstanceId, // 流程实例id,必须传人员信息右侧表格查询需要用
|
||||
nodeId: record.nodeId // 节点的id
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user