diff --git a/src/common/lang/workCenter/en.js b/src/common/lang/workCenter/en.js
index 260c7d9c..ed3a4f49 100644
--- a/src/common/lang/workCenter/en.js
+++ b/src/common/lang/workCenter/en.js
@@ -323,6 +323,7 @@ module.exports = {
standardName: '标准名称',
meetingName: '会议名称',
attendanceDate: '参会日期',
- relevantData: '相关材料'
+ relevantData: '相关材料',
+ uncommitted: '未参加'
}
}
diff --git a/src/common/lang/workCenter/zh.js b/src/common/lang/workCenter/zh.js
index 4efcc3aa..c5379a3b 100644
--- a/src/common/lang/workCenter/zh.js
+++ b/src/common/lang/workCenter/zh.js
@@ -349,7 +349,8 @@ module.exports = {
standardName: '标准名称',
meetingName: '会议名称',
attendanceDate: '参会日期',
- relevantData: '相关材料'
+ relevantData: '相关材料',
+ uncommitted: '未参加'
},
// 法规采购流程
standardProcurementProcess: {
diff --git a/src/enums/commonEnums.js b/src/enums/commonEnums.js
index 5773b786..eb81a1fa 100644
--- a/src/enums/commonEnums.js
+++ b/src/enums/commonEnums.js
@@ -265,53 +265,53 @@ export const SenderType = {
// 企标稽查计划
export const EsInspectionPlan = new EsEnums({
- initiate: { text: '稽查联络人发起计划', value: 'liaisons_start', btn: 6 },
- fillInComments: { text: '稽查征求意见对象填写意见', value: 'opinion_fill', btn: 6 },
- liaisonCollect: { text: '稽查联络人汇总', value: 'liaisons_collect', btn: 6 },
- relevantPersonnelCountersign: { text: '相关人员会签', value: 'involve_countersign', btn: 27 },
- liaisonLeaderApproval: { text: '联络人主管级领导批准', value: 'leader_approval', btn: 27 }
+ initiate: { text: '稽查联络人发起计划', value: 'liaisons_start', btn: ['save', 'submit'] },
+ fillInComments: { text: '稽查征求意见对象填写意见', value: 'opinion_fill', btn: ['save', 'submit'] },
+ liaisonCollect: { text: '稽查联络人汇总', value: 'liaisons_collect', btn: ['save', 'submit'] },
+ relevantPersonnelCountersign: { text: '相关人员会签', value: 'involve_countersign', btn: ['transfer', 'save', 'agree', 'reject'] },
+ liaisonLeaderApproval: { text: '联络人主管级领导批准', value: 'leader_approval', btn: ['transfer', 'save', 'agree', 'reject'] }
})
// 企标稽查流程
export const EsInspectionProcess = new EsEnums({
- initiate: { text: '稽查负责人发起', value: 'responsible_start', btn: 6 },
- directorLeaderApprovalOne: { text: '负责人主管级领导审批', value: 'leader_approval', btn: 27 },
- inputInspectionReport: { text: '稽查负责人上传稽查报告和整改计划', value: 'responsible_upload', btn: 7 },
- directorLeaderApprovalTwo: { text: '负责人主管级领导审批', value: 'leader_approval_again', btn: 27 },
- relevantPersonnelCountersign: { text: '相关人员会签', value: 'involve_countersign', btn: 27 }
+ initiate: { text: '稽查负责人发起', value: 'responsible_start', btn: ['save', 'submit'] },
+ directorLeaderApprovalOne: { text: '负责人主管级领导审批', value: 'leader_approval', btn: ['transfer', 'save', 'agree', 'reject'] },
+ inputInspectionReport: { text: '稽查负责人上传稽查报告和整改计划', value: 'responsible_upload', btn: ['transfer', 'save', 'submit'] },
+ directorLeaderApprovalTwo: { text: '负责人主管级领导审批', value: 'leader_approval_again', btn: ['transfer', 'save', 'agree', 'reject'] },
+ relevantPersonnelCountersign: { text: '相关人员会签', value: 'involve_countersign', btn: ['transfer', 'save', 'agree', 'reject'] }
})
// 稽查延期申请流程
export const InspectionExtensionRequestProcess = new EsEnums({
- initiate: { text: '稽查负责人申请延期', value: 'responsible_start', btn: 6 },
- directorLeaderApproval: { text: '负责人主管级领导审批', value: 'leader_approval', btn: 27 },
- contactEvaluation: { text: '稽查联络人评估', value: 'liaisons_assess', btn: 27 },
- directorSuperiorLeaderApproval: { text: '负责人主管级上一级领导审批', value: 'leader_up_level', btn: 27 }
+ initiate: { text: '稽查负责人申请延期', value: 'responsible_start', btn: ['save', 'submit'] },
+ directorLeaderApproval: { text: '负责人主管级领导审批', value: 'leader_approval', btn: ['transfer', 'save', 'agree', 'reject'] },
+ contactEvaluation: { text: '稽查联络人评估', value: 'liaisons_assess', btn: ['transfer', 'save', 'agree', 'reject'] },
+ directorSuperiorLeaderApproval: { text: '负责人主管级上一级领导审批', value: 'leader_up_level', btn: ['transfer', 'save', 'agree', 'reject'] }
})
// 企标稽查整改
export const EsInspectionRectification = new EsEnums({
- uploadRectificationResult: { text: '整改负责人上传整改结果', value: 'responsible_start', btn: 7 },
- directorLeaderApproval: { text: '负责人主管级领导审批', value: 'leader_approval', btn: 27 },
- directorToExamine: { text: '稽查负责人审核', value: 'responsible_approval', btn: 6 }
+ uploadRectificationResult: { text: '整改负责人上传整改结果', value: 'responsible_start', btn: ['transfer', 'save', 'submit'] },
+ directorLeaderApproval: { text: '负责人主管级领导审批', value: 'leader_approval', btn: ['transfer', 'save', 'agree', 'reject'] },
+ directorToExamine: { text: '稽查负责人审核', value: 'responsible_approval', btn: ['transfer', 'save', 'agree', 'reject'] }
})
// 权限申请流程
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 }
+ initiate: { text: '发起人申请', value: 'initiator_start', btn: ['save', 'submit'] },
+ leaderApproval: { text: '发起人领导审批', value: 'leader_approval', btn: ['transfer', 'save', 'agree', 'reject'] },
+ standardApproval: { text: '标准化审批', value: 'standard_approval', btn: ['transfer', 'save', 'agree', 'reject'] }
})
// 标准宣贯流程
export const StandardPromotion = new EsEnums({
- initiate: { text: '发起并归档', value: 'initiator_start', btn: 7 }
+ initiate: { text: '发起并归档', value: 'initiator_start', btn: ['cancel', 'save', 'submit'] }
})
// 会后管理流程
export const PostMeetingManage = new EsEnums({
- initiate: { text: '法规工程师发起', value: 'engineer_start', btn: 12 },
- attendeesUploadMaterials: { text: '参会人员上传材料', value: 'meeting_upload', btn: 15 }
+ initiate: { text: '法规工程师发起', value: 'engineer_start', btn: ['save', 'submit'] },
+ attendeesUploadMaterials: { text: '参会人员上传材料', value: 'meeting_upload', btn: ['uncommitted', 'transfer', 'save', 'submit'] }
})
// 项目评估结果类型
diff --git a/src/views/workCenter/enterpriseStandardInspectionPlan/EnterpriseStandardInspectionPlanFlow.vue b/src/views/workCenter/enterpriseStandardInspectionPlan/EnterpriseStandardInspectionPlanFlow.vue
index e567e4c2..055643e4 100644
--- a/src/views/workCenter/enterpriseStandardInspectionPlan/EnterpriseStandardInspectionPlanFlow.vue
+++ b/src/views/workCenter/enterpriseStandardInspectionPlan/EnterpriseStandardInspectionPlanFlow.vue
@@ -104,15 +104,15 @@
-
{{ $t('turnTo') }}
+
{{ $t('turnTo') }}
-
{{ $t('preservation') }}
+
{{ $t('preservation') }}
-
{{ $t('submit') }}
+
{{ $t('submit') }}
-
{{ $t('agree') }}
+
{{ $t('agree') }}
-
{{ $t('reject') }}
+
{{ $t('reject') }}
@@ -171,7 +171,7 @@ export default {
currentNodeName: '',
// 项目id
projectId: '',
- btn: 0,
+ btn: [],
validatorRules: {
// 流程名称
processName: {
@@ -236,11 +236,11 @@ export default {
this.currentNode = nodeId || EsInspectionPlan.initiate.value
this.currentNodeName = taskName || EsInspectionPlan.initiate.text
this.projectId = projectId
- this.btn = EsInspectionPlan.propertyOfValue('btn', this.currentNode) || 0
+ this.btn = EsInspectionPlan.propertyOfValue('btn', this.currentNode) || []
// 如果有nodeId,但是匹配不到任何节点,就是是增加的审批节点
if (nodeId && !EsInspectionPlan.keyOfValue(nodeId)) {
- // 审批和同意按钮
- this.btn = 24
+ // 同意按钮
+ this.btn = ['agree']
}
// 查询人员信息
this.getPersonInfoStructure(this.processKey, () => {
diff --git a/src/views/workCenter/enterpriseStandardInspectionProcess/EnterpriseStandardInspectionProcess.vue b/src/views/workCenter/enterpriseStandardInspectionProcess/EnterpriseStandardInspectionProcess.vue
index ff37ea56..27870db5 100644
--- a/src/views/workCenter/enterpriseStandardInspectionProcess/EnterpriseStandardInspectionProcess.vue
+++ b/src/views/workCenter/enterpriseStandardInspectionProcess/EnterpriseStandardInspectionProcess.vue
@@ -85,15 +85,15 @@
-
{{ $t('turnTo') }}
+
{{ $t('turnTo') }}
-
{{ $t('preservation') }}
+
{{ $t('preservation') }}
-
{{ $t('submit') }}
+
{{ $t('submit') }}
-
{{ $t('agree') }}
+
{{ $t('agree') }}
-
{{ $t('reject') }}
+
{{ $t('reject') }}
@@ -150,7 +150,7 @@ export default {
currentNodeName: '',
// 项目id
projectId: '',
- btn: 0,
+ btn: [],
validatorRules: {
// 流程名称
processName: {
@@ -194,11 +194,11 @@ export default {
this.currentNode = nodeId || EsInspectionProcess.initiate.value
this.currentNodeName = taskName || EsInspectionProcess.initiate.text
this.projectId = projectId
- this.btn = EsInspectionProcess.propertyOfValue('btn', this.currentNode) || 0
+ this.btn = EsInspectionProcess.propertyOfValue('btn', this.currentNode) || []
// 如果有nodeId,但是匹配不到任何节点,就是是增加的审批节点
if (nodeId && !EsInspectionProcess.keyOfValue(nodeId)) {
- // 审批和同意按钮
- this.btn = 24
+ // 同意按钮
+ this.btn = ['agree']
}
// 查询人员信息
this.getPersonInfoStructure(this.processKey, () => {
diff --git a/src/views/workCenter/enterpriseStandardInspectionRectification/EnterpriseStandardInspectionRectification.vue b/src/views/workCenter/enterpriseStandardInspectionRectification/EnterpriseStandardInspectionRectification.vue
index 2b73932b..21fcfcb3 100644
--- a/src/views/workCenter/enterpriseStandardInspectionRectification/EnterpriseStandardInspectionRectification.vue
+++ b/src/views/workCenter/enterpriseStandardInspectionRectification/EnterpriseStandardInspectionRectification.vue
@@ -85,15 +85,15 @@
-
{{ $t('turnTo') }}
+
{{ $t('turnTo') }}
-
{{ $t('preservation') }}
+
{{ $t('preservation') }}
-
{{ $t('submit') }}
+
{{ $t('submit') }}
-
{{ $t('agree') }}
+
{{ $t('agree') }}
-
{{ $t('reject') }}
+
{{ $t('reject') }}
@@ -149,7 +149,7 @@ export default {
currentNodeName: '',
// 项目id
projectId: '',
- btn: 0,
+ btn: [],
validatorRules: {
// 流程名称
processName: {
@@ -193,11 +193,11 @@ export default {
this.currentNode = nodeId || EsInspectionRectification.uploadRectificationResult.value
this.currentNodeName = taskName || EsInspectionRectification.uploadRectificationResult.text
this.projectId = projectId
- this.btn = EsInspectionRectification.propertyOfValue('btn', this.currentNode) || 0
+ this.btn = EsInspectionRectification.propertyOfValue('btn', this.currentNode) || []
// 如果有nodeId,但是匹配不到任何节点,就是是增加的审批节点
if (nodeId && !EsInspectionRectification.keyOfValue(nodeId)) {
- // 审批和同意按钮
- this.btn = 24
+ // 同意按钮
+ this.btn = ['agree']
}
// 查询人员信息
this.getPersonInfoStructure(this.processKey, () => {
diff --git a/src/views/workCenter/inspectionExtensionRequestProcess/InspectionExtensionRequestProcess.vue b/src/views/workCenter/inspectionExtensionRequestProcess/InspectionExtensionRequestProcess.vue
index 456528ff..a7080952 100644
--- a/src/views/workCenter/inspectionExtensionRequestProcess/InspectionExtensionRequestProcess.vue
+++ b/src/views/workCenter/inspectionExtensionRequestProcess/InspectionExtensionRequestProcess.vue
@@ -85,15 +85,15 @@
-
{{ $t('turnTo') }}
+
{{ $t('turnTo') }}
-
{{ $t('preservation') }}
+
{{ $t('preservation') }}
-
{{ $t('submit') }}
+
{{ $t('submit') }}
-
{{ $t('agree') }}
+
{{ $t('agree') }}
-
{{ $t('reject') }}
+
{{ $t('reject') }}
@@ -149,7 +149,7 @@ export default {
currentNodeName: '',
// 项目id
projectId: '',
- btn: 0,
+ btn: [],
validatorRules: {
// 流程名称
processName: {
@@ -193,11 +193,11 @@ export default {
this.currentNode = nodeId || InspectionExtensionRequestProcess.initiate.value
this.currentNodeName = taskName || InspectionExtensionRequestProcess.initiate.text
this.projectId = projectId
- this.btn = InspectionExtensionRequestProcess.propertyOfValue('btn', this.currentNode) || 0
+ this.btn = InspectionExtensionRequestProcess.propertyOfValue('btn', this.currentNode) || []
// 如果有nodeId,但是匹配不到任何节点,就是是增加的审批节点
if (nodeId && !InspectionExtensionRequestProcess.keyOfValue(nodeId)) {
- // 审批和同意按钮
- this.btn = 24
+ // 同意按钮
+ this.btn = ['agree']
}
// 查询人员信息
this.getPersonInfoStructure(this.processKey, () => {
diff --git a/src/views/workCenter/permissionApplicationProcess/PermissionApplicationProcess.vue b/src/views/workCenter/permissionApplicationProcess/PermissionApplicationProcess.vue
index 428b7b8b..465e783e 100644
--- a/src/views/workCenter/permissionApplicationProcess/PermissionApplicationProcess.vue
+++ b/src/views/workCenter/permissionApplicationProcess/PermissionApplicationProcess.vue
@@ -130,15 +130,15 @@
-
{{ $t('turnTo') }}
+
{{ $t('turnTo') }}
-
{{ $t('preservation') }}
+
{{ $t('preservation') }}
-
{{ $t('submit') }}
+
{{ $t('submit') }}
-
{{ $t('agree') }}
+
{{ $t('agree') }}
-
{{ $t('reject') }}
+
{{ $t('reject') }}
@@ -204,7 +204,7 @@ export default {
currentNodeName: '',
// 项目id
projectId: '',
- btn: 0,
+ btn: [],
validatorRules: {
// 流程名称
processName: {
@@ -265,11 +265,11 @@ export default {
this.currentNode = nodeId || PermissionApply.initiate.value
this.currentNodeName = taskName || PermissionApply.initiate.text
this.projectId = projectId
- this.btn = PermissionApply.propertyOfValue('btn', this.currentNode) || 0
+ this.btn = PermissionApply.propertyOfValue('btn', this.currentNode) || []
// 如果有nodeId,但是匹配不到任何节点,就是是增加的审批节点
if (nodeId && !PermissionApply.keyOfValue(nodeId)) {
- // 审批和同意按钮
- this.btn = 24
+ // 同意按钮
+ this.btn = ['agree']
}
// 查询人员信息
this.getPersonInfoStructure(this.processKey, () => {
diff --git a/src/views/workCenter/postMeetingManageProcess/PostMeetingManageProcess.vue b/src/views/workCenter/postMeetingManageProcess/PostMeetingManageProcess.vue
index b443a2fa..35b22be5 100644
--- a/src/views/workCenter/postMeetingManageProcess/PostMeetingManageProcess.vue
+++ b/src/views/workCenter/postMeetingManageProcess/PostMeetingManageProcess.vue
@@ -85,13 +85,13 @@
-
{{ $t('turnTo') }}
+
{{ $t('workCenter.postMeetingManageProcess.uncommitted') }}
-
{{ $t('turnTo') }}
+
{{ $t('turnTo') }}
-
{{ $t('preservation') }}
+
{{ $t('preservation') }}
-
{{ $t('submit') }}
+
{{ $t('submit') }}
@@ -149,7 +149,7 @@ export default {
currentNodeName: '',
// 项目id
projectId: '',
- btn: 0,
+ btn: [],
validatorRules: {
// 流程名称
processName: {
@@ -200,11 +200,11 @@ export default {
this.currentNode = nodeId || PostMeetingManage.initiate.value
this.currentNodeName = taskName || PostMeetingManage.initiate.text
this.projectId = projectId
- this.btn = PostMeetingManage.propertyOfValue('btn', this.currentNode) || 0
+ this.btn = PostMeetingManage.propertyOfValue('btn', this.currentNode) || []
// 如果有nodeId,但是匹配不到任何节点,就是是增加的审批节点
if (nodeId && !PostMeetingManage.keyOfValue(nodeId)) {
- // 审批和同意按钮
- this.btn = 8
+ // 提交按钮
+ this.btn = ['submit']
}
// 查询人员信息
this.getPersonInfoStructure(this.processKey, () => {
diff --git a/src/views/workCenter/standardPromotionProcess/StandardPromotionProcess.vue b/src/views/workCenter/standardPromotionProcess/StandardPromotionProcess.vue
index b1c811c5..9675a45c 100644
--- a/src/views/workCenter/standardPromotionProcess/StandardPromotionProcess.vue
+++ b/src/views/workCenter/standardPromotionProcess/StandardPromotionProcess.vue
@@ -62,11 +62,11 @@
-
{{ $t('cancel') }}
+
{{ $t('cancel') }}
-
{{ $t('preservation') }}
+
{{ $t('preservation') }}
-
{{ $t('submit') }}
+
{{ $t('submit') }}
@@ -116,7 +116,7 @@ export default {
currentNodeName: '',
// 项目id
projectId: '',
- btn: 0,
+ btn: [],
validatorRules: {
// 流程名称
processName: {
@@ -175,11 +175,11 @@ export default {
this.currentNode = nodeId || StandardPromotion.initiate.value
this.currentNodeName = taskName || StandardPromotion.initiate.text
this.projectId = projectId
- this.btn = StandardPromotion.propertyOfValue('btn', this.currentNode) || 0
+ this.btn = StandardPromotion.propertyOfValue('btn', this.currentNode) || []
// 如果有nodeId,但是匹配不到任何节点,就是是增加的审批节点
if (nodeId && !StandardPromotion.keyOfValue(nodeId)) {
// 提交按钮
- this.btn = 4
+ this.btn = ['submit']
}
// 如果是待办进来,就获取详情数据
if (this.$route.query.projectId) {
@@ -299,7 +299,7 @@ export default {
}).then(res => {
if (res.success) {
this.$message.success(res.message)
- this.goBack()
+ this.handleCancel()
} else {
this.$message.warn(res.message)
}
@@ -321,7 +321,7 @@ export default {
}).then(res => {
if (res.success) {
this.$message.success(res.message)
- this.goBack()
+ this.handleCancel()
} else {
this.$message.warn(res.message)
}
@@ -355,7 +355,7 @@ export default {
})
},
handleCancel () {
- this.goBack()
+ this.$router.go(-1)
}
}
}