ZQ/laws-sinotruk-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[update] 已封存企标启用流程,企标废止，企标复审，企标更改流程的查看详情

Browse Source
This commit is contained in:
lideqin
2024-07-22 20:27:54 +08:00
parent 27f6a68517
commit 0b888f0876
6 changed files with 299 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue
+87 -19
View File
@@ -1,7 +1,7 @@
<template>
<internal-detail-page :title="pageTitle" :content-padding="0" :loading="loading">
<!-- 标题右侧tab -->
<template v-slot:titleRightCustom>
<template v-slot:titleRightCustom v-if="!isLook">
<div class="table-operator-tab">
<a class="switch-item" :class="switchValue === 'base' ? 'table-operator-tab-active' : ''"
@click="switchChange('base')">{{ $t('basicInformation') }}
@@ -31,7 +31,7 @@
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('expirationDate')" :colon="formItemColon">
<a-date-picker :placeholder="$t('pleaseSelect') + $t('expirationDate')"
style="width: 100%"
:disabled="disabled"
:disabled="disabled || isLook"
value-format="YYYY-MM-DD"
v-decorator="['dueTime']" />
</a-form-item>
@@ -42,7 +42,7 @@
<a-textarea :placeholder="$t('pleaseEnter') + $t('processExplain')"
:maxLength="500"
:rows="4"
:disabled="disabled"
:disabled="disabled || isLook"
v-decorator="['prcMes']" />
</a-form-item>
</a-col>
@@ -52,7 +52,7 @@
<!-- 业务基本信息 -->
<div class="process-part-title">{{ $t('basicServiceInformation') }}</div>
<!-- 节点1、发起人发起 -->
<base-info-form v-if="currentNode === 1" ref="baseInfoRef" @processNameChange="processNameChange"></base-info-form>
<base-info-form v-if="currentNode === 1" ref="baseInfoRef" :disabled="isLook" @processNameChange="processNameChange"></base-info-form>
<!-- 节点2、相关人员会签 -->
<!-- 节点3、起草人和会签人主管级领导审批 -->
<!-- 节点4、标准化审批 -->
@@ -66,11 +66,12 @@
<a-textarea :placeholder="$t('pleaseEnter') + $t('remarks')"
:maxLength="500"
:rows="4"
:disabled="isLook"
v-decorator="['commitText', validatorRules.commitText]" />
</a-form-item>
<!--附件-->
<a-form-item :labelCol="longLabelCol" :wrapperCol="longWrapperCol" :label="$t('attach')" :colon="formItemColon">
<j-upload v-decorator="['commitFile']" return-id multiple />
<j-upload v-decorator="['commitFile']" return-id multiple :disabled="isLook" />
</a-form-item>
</a-form>
</div>
@@ -81,7 +82,7 @@
</process-detail-list>
</div>
<!-- 操作按钮 -->
<div class="detail-page-bottom-operate-box">
<div v-if="!isLook" class="detail-page-bottom-operate-box">
<!-- 发起节点 -->
<template v-if="currentNode === 1">
<!-- 保存 -->
@@ -119,11 +120,13 @@ import {
enStandardAnnulTurnTo,
enStandardAnnulAgree,
enStandardAnnulReject,
enStandardAnnulGetDataDraft
enStandardAnnulGetDataDraft,
saveSnapShot,
getLookData
} from '@/api/workCenter'
import BaseInfoForm from './modules/BaseInfoForm'
import { WorkCenterMixin } from '@/mixins/WorkCenterMixin'
import { ProcessKey, EsAnnulNodes } from '@/enums/commonEnums'
import { ProcessKey, EsAnnulNodes, ProcessType } from '@/enums/commonEnums'
export default {
name: 'EnterpriseStandardAnnulFlow',
@@ -175,13 +178,22 @@ export default {
}
}
})
if (this.$route.query.taskId && !this.$route.query.draftId) {
// 有流程id说明是从流程中心来的，需要初始化数据
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.isLook + '' === '1') {
// 是查看
this.isLook = true
// 人员信息全部不可选
this.initPersonInfoData(false)
// 查询数据
this.getProcessData('look', { snapshotId: this.$route.query.snapshotId })
} else {
if (this.$route.query.taskId && !this.$route.query.draftId) {
// 有流程id说明是从流程中心来的，需要初始化数据
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) {
// 说明是已发起流程
@@ -238,7 +250,8 @@ export default {
url: {
list: '' // 人员信息的右侧表格获取接口
},
onlySelectFromFlowStation: [EsAnnulNodes.standardizationApproval.value] // 只能在标准与流程所里选人的节点
onlySelectFromFlowStation: [EsAnnulNodes.standardizationApproval.value], // 只能在标准与流程所里选人的节点
isLook: false
}
},
methods: {
@@ -250,6 +263,9 @@ export default {
if (type === 'todo') {
func = enStandardAnnulGetDataById
params = param.taskId
} else if (type === 'look') {
func = getLookData
params = param
} else {
func = enStandardAnnulGetDataDraft
params = param
@@ -360,6 +376,49 @@ export default {
}
})
},
// 获取快照json
getParamJsonStr () {
// 流程信息表单
const processInfoForm = this.processInfoForm.getFieldsValue()
// 流程审批信息
const approvalInfoForm = this.approvalInfoForm.getFieldsValue()
// 人员信息的数据, 处理成对象
const personnelObj = this.$refs.personnelInfo.getDataObj()
// 业务基本信息
const baseInfo = this.$refs.baseInfoRef.getData()
const infoJsonStr = JSON.stringify({
basicProcessInfoDTO: processInfoForm,
basicTaskInfoDTO: approvalInfoForm,
data: baseInfo.formInline,
personnelObj: personnelObj
})
return infoJsonStr
},
// 保存快照
saveParamJsonStr () {
// 流程信息表单
const processInfoForm = this.processInfoForm.getFieldsValue()
// 流程审批信息
const approvalInfoForm = this.approvalInfoForm.getFieldsValue()
// 人员信息的数据, 处理成对象
const personnelObj = this.$refs.personnelInfo.getDataObj()
// 业务基本信息
const baseInfo = this.$refs.baseInfoRef.getData()
const params = { ...processInfoForm, ...approvalInfoForm }
params.infoJsonStr = JSON.stringify({
basicProcessInfoDTO: processInfoForm,
basicTaskInfoDTO: approvalInfoForm,
data: baseInfo.formInline,
personnelObj: personnelObj
})
params.taskId = this.$route.query.taskId
params.prcType = ProcessType.ES_ABOLISH.value
saveSnapShot(params).then(res => {
if (!res.success) {
console.log(res.message)
}
})
},
// 节点一时候的提交
handleStart () {
if (this.loading) return
@@ -391,10 +450,15 @@ export default {
paramObj.common.taskId = this.$route.query.taskId
} else {
func = enStandardAnnulApproval
// 快照JSON
paramObj.common.infoJsonStr = this.getParamJsonStr()
}
func(paramObj).then(res => {
func(paramObj).then(async res => {
if (res.success) {
this.$message.success(res.message)
if (this.$route.query.taskId) {
await this.saveParamJsonStr()
}
this.goBack()
} else {
this.$message.warning(res.message)
@@ -446,9 +510,11 @@ export default {
const param = {}
param.common = Object.assign({}, values)
param.common.taskId = this.$route.query.taskId
enStandardAnnulAgree(param).then(res => {
enStandardAnnulAgree(param).then(async res => {
if (res.success) {
this.$message.success(res.message)
// 保存快照
await this.saveParamJsonStr()
this.goBack()
} else {
this.$message.warning(res.message)
@@ -473,9 +539,11 @@ export default {
const param = {}
param.common = Object.assign({}, values)
param.common.taskId = this.$route.query.taskId
enStandardAnnulReject(param).then(res => {
enStandardAnnulReject(param).then(async res => {
if (res.success) {
this.$message.success(res.message)
// 保存快照
await this.saveParamJsonStr()
this.goBack()
} else {
this.$message.warning(res.message)
src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue
+96 -20
View File
@@ -1,7 +1,7 @@
<template>
<internal-detail-page :title="pageTitle" :content-padding="0" :loading="loading">
<!-- 标题右侧tab -->
<template v-slot:titleRightCustom>
<template v-slot:titleRightCustom v-if="!isLook">
<div class="table-operator-tab">
<a class="switch-item" :class="switchValue === 'base' ? 'table-operator-tab-active' : ''"
@click="switchChange('base')">{{ $t('basicInformation') }}
@@ -31,7 +31,7 @@
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('expirationDate')" :colon="formItemColon">
<a-date-picker :placeholder="$t('pleaseSelect') + $t('expirationDate')"
style="width: 100%"
:disabled="disabled"
:disabled="disabled || isLook"
value-format="YYYY-MM-DD"
v-decorator="['dueTime']" />
</a-form-item>
@@ -42,7 +42,7 @@
<a-textarea :placeholder="$t('pleaseEnter') + $t('processExplain')"
:maxLength="500"
:rows="4"
:disabled="disabled"
:disabled="disabled || isLook"
v-decorator="['prcMes']" />
</a-form-item>
</a-col>
@@ -52,12 +52,12 @@
<!-- 业务基本信息 -->
<div class="process-part-title">{{ $t('basicServiceInformation') }}</div>
<!-- 节点1、主起草人发起 -->
<main-drafter-init-base-info v-if="currentNode === 1" ref="baseInfoRef" @processNameChange="processNameChange" @save="handleSave"></main-drafter-init-base-info>
<main-drafter-init-base-info v-if="currentNode === 1" ref="baseInfoRef" :disabled="isLook" @processNameChange="processNameChange" @save="handleSave"></main-drafter-init-base-info>
<!-- 节点2、相关人员校对 -->
<!-- 节点3、起草人主管级领导审批 -->
<!-- 节点4、标准化审批 -->
<!-- 节点5、起草人主管级上一级领导审批 -->
<approve-base-info v-else ref="baseInfoRef"></approve-base-info>
<approve-base-info v-else ref="baseInfoRef" :disabled="isLook"></approve-base-info>
<!-- 流程审批信息 -->
<div class="process-part-title">{{ $t('processApprovalInformation') }}</div>
@@ -67,11 +67,12 @@
<a-textarea :placeholder="$t('pleaseEnter') + $t('remarks')"
:maxLength="500"
:rows="4"
:disabled="isLook"
v-decorator="['commitText', validatorRules.commitText]" />
</a-form-item>
<!--附件-->
<a-form-item :labelCol="longLabelCol" :wrapperCol="longWrapperCol" :label="$t('attach')" :colon="formItemColon">
<j-upload v-decorator="['commitFile']" return-id multiple />
<j-upload v-decorator="['commitFile']" return-id multiple :disabled="isLook" />
</a-form-item>
</a-form>
</div>
@@ -82,7 +83,7 @@
</process-detail-list>
</div>
<!-- 操作按钮 -->
<div class="detail-page-bottom-operate-box">
<div v-if="!isLook" class="detail-page-bottom-operate-box">
<!-- 发起节点 -->
<template v-if="currentNode === 1">
<!-- 保存 -->
@@ -120,12 +121,14 @@ import {
enStandardChangeReject,
enStandardChangeTurnTo,
enStandardChangeGetDataById,
enStandardChangeGetDataDraft
enStandardChangeGetDataDraft,
saveSnapShot,
getLookData
} from '@/api/workCenter'
import MainDrafterInitBaseInfo from './modules/MainDrafterInitBaseInfo'
import ApproveBaseInfo from './modules/ApproveBaseInfo'
import { WorkCenterMixin } from '@/mixins/WorkCenterMixin'
import { ProcessKey, EsChangeNodes } from '@/enums/commonEnums'
import { ProcessKey, EsChangeNodes, ProcessType } from '@/enums/commonEnums'
export default {
name: 'EnterpriseStandardChangeFlow',
@@ -176,13 +179,22 @@ export default {
}
}
})
if (this.$route.query.taskId && !this.$route.query.draftId) {
// 有流程id说明是从流程中心来的，需要初始化数据
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.isLook + '' === '1') {
// 是查看
this.isLook = true
// 人员信息全部不可选
this.initPersonInfoData(false)
// 查询数据
this.getProcessData('look', { snapshotId: this.$route.query.snapshotId })
} else {
if (this.$route.query.taskId && !this.$route.query.draftId) {
// 有流程id说明是从流程中心来的，需要初始化数据
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) {
// 说明是已发起流程
@@ -249,7 +261,8 @@ export default {
list: '' // 人员信息的右侧表格获取接口
},
tempDraftId: '', // 临时草稿id,解决发起的时候点在线编辑会生成多条草稿的问题
onlySelectFromFlowStation: [EsChangeNodes.standardizationApproval.value] // 只能在标准与流程所里选人的节点
onlySelectFromFlowStation: [EsChangeNodes.standardizationApproval.value], // 只能在标准与流程所里选人的节点
isLook: false
}
},
methods: {
@@ -260,6 +273,9 @@ export default {
if (type === 'todo') {
func = enStandardChangeGetDataById
params = param.taskId
} else if (type === 'look') {
func = getLookData
params = param
} else {
func = enStandardChangeGetDataDraft
params = param
@@ -391,6 +407,57 @@ export default {
}
})
},
// 获取快照json
getParamJsonStr () {
// 流程信息表单
const processInfoForm = this.processInfoForm.getFieldsValue()
// 流程审批信息
const approvalInfoForm = this.approvalInfoForm.getFieldsValue()
// 人员信息的数据, 处理成对象
const personnelObj = this.$refs.personnelInfo.getDataObj()
// 业务基本信息
const baseInfo = this.$refs.baseInfoRef.getData()
const baseInfoObj = Object.assign({}, baseInfo.formInline, { onEditFile: baseInfo.onEditFile, replaceFileId: baseInfo.replaceFileId })
if (baseInfo.dataSource) {
baseInfoObj.list = baseInfo.dataSource
}
const infoJsonStr = JSON.stringify({
basicProcessInfoDTO: processInfoForm,
basicTaskInfoDTO: approvalInfoForm,
data: baseInfoObj,
personnelObj: personnelObj
})
return infoJsonStr
},
// 保存快照
saveParamJsonStr () {
// 流程信息表单
const processInfoForm = this.processInfoForm.getFieldsValue()
// 流程审批信息
const approvalInfoForm = this.approvalInfoForm.getFieldsValue()
// 人员信息的数据, 处理成对象
const personnelObj = this.$refs.personnelInfo.getDataObj()
// 业务基本信息
const baseInfo = this.$refs.baseInfoRef.getData()
const baseInfoObj = Object.assign({}, baseInfo.formInline, { onEditFile: baseInfo.onEditFile, replaceFileId: baseInfo.replaceFileId })
if (baseInfo.dataSource) {
baseInfoObj.list = baseInfo.dataSource
}
const params = { ...processInfoForm, ...approvalInfoForm }
params.infoJsonStr = JSON.stringify({
basicProcessInfoDTO: processInfoForm,
basicTaskInfoDTO: approvalInfoForm,
data: baseInfoObj,
personnelObj: personnelObj
})
params.taskId = this.$route.query.taskId
params.prcType = ProcessType.ES_CHANGE.value
saveSnapShot(params).then(res => {
if (!res.success) {
console.log(res.message)
}
})
},
// 节点一时候的提交
handleStart () {
if (this.loading) return
@@ -428,10 +495,15 @@ export default {
param.common.taskId = this.$route.query.taskId
} else {
func = enStandardChangeApproval
// 快照JSON
param.common.infoJsonStr = this.getParamJsonStr()
}
func(param).then(res => {
func(param).then(async res => {
if (res.success) {
this.$message.success(res.message)
if (this.$route.query.taskId) {
await this.saveParamJsonStr()
}
this.goBack()
} else {
this.$message.warning(res.message)
@@ -483,9 +555,11 @@ export default {
const param = {}
param.common = Object.assign({}, values)
param.common.taskId = this.$route.query.taskId
enStandardChangeAgree(param).then(res => {
enStandardChangeAgree(param).then(async res => {
if (res.success) {
this.$message.success(res.message)
// 保存快照
await this.saveParamJsonStr()
this.goBack()
} else {
this.$message.warning(res.message)
@@ -510,9 +584,11 @@ export default {
const param = {}
param.common = Object.assign({}, values)
param.common.taskId = this.$route.query.taskId
enStandardChangeReject(param).then(res => {
enStandardChangeReject(param).then(async res => {
if (res.success) {
this.$message.success(res.message)
// 保存快照
await this.saveParamJsonStr()
this.goBack()
} else {
this.$message.warning(res.message)
src/views/workCenter/enterpriseStandardChange/modules/MainDrafterInitBaseInfo.vue
+12 -2
View File
@@ -12,7 +12,8 @@
<a-form-model-item class="item-model">
<div class="online-edit-wrapper">
<p>{{ $t('enterpriseStandard') }}</p>
<a-button type="primary" @click="toOnlineEditor">{{ $t('workCenter.enStandardRevision.onLineEditing') }}</a-button>
<a-button v-if="!disabled" type="primary" @click="toOnlineEditor">{{ $t('workCenter.enStandardRevision.onLineEditing') }}</a-button>
<a-button v-else type="primary" @click="onlineEditView">{{ $t('view') }}</a-button>
</div>
</a-form-model-item>
</div>
@@ -266,7 +267,7 @@ import JTable from '@/components/jero/JTable'
import UpdateListModal from './UpdateListModal'
import TextContentModal from '../../../businessSupport/askForAdvice/modules/TextContentModal'
import { getEnterpriseStandardInfoById } from '../../../../api/enterpriseStandardLibraryApi'
import { onlineEditor } from '../../../../utils/onlyOfficeUtils'
import { onlineEditor, onlineEditorView } from '../../../../utils/onlyOfficeUtils'
import { getOnlineFileIdByFileId, getStandardEditFileByNo } from '@/api/workCenter'
export default {
@@ -648,6 +649,15 @@ export default {
// false表示保存后不返回
this.$emit('save', false)
}
},
// 在线编辑的查看
onlineEditView () {
if (!this.onEditFile) {
this.$message.warning(this.$t('workCenter.enStandardRevision.noStandardTextLook'))
return
} else {
onlineEditorView(this.onEditFile)
}
}
}
}
src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue
+93 -23
View File
@@ -1,7 +1,7 @@
<template>
<internal-detail-page :title="pageTitle" :content-padding="0" :loading="loading">
<!-- 标题右侧tab -->
<template v-slot:titleRightCustom>
<template v-slot:titleRightCustom v-if="!isLook">
<div class="table-operator-tab">
<a class="switch-item" :class="switchValue === 'base' ? 'table-operator-tab-active' : ''"
@click="switchChange('base')">{{ $t('basicInformation') }}
@@ -31,7 +31,7 @@
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('expirationDate')" :colon="formItemColon">
<a-date-picker :placeholder="$t('pleaseSelect') + $t('expirationDate')"
style="width: 100%"
:disabled="disabled"
:disabled="disabled || isLook"
value-format="YYYY-MM-DD"
v-decorator="['dueTime']" />
</a-form-item>
@@ -42,7 +42,7 @@
<a-textarea :placeholder="$t('pleaseEnter') + $t('processExplain')"
:maxLength="500"
:rows="4"
:disabled="disabled"
:disabled="disabled || isLook"
v-decorator="['prcMes']" />
</a-form-item>
</a-col>
@@ -52,14 +52,14 @@
<!-- 业务基本信息 -->
<div class="process-part-title">{{ $t('basicServiceInformation') }}</div>
<!-- 节点1、是标准化发起 -->
<standardization-init-base-info v-if="currentNode === 1" ref="baseInfoRef" @processNameChange="processNameChange"></standardization-init-base-info>
<standardization-init-base-info v-if="currentNode === 1" ref="baseInfoRef" :disabled="isLook" @processNameChange="processNameChange"></standardization-init-base-info>
<!-- 节点2、是联络人发起 -->
<contact-init-base-info v-else-if="currentNode === 2" ref="baseInfoRef" @processNameChange="processNameChange"></contact-init-base-info>
<contact-init-base-info v-else-if="currentNode === 2" ref="baseInfoRef" :disabled="isLook" @processNameChange="processNameChange"></contact-init-base-info>
<!-- 节点3、起草人填写意见 -->
<drafter-enter-option-base-info v-else-if="currentNode === 3" ref="baseInfoRef"></drafter-enter-option-base-info>
<drafter-enter-option-base-info v-else-if="currentNode === 3" ref="baseInfoRef" :disabled="isLook"></drafter-enter-option-base-info>
<!-- 节点4、起草人部长审批 -->
<!-- 节点5、标准化审批 -->
<recheck-approve-base-info v-else-if="currentNode === 4 || currentNode === 5" ref="baseInfoRef"></recheck-approve-base-info>
<recheck-approve-base-info v-else-if="currentNode === 4 || currentNode === 5" ref="baseInfoRef" :disabled="isLook"></recheck-approve-base-info>
<!-- 流程审批信息 -->
<div class="process-part-title">{{ $t('processApprovalInformation') }}</div>
@@ -69,11 +69,12 @@
<a-textarea :placeholder="$t('pleaseEnter') + $t('remarks')"
:maxLength="500"
:rows="4"
:disabled="isLook"
v-decorator="['commitText', validatorRules.commitText]" />
</a-form-item>
<!--附件-->
<a-form-item :labelCol="longLabelCol" :wrapperCol="longWrapperCol" :label="$t('attach')" :colon="formItemColon">
<j-upload v-decorator="['commitFile']" return-id multiple />
<j-upload v-decorator="['commitFile']" return-id multiple :disabled="isLook" />
</a-form-item>
</a-form>
</div>
@@ -84,7 +85,7 @@
</process-detail-list>
</div>
<!-- 操作按钮 -->
<div class="detail-page-bottom-operate-box">
<div v-if="!isLook" class="detail-page-bottom-operate-box">
<!-- 发起节点 -->
<template v-if="currentNode === 1 || currentNode === 2">
<!-- 保存 -->
@@ -131,14 +132,16 @@ import {
enStandardRecheckTurnTo,
enStandardRecheckAgree,
enStandardRecheckReject,
enStandardRecheckGetDataDraft
enStandardRecheckGetDataDraft,
saveSnapShot,
getLookData
} from '@/api/workCenter'
import ContactInitBaseInfo from './modules/ContactInitBaseInfo'
import StandardizationInitBaseInfo from './modules/StandardizationInitBaseInfo'
import DrafterEnterOptionBaseInfo from './modules/DrafterEnterOptionBaseInfo'
import RecheckApproveBaseInfo from './modules/RecheckApproveBaseInfo'
import { WorkCenterMixin } from '@/mixins/WorkCenterMixin'
import { ProcessKey, EsRecheckNodes } from '@/enums/commonEnums'
import { ProcessKey, EsRecheckNodes, ProcessType } from '@/enums/commonEnums'
import Vue from 'vue'
import { USER_INFO } from '../../../store/mutation-types'
@@ -217,13 +220,22 @@ export default {
this.personnelInfoData[0].userList = Vue.ls.get(USER_INFO).realname + '(' + Vue.ls.get(USER_INFO).username + ')'
}
})
if (this.$route.query.taskId && !this.$route.query.draftId) {
// 有流程id说明是从流程中心来的，需要初始化数据
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.isLook + '' === '1') {
// 是查看
this.isLook = true
// 人员信息全部不可选
this.initPersonInfoData(false)
// 查询数据
this.getProcessData('look', { snapshotId: this.$route.query.snapshotId })
} else {
if (this.$route.query.taskId && !this.$route.query.draftId) {
// 有流程id说明是从流程中心来的，需要初始化数据
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) {
// 说明是已发起流程
@@ -286,7 +298,8 @@ export default {
url: {
list: '' // 人员信息的右侧表格获取接口
},
onlySelectFromFlowStation: [EsRecheckNodes.standardizationApproval.value] // 只能在标准与流程所里选人的节点
onlySelectFromFlowStation: [EsRecheckNodes.standardizationApproval.value], // 只能在标准与流程所里选人的节点
isLook: false
}
},
methods: {
@@ -298,6 +311,9 @@ export default {
if (type === 'todo') {
func = enStandardRecheckGetDataById
params = param.taskId
} else if (type === 'look') {
func = getLookData
params = param
} else {
func = enStandardRecheckGetDataDraft
params = param
@@ -417,6 +433,49 @@ export default {
}
})
},
// 获取快照json
getParamJsonStr () {
// 流程信息表单
const processInfoForm = this.processInfoForm.getFieldsValue()
// 流程审批信息
const approvalInfoForm = this.approvalInfoForm.getFieldsValue()
// 人员信息的数据, 处理成对象
const personnelObj = this.$refs.personnelInfo.getDataObj()
// 业务基本信息
const baseInfo = this.$refs.baseInfoRef.getData()
const infoJsonStr = JSON.stringify({
basicProcessInfoDTO: processInfoForm,
basicTaskInfoDTO: approvalInfoForm,
data: baseInfo.formInline,
personnelObj: personnelObj
})
return infoJsonStr
},
// 保存快照
saveParamJsonStr () {
// 流程信息表单
const processInfoForm = this.processInfoForm.getFieldsValue()
// 流程审批信息
const approvalInfoForm = this.approvalInfoForm.getFieldsValue()
// 人员信息的数据, 处理成对象
const personnelObj = this.$refs.personnelInfo.getDataObj()
// 业务基本信息
const baseInfo = this.$refs.baseInfoRef.getData()
const params = { ...processInfoForm, ...approvalInfoForm }
params.infoJsonStr = JSON.stringify({
basicProcessInfoDTO: processInfoForm,
basicTaskInfoDTO: approvalInfoForm,
data: baseInfo.formInline,
personnelObj: personnelObj
})
params.taskId = this.$route.query.taskId
params.prcType = ProcessType.ES_RECHECK.value
saveSnapShot(params).then(res => {
if (!res.success) {
console.log(res.message)
}
})
},
// 节点一时候的提交
handleStart () {
if (this.loading) return
@@ -448,10 +507,15 @@ export default {
paramObj.common.taskId = this.$route.query.taskId
} else {
func = enStandardRecheckApproval
// 快照JSON
paramObj.common.infoJsonStr = this.getParamJsonStr()
}
func(paramObj).then(res => {
func(paramObj).then(async res => {
if (res.success) {
this.$message.success(res.message)
if (this.$route.query.taskId) {
await this.saveParamJsonStr()
}
this.goBack()
} else {
this.$message.warning(res.message)
@@ -502,9 +566,11 @@ export default {
param.common.taskId = this.$route.query.taskId
param.data = Object.assign({}, data.formInline)
console.log(param)
enStandardRecheckAgree(param).then(res => {
enStandardRecheckAgree(param).then(async res => {
if (res.success) {
this.$message.success(res.message)
// 保存快照
await this.saveParamJsonStr()
this.goBack()
} else {
this.$message.warning(res.message)
@@ -529,9 +595,11 @@ export default {
const param = {}
param.common = Object.assign({}, values)
param.common.taskId = this.$route.query.taskId
enStandardRecheckAgree(param).then(res => {
enStandardRecheckAgree(param).then(async res => {
if (res.success) {
this.$message.success(res.message)
// 保存快照
await this.saveParamJsonStr()
this.goBack()
} else {
this.$message.warning(res.message)
@@ -556,9 +624,11 @@ export default {
const param = {}
param.common = Object.assign({}, values)
param.common.taskId = this.$route.query.taskId
enStandardRecheckReject(param).then(res => {
enStandardRecheckReject(param).then(async res => {
if (res.success) {
this.$message.success(res.message)
// 保存快照
await this.saveParamJsonStr()
this.goBack()
} else {
this.$message.warning(res.message)
src/views/workCenter/enterpriseStandardRecheck/modules/DrafterEnterOptionBaseInfo.vue
+1 -1
View File
@@ -117,7 +117,7 @@
</span>
</div>
<a-form-model-item class="item-model" prop="recheckAdvice">
<a-radio-group v-model="formInline.recheckAdvice">
<a-radio-group v-model="formInline.recheckAdvice" :disabled="disabled">
<!-- 继续有效 -->
<a-radio :value="Recheck.STAND_GOOD.value">
{{ $t('workCenter.enStandardRecheck.standGood') }}
src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUseFlow.vue
+10 -8
View File
@@ -121,13 +121,12 @@ import {
enStandardStartUseTurnTo,
enStandardStartUseAgree,
enStandardStartUseReject,
getLookData
getLookData,
saveSnapShot
} from '@/api/workCenter'
import BaseInfoForm from './modules/BaseInfoForm'
import { WorkCenterMixin } from '@/mixins/WorkCenterMixin'
import { ProcessKey, EsStartUseNodes } from '@/enums/commonEnums'
import { saveSnapShot } from '../../../api/workCenter'
import { ProcessType } from '../../../enums/commonEnums'
import { ProcessKey, EsStartUseNodes, ProcessType } from '@/enums/commonEnums'
export default {
name: 'EnterpriseStandardStartUseFlow',
@@ -405,7 +404,7 @@ export default {
const personnelObj = this.$refs.personnelInfo.getDataObj()
// 业务基本信息
const baseInfo = this.$refs.baseInfoRef.getData()
const params = {}
const params = { ...processInfoForm, ...approvalInfoForm }
params.infoJsonStr = JSON.stringify({
basicProcessInfoDTO: processInfoForm,
basicTaskInfoDTO: approvalInfoForm,
@@ -444,8 +443,6 @@ export default {
}
paramObj.flowUser = personnelObj
paramObj.data = data.formInline
// 快照JSON
paramObj.common.infoJsonStr = this.getParamJsonStr()
let func
if (this.$route.query.taskId) {
// 有taskId说明是驳回的提交
@@ -453,10 +450,15 @@ export default {
paramObj.common.taskId = this.$route.query.taskId
} else {
func = enStandardStartUseApproval
// 快照JSON
paramObj.common.infoJsonStr = this.getParamJsonStr()
}
func(paramObj).then(res => {
func(paramObj).then(async res => {
if (res.success) {
this.$message.success(res.message)
if (this.$route.query.taskId) {
await this.saveParamJsonStr()
}
this.goBack()
} else {
this.$message.warning(res.message)