+
{{ $t('turnTo') }}
@@ -108,10 +109,16 @@ import BaseInfoForm from '@views/workCenter/enterpriseStandardInspectionRectific
import UserSelectModal from '@comp/selection/UserSelectModal'
import { WorkCenterMixin } from '@/mixins/WorkCenterMixin'
import {
- approvalInspectRectify, getInspectRectifyDataById,
- getInspectRectifyDetail, rejectInspectRectify, saveInspectRectify, startInspectRectify, transferInspectRectify
+ approvalInspectRectify,
+ getInspectRectifyDataById,
+ getInspectRectifyDetail, getLookData,
+ rejectInspectRectify,
+ saveInspectRectify,
+ saveSnapShot,
+ startInspectRectify,
+ transferInspectRectify
} from '@api/workCenter'
-import { ApprovalOpinions, EsInspectionRectification, ProcessKey } from '@/enums/commonEnums'
+import { ApprovalOpinions, EsInspectionRectification, ProcessKey, ProcessType } from '@/enums/commonEnums'
const tabList = ['base', 'user']
export default {
@@ -197,7 +204,8 @@ export default {
}
},
created () {
- const { projectId, nodeId, taskName } = this.$route.query
+ const { projectId, nodeId, taskName, isLook } = this.$route.query
+ this.disabled = isLook === '1'
// 自动发起流程: 没有默认节点
this.currentNode = nodeId || ''
this.currentNodeName = taskName || ''
@@ -212,6 +220,11 @@ export default {
// 同意按钮
this.btn = ['agree']
}
+ // 快照回显
+ if (this.$route.query.snapshotId) {
+ this.loadSnapshotPage()
+ return
+ }
// 查询人员信息
this.getPersonInfoStructure(this.processKey, () => {
this.personnelInfoData = this.personnelInfoData.map(item => {
@@ -348,6 +361,8 @@ export default {
// 保存清空校验
this.approvalInfoForm.validateFields(['commitText'], { force: true }, () => {})
}
+ // 保存一下所有表单收集的数据用于快照回显
+ params.formDataList = formDataList
// 收集人员信息
const personInfo = this.getPersonInfo(isValidate && !flag)
if (!personInfo) {
@@ -389,7 +404,9 @@ export default {
// 人员信息(要重新获取,流程里的信息不能直接用,后端需要多选人员处理成数组了)
personInfo: this.$refs.personnelInfo.getDataObj(),
// 业务表格数据,用于强制撤回后回显
- draftData
+ draftData,
+ // 将流程数据保存json,后续进行快照回显
+ prcData: params
})
}
@@ -399,6 +416,63 @@ export default {
}
return params
},
+ /**
+ * 保存快照信息
+ */
+ saveSnapShotInfo (prcParams) {
+ // 没有taskId就不保存
+ if (!this.$route.query.taskId) {
+ return Promise.resolve({ success: true })
+ }
+ const { processAll = {}, processApprovalRecord = {} } = prcParams
+ const params = Object.assign({}, {
+ taskId: this.$route.query.taskId,
+ pcrType: ProcessType.ES_INSPECTION_RECTIFICATION.value,
+ // 流程信息
+ prcName: processAll.prcName,
+ processDueDate: processAll.dueTime,
+ processDescription: processAll.prcMes,
+ // 流程审批信息
+ handleText: processApprovalRecord.commitText,
+ handleFile: processApprovalRecord.commitFile,
+ // 流程json字符串存储全部信息
+ infoJsonStr: JSON.stringify({
+ // 人员信息
+ personInfo: this.$refs.personnelInfo.getDataObj(),
+ // 流程信息
+ prcData: prcParams
+ })
+ })
+ return saveSnapShot(params)
+ },
+ // 回显快照页面
+ loadSnapshotPage () {
+ const { snapshotId } = this.$route.query
+ if (!snapshotId) {
+ return
+ }
+ this.loading = true
+ getLookData({ snapshotId }).then(res => {
+ const result = res.result || {}
+ const jsonData = JSON.parse(result.infoJsonStr || '{}')
+ const prcData = jsonData.prcData || {}
+ this.info = prcData
+ this.processInfoForm && this.processInfoForm.setFieldsValue({
+ prcName: prcData.processAll.prcName,
+ dueTime: prcData.processAll.dueTime,
+ prcMes: prcData.processAll.prcMes
+ })
+ this.approvalInfoForm && this.approvalInfoForm.setFieldsValue({
+ commitText: prcData.processApprovalRecord.commitText,
+ commitFile: prcData.processApprovalRecord.commitFile
+ })
+ this.$nextTick(() => {
+ this.$refs.baseInfoForm.initData(prcData.processEsInspectRectify)
+ })
+ }).finally(() => {
+ this.loading = false
+ })
+ },
/**
* 转办弹框
*/
@@ -463,17 +537,24 @@ export default {
handleSubmit () {
if (this.loading) return
this.loading = true
- this.getPageParams().then(res => {
- console.log(res)
- res.map.pass = true
+ this.getPageParams().then(params => {
+ console.log(params)
+ params.map.pass = true
let fn = approvalInspectRectify
// 是否强制撤回(强制撤回的话,就发起接口)
if (this.isForceRevoke) {
fn = startInspectRectify
// 重新发起置空业务id
- delete res.processEsInspectRectify.id
+ delete params.processEsInspectRectify.id
}
- return fn(res)
+ // 保存快照,成功了就调接口,失败了就提示
+ return this.saveSnapShotInfo(params).then(res => {
+ if (res.success) {
+ return fn(params)
+ } else {
+ return res
+ }
+ })
}).then(res => {
if (res.success) {
this.$message.success(res.message)
@@ -499,19 +580,26 @@ export default {
handleAgree (isSubmitBtn) {
if (this.loading) return
this.loading = true
- this.getPageParams().then(res => {
+ this.getPageParams().then(params => {
// 同意和提交一直传true
- res.map.pass = true
+ params.map.pass = true
// 不是提交按钮
if (isSubmitBtn !== true) {
// 没有填写注释,就默认同意
- if (!res.processApprovalRecord.commitText) {
- res.processApprovalRecord.commitText = '同意'
+ if (!params.processApprovalRecord.commitText) {
+ params.processApprovalRecord.commitText = '同意'
}
// 审批意见
- res.processApprovalRecord.commitFlag = ApprovalOpinions.AGREE.value
+ params.processApprovalRecord.commitFlag = ApprovalOpinions.AGREE.value
}
- return approvalInspectRectify(res)
+ // 保存快照,成功了就调接口,失败了就提示
+ return this.saveSnapShotInfo(params).then(res => {
+ if (res.success) {
+ return approvalInspectRectify(params)
+ } else {
+ return res
+ }
+ })
}).then(res => {
if (res.success) {
this.$message.success(res.message)
@@ -550,11 +638,18 @@ export default {
return
}
this.loading = true
- this.getPageParams().then(res => {
- res.map.pass = false
+ this.getPageParams().then(params => {
+ params.map.pass = false
// 审批意见
- res.processApprovalRecord.commitFlag = ApprovalOpinions.REJECT.value
- return rejectInspectRectify(res)
+ params.processApprovalRecord.commitFlag = ApprovalOpinions.REJECT.value
+ // 保存快照,成功了就调接口,失败了就提示
+ return this.saveSnapShotInfo(params).then(res => {
+ if (res.success) {
+ return rejectInspectRectify(params)
+ } else {
+ return res
+ }
+ })
}).then(res => {
if (res.success) {
this.$message.success(res.message)
diff --git a/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue b/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue
index afbfb5a6..a96f2b42 100644
--- a/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue
+++ b/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue
@@ -1,7 +1,7 @@
-
+
@@ -84,7 +85,7 @@
-
+
@@ -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,52 @@ 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 (callback) {
+ // 流程信息表单
+ 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(async res => {
+ if (res.success) {
+ callback && await callback()
+ } else {
+ this.$message.warning(res.message)
+ this.loading = false
+ }
+ })
+ },
// 节点一时候的提交
handleStart () {
if (this.loading) return
@@ -448,16 +510,32 @@ export default {
paramObj.common.taskId = this.$route.query.taskId
} else {
func = enStandardRecheckApproval
+ // 快照JSON
+ paramObj.common.infoJsonStr = this.getParamJsonStr()
+ }
+ if (this.$route.query.taskId) {
+ this.saveParamJsonStr(() => {
+ func(paramObj).then(res => {
+ if (res.success) {
+ this.$message.success(res.message)
+ this.goBack()
+ } else {
+ this.$message.warning(res.message)
+ this.loading = false
+ }
+ })
+ })
+ } else {
+ func(paramObj).then(res => {
+ if (res.success) {
+ this.$message.success(res.message)
+ this.goBack()
+ } else {
+ this.$message.warning(res.message)
+ this.loading = false
+ }
+ })
}
- func(paramObj).then(res => {
- if (res.success) {
- this.$message.success(res.message)
- this.goBack()
- } else {
- this.$message.warning(res.message)
- this.loading = false
- }
- })
} else {
this.switchValue = 'base'
}
@@ -502,14 +580,17 @@ export default {
param.common.taskId = this.$route.query.taskId
param.data = Object.assign({}, data.formInline)
console.log(param)
- enStandardRecheckAgree(param).then(res => {
- if (res.success) {
- this.$message.success(res.message)
- this.goBack()
- } else {
- this.$message.warning(res.message)
- this.loading = false
- }
+ // 保存快照
+ this.saveParamJsonStr(() => {
+ enStandardRecheckAgree(param).then(res => {
+ if (res.success) {
+ this.$message.success(res.message)
+ this.goBack()
+ } else {
+ this.$message.warning(res.message)
+ this.loading = false
+ }
+ })
})
} else {
this.switchValue = 'base'
@@ -529,14 +610,17 @@ export default {
const param = {}
param.common = Object.assign({}, values)
param.common.taskId = this.$route.query.taskId
- enStandardRecheckAgree(param).then(res => {
- if (res.success) {
- this.$message.success(res.message)
- this.goBack()
- } else {
- this.$message.warning(res.message)
- this.loading = false
- }
+ // 保存快照
+ this.saveParamJsonStr(() => {
+ enStandardRecheckAgree(param).then(res => {
+ if (res.success) {
+ this.$message.success(res.message)
+ this.goBack()
+ } else {
+ this.$message.warning(res.message)
+ this.loading = false
+ }
+ })
})
}
})
@@ -556,16 +640,19 @@ export default {
const param = {}
param.common = Object.assign({}, values)
param.common.taskId = this.$route.query.taskId
- enStandardRecheckReject(param).then(res => {
- if (res.success) {
- this.$message.success(res.message)
- this.goBack()
- } else {
- this.$message.warning(res.message)
- this.loading = false
- }
- }).finally(() => {
- this.validatorRules.commitText.rules[0].required = false
+ // 保存快照
+ this.saveParamJsonStr(() => {
+ enStandardRecheckReject(param).then(res => {
+ if (res.success) {
+ this.$message.success(res.message)
+ this.goBack()
+ } else {
+ this.$message.warning(res.message)
+ this.loading = false
+ }
+ }).finally(() => {
+ this.validatorRules.commitText.rules[0].required = false
+ })
})
}
})
diff --git a/src/views/workCenter/enterpriseStandardRecheck/modules/DrafterEnterOptionBaseInfo.vue b/src/views/workCenter/enterpriseStandardRecheck/modules/DrafterEnterOptionBaseInfo.vue
index aca27065..c9d2704b 100644
--- a/src/views/workCenter/enterpriseStandardRecheck/modules/DrafterEnterOptionBaseInfo.vue
+++ b/src/views/workCenter/enterpriseStandardRecheck/modules/DrafterEnterOptionBaseInfo.vue
@@ -117,7 +117,7 @@
-
+
{{ $t('workCenter.enStandardRecheck.standGood') }}
diff --git a/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue b/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue
index 958c532c..60caa681 100644
--- a/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue
+++ b/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue
@@ -1,7 +1,7 @@
-
+
@@ -115,7 +123,7 @@
-
+
@@ -173,7 +181,7 @@ import MainDrafterCollectUploadMinuteBaseInfo from './modules/MainDrafterCollect
import MainDrafterUploadMinuteBaseInfo from './modules/MainDrafterUploadMinuteBaseInfo'
import OtherDrafterProofreadBaseInfo from './modules/OtherDrafterProofreadBaseInfo'
import MainDrafterPublishBaseInfo from './modules/MainDrafterPublishBaseInfo'
-import { ProcessKey, EsRevisionNodes } from '../../../enums/commonEnums'
+import { ProcessKey, EsRevisionNodes, ProcessType } from '../../../enums/commonEnums'
import {
enStandardEditAgree,
enStandardEditApproval,
@@ -182,10 +190,10 @@ import {
enStandardEditReject,
enStandardEditSave,
enStandardEditTurnTo,
- queryFileInfoByEditId
+ saveSnapShot,
+ getLookData
} from '@/api/workCenter'
import { WorkCenterMixin } from '@/mixins/WorkCenterMixin'
-import { Base64 } from 'js-base64'
import { onlineEditorView } from '../../../utils/onlyOfficeUtils'
export default {
@@ -293,13 +301,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) {
// 说明是已发起流程
@@ -371,7 +388,8 @@ export default {
rejectBtnDisabled: false, // 驳回按钮是否置灰
agreeBtnDisabled: false, // 同意按钮是否置灰
tempDraftId: '', // 临时草稿id,解决发起的时候点在线编辑会生成多条草稿的问题
- onlySelectFromFlowStation: [EsRevisionNodes.standardizationAudit.value] // 只能在标准与流程所里选人的节点
+ onlySelectFromFlowStation: [EsRevisionNodes.standardizationAudit.value], // 只能在标准与流程所里选人的节点
+ isLook: false
}
},
methods: {
@@ -382,6 +400,9 @@ export default {
if (type === 'todo') {
func = enStandardEditGetDataById
params = param.taskId
+ } else if (type === 'look') {
+ func = getLookData
+ params = param
} else {
func = enStandardEditGetDataDraft
params = param
@@ -540,6 +561,52 @@ 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: Object.assign({}, baseInfo, { id: this.model.data ? this.model.data.id : '' }),
+ personnelObj: personnelObj
+ })
+ return infoJsonStr
+ },
+ // 保存快照
+ saveParamJsonStr (callback) {
+ // 流程信息表单
+ 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: Object.assign({}, baseInfo, { id: this.model.data ? this.model.data.id : '' }),
+ personnelObj: personnelObj
+ })
+ params.taskId = this.$route.query.taskId
+ params.prcType = ProcessType.ES_EDIT.value
+ saveSnapShot(params).then(async res => {
+ if (res.success) {
+ callback && await callback()
+ } else {
+ this.$message.warning(res.message)
+ this.loading = false
+ }
+ })
+ },
// 节点一时候的提交,发起变更
handleStart () {
if (this.loading) return
@@ -588,16 +655,32 @@ export default {
param.common.taskId = this.$route.query.taskId
} else {
func = enStandardEditApproval
+ // 快照JSON
+ param.common.infoJsonStr = this.getParamJsonStr()
+ }
+ if (this.$route.query.taskId) {
+ this.saveParamJsonStr(() => {
+ func(param).then(res => {
+ if (res.success) {
+ this.$message.success(res.message)
+ this.goBack()
+ } else {
+ this.$message.warning(res.message)
+ this.loading = false
+ }
+ })
+ })
+ } else {
+ func(param).then(res => {
+ if (res.success) {
+ this.$message.success(res.message)
+ this.goBack()
+ } else {
+ this.$message.warning(res.message)
+ this.loading = false
+ }
+ })
}
- func(param).then(res => {
- if (res.success) {
- this.$message.success(res.message)
- this.goBack()
- } else {
- this.$message.warning(res.message)
- this.loading = false
- }
- })
} else {
this.switchValue = 'base'
}
@@ -652,14 +735,17 @@ export default {
param.common.taskId = this.$route.query.taskId
param.data = data
this.loading = true
- enStandardEditAgree(param).then(res => {
- if (res.success) {
- this.$message.success(res.message)
- this.goBack()
- } else {
- this.$message.warning(res.message)
- this.loading = false
- }
+ // 保存快照
+ this.saveParamJsonStr(() => {
+ enStandardEditAgree(param).then(res => {
+ if (res.success) {
+ this.$message.success(res.message)
+ this.goBack()
+ } else {
+ this.$message.warning(res.message)
+ this.loading = false
+ }
+ })
})
} else {
this.switchValue = 'base'
@@ -676,14 +762,17 @@ export default {
param.common.taskId = this.$route.query.taskId
param.data = data
this.loading = true
- enStandardEditAgree(param).then(res => {
- if (res.success) {
- this.$message.success(res.message)
- this.goBack()
- } else {
- this.$message.warning(res.message)
- this.loading = false
- }
+ // 保存快照
+ this.saveParamJsonStr(() => {
+ enStandardEditAgree(param).then(res => {
+ if (res.success) {
+ this.$message.success(res.message)
+ this.goBack()
+ } else {
+ this.$message.warning(res.message)
+ this.loading = false
+ }
+ })
})
} else {
this.switchValue = 'base'
@@ -707,14 +796,17 @@ export default {
param.common = Object.assign({}, values)
param.common.taskId = this.$route.query.taskId
param.data = data
- enStandardEditAgree(param).then(res => {
- if (res.success) {
- this.$message.success(res.message)
- this.goBack()
- } else {
- this.$message.warning(res.message)
- this.loading = false
- }
+ // 保存快照
+ this.saveParamJsonStr(() => {
+ enStandardEditAgree(param).then(res => {
+ if (res.success) {
+ this.$message.success(res.message)
+ this.goBack()
+ } else {
+ this.$message.warning(res.message)
+ this.loading = false
+ }
+ })
})
}
} else {
@@ -723,14 +815,17 @@ export default {
const param = {}
param.common = Object.assign({}, values)
param.common.taskId = this.$route.query.taskId
- enStandardEditAgree(param).then(res => {
- if (res.success) {
- this.$message.success(res.message)
- this.goBack()
- } else {
- this.$message.warning(res.message)
- this.loading = false
- }
+ // 保存快照
+ this.saveParamJsonStr(() => {
+ enStandardEditAgree(param).then(res => {
+ if (res.success) {
+ this.$message.success(res.message)
+ this.goBack()
+ } else {
+ this.$message.warning(res.message)
+ this.loading = false
+ }
+ })
})
}
}
@@ -751,16 +846,19 @@ export default {
const param = {}
param.common = Object.assign({}, values)
param.common.taskId = this.$route.query.taskId
- enStandardEditReject(param).then(res => {
- if (res.success) {
- this.$message.success(res.message)
- this.goBack()
- } else {
- this.$message.warning(res.message)
- this.loading = false
- }
- }).finally(() => {
- this.validatorRules.commitText.rules[0].required = false
+ // 保存快照
+ this.saveParamJsonStr(() => {
+ enStandardEditReject(param).then(async res => {
+ if (res.success) {
+ this.$message.success(res.message)
+ this.goBack()
+ } else {
+ this.$message.warning(res.message)
+ this.loading = false
+ }
+ }).finally(() => {
+ this.validatorRules.commitText.rules[0].required = false
+ })
})
}
})
diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/CommentObjectEnterBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/modules/CommentObjectEnterBaseInfo.vue
index fca89e90..4bfafb8a 100644
--- a/src/views/workCenter/enterpriseStandardRevision/modules/CommentObjectEnterBaseInfo.vue
+++ b/src/views/workCenter/enterpriseStandardRevision/modules/CommentObjectEnterBaseInfo.vue
@@ -151,6 +151,8 @@ export default {
const data = {}
data.advices = this.dataSource
data.businessJson = JSON.stringify(this.$refs.baseInfoForm.getData())
+ // 在线编辑文件id
+ data.onEditFile = this.onEditFile
return data
},
// 外层获取数据要过校验,返回false表示没有通过校验
diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/ConfirmWhetherCommentBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/modules/ConfirmWhetherCommentBaseInfo.vue
index cc2826e0..9ac6f525 100644
--- a/src/views/workCenter/enterpriseStandardRevision/modules/ConfirmWhetherCommentBaseInfo.vue
+++ b/src/views/workCenter/enterpriseStandardRevision/modules/ConfirmWhetherCommentBaseInfo.vue
@@ -25,7 +25,7 @@
-
+
{{ $t('yes') }}
@@ -132,6 +132,8 @@ export default {
getData () {
// 把数据抛出,在线编辑不知道要不要抛
const data = Object.assign({}, this.formInline)
+ // 在线编辑文件id
+ data.onEditFile = this.onEditFile
return data
},
// 外层获取数据要过校验,返回false表示没有通过校验
diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/DepartLiaisonCollectBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/modules/DepartLiaisonCollectBaseInfo.vue
index 9898a600..1dff1a39 100644
--- a/src/views/workCenter/enterpriseStandardRevision/modules/DepartLiaisonCollectBaseInfo.vue
+++ b/src/views/workCenter/enterpriseStandardRevision/modules/DepartLiaisonCollectBaseInfo.vue
@@ -179,6 +179,8 @@ export default {
// 把数据抛出,在线编辑不知道要不要抛
const data = Object.assign({}, this.formInline)
data.advices = this.dataSource
+ // 在线编辑文件id
+ data.onEditFile = this.onEditFile
return data
},
// 外层获取数据要过校验,返回false表示没有通过校验
diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/DepartLiaisonIssueBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/modules/DepartLiaisonIssueBaseInfo.vue
index 727b25cf..55978e9a 100644
--- a/src/views/workCenter/enterpriseStandardRevision/modules/DepartLiaisonIssueBaseInfo.vue
+++ b/src/views/workCenter/enterpriseStandardRevision/modules/DepartLiaisonIssueBaseInfo.vue
@@ -116,6 +116,8 @@ export default {
getData () {
// 把数据抛出,在线编辑不知道要不要抛
const data = Object.assign({}, this.formInline)
+ // 在线编辑文件id
+ data.onEditFile = this.onEditFile
return data
},
// 外层获取数据要过校验,返回false表示没有通过校验
diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/DepartLiaisonLeaderApproveBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/modules/DepartLiaisonLeaderApproveBaseInfo.vue
index 0ab59fe6..686e6c21 100644
--- a/src/views/workCenter/enterpriseStandardRevision/modules/DepartLiaisonLeaderApproveBaseInfo.vue
+++ b/src/views/workCenter/enterpriseStandardRevision/modules/DepartLiaisonLeaderApproveBaseInfo.vue
@@ -158,6 +158,8 @@ export default {
const data = {}
data.advices = this.dataSource
data.businessJson = JSON.stringify(this.$refs.baseInfoForm.getData())
+ // 在线编辑文件id
+ data.onEditFile = this.onEditFile
return data
},
// 外层获取数据要过校验,返回false表示没有通过校验
diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectBaseInfo.vue
index 8e5818c2..53d5d47b 100644
--- a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectBaseInfo.vue
+++ b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectBaseInfo.vue
@@ -11,7 +11,8 @@
{{ $t('enterpriseStandard') }}
-
{{ $t('workCenter.enStandardRevision.onLineEditing') }}
+
{{ $t('workCenter.enStandardRevision.onLineEditing') }}
+
{{ $t('view') }}
@@ -128,7 +129,7 @@ export default {
slots: { title: 'customTitleHandlingSuggestion' },
customRender: (text, row, index) => {
const obj = {
- children:
,
@@ -144,7 +145,7 @@ export default {
dataIndex: 'reason',
customRender: (text, row, index) => {
const obj = {
- children:
{
e.target.value = e.target.value.trim()
@@ -292,6 +293,10 @@ export default {
} else {
onlineEditor(params, this.onEditFile)
}
+ },
+ // 在线编辑的查看
+ onlineEditView () {
+ this.$emit('onlineEditView', this.onEditFile)
}
}
}
diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectUploadMinuteBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectUploadMinuteBaseInfo.vue
index d6a27dd4..9db38315 100644
--- a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectUploadMinuteBaseInfo.vue
+++ b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectUploadMinuteBaseInfo.vue
@@ -38,7 +38,8 @@
{{ $t('enterpriseStandard') }}
-
{{ $t('workCenter.enStandardRevision.onLineEditing') }}
+
{{ $t('workCenter.enStandardRevision.onLineEditing') }}
+
{{ $t('view') }}
@@ -109,7 +110,7 @@