[update] 稽查流程

src/api/api.js

@@ -163,30 +163,38 @@ const carbonCopyProcurementProcess = (params) => getAction('/process/fb/processF
 const getInspectPlanDetail = (params) => getAction('/process/esInspectPlanFlow/queryDetailByProjectId', params)
 // 转办
 const transferInspectPlan = (params) => getAction('/process/esInspectPlanFlow/flowTransfer', params)
-// 审批(通过、驳回)
+// 同意
 const approvalInspectPlan = (params) => postAction('/process/esInspectPlanFlow/flowApproval', params)
+// 驳回
+const rejectInspectPlan = (params) => postAction('/process/esInspectPlanFlow/flowReject', params)
 
 /* 企标稽查流程 */
 // 详情信息
 const getInspectProcessDetail = (params) => getAction('/esinspect/esInspectFlowController/queryDetailByProjectId', 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)
 
 /* 稽查延期申请 */
 // 详情信息
 const getInspectExtensionDetail = (params) => getAction('/process/esInspectDelayApplyFlow/queryDetailByProjectId', 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)
 
 /* 企标稽查整改 */
 // 详情信息
 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)
 // 企标稽查整改业务数据
@@ -279,17 +287,21 @@ export {
   getInspectPlanDetail,
   transferInspectPlan,
   approvalInspectPlan,
+  rejectInspectPlan,
 
   getInspectProcessDetail,
   approvalInspectProcess,
+  rejectInspectProcess,
   transferInspectProcess,
 
   getInspectExtensionDetail,
   approvalInspectExtension,
+  rejectInspectExtension,
   transferInspectExtension,
 
   getInspectRectifyDetail,
   approvalInspectRectify,
+  rejectInspectRectify,
   transferInspectRectify,
   getInspectRectifyDataById,
 

src/enums/commonEnums.js

@@ -5,6 +5,12 @@ export const YesOrNoEnum = new EsEnums({
   YES: { name: '是', value: '1' }
 })
 
+// 审批意见
+export const ApprovalOpinions = {
+  AGREE: { text: '同意', value: '1' },
+  REJECT: { text: '驳回', value: '2' }
+}
+
 // 既可以使用EsEnums 也可以单独写明
 export const FieldType = {
   DATE_SINGLE: { text: '单日期选择', value: '1' },
@@ -255,4 +261,4 @@ export const ProjectComplianceEvaluationProcessNode = new EsEnums({
   departLeaderApproval: { text: '各部门主管级领导审批', value: 'gbmzgjldsp', btn: ['return', 'save', 'agree', 'reject'], isMobile: true },
   moduleOwnerModification: { text: '模块负责人修改', value: 'mkfzrxg', btn: ['return', 'save', 'agree', 'reject'] },
   regulatoryEngineerFiling: { text: '法规工程师归档', value: 'fggcsgd', btn: ['return', 'save', 'submit'] }
-})
+})

src/views/workCenter/enterpriseStandardInspectionPlan/EnterpriseStandardInspectionPlanFlow.vue

@@ -104,11 +104,11 @@
 
 <script>
 import ProcessCommonLayout from '@/components/ProcessCommonLayout'
-import { EsInspectionPlan, ProcessKey } from '@/enums/commonEnums'
+import { ApprovalOpinions, EsInspectionPlan, ProcessKey } from '@/enums/commonEnums'
 import SelectUser from '@/components/SelectUser'
 import CalendarField from '@/components/CalendarField'
 import ZUpload from '@/components/ZUpload'
