diff --git a/src/api/workCenter.js b/src/api/workCenter.js
index f4d6e72a..16de1f66 100644
--- a/src/api/workCenter.js
+++ b/src/api/workCenter.js
@@ -223,8 +223,10 @@ const getInspectPlanProjectId = (params) => getAction('/process/esInspectPlanFlo
const getInspectPlanDetail = (params) => getAction('/process/esInspectPlanFlow/queryDetailByProjectId', params)
// 发起
const startInspectPlan = (params) => postAction('/process/esInspectPlanFlow/flowStart', params)
-// 审批
+// 同意
const approvalInspectPlan = (params) => postAction('/process/esInspectPlanFlow/flowApproval', params)
+// 驳回
+const rejectInspectPlan = (params) => postAction('/process/esInspectPlanFlow/flowReject', params)
// 转办
const transferInspectPlan = (params) => getAction('/process/esInspectPlanFlow/flowTransfer', params)
// 保存
@@ -243,8 +245,10 @@ const getInspectProcessProjectId = (params) => getAction('/esinspect/esInspectFl
const getInspectProcessDetail = (params) => getAction('/esinspect/esInspectFlowController/queryDetailByProjectId', params)
// 发起
const startInspectProcess = (params) => postAction('/esinspect/esInspectFlowController/flowStart', params)
-// 审批
+// 同意
const approvalInspectProcess = (params) => postAction('/esinspect/esInspectFlowController/flowApproval', params)
+// 驳回
+const rejectInspectProcess = (params) => postAction('/esinspect/esInspectFlowController/flowReject', params)
// 转办
const transferInspectProcess = (params) => getAction('/esinspect/esInspectFlowController/flowTransfer', params)
// 保存
@@ -257,8 +261,8 @@ const editInspectProcessTable = (params) => postAction('/esinspect/processEsInsp
const addInspectionContentTable = (params) => postAction('/enterprise/InspectContent/add', params)
// 稽查流程表-稽查内容-编辑
const editInspectionContentTable = (params) => postAction('/enterprise/InspectContent/edit', params)
-// 稽查流程表-稽查内容-通过稽查id获取预览文件id
-const getFileIdByInspectId = (params) => getAction('/esinspect/processEsInspect/queryFileByInspectId', params)
+// 稽查流程表-稽查内容-通过稽查id获取预览文件
+const getFileByInspectId = (params) => getAction('/esinspect/processEsInspect/queryFileByInspectId', params)
// 稽查流程表-稽查内容-列表(下拉)
const getInspectionContentTable = (params) => getAction('/enterprise/InspectContent/queryClauseByEsInspectId', params)
// 稽查流程表-稽查报告-添加
@@ -279,8 +283,10 @@ const getInspectExtensionProjectId = (params) => getAction('/process/esInspectDe
const getInspectExtensionDetail = (params) => getAction('/process/esInspectDelayApplyFlow/queryDetailByProjectId', params)
// 发起
const startInspectExtension = (params) => postAction('/process/esInspectDelayApplyFlow/flowStart', params)
-// 审批
+// 同意
const approvalInspectExtension = (params) => postAction('/process/esInspectDelayApplyFlow/flowApproval', params)
+// 驳回
+const rejectInspectExtension = (params) => postAction('/process/esInspectDelayApplyFlow/flowReject', params)
// 转办
const transferInspectExtension = (params) => getAction('/process/esInspectDelayApplyFlow/flowTransfer', params)
// 保存
@@ -293,8 +299,10 @@ const editInspectExtensionTable = (params) => postAction('/esinspectdelayapply/p
/* 企标稽查整改 */
// 详情信息
const getInspectRectifyDetail = (params) => getAction('/process/esInspectRectifyFlow/queryDetailByProjectId', params)
-// 审批
+// 同意
const approvalInspectRectify = (params) => postAction('/process/esInspectRectifyFlow/flowApproval', params)
+// 驳回
+const rejectInspectRectify = (params) => postAction('/process/esInspectRectifyFlow/flowReject', params)
// 转办
const transferInspectRectify = (params) => getAction('/process/esInspectRectifyFlow/flowTransfer', params)
// 保存
@@ -309,8 +317,10 @@ const getPermissionApplyProjectId = (params) => getAction('/process/esPermission
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 rejectPermissionApply = (params) => postAction('/process/esPermissionApplyFlow/flowReject', params)
// 转办
const transferPermissionApply = (params) => getAction('/process/esPermissionApplyFlow/flowTransfer', params)
// 保存
@@ -339,7 +349,7 @@ const getPostMeetingManageProjectId = (params) => getAction('/process/meetingMan
const getPostMeetingManageDetail = (params) => getAction('/process/meetingManageFlow/queryDetailByProjectId', params)
// 发起
const startPostMeetingManage = (params) => postAction('/process/meetingManageFlow/flowStart', params)
-// 审批
+// 同意
const approvalPostMeetingManage = (params) => postAction('/process/meetingManageFlow/flowApproval', params)
// 转办
const transferPostMeetingManage = (params) => getAction('/process/meetingManageFlow/flowTransfer', params)
@@ -462,6 +472,7 @@ export {
getInspectPlanDetail,
startInspectPlan,
approvalInspectPlan,
+ rejectInspectPlan,
transferInspectPlan,
saveInspectPlan,
addInspectPlanTable,
@@ -472,13 +483,14 @@ export {
getInspectProcessDetail,
startInspectProcess,
approvalInspectProcess,
+ rejectInspectProcess,
transferInspectProcess,
saveInspectProcess,
addInspectProcessTable,
editInspectProcessTable,
addInspectionContentTable,
editInspectionContentTable,
- getFileIdByInspectId,
+ getFileByInspectId,
getInspectionContentTable,
addInspectionReportTable,
editInspectionReportTable,
@@ -490,6 +502,7 @@ export {
getInspectExtensionDetail,
startInspectExtension,
approvalInspectExtension,
+ rejectInspectExtension,
transferInspectExtension,
saveInspectExtension,
addInspectExtensionTable,
@@ -497,6 +510,7 @@ export {
getInspectRectifyDetail,
approvalInspectRectify,
+ rejectInspectRectify,
transferInspectRectify,
saveInspectRectify,
getInspectRectifyDataById,
@@ -505,6 +519,7 @@ export {
getPermissionApplyDetail,
startPermissionApply,
approvalPermissionApply,
+ rejectPermissionApply,
transferPermissionApply,
savePermissionApply,
getPermissionApplyDataById,
diff --git a/src/views/enterpriseStandardLibrary/check/CheckList.vue b/src/views/enterpriseStandardLibrary/check/CheckList.vue
index 2d590f28..f8c38d55 100644
--- a/src/views/enterpriseStandardLibrary/check/CheckList.vue
+++ b/src/views/enterpriseStandardLibrary/check/CheckList.vue
@@ -7,13 +7,13 @@
-
+
-
+
diff --git a/src/views/workCenter/enterpriseStandardInspectionPlan/EnterpriseStandardInspectionPlanFlow.vue b/src/views/workCenter/enterpriseStandardInspectionPlan/EnterpriseStandardInspectionPlanFlow.vue
index dcdfc14b..3daabb36 100644
--- a/src/views/workCenter/enterpriseStandardInspectionPlan/EnterpriseStandardInspectionPlanFlow.vue
+++ b/src/views/workCenter/enterpriseStandardInspectionPlan/EnterpriseStandardInspectionPlanFlow.vue
@@ -131,7 +131,7 @@ import { EsInspectionPlan, ProcessKey } from '@/enums/commonEnums'
import {
approvalInspectPlan,
getInspectPlanDetail,
- getInspectPlanProjectId,
+ getInspectPlanProjectId, rejectInspectPlan,
saveInspectPlan,
startInspectPlan, transferInspectPlan
} from '@api/workCenter'
@@ -354,6 +354,7 @@ export default {
// 流程信息
params.processAll = Object.assign({}, this.info.processAll, formDataList[0], {
projectId: this.projectId,
+ nodeId: this.$route.query.nodeId,
taskId: this.$route.query.taskId
})
@@ -493,7 +494,7 @@ export default {
this.loading = true
this.getPageParams().then(res => {
res.map.pass = false
- return approvalInspectPlan(res)
+ return rejectInspectPlan(res)
}).then(res => {
if (res.success) {
this.$message.success(res.message)
diff --git a/src/views/workCenter/enterpriseStandardInspectionProcess/EnterpriseStandardInspectionProcess.vue b/src/views/workCenter/enterpriseStandardInspectionProcess/EnterpriseStandardInspectionProcess.vue
index 5ad21061..f56c7f8e 100644
--- a/src/views/workCenter/enterpriseStandardInspectionProcess/EnterpriseStandardInspectionProcess.vue
+++ b/src/views/workCenter/enterpriseStandardInspectionProcess/EnterpriseStandardInspectionProcess.vue
@@ -113,7 +113,7 @@ import { WorkCenterMixin } from '@/mixins/WorkCenterMixin'
import {
approvalInspectProcess,
getInspectProcessDetail,
- getInspectProcessProjectId, saveInspectProcess, startInspectProcess, transferInspectProcess
+ getInspectProcessProjectId, rejectInspectProcess, saveInspectProcess, startInspectProcess, transferInspectProcess
} from '@api/workCenter'
export default {
@@ -304,6 +304,7 @@ export default {
// 流程信息
params.processAll = Object.assign({}, this.info.processAll, formDataList[0], {
projectId: this.projectId,
+ nodeId: this.$route.query.nodeId,
taskId: this.$route.query.taskId
})
@@ -441,7 +442,7 @@ export default {
this.loading = true
this.getPageParams().then(res => {
res.map.pass = false
- return approvalInspectProcess(res)
+ return rejectInspectProcess(res)
}).then(res => {
if (res.success) {
this.$message.success(res.message)
diff --git a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessContentModal.vue b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessContentModal.vue
index 4a71df93..9fb0a4cd 100644
--- a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessContentModal.vue
+++ b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessContentModal.vue
@@ -57,7 +57,7 @@ import { getFileInfo } from '@/api/api'
import { previewPdf } from '@/utils/previewPdf'
import Vue from 'vue'
import { ACCESS_TOKEN } from '@/store/mutation-types'
-import { addInspectionContentTable, editInspectionContentTable, getFileIdByInspectId } from '@api/workCenter'
+import { addInspectionContentTable, editInspectionContentTable, getFileByInspectId } from '@api/workCenter'
const Base64 = require('js-base64').Base64
@@ -104,13 +104,11 @@ export default {
methods: {
add (data) {
this.data = Object.assign({}, data)
- // 后端获取预览文件id接口
- getFileIdByInspectId({ inspectId: data.inspectId }).then(res => {
- return res.success ? res.result.id : ''
- }).then(fileId => {
- this.getFileInfo(fileId).then(res => {
- this.handlePreview(res)
- })
+ // 后端获取预览文件
+ getFileByInspectId({ inspectId: data.inspectId }).then(res => {
+ if (res.success) {
+ this.handlePreview(res.result.id)
+ }
}).catch(err => {
console.log(err)
})
@@ -118,13 +116,11 @@ export default {
this.form.resetFields()
},
edit (data, record, index) {
- // 后端获取预览文件id接口
- getFileIdByInspectId({ inspectId: data.inspectId }).then(res => {
- return res.success ? res.result.id : ''
- }).then(fileId => {
- this.getFileInfo(fileId).then(res => {
- this.handlePreview(res)
- })
+ // 后端获取预览文件
+ getFileByInspectId({ inspectId: data.inspectId }).then(res => {
+ if (res.success) {
+ this.handlePreview(res.result.id)
+ }
}).catch(err => {
console.log(err)
})
diff --git a/src/views/workCenter/enterpriseStandardInspectionRectification/EnterpriseStandardInspectionRectification.vue b/src/views/workCenter/enterpriseStandardInspectionRectification/EnterpriseStandardInspectionRectification.vue
index 4e8b0435..457ce08f 100644
--- a/src/views/workCenter/enterpriseStandardInspectionRectification/EnterpriseStandardInspectionRectification.vue
+++ b/src/views/workCenter/enterpriseStandardInspectionRectification/EnterpriseStandardInspectionRectification.vue
@@ -110,7 +110,7 @@ import UserSelectModal from '@comp/selection/UserSelectModal'
import { WorkCenterMixin } from '@/mixins/WorkCenterMixin'
import {
approvalInspectRectify, getInspectRectifyDataById,
- getInspectRectifyDetail, saveInspectRectify, transferInspectRectify
+ getInspectRectifyDetail, rejectInspectRectify, saveInspectRectify, transferInspectRectify
} from '@api/workCenter'
import { EsInspectionRectification, ProcessKey } from '@/enums/commonEnums'
@@ -309,6 +309,7 @@ export default {
// 流程信息
params.processAll = Object.assign({}, this.info.processAll, formDataList[0], {
projectId: this.projectId,
+ nodeId: this.$route.query.nodeId,
taskId: this.$route.query.taskId
})
@@ -438,7 +439,7 @@ export default {
this.loading = true
this.getPageParams().then(res => {
res.map.pass = false
- return approvalInspectRectify(res)
+ return rejectInspectRectify(res)
}).then(res => {
if (res.success) {
this.$message.success(res.message)
diff --git a/src/views/workCenter/inspectionExtensionRequestProcess/InspectionExtensionRequestProcess.vue b/src/views/workCenter/inspectionExtensionRequestProcess/InspectionExtensionRequestProcess.vue
index d92f8cb4..0697eaa4 100644
--- a/src/views/workCenter/inspectionExtensionRequestProcess/InspectionExtensionRequestProcess.vue
+++ b/src/views/workCenter/inspectionExtensionRequestProcess/InspectionExtensionRequestProcess.vue
@@ -112,7 +112,11 @@ import { WorkCenterMixin } from '@/mixins/WorkCenterMixin'
import {
approvalInspectExtension,
getInspectExtensionDetail,
- getInspectExtensionProjectId, saveInspectExtension, startInspectExtension, transferInspectExtension
+ getInspectExtensionProjectId,
+ rejectInspectExtension,
+ saveInspectExtension,
+ startInspectExtension,
+ transferInspectExtension
} from '@api/workCenter'
export default {
@@ -305,6 +309,7 @@ export default {
// 流程信息
params.processAll = Object.assign({}, this.info.processAll, formDataList[0], {
projectId: this.projectId,
+ nodeId: this.$route.query.nodeId,
taskId: this.$route.query.taskId
})
@@ -442,7 +447,7 @@ export default {
this.loading = true
this.getPageParams().then(res => {
res.map.pass = false
- return approvalInspectExtension(res)
+ return rejectInspectExtension(res)
}).then(res => {
if (res.success) {
this.$message.success(res.message)
diff --git a/src/views/workCenter/permissionApplicationProcess/PermissionApplicationProcess.vue b/src/views/workCenter/permissionApplicationProcess/PermissionApplicationProcess.vue
index 9312e830..8d50cbb1 100644
--- a/src/views/workCenter/permissionApplicationProcess/PermissionApplicationProcess.vue
+++ b/src/views/workCenter/permissionApplicationProcess/PermissionApplicationProcess.vue
@@ -157,7 +157,7 @@ import { PermissionApply, ProcessKey } from '@/enums/commonEnums'
import {
approvalPermissionApply, getPermissionApplyDataById,
getPermissionApplyDetail,
- getPermissionApplyProjectId,
+ getPermissionApplyProjectId, rejectPermissionApply,
savePermissionApply, startPermissionApply,
transferPermissionApply
} from '@api/workCenter'
@@ -396,6 +396,7 @@ export default {
// 流程信息
params.processAll = Object.assign({}, this.info.processAll, formDataList[0], {
projectId: this.projectId,
+ nodeId: this.$route.query.nodeId,
taskId: this.$route.query.taskId
})
@@ -535,7 +536,7 @@ export default {
this.loading = true
this.getPageParams().then(res => {
res.map.pass = false
- return approvalPermissionApply(res)
+ return rejectPermissionApply(res)
}).then(res => {
if (res.success) {
this.$message.success(res.message)
diff --git a/src/views/workCenter/postMeetingManageProcess/PostMeetingManageProcess.vue b/src/views/workCenter/postMeetingManageProcess/PostMeetingManageProcess.vue
index 10d2f3b3..db22685e 100644
--- a/src/views/workCenter/postMeetingManageProcess/PostMeetingManageProcess.vue
+++ b/src/views/workCenter/postMeetingManageProcess/PostMeetingManageProcess.vue
@@ -328,6 +328,7 @@ export default {
// 流程信息
params.processAll = Object.assign({}, this.info.processAll, formDataList[0], {
projectId: this.projectId,
+ nodeId: this.$route.query.nodeId,
taskId: this.$route.query.taskId
})
diff --git a/src/views/workCenter/standardPromotionProcess/StandardPromotionProcess.vue b/src/views/workCenter/standardPromotionProcess/StandardPromotionProcess.vue
index 9675a45c..75fad28e 100644
--- a/src/views/workCenter/standardPromotionProcess/StandardPromotionProcess.vue
+++ b/src/views/workCenter/standardPromotionProcess/StandardPromotionProcess.vue
@@ -266,6 +266,7 @@ export default {
// 流程信息
params.processAll = Object.assign({}, this.info.processAll, formDataList[0], {
projectId: this.projectId,
+ nodeId: this.$route.query.nodeId,
taskId: this.$route.query.taskId
})