业务流程添加重新发起&取消

src/views/pqs/supervise/technology/components/alarm.vue

@@ -1,21 +1,17 @@
 <template>
-    <TableHeader datePicker ref='TableHeaderRef'>
-
+    <TableHeader datePicker ref="TableHeaderRef">
         <template #operation>
-
             <!--            <el-button icon="el-icon-Plus" type="primary" @click="add">新增</el-button>-->
             <!--            <el-button icon="el-icon-Delete" type="primary">删除</el-button>-->
             <!--            <el-button icon="el-icon-Download" type="primary">导出</el-button>-->
-
         </template>
     </TableHeader>
     <!--表格-->
-    <Table ref='tableRef' />
+    <Table ref="tableRef" />
     <!--弹框-->
-    <feedback-popup ref='feedbackPopup' />
-
+    <feedback-popup ref="feedbackPopup" />
 </template>
-<script setup lang='ts'>
+<script setup lang="ts">
 import { ref, onMounted, provide, nextTick } from 'vue'
 import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
@@ -23,7 +19,10 @@ import TableHeader from '@/components/table/header/index.vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import FeedbackPopup from '@/views/pqs/supervise/technology/feedbackPopup.vue'
 import { useRouter } from 'vue-router'
-
+import { cancelFeedback } from '@/api/supervision-boot/leaflet'
+import { useAdminInfo } from '@/stores/adminInfo'
+//获取登陆用户姓名和部门
+const adminInfo = useAdminInfo()
 const { push } = useRouter()
 
 const feedbackPopup = ref()
