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

src/views/pqs/supervise/plan/components/addForm.vue

@@ -362,7 +362,12 @@ import { genFileId, ElMessage } from 'element-plus'
 import { useDictData } from '@/stores/dictData'
 import { useAdminInfo } from '@/stores/adminInfo'
 import { uploadFile } from '@/api/system-boot/file'
-import { addPlanFormData, getUserByDeptId, getPlanDetailsById,updatePlanFormData } from '@/api/supervision-boot/plan/index'
+import {
+    addPlanFormData,
+    getUserByDeptId,
+    getPlanDetailsById,
+    updatePlanFormData
+} from '@/api/supervision-boot/plan/index'
 import Area from '@/components/form/area/index.vue'
 const emits = defineEmits(['onSubmit'])
 const dictData = useDictData()
@@ -557,15 +562,17 @@ watch(
         immediate: true
     }
 )
-const resendId=ref('')
+const resendId = ref('')
 const open = (row: any) => {
-    title.value = row.title;
-    dialogFormVisible.value = true;
-    resendId.value=row.row.planId;
+    title.value = row.title
+    dialogFormVisible.value = true
     if (row.row) {
-        getPlanDetailsById({ id: row.row.planId}).then(res => {
+        resendId.value = row.row.planId
+        getPlanDetailsById({ id: row.row.planId }).then(res => {
             form.value = res.data
         })
+    } else {
+        resendId.value = ''
     }
 }
 const close = () => {
@@ -667,11 +674,12 @@ const confirmForm = () => {
                 })
             } else {
                 console.log(confirmFormData)
-                confirmFormData.id=resendId.value;
+                confirmFormData.id = resendId.value
+                confirmFormData.planSupvDate = confirmFormData.planSupvDate.replace('T', ' ')
                 updatePlanFormData(confirmFormData).then(res => {
                     if (res.code == 'A0000') {
                         ElMessage({
-                            message: '新建技术监督计划成功',
+                            message: '重新发起成功',
                             type: 'success'
                         })
                         ruleFormRef.value.resetFields()

src/views/pqs/supervise/plan/index.vue

@@ -46,7 +46,10 @@ import addForm from './components/addForm.vue'
 import effectProblem from './components/effectProblem/index.vue'
 import { planDetailsAudit, sendAlarm } from '@/api/supervision-boot/plan/index'
 import { ElMessage } from 'element-plus'
-
+import { useAdminInfo } from '@/stores/adminInfo'
+import { cancelPlanFormData } from '@/api/supervision-boot/plan/index'
+//获取登陆用户姓名和部门
+const adminInfo = useAdminInfo()
 defineOptions({
     name: 'plan'
 })
@@ -169,30 +172,12 @@ const tableStore = new TableStore({
                     icon: 'el-icon-EditPen',
                     render: 'basicButton',
                     click: row => {
-                        console.log(row.processInstanceId,"000000000");
-                        handleDetails(row.processInstanceId)
+                        handleDetails(row.processInstanceId, row.historyInstanceId)
                     },
                     disabled: row => {
                         return !row.processInstanceId
                     }
                 },
-                {
-                    name: 'edit',
-                    title: '重新发起',
-                    type: 'warning',
-                    icon: 'el-icon-Open',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.status == 1 || row.status == 2
-                    },
-                    click: row => {
-                        addForms.value.open({
-                            title: '重新发起',
-                            row: row
-                        })
-                    }
-                },
-
                 {
                     name: 'productSetting',
                     title: '实施问题',
@@ -216,7 +201,24 @@ const tableStore = new TableStore({
                         handleAudit(row)
                     }
                 },
-
+                {
+                    name: 'edit',
+                    title: '重新发起',
+                    type: 'warning',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return (
+                            row.createBy != adminInfo.$state.id || row.status !=3
+                        )
+                    },
+                    click: row => {
+                        addForms.value.open({
+                            title: '重新发起',
+                            row: row
+                        })
+                    }
+                },
                 {
                     name: 'cancel',
                     title: '取消',
@@ -224,10 +226,12 @@ const tableStore = new TableStore({
                     icon: 'el-icon-Open',
                     render: 'basicButton',
                     disabled: row => {
-                        return row.status == 3 || row.status == 2 || row.status == 4
+                        return (
+                            row.createBy != adminInfo.$state.id || row.status != 1 
+                        )
                     },
                     click: row => {
-                        // cancelLeave(row)
+                        cancelLeave(row)
                     }
                 },
                 {
@@ -299,17 +303,19 @@ onMounted(() => {
     tableStore.index()
 })
 //
-const handleDetails = (id: any) => {
+const handleDetails = (id: any, historyInstanceId: any) => {
     push({
         name: 'BpmProcessInstanceDetail',
-        query: {
-            id: id
+        state: {
+            id: id,
+            historyInstanceId
         }
     })
 }
 /** 提交审核按钮 */
 const handleAudit = (row: any) => {
     planDetailsAudit({ id: row.planId }).then(res => {
+        ElMessage.success('提交审核成功！')
         tableStore.index()
     })
 }
@@ -320,6 +326,26 @@ const handleAlarmForm = (row: any) => {
         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 cancelPlanFormData(data)
+    ElMessage.success('取消成功')
+    // 加载数据
+    tableStore.index()
+}
 // 实施问题按钮
 const effectProblemList = ref()
 const effectProblemForm: any = ref({})
@@ -333,5 +359,4 @@ const handleEffectProblem = (row: any) => {
         }
     })
 }
-
 </script>