[update] 修改goBack调用钉钉的关闭当前页

src/mixins/WorkCenterMixin.js

@@ -1,3 +1,5 @@
+import * as dd from 'dingtalk-jsapi'
+
 export const WorkCenterMixin = {
   data () {
     return {
@@ -9,6 +11,14 @@ export const WorkCenterMixin = {
     // switch切换
     switchChange (value) {
       this.switchValue = value
+    },
+    goBack () {
+      // 调用钉钉的关闭当前页面方法
+      if (dd.ios || dd.android || dd.pc) {
+        dd.biz.navigation.close()
+      } else {
+        this.$router.go(-1)
+      }
     }
   }
 }

src/views/workCenter/annualRevisionPlanActivelyReport/AnnualRevisionPlanActivelyReport.vue

@@ -146,9 +146,11 @@ import {
   activelyReportAgree,
   activelyReportReject
 } from '@/api/api'
+import { WorkCenterMixin } from '@/mixins/WorkCenterMixin'
 
 export default {
   name: 'AnnualRevisionPlanActivelyReport',
+  mixins: [WorkCenterMixin],
   components: {
     ProcessCommonLayout,
     CalendarField,
@@ -418,9 +420,6 @@ export default {
           this.$message(this.$t('pleaseEnterRemarks'))
         }
       })
-    },
-    goBack () {
-      this.$router.go(-1)
     }
   }
 }

src/views/workCenter/annualRevisionPlanStandardizationInit/AnnualRevisionPlanStandardizationInit.vue

@@ -134,9 +134,11 @@ import {
   standardizationInitAgree,
   standardizationInitReject
 } from '@/api/api'
+import { WorkCenterMixin } from '@/mixins/WorkCenterMixin'
 
 export default {
   name: 'AnnualRevisionPlanStandardizationInit',
+  mixins: [WorkCenterMixin],
   components: {
     ProcessCommonLayout,
     CalendarField,
@@ -399,9 +401,6 @@ export default {
           this.$message(this.$t('pleaseEnterRemarks'))
         }
       })
-    },
-    goBack () {
-      this.$router.go(-1)
     }
   }
 }

src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnul.vue

@@ -200,9 +200,11 @@ import {
   enStandardAnnulAgree,
   enStandardAnnulReject
 } from '@/api/api'
+import { WorkCenterMixin } from '@/mixins/WorkCenterMixin'
 
 export default {
   name: 'EnterpriseStandardAnnul',
+  mixins: [WorkCenterMixin],
   components: {
     ProcessCommonLayout,
     CalendarField,
@@ -342,9 +344,6 @@ export default {
           this.$message(this.$t('pleaseEnterRemarks'))
         }
       })
-    },
-    goBack () {
-      this.$router.go(-1)
     }
   }
 }

src/views/workCenter/enterpriseStandardInitChange/EnterpriseStandardInitChange.vue

@@ -846,9 +846,12 @@ import {
 import SelectUserField from '@/components/SelectUserField'
 import SelectDepartmentField from '@/components/SelectDepartmentField'
 import SelectUser from '@/components/SelectUser'
+import { WorkCenterMixin } from '@/mixins/WorkCenterMixin'
+import * as dd from "dingtalk-jsapi";
 
 export default {
   name: 'EnterpriseStandardInitChange',
+  mixins: [WorkCenterMixin],
   components: {
     PickerDictField,
     PickerField,
@@ -1194,7 +1197,6 @@ export default {
                 this.$emit('titleChange', EsInitChangeNodes.leaderLeaderApproval.changeText)
               }
             }
-
           }
           // 节点7或者节点8需要回显选人表单
           if (this.currentNode === 7) {
@@ -1411,9 +1413,6 @@ export default {
       }).catch((errorInfo) => {
         console.log(errorInfo)
       })
-    },
-    goBack () {
-      this.$router.go(-1)
     }
   }
 }

src/views/workCenter/enterpriseStandardInspectionPlan/EnterpriseStandardInspectionPlanFlow.vue

@@ -119,8 +119,10 @@ import SelectUser from '@/components/SelectUser'
 import CalendarField from '@/components/CalendarField'
 import ZUpload from '@/components/ZUpload'
 import { approvalInspectPlan, getInspectPlanDetail, rejectInspectPlan, transferInspectPlan } from '@/api/api'
+import { WorkCenterMixin } from '@/mixins/WorkCenterMixin'
 export default {
   name: 'EnterpriseStandardInspectionPlanFlow',
+  mixins: [WorkCenterMixin],
   components: { ZUpload, CalendarField, SelectUser, ProcessCommonLayout },
   data () {
     return {
@@ -383,9 +385,6 @@ export default {
         this.loading = false
         this.rules.commitText[0].required = false
       })
-    },
-    goBack () {
-      this.$router.go(-1)
     }
   }
 }

