update 流程完善-审批意见

src/enums/commonEnums.js

@@ -5,6 +5,11 @@ export const YesOrNoEnum = new EsEnums({
   YES: { name: '是', value: '1' }
 })
 
+// 审批意见
+export const ApprovalOpinions = {
+  AGREE: { text: '同意', value: '1' },
+  REJECT: { text: '驳回', value: '2' }
+}
 // 既可以使用EsEnums 也可以单独写明
 
 export const FieldType = {

src/views/workCenter/enterpriseStandardInspectionPlan/EnterpriseStandardInspectionPlanFlow.vue

@@ -127,7 +127,7 @@ import ProcessDetailList from '@comp/ProcessDetailList'
 import InspectionPlanTable from '@views/workCenter/enterpriseStandardInspectionPlan/modules/InspectionPlanTable'
 import UserSelection from '@comp/selection/UserSelection'
 import { WorkCenterMixin } from '@/mixins/WorkCenterMixin'
-import { EsInspectionPlan, ProcessKey } from '@/enums/commonEnums'
+import { ApprovalOpinions, EsInspectionPlan, ProcessKey } from '@/enums/commonEnums'
 import {
   approvalInspectPlan,
   getInspectPlanDetail,
@@ -459,6 +459,8 @@ export default {
       this.loading = true
       this.getPageParams().then(res => {
         console.log(res)
+        // 审批意见
+        res.processApprovalRecord.commitFlag = ApprovalOpinions.AGREE.value
         return startInspectPlan(res)
       }).then(res => {
         if (res.success) {
@@ -491,6 +493,8 @@ export default {
         if (!isSubmitBtn && !res.processApprovalRecord.commitText) {
           res.processApprovalRecord.commitText = '同意'
         }
+        // 审批意见
+        res.processApprovalRecord.commitFlag = ApprovalOpinions.AGREE.value
         return approvalInspectPlan(res)
       }).then(res => {
         if (res.success) {
@@ -518,6 +522,8 @@ export default {
       this.loading = true
       this.getPageParams().then(res => {
         res.map.pass = false
+        // 审批意见
+        res.processApprovalRecord.commitFlag = ApprovalOpinions.REJECT.value
         return rejectInspectPlan(res)
       }).then(res => {
         if (res.success) {

src/views/workCenter/enterpriseStandardInspectionProcess/EnterpriseStandardInspectionProcess.vue

@@ -108,7 +108,7 @@ import ProcessDetailList from '@comp/ProcessDetailList'
 import InspectionProcessTable
   from '@views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessTable'
 import UserSelectModal from '@comp/selection/UserSelectModal'
-import { EsInspectionProcess, ProcessKey } from '@/enums/commonEnums'
+import { ApprovalOpinions, EsInspectionProcess, ProcessKey } from '@/enums/commonEnums'
 import { WorkCenterMixin } from '@/mixins/WorkCenterMixin'
 import {
   approvalInspectProcess,
@@ -388,6 +388,8 @@ export default {
       this.loading = true
       this.getPageParams().then(res => {
         console.log(res)
+        // 审批意见
+        res.processApprovalRecord.commitFlag = ApprovalOpinions.AGREE.value
         return startInspectProcess(res)
       }).then(res => {
         if (res.success) {
@@ -415,6 +417,8 @@ export default {
         if (!isSubmitBtn && !res.processApprovalRecord.commitText) {
           res.processApprovalRecord.commitText = '同意'
         }
+        // 审批意见
+        res.processApprovalRecord.commitFlag = ApprovalOpinions.AGREE.value
         return approvalInspectProcess(res)
       }).then(res => {
         if (res.success) {
@@ -442,6 +446,8 @@ export default {
       this.loading = true
       this.getPageParams().then(res => {
         res.map.pass = false
+        // 审批意见
+        res.processApprovalRecord.commitFlag = ApprovalOpinions.REJECT.value
         return rejectInspectProcess(res)
       }).then(res => {
         if (res.success) {

src/views/workCenter/enterpriseStandardInspectionRectification/EnterpriseStandardInspectionRectification.vue

@@ -112,7 +112,7 @@ import {
   approvalInspectRectify, getInspectRectifyDataById,
   getInspectRectifyDetail, rejectInspectRectify, saveInspectRectify, transferInspectRectify
 } from '@api/workCenter'
-import { EsInspectionRectification, ProcessKey } from '@/enums/commonEnums'
+import { ApprovalOpinions, EsInspectionRectification, ProcessKey } from '@/enums/commonEnums'
 
 export default {
   name: 'EnterpriseStandardInspectionRectification',
@@ -385,6 +385,8 @@ export default {
       this.getPageParams().then(res => {
         console.log(res)
         res.map.pass = true
+        // 审批意见
+        res.processApprovalRecord.commitFlag = ApprovalOpinions.AGREE.value
         return approvalInspectRectify(res)
       }).then(res => {
         if (res.success) {
@@ -412,6 +414,8 @@ export default {
         if (!isSubmitBtn && !res.processApprovalRecord.commitText) {
           res.processApprovalRecord.commitText = '同意'
         }
+        // 审批意见
+        res.processApprovalRecord.commitFlag = ApprovalOpinions.AGREE.value
         return approvalInspectRectify(res)
       }).then(res => {
         if (res.success) {
@@ -439,6 +443,8 @@ export default {
       this.loading = true
       this.getPageParams().then(res => {
         res.map.pass = false
+        // 审批意见
+        res.processApprovalRecord.commitFlag = ApprovalOpinions.REJECT.value
         return rejectInspectRectify(res)
       }).then(res => {
         if (res.success) {

src/views/workCenter/inspectionExtensionRequestProcess/InspectionExtensionRequestProcess.vue

@@ -107,7 +107,7 @@ import PersonnelInfo from '@comp/PersonnelInfo'
 import ProcessDetailList from '@comp/ProcessDetailList'
 import ExtensionRequestTable from '@views/workCenter/inspectionExtensionRequestProcess/modules/ExtensionRequestTable'
 import UserSelectModal from '@comp/selection/UserSelectModal'
-import { InspectionExtensionRequestProcess, ProcessKey } from '@/enums/commonEnums'
+import { ApprovalOpinions, InspectionExtensionRequestProcess, ProcessKey } from '@/enums/commonEnums'
 import { WorkCenterMixin } from '@/mixins/WorkCenterMixin'
 import {
   approvalInspectExtension,
@@ -393,6 +393,8 @@ export default {
       this.loading = true
       this.getPageParams().then(res => {
         console.log(res)
+        // 审批意见
+        res.processApprovalRecord.commitFlag = ApprovalOpinions.AGREE.value
         return startInspectExtension(res)
       }).then(res => {
         if (res.success) {
@@ -420,6 +422,8 @@ export default {
         if (!isSubmitBtn && !res.processApprovalRecord.commitText) {
           res.processApprovalRecord.commitText = '同意'
         }
+        // 审批意见
+        res.processApprovalRecord.commitFlag = ApprovalOpinions.AGREE.value
         return approvalInspectExtension(res)
       }).then(res => {
         if (res.success) {
@@ -447,6 +451,8 @@ export default {
       this.loading = true
       this.getPageParams().then(res => {
         res.map.pass = false
+        // 审批意见
+        res.processApprovalRecord.commitFlag = ApprovalOpinions.REJECT.value
         return rejectInspectExtension(res)
       }).then(res => {
         if (res.success) {

src/views/workCenter/permissionApplicationProcess/PermissionApplicationProcess.vue

@@ -153,7 +153,7 @@ import PersonnelInfo from '@comp/PersonnelInfo'
 import BaseInfoTable from '@views/workCenter/permissionApplicationProcess/modules/BaseInfoTable'
 import UserSelectModal from '@comp/selection/UserSelectModal'
 import { WorkCenterMixin } from '@/mixins/WorkCenterMixin'
-import { PermissionApply, ProcessKey } from '@/enums/commonEnums'
+import { ApprovalOpinions, PermissionApply, ProcessKey } from '@/enums/commonEnums'
 import {
   approvalPermissionApply, getPermissionApplyDataById,
   getPermissionApplyDetail,
@@ -482,6 +482,8 @@ export default {
       this.loading = true
       this.getPageParams().then(res => {
         console.log(res)
+        // 审批意见
+        res.processApprovalRecord.commitFlag = ApprovalOpinions.AGREE.value
         return startPermissionApply(res)
       }).then(res => {
         if (res.success) {
@@ -509,6 +511,8 @@ export default {
         if (!isSubmitBtn && !res.processApprovalRecord.commitText) {
           res.processApprovalRecord.commitText = '同意'
         }
+        // 审批意见
+        res.processApprovalRecord.commitFlag = ApprovalOpinions.AGREE.value
         return approvalPermissionApply(res)
       }).then(res => {
         if (res.success) {
@@ -536,6 +540,8 @@ export default {
       this.loading = true
       this.getPageParams().then(res => {
         res.map.pass = false
+        // 审批意见
+        res.processApprovalRecord.commitFlag = ApprovalOpinions.REJECT.value
         return rejectPermissionApply(res)
       }).then(res => {
         if (res.success) {

src/views/workCenter/postMeetingManageProcess/PostMeetingManageProcess.vue

@@ -109,7 +109,7 @@ import InternalDetailPage from '@comp/InternalDetailPage'
 import BaseInfoForm from '@views/workCenter/postMeetingManageProcess/modules/BaseInfoForm'
 import { WorkCenterMixin } from '@/mixins/WorkCenterMixin'
 import UserSelectModal from '@comp/selection/UserSelectModal'
-import { PostMeetingManage, ProcessKey } from '@/enums/commonEnums'
+import { ApprovalOpinions, PostMeetingManage, ProcessKey } from '@/enums/commonEnums'
 import {
   approvalPostMeetingManage,
   getPostMeetingManageDataById,
@@ -414,6 +414,8 @@ export default {
       this.loading = true
       this.getPageParams().then(res => {
         console.log(res)
+        // 审批意见
+        res.processApprovalRecord.commitFlag = ApprovalOpinions.AGREE.value
         return startPostMeetingManage(res)
       }).then(res => {
         if (res.success) {
@@ -442,6 +444,8 @@ export default {
         if (!isSubmitBtn && !res.processApprovalRecord.commitText) {
           res.processApprovalRecord.commitText = '同意'
         }
+        // 审批意见
+        res.processApprovalRecord.commitFlag = ApprovalOpinions.AGREE.value
         return approvalPostMeetingManage(res)
       }).then(res => {
         if (res.success) {

src/views/workCenter/standardPromotionProcess/StandardPromotionProcess.vue

@@ -75,7 +75,7 @@
 import '@assets/less/common.less'
 import InternalDetailPage from '@comp/InternalDetailPage'
 import BaseInfoForm from '@views/workCenter/standardPromotionProcess/modules/BaseInfoForm'
-import { ProcessKey, StandardPromotion } from '@/enums/commonEnums'
+import { ApprovalOpinions, ProcessKey, StandardPromotion } from '@/enums/commonEnums'
 import {
   getStandardPromotionDataById, getStandardPromotionDetail,
   getStandardPromotionProjectId,
@@ -318,6 +318,8 @@ export default {
       this.loading = true
       this.getPageParams().then(res => {
         console.log(res)
+        // 审批意见
+        res.processApprovalRecord.commitFlag = ApprovalOpinions.AGREE.value
         return startStandardPromotion(res)
       }).then(res => {
         if (res.success) {