@@ -44,7 +43,9 @@ const tableStore = new TableStore({
             }
         },
         {
-            field: 'problemType', title: '告警单问题来源', minWidth: '150',
+            field: 'problemType',
+            title: '告警单问题来源',
+            minWidth: '150',
             render: 'tag',
             custom: {
                 1: 'warning',
@@ -61,7 +62,9 @@ const tableStore = new TableStore({
         },
         { field: 'leafletName', title: '单据名称', minWidth: '150' },
         {
-            field: 'status', title: '告警单状态', minWidth: '150',
+            field: 'status',
+            title: '告警单状态',
+            minWidth: '150',
             render: 'tag',
             custom: {
                 1: 'primary',
@@ -107,7 +110,7 @@ const tableStore = new TableStore({
                         return row.status !== 5
                     },
                     click: row => {
-                        feedbackPopup.value.open('填报反馈单', row.id, row.status, row.issueDetail,row.problemPath)
+                        feedbackPopup.value.open('填报反馈单', row.id, row.status, row.issueDetail, row.problemPath)
                     }
                 },
 
@@ -121,7 +124,7 @@ const tableStore = new TableStore({
                         return row.status == 5
                     },
                     click: row => {
-                        handleAudit(row.processInstanceId)
+                        handleAudit(row.processInstanceId, row.historyInstanceId)
                     }
                 },
                 {
@@ -131,10 +134,19 @@ const tableStore = new TableStore({
                     icon: 'el-icon-Open',
                     render: 'basicButton',
                     disabled: row => {
-                        return row.status == 1 || row.status == 2 || row.status == 4 || row.status == 5
+                        return row.createBy != adminInfo.$state.id || row.status != 3
                     },
                     click: row => {
                         // deviceQuitPopup.value.open('重新发起', row)
+                        feedbackPopup.value.open(
+                            '重新发起告警单',
+                            row.id,
+                            row.status,
+                            row.issueDetail,
+                            row.problemPath,
+                            row.takeStep,
+                            row.reportPath
+                        )
                     }
                 },
                 {
@@ -144,13 +156,12 @@ const tableStore = new TableStore({
                     icon: 'el-icon-Open',
                     render: 'basicButton',
                     disabled: row => {
-                        return row.status == 3 || row.status == 2 || row.status == 4 || row.status == 5
+                        return row.createBy != adminInfo.$state.id || row.status != 1
                     },
                     click: row => {
-                        // cancelLeave(row)
+                        cancelLeave(row)
                     }
                 }
-
             ]
         }
     ],
@@ -160,24 +171,44 @@ const tableStore = new TableStore({
     }
 })
 
+/**取消流程操作*/
+const cancelLeave = async (row: any) => {
+    // 二次确认
+    const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
+        inputErrorMessage: '取消原因不能为空'
+    })
+    // 发起取消
+    let data = {
+        id: row.id,
+        processInstanceId: row.processInstanceId,
+        reason: value
+    }
+    await cancelFeedback(data)
+    ElMessage.success('取消成功')
+    // 加载数据
+    tableStore.index()
+}
 tableStore.table.params.status = ''
 
 provide('tableStore', tableStore)
 
-
 onMounted(() => {
     tableStore.index()
 })
 
 /** 流程实例详情 */
-const handleAudit = (instanceId: any) => {
+const handleAudit = (instanceId: any, historyInstanceId: any) => {
     push({
         name: 'BpmProcessInstanceDetail',
-        query: {
-            id: instanceId
+        state: {
+            id: instanceId,
+            historyInstanceId
         }
     })
 }
 </script>
 
-<style scoped lang='scss'></style>
+<style scoped lang="scss"></style>

src/views/pqs/supervise/technology/components/earlyWarn.vue

@@ -17,7 +17,10 @@ import TableHeader from '@/components/table/header/index.vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import FeedbackPopup from '@/views/pqs/supervise/technology/feedbackPopup.vue'
 import { useRouter } from 'vue-router'
-
+import { cancelFeedback } from '@/api/supervision-boot/leaflet'
+import { useAdminInfo } from '@/stores/adminInfo'
+//获取登陆用户姓名和部门
+const adminInfo = useAdminInfo()
 const { push } = useRouter()
 const tableRef = ref()
 const TableHeaderRef = ref()
@@ -113,7 +116,7 @@ const tableStore = new TableStore({
                         return row.status == 5
                     },
                     click: row => {
-                        handleAudit(row.processInstanceId)
+                        handleAudit(row.processInstanceId,row.historyInstanceId)
                     }
                 },
                 {
@@ -123,10 +126,11 @@ const tableStore = new TableStore({
                     icon: 'el-icon-Open',
                     render: 'basicButton',
                     disabled: row => {
-                        return row.status == 1 || row.status == 2 || row.status == 4 || row.status == 5
+                        return row.createBy != adminInfo.$state.id || row.status != 3
                     },
                     click: row => {
                         // deviceQuitPopup.value.open('重新发起', row)
+                        feedbackPopup.value.open('重新发起预警单', row.id, row.status, row.issueDetail,row.problemPath,row.takeStep,row.reportPath)
                     }
                 },
                 {
@@ -136,10 +140,10 @@ const tableStore = new TableStore({
                     icon: 'el-icon-Open',
                     render: 'basicButton',
                     disabled: row => {
-                        return row.status == 3 || row.status == 2 || row.status == 4 || row.status == 5
+                        return row.createBy != adminInfo.$state.id || row.status != 1
                     },
                     click: row => {
-                        // cancelLeave(row)
+                        cancelLeave(row)
                     }
                 }
             ]
@@ -156,13 +160,33 @@ provide('tableStore', tableStore)
 onMounted(() => {
     tableStore.index()
 })
-
+/**取消流程操作*/
+const cancelLeave = async (row: any) => {
+    // 二次确认
+    const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
+        inputErrorMessage: '取消原因不能为空'
+    })
+    // 发起取消
+    let data = {
+        id: row.id,
+        processInstanceId: row.processInstanceId,
+        reason: value
+    }
+    await cancelFeedback(data)
+    ElMessage.success('取消成功')
+    // 加载数据
+    tableStore.index()
+}
 /** 流程实例详情 */
-const handleAudit = (instanceId: any) => {
+const handleAudit = (instanceId: any,historyInstanceId:any) => {
     push({
         name: 'BpmProcessInstanceDetail',
         query: {
-            id: instanceId
+            id: instanceId,
+            historyInstanceId
         }
     })
 }