-import { approvalInspectPlan, getInspectPlanDetail, transferInspectPlan } from '@/api/api'
+import { approvalInspectPlan, getInspectPlanDetail, rejectInspectPlan, transferInspectPlan } from '@/api/api'
 import { getAction } from '@/api/manage'
 export default {
   name: 'EnterpriseStandardInspectionPlanFlow',
@@ -273,10 +273,10 @@ export default {
       param.taskId = this.$route.query.taskId
       transferInspectPlan(param).then(res => {
         if (res.success) {
-          this.$message.success(res.message)
+          this.$message(res.message)
           this.goBack()
         } else {
-          this.$message.fail(res.message)
+          this.$message(res.message)
         }
       }).finally(() => {
         this.loading = false
@@ -325,14 +325,16 @@ export default {
         if (!params.processApprovalRecord.commitText) {
           params.processApprovalRecord.commitText = '同意'
         }
+        // 审批意见
+        params.processApprovalRecord.commitFlag = ApprovalOpinions.AGREE.value
         console.log(params)
         return approvalInspectPlan(params)
       }).then(res => {
         if (res.success) {
-          this.$message.success(res.message)
+          this.$message(res.message)
           this.goBack()
         } else {
-          this.$message.fail(res.message)
+          this.$message(res.message)
         }
       }).catch((err) => {
         console.log(err)
@@ -346,18 +348,20 @@ export default {
       this.rules.commitText[0].required = true
       // 驳回需要填写备注
       if (!this.approvalInfoForm.commitText) {
-        this.$message.fail(this.$t('pleaseEnterRemarks'))
+        this.$message(this.$t('pleaseEnterRemarks'))
       }
       this.getPageParams().then(params => {
         params.map.pass = false
+        // 审批意见
+        params.processApprovalRecord.commitFlag = ApprovalOpinions.REJECT.value
         console.log(params)
-        return approvalInspectPlan(params)
+        return rejectInspectPlan(params)
       }).then(res => {
         if (res.success) {
-          this.$message.success(res.message)
+          this.$message(res.message)
           this.goBack()
         } else {
-          this.$message.fail(res.message)
+          this.$message(res.message)
         }
       }).catch((err) => {
         console.log(err)

src/views/workCenter/enterpriseStandardInspectionProcess/EenterpriseStandardInspectionProcess.vue

@@ -116,13 +116,18 @@
 </template>
 
 <script>
-import { EsInspectionProcess, ProcessKey } from '@/enums/commonEnums'
+import { ApprovalOpinions, EsInspectionProcess, ProcessKey } from '@/enums/commonEnums'
 import ProcessCommonLayout from '@/components/ProcessCommonLayout'
 import SelectUser from '@/components/SelectUser'
 import CalendarField from '@/components/CalendarField'
 import ZUpload from '@/components/ZUpload'
 import { getAction } from '@/api/manage'
-import { approvalInspectProcess, getInspectProcessDetail, transferInspectProcess } from '@/api/api'
+import {
+  approvalInspectProcess,
+  getInspectProcessDetail,
+  rejectInspectProcess,
+  transferInspectProcess
+} from '@/api/api'
 
 export default {
   name: 'EenterpriseStandardInspectionProcess',
@@ -328,10 +333,10 @@ export default {
       param.taskId = this.$route.query.taskId
       transferInspectProcess(param).then(res => {
         if (res.success) {
-          this.$message.success(res.message)
+          this.$message(res.message)
           this.goBack()
         } else {
-          this.$message.fail(res.message)
+          this.$message(res.message)
         }
       }).finally(() => {
         this.loading = false
@@ -380,14 +385,16 @@ export default {
         if (!params.processApprovalRecord.commitText) {
           params.processApprovalRecord.commitText = '同意'
         }
+        // 审批意见
+        params.processApprovalRecord.commitFlag = ApprovalOpinions.AGREE.value
         console.log(params)
         return approvalInspectProcess(params)
       }).then(res => {
         if (res.success) {
-          this.$message.success(res.message)
+          this.$message(res.message)
           this.goBack()
         } else {
-          this.$message.fail(res.message)
+          this.$message(res.message)
         }
       }).catch((err) => {
         console.log(err)
@@ -401,18 +408,20 @@ export default {
       this.rules.commitText[0].required = true
       // 驳回需要填写备注
       if (!this.approvalInfoForm.commitText) {
-        this.$message.fail(this.$t('pleaseEnterRemarks'))
+        this.$message(this.$t('pleaseEnterRemarks'))
       }
       this.getPageParams().then(params => {
         params.map.pass = false
+        // 审批意见
+        params.processApprovalRecord.commitFlag = ApprovalOpinions.REJECT.value
         console.log(params)
-        return approvalInspectProcess(params)
+        return rejectInspectProcess(params)
       }).then(res => {
         if (res.success) {
-          this.$message.success(res.message)
+          this.$message(res.message)
           this.goBack()
         } else {
-          this.$message.fail(res.message)
+          this.$message(res.message)
         }
       }).catch((err) => {
         console.log(err)

src/views/workCenter/enterpriseStandardInspectionRectification/EnterpriseStandardInspectionRectification.vue

@@ -97,14 +97,14 @@
 
 <script>
 import ProcessCommonLayout from '@/components/ProcessCommonLayout'
-import { EsInspectionRectification, ProcessKey } from '@/enums/commonEnums'
+import { ApprovalOpinions, EsInspectionRectification, ProcessKey } from '@/enums/commonEnums'
 import SelectUser from '@/components/SelectUser'
 import CalendarField from '@/components/CalendarField'
 import ZUpload from '@/components/ZUpload'
 import {
   approvalInspectRectify,
   getInspectRectifyDataById,
-  getInspectRectifyDetail,
+  getInspectRectifyDetail, rejectInspectRectify,
   transferInspectRectify
 } from '@/api/api'
 
@@ -131,7 +131,7 @@ export default {
       // 审批意见信息
       approvalInfoForm: {},
       // 业务信息
-      baseInfoForm: {},
+      baseInfoForm: {}
     }
   },
   computed: {
@@ -202,10 +202,10 @@ export default {
       param.taskId = this.$route.query.taskId
       transferInspectRectify(param).then(res => {
         if (res.success) {
-          this.$message.success(res.message)
+          this.$message(res.message)
           this.goBack()
         } else {
-          this.$message.fail(res.message)
+          this.$message(res.message)
         }
       }).finally(() => {
         this.loading = false
@@ -254,14 +254,16 @@ export default {
         if (!params.processApprovalRecord.commitText) {
           params.processApprovalRecord.commitText = '同意'
         }
+        // 审批意见
+        params.processApprovalRecord.commitFlag = ApprovalOpinions.AGREE.value
         console.log(params)
         return approvalInspectRectify(params)
       }).then(res => {
         if (res.success) {
-          this.$message.success(res.message)
+          this.$message(res.message)
           this.goBack()
         } else {
-          this.$message.fail(res.message)
+          this.$message(res.message)
         }
       }).catch((err) => {
         console.log(err)
@@ -275,18 +277,20 @@ export default {
       this.rules.commitText[0].required = true
       // 驳回需要填写备注
       if (!this.approvalInfoForm.commitText) {
-        this.$message.fail(this.$t('pleaseEnterRemarks'))
+        this.$message(this.$t('pleaseEnterRemarks'))
       }
       this.getPageParams().then(params => {
         params.map.pass = false
+        // 审批意见
+        params.processApprovalRecord.commitFlag = ApprovalOpinions.REJECT.value
         console.log(params)
-        return approvalInspectRectify(params)
+        return rejectInspectRectify(params)
       }).then(res => {
         if (res.success) {
-          this.$message.success(res.message)
+          this.$message(res.message)
           this.goBack()
         } else {
-          this.$message.fail(res.message)
+          this.$message(res.message)
         }
       }).catch((err) => {
         console.log(err)

src/views/workCenter/inspectionExtensionRequestProcess/InspectionExtensionRequestProcess.vue

@@ -104,12 +104,17 @@
 
 <script>
 import ProcessCommonLayout from '@/components/ProcessCommonLayout'
-import { InspectionExtensionRequestProcess, ProcessKey } from '@/enums/commonEnums'
+import { ApprovalOpinions, InspectionExtensionRequestProcess, ProcessKey } from '@/enums/commonEnums'
 import SelectUser from '@/components/SelectUser'
 import CalendarField from '@/components/CalendarField'
 import ZUpload from '@/components/ZUpload'
 import { getAction } from '@/api/manage'
-import { approvalInspectExtension, getInspectExtensionDetail, transferInspectExtension } from '@/api/api'
+import {
+  approvalInspectExtension,
+  getInspectExtensionDetail,
+  rejectInspectExtension,
+  transferInspectExtension
+} from '@/api/api'
 export default {
   name: 'InspectionExtensionRequestProcess',
   components: { ZUpload, CalendarField, SelectUser, ProcessCommonLayout },
@@ -267,10 +272,10 @@ export default {
       param.taskId = this.$route.query.taskId
       transferInspectExtension(param).then(res => {
         if (res.success) {
-          this.$message.success(res.message)
+          this.$message(res.message)
           this.goBack()
         } else {
-          this.$message.fail(res.message)
+          this.$message(res.message)
         }
       }).finally(() => {
         this.loading = false
@@ -319,14 +324,16 @@ export default {
         if (!params.processApprovalRecord.commitText) {
           params.processApprovalRecord.commitText = '同意'
         }
+        // 审批意见
+        params.processApprovalRecord.commitFlag = ApprovalOpinions.AGREE.value
         console.log(params)
-        return approvalInspectExtension(params)
+        return rejectInspectExtension(params)
       }).then(res => {
         if (res.success) {
-          this.$message.success(res.message)
+          this.$message(res.message)
           this.goBack()
         } else {
-          this.$message.fail(res.message)
+          this.$message(res.message)
         }
       }).catch((err) => {
         console.log(err)
@@ -340,18 +347,20 @@ export default {
       this.rules.commitText[0].required = true
       // 驳回需要填写备注
       if (!this.approvalInfoForm.commitText) {
-        this.$message.fail(this.$t('pleaseEnterRemarks'))
+        this.$message(this.$t('pleaseEnterRemarks'))
       }
       this.getPageParams().then(params => {
         params.map.pass = false
+        // 审批意见
+        params.processApprovalRecord.commitFlag = ApprovalOpinions.REJECT.value
         console.log(params)
         return approvalInspectExtension(params)
       }).then(res => {
         if (res.success) {
-          this.$message.success(res.message)
+          this.$message(res.message)
           this.goBack()
         } else {
-          this.$message.fail(res.message)
+          this.$message(res.message)
         }
       }).catch((err) => {
         console.log(err)