src/views/workCenter/enterpriseStandardInspectionProcess/EenterpriseStandardInspectionProcess.vue

@@ -136,9 +136,11 @@ import {
   rejectInspectProcess,
   transferInspectProcess
 } from '@/api/api'
+import { WorkCenterMixin } from '@/mixins/WorkCenterMixin'
 
 export default {
   name: 'EenterpriseStandardInspectionProcess',
+  mixins: [WorkCenterMixin],
   components: { ZUpload, CalendarField, SelectUser, ProcessCommonLayout },
   data () {
     return {
@@ -444,9 +446,6 @@ export default {
     // 去PC端查看
     handleGoPC () {
       this.$message(this.$t('toPcLook'))
-    },
-    goBack () {
-      this.$router.go(-1)
     }
   }
 }

src/views/workCenter/enterpriseStandardInspectionRectification/EnterpriseStandardInspectionRectification.vue

@@ -244,9 +244,11 @@ import {
   transferInspectRectify
 } from '@/api/api'
 import FileDisplay from '@/components/FileDisplay'
+import { WorkCenterMixin } from '@/mixins/WorkCenterMixin'
 
 export default {
   name: 'EnterpriseStandardInspectionRectification',
+  mixins: [WorkCenterMixin],
   components: { FileDisplay, ZUpload, CalendarField, SelectUser, ProcessCommonLayout },
   data () {
     return {
@@ -449,9 +451,6 @@ export default {
         this.loading = false
         this.rules.commitText[0].required = false
       })
-    },
-    goBack () {
-      this.$router.go(-1)
     }
   }
 }

src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheck.vue

@@ -212,9 +212,11 @@ import {
   enStandardRecheckReject,
   enStandardRecheckGetDataById
 } from '@/api/api'
+import { WorkCenterMixin } from '@/mixins/WorkCenterMixin'
 
 export default {
   name: 'EnterpriseStandardRecheck',
+  mixins: [WorkCenterMixin],
   components: { PickerField, ProcessCommonLayout, SelectUser, CalendarField, ZUpload },
   data () {
     return {
@@ -452,9 +454,6 @@ export default {
           this.$message(this.$t('pleaseEnterRemarks'))
         }
       })
-    },
-    goBack () {
-      this.$router.go(-1)
     }
   }
 }

src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevision.vue

@@ -179,9 +179,11 @@ import DepartLiaisonIssueBaseInfo
 import OnlyOnlineEditBaseInfo from '@/views/workCenter/enterpriseStandardRevision/module/OnlyOnlineEditBaseInfo'
 import ZUpload from '@/components/ZUpload'
 import { Base64 } from 'js-base64'
+import { WorkCenterMixin } from '@/mixins/WorkCenterMixin'
 
 export default {
   name: 'EnterpriseStandardRevision',
+  mixins: [WorkCenterMixin],
   components: {
     OnlyOnlineEditBaseInfo,
     DepartLiaisonIssueBaseInfo,
@@ -515,9 +517,6 @@ export default {
         }
       })
     },
-    goBack () {
-      this.$router.go(-1)
-    },
     // 在线编辑的查看
     onlineEditView (fileId) {
       queryFileInfoByEditId({ id: fileId }).then(res => {

src/views/workCenter/enterpriseStandardSealSave/EnterpriseStandardSealSave.vue

@@ -200,9 +200,11 @@ import {
   enStandardSealSaveReject,
   enStandardSealSaveGetDataById
 } from '@/api/api'
+import { WorkCenterMixin } from '@/mixins/WorkCenterMixin'
 
 export default {
   name: 'EnterpriseStandardSealSave',
+  mixins: [WorkCenterMixin],
   components: {
     ProcessCommonLayout,
     CalendarField,
@@ -342,9 +344,6 @@ export default {
           this.$message(this.$t('pleaseEnterRemarks'))
         }
       })
-    },
-    goBack () {
-      this.$router.go(-1)
     }
   }
 }

src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUse.vue

@@ -200,9 +200,11 @@ import {
   enStandardStartUseReject,
   enStandardStartUseGetDataById
 } from '@/api/api'
+import { WorkCenterMixin } from '@/mixins/WorkCenterMixin'
 
 export default {
   name: 'EnterpriseStandardStartUse',
+  mixins: [WorkCenterMixin],
   components: {
     ProcessCommonLayout,
     CalendarField,
@@ -342,9 +344,6 @@ export default {
           this.$message(this.$t('pleaseEnterRemarks'))
         }
       })
-    },
-    goBack () {
-      this.$router.go(-1)
     }
   }
 }

src/views/workCenter/inspectionExtensionRequestProcess/InspectionExtensionRequestProcess.vue

@@ -124,8 +124,11 @@ import {
   rejectInspectExtension,
   transferInspectExtension
 } from '@/api/api'
