Ver Fonte

EOEG SAI

wangggziwen há 1 mês atrás
pai
commit
3a24a9fae8

+ 9 - 2
ui/src/views/approve/myapprove/index.vue

@@ -63,7 +63,7 @@
     <pssr-approve-detail v-if="pssrApproveDetailVisible" ref="pssrApproveDetail" @refreshDataList="getList"></pssr-approve-detail>
     <pssr-mgr-approve-detail v-if="pssrMgrApproveDetailVisible" ref="pssrMgrApproveDetail" @refreshDataList="getList"></pssr-mgr-approve-detail>
     <EoegLockChangeDetail v-if="eoegLockApproveDetailVisible" ref="eoegLockApproveDetail" @refreshDataList="getList"></EoegLockChangeDetail>
-
+    <eoeg-sai-apply-detail v-if="eoegSaiApplyVisible" ref="saiApplyDetail" @refreshDataList="getList"></eoeg-sai-apply-detail>
   </div>
 </template>
 
@@ -89,10 +89,12 @@
   import PssrApproveDetail from "@/views/approve/approveDetail/pssrApprove-detail.vue";
   import PssrMgrApproveDetail from "@/views/approve/approveDetail/pssrMgrApprove-detail.vue";
   import EoegLockChangeDetail from "@/views/approve/approveDetail/eoegLockChange-detail.vue";
+  import EoegSaiApplyDetail from "@/views/approve/approveDetail/eoeg-sai-apply-detail";
 
   export default {
     name: "Myapprove",
     components: {
+      EoegSaiApplyDetail,
       EoegLockChangeDetail,
       PssrMgrApproveDetail,
       PssrApproveDetail,
@@ -107,6 +109,7 @@
       return {
         // 遮罩层
         loading: true,
+        eoegSaiApplyVisible: false,
         processImgVisible: false,
         specDealVisible: false,
         specModifyDealVisible: false,
@@ -264,11 +267,15 @@
             this.$refs.safetychangeDetail.init(row.approveObject.id, row.taskId, row.processId, row.taskName)
           })
         } else if (row.processName == "SAI开项申请流程") {
-          console.log(row)
           this.saiApplyVisible = true
           this.$nextTick(() => {
             this.$refs.saiApplyDetail.init(row.approveObject.saiApplyId, row.taskId, row.processId, row.taskName)
           })
+        } else if (row.processName == "EOEG_SAI开项申请流程") {
+          this.eoegSaiApplyVisible = true
+          this.$nextTick(() => {
+            this.$refs.saiApplyDetail.init(row.approveObject.saiApplyId, row.taskId, row.processId, row.taskName)
+          })
         } else if (row.processName == "每周安全排查报告") {
           this.semsWeekcheckDetailVisible = true
           this.$nextTick(() => {

+ 9 - 1
ui/src/views/approve/pending/index.vue

@@ -138,7 +138,7 @@
     <pssr-approve-detail v-if="pssrApproveDetailVisible" ref="pssrApproveDetail" @refreshDataList="getList"></pssr-approve-detail>
     <pssr-mgr-approve-detail v-if="pssrMgrApproveDetailVisible" ref="pssrMgrApproveDetail" @refreshDataList="getList"></pssr-mgr-approve-detail>
     <EoegLockChangeDetail v-if="eoegLockApproveDetailVisible" ref="eoegLockApproveDetail" @refreshDataList="getList"></EoegLockChangeDetail>
-
+    <eoeg-sai-apply-detail v-if="eoegSaiApplyVisible" ref="saiApplyDetail" @refreshDataList="getList"></eoeg-sai-apply-detail>
   </div>
 </template>
 
@@ -166,10 +166,12 @@ import DsdtNopassDetail from "@/views/approve/approveDetail/dsdtNoPass-detail.vu
 import PssrApproveDetail from "@/views/approve/approveDetail/pssrApprove-detail.vue";
 import PssrMgrApproveDetail from "@/views/approve/approveDetail/pssrMgrApprove-detail.vue";
 import EoegLockChangeDetail from "@/views/approve/approveDetail/eoegLockChange-detail.vue";
+import EoegSaiApplyDetail from "@/views/approve/approveDetail/eoeg-sai-apply-detail";
 
 export default {
     name: "Pending",
     components: {
+      EoegSaiApplyDetail,
       EoegLockChangeDetail,
       PssrMgrApproveDetail,
       PssrApproveDetail,
@@ -195,6 +197,7 @@ export default {
         // 遮罩层
         loading: true,
         //弹窗界面是否开启
+        eoegSaiApplyVisible: false,
         addOrUpdateVisible: false,
         processImgVisible: false,
         specDealVisible: false,
@@ -446,6 +449,11 @@ export default {
           this.$nextTick(() => {
             this.$refs.saiApplyDetail.init(row.approveObject.saiApplyId, row.taskId, row.processId, row.taskName)
           })
+        } else if (row.processName == "EOEG_SAI开项申请流程") {
+          this.eoegSaiApplyVisible = true
+          this.$nextTick(() => {
+            this.$refs.saiApplyDetail.init(row.approveObject.saiApplyId, row.taskId, row.processId, row.taskName)
+          })
         }else if (row.processName == "每周安全排查报告") {
           this.semsWeekcheckDetailVisible = true
           this.$nextTick(() => {

+ 9 - 1
ui/src/views/approve/taskdone/index.vue

@@ -67,7 +67,7 @@
     <pssr-approve-detail v-if="pssrApproveDetailVisible" ref="pssrApproveDetail" @refreshDataList="getList"></pssr-approve-detail>
     <pssr-mgr-approve-detail v-if="pssrMgrApproveDetailVisible" ref="pssrMgrApproveDetail" @refreshDataList="getList"></pssr-mgr-approve-detail>
     <EoegLockChangeDetail v-if="eoegLockApproveDetailVisible" ref="eoegLockApproveDetail" @refreshDataList="getList"></EoegLockChangeDetail>
-
+    <eoeg-sai-apply-detail v-if="eoegSaiApplyVisible" ref="saiApplyDetail" @refreshDataList="getList"></eoeg-sai-apply-detail>
   </div>
 </template>
 
@@ -94,10 +94,12 @@
   import PssrApproveDetail from "@/views/approve/approveDetail/pssrApprove-detail.vue";
   import PssrMgrApproveDetail from "@/views/approve/approveDetail/pssrMgrApprove-detail.vue";
   import EoegLockChangeDetail from "@/views/approve/approveDetail/eoegLockChange-detail.vue";
+  import EoegSaiApplyDetail from "@/views/approve/approveDetail/eoeg-sai-apply-detail";
 
   export default {
     name: "Taskdone",
     components: {
+      EoegSaiApplyDetail,
       EoegLockChangeDetail,
       PssrMgrApproveDetail,
       PssrApproveDetail,
@@ -113,6 +115,7 @@
       return {
         // 遮罩层
         loading: true,
+        eoegSaiApplyVisible: false,
         processImgVisible: false,
         specDealVisible: false,
         specModifyDealVisible: false,
@@ -281,6 +284,11 @@
           this.$nextTick(() => {
             this.$refs.saiApplyDetail.init(row.approveObject.saiApplyId, row.taskId, row.processId, row.taskName)
           })
+        } else if (row.processName == "EOEG_SAI开项申请流程") {
+          this.eoegSaiApplyVisible = true
+          this.$nextTick(() => {
+            this.$refs.saiApplyDetail.init(row.approveObject.saiApplyId, row.taskId, row.processId, row.taskName)
+          })
         }else if (row.processName == "每周安全排查报告") {
           this.semsWeekcheckDetailVisible = true
           this.$nextTick(() => {