+import { WorkCenterMixin } from '@/mixins/WorkCenterMixin'
+
 export default {
   name: 'InspectionExtensionRequestProcess',
+  mixins: [WorkCenterMixin],
   components: { ZUpload, CalendarField, SelectUser, ProcessCommonLayout },
   data () {
     return {
@@ -381,9 +384,6 @@ export default {
         this.loading = false
         this.rules.commitText[0].required = false
       })
-    },
-    goBack () {
-      this.$router.go(-1)
     }
   }
 }

src/views/workCenter/noMatchTrackingProcess/NoMatchTrackingProcess.vue

@@ -116,6 +116,7 @@ import { processTransfer, queryNoMatchTrackingProcess, agreeNoMatchTrackingProce
 import ZExpandTable from '../../../components/ZExpandTable'
 import SelectUser from '../../../components/SelectUser'
 import ZUpload from '../../../components/ZUpload'
+import * as dd from 'dingtalk-jsapi'
 
 export default {
   name: 'NoMatchTrackingProcess',
@@ -254,7 +255,6 @@ export default {
             this.dataSource = result.businessInfoDTO.processProjectNotMetLinks || []
           }
           console.log(result)
-
         }
       }).finally(() => {
         this.loading = false
@@ -285,7 +285,12 @@ export default {
       let timer = setTimeout(() => {
         clearTimeout(timer)
         timer = null
-        this.$router.go(-1)
+        // 调用钉钉的关闭当前页面方法
+        if (dd.ios || dd.android || dd.pc) {
+          dd.biz.navigation.close()
+        } else {
+          this.$router.go(-1)
+        }
       }, 700)
     },
     validateForm (formName) {
@@ -308,7 +313,7 @@ export default {
      * @returns {Promise<{businessInfoDTO: {processProjectNotMetLinks: any}, userInfoMap, basicProcessInfoDTO: {}, basicTaskInfoDTO: {}}|boolean>}
      */
     async dealFormData () {
-      let flag = true, basicTaskInfoDTO = {}
+      let flag = true; let basicTaskInfoDTO = {}
       const approvalCheckResult = await this.validateForm('approvalForm')
       if (approvalCheckResult) {
         basicTaskInfoDTO = { ...this.approvalInfo, taskId: this.$route.query.taskId }

src/views/workCenter/permissionApplicationProcess/PermissionApplicationProcess.vue

@@ -160,9 +160,11 @@ import {
   transferPermissionApply
 } from '@/api/api'
 import CalendarField from '@/components/CalendarField'
+import { WorkCenterMixin } from '@/mixins/WorkCenterMixin'
 
 export default {
   name: 'permissionApplicationProcess',
+  mixins: [WorkCenterMixin],
   components: { CalendarField, ZUpload, SelectUser, ProcessCommonLayout },
   data () {
     return {
@@ -376,9 +378,6 @@ export default {
         this.loading = false
         this.rules.commitText[0].required = false
       })
-    },
-    goBack () {
-      this.$router.go(-1)
     }
   },
   // 组件内路由拦截

src/views/workCenter/projectComplianceEvaluationProcess/ProjectComplianceEvaluationProcess.vue

@@ -174,6 +174,7 @@ import {
   rejectProjectComplianceEvaluation
 } from '../../../api/api'
 import ZExpandTable from '../../../components/ZExpandTable'
+import * as dd from 'dingtalk-jsapi'
 
 export default {
   name: 'ProjectComplianceEvaluationProcess',
@@ -243,7 +244,7 @@ export default {
       // 展开表格的配置项
       extraForm: {
         // 符合
-        '1': {
+        1: {
           rules: {
             // 依据描述
             description: {
@@ -273,7 +274,7 @@ export default {
           ]
         },
         // 不符合
-        '2': {
+        2: {
           rules: {
             // 不符合项
             nonConformance: {
@@ -313,7 +314,7 @@ export default {
           ]
         },
         // 待验证
-        '3': {
+        3: {
           rules: {
             // 风险点
             riskPoints: {
@@ -353,7 +354,7 @@ export default {
           ]
         },
         // 不涉及
-        '4': {
+        4: {
           rules: {
             // 不涉及原因
             description: {
@@ -448,7 +449,7 @@ export default {
       })
     },
     async dealFormData () {
-      let flag = true, approvalInfo = {}
+      let flag = true; let approvalInfo = {}
       const approvalCheckResult = await this.validateForm('approvalForm')
       if (approvalCheckResult) {
         approvalInfo = { ...this.approvalInfo, taskId: this.$route.query.taskId }
@@ -549,7 +550,12 @@ export default {
       let timer = setTimeout(() => {
         clearTimeout(timer)
         timer = null
-        this.$router.go(-1)
+        // 调用钉钉的关闭当前页面方法
+        if (dd.ios || dd.android || dd.pc) {
+          dd.biz.navigation.close()
+        } else {
+          this.$router.go(-1)
+        }
       }, 700)
     },
     handleShowContentDetail (text) {

src/views/workCenter/standardComplianceProcess/StandardComplianceProcess.vue

@@ -167,6 +167,7 @@ import { agreeStandardCompliance, processTransfer, queryStandardCompliance, reje
 import ZExpandTable from '../../../components/ZExpandTable'
 import FileDisplay from '../../../components/FileDisplay'
 import ZUpload from '../../../components/ZUpload'
+import * as dd from 'dingtalk-jsapi'
 
 export default {
   name: 'StandardComplianceProcess',
@@ -340,7 +341,12 @@ export default {
       let timer = setTimeout(() => {
         clearTimeout(timer)
         timer = null
-        this.$router.go(-1)
+        // 调用钉钉的关闭当前页面方法
+        if (dd.ios || dd.android || dd.pc) {
+          dd.biz.navigation.close()
+        } else {
+          this.$router.go(-1)
+        }
       }, 700)
     },
     handleShowContentDetail (text) {

src/views/workCenter/standardConsultation/StandardConsultationProcess.vue

@@ -243,6 +243,7 @@ import {
 } from '../../../api/api'
 import SelectUser from '../../../components/SelectUser'
 import ZExpandTable from '../../../components/ZExpandTable'
+import * as dd from 'dingtalk-jsapi'
 
 export default {
   name: 'StandardConsultationProcess',
@@ -344,7 +345,7 @@ export default {
       dataSource: [],
       extraForm: {
         // 采纳
-        '1': {
+        1: {
           rules: {
             // 依据描述
             basisDescription: {
@@ -374,7 +375,7 @@ export default {
           ]
         },
         // 部分采纳
-        '2': {
+        2: {
           rules: {
             // 依据描述
             basisDescription: {
@@ -404,7 +405,7 @@ export default {
           ]
         },
         // 不采纳
-        '3': {
+        3: {
           rules: {
             // 依据描述
             basisDescription: {
@@ -517,8 +518,8 @@ export default {
     },
     async dealFormData (isSave) {
       // 提交的表单数据，流程信息，流程审批信息，征求意见列表，业务分派信息，业务基本信息
-      let formData = {}, processInfo = {}, approvalInfo = {}, consultationListData = [], dispatchInfo = {}, basicServiceInfo = {},
+      let formData = {}; let processInfo = {}; let approvalInfo = {}; let consultationListData = []; let dispatchInfo = {}; let basicServiceInfo = {}
-        userInfoMap = {}, flag = true
+      let userInfoMap = {}; let flag = true
       // 流程信息
       processInfo = { ...this.processInfo }
       // 业务基本信息
@@ -672,7 +673,12 @@ export default {
       let timer = setTimeout(() => {
         clearTimeout(timer)
         timer = null
-        this.$router.go(-1)
+        // 调用钉钉的关闭当前页面方法
+        if (dd.ios || dd.android || dd.pc) {
+          dd.biz.navigation.close()
+        } else {
+          this.$router.go(-1)
+        }
       }, 700)
     },
     handleShowContentDetail (text) {

src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue

@@ -152,6 +152,7 @@ import { FieldType, StandardSource, ProcessKey, FGEntryChangeProcessNode } from
 import FileDisplay from '../../../components/FileDisplay'
 import SelectUser from '../../../components/SelectUser'
 import ZUpload from '../../../components/ZUpload'
+import * as dd from 'dingtalk-jsapi'
 
 export default {
   name: 'StandardEntryOrChangeProcess',
@@ -388,7 +389,12 @@ export default {
       let timer = setTimeout(() => {
         clearTimeout(timer)
         timer = null
-        this.$router.go(-1)
+        // 调用钉钉的关闭当前页面方法
+        if (dd.ios || dd.android || dd.pc) {
+          dd.biz.navigation.close()
+        } else {
+          this.$router.go(-1)
+        }
       }, 700)
     }
   },

src/views/workCenter/standardProcurementProcess/StandardProcurementProcess.vue

@@ -149,6 +149,7 @@ import {
   carbonCopyProcurementProcess
 } from '../../../api/api'
 import SelectUser from '../../../components/SelectUser'
+import * as dd from 'dingtalk-jsapi'
 
 export default {
   name: 'StandardProcurementProcess',
@@ -230,7 +231,12 @@ export default {
       let timer = setTimeout(() => {
         clearTimeout(timer)
         timer = null
-        this.$router.go(-1)
+        // 调用钉钉的关闭当前页面方法
+        if (dd.ios || dd.android || dd.pc) {
+          dd.biz.navigation.close()
+        } else {
+          this.$router.go(-1)
+        }
       }, 700)
     },
     /**