设备退运增加 重新发起 + 取消 两个按钮

src/api/supervision-boot/device/quitRunningDev.ts

@@ -17,6 +17,31 @@ export const addRunningDevice = (data: any) => {
 }
 
 
+/**
+ * 新增设备退运
+ */
+export const quitRunningDeviceUpdate = (data: any) => {
+    return createAxios({
+        url: MAPPING_PATH + '/update',
+        method: 'POST',
+        data: data
+    })
+}
+
+/**
+ * 取消设备退运
+ */
+export const cancelQuitRunningDevice = (data: any) => {
+    return createAxios({
+        url: MAPPING_PATH + '/cancel',
+        method: 'POST',
+        data: data
+    })
+}
+
+
+
+
 
 /**
  * 根据id获取设备的详细数据

src/views/pqs/supervise/retire/deviceQuitPopup.vue

@@ -46,7 +46,7 @@ import { ref, inject, reactive, nextTick } from 'vue'
 import { ElMessage } from 'element-plus'
 import TableStore from '@/utils/tableStore' // 若不是列表页面弹框可删除
 import { getTerminalSelectTree } from '@/api/device-boot/Business'
-import { addRunningDevice } from '@/api/supervision-boot/device/quitRunningDev'
+import { addRunningDevice, quitRunningDeviceUpdate } from '@/api/supervision-boot/device/quitRunningDev'
 
 
 //下拉数据源
@@ -80,6 +80,10 @@ const resetForm = () => {
 
 const open = async (text: string, tempData?: any) => {
     title.value = text
+
+    if (tempData) {
+        if (tempData.deviceType == 1) {
+            //先加载装置数据并赋值
             //终端
             await getTerminalSelectTree(4).then(res => {
                 deviceList.value = res.data
@@ -88,21 +92,43 @@ const open = async (text: string, tempData?: any) => {
             getTerminalSelectTree(6).then(res => {
                 lineList.value = res.data
             })
-
+            sourceData.value = deviceList.value
-  if (tempData) {
+            data.value = deviceList.value
+        } else {
+            //先加载监测点数据并赋值
+            //终端
+            getTerminalSelectTree(4).then(res => {
+                deviceList.value = res.data
+            })
+            //监测点
+            await getTerminalSelectTree(6).then(res => {
+                lineList.value = res.data
+            })
+            sourceData.value = lineList.value
+            data.value = lineList.value
+        }
         // 表单赋值
         for (let key in formData) {
             formData[key] = tempData[key]
         }
+        formData.deviceType = formData.deviceType + ''
     } else {
+        //终端
+        await getTerminalSelectTree(4).then(res => {
+            deviceList.value = res.data
+        })
+        //监测点
+        getTerminalSelectTree(6).then(res => {
+            lineList.value = res.data
+        })
+        sourceData.value = deviceList.value
+        data.value = deviceList.value
         resetForm()
         // 在此处恢复默认表单
         for (let key in formData) {
             formData[key] = ''
         }
         formData.deviceType = '1'
-    sourceData.value = deviceList.value
-    data.value = deviceList.value
     }
     dialogVisible.value = true
 }
@@ -115,18 +141,16 @@ const submit = () => {
     formRef.value.validate(async (valid: any) => {
         if (valid) {
             if (formData.id) {
-        // await updateModel(formData)
+                await quitRunningDeviceUpdate(formData)
-        ElMessage.success('更新成功')
+                ElMessage.success('重新发起成功')
                 tableStore.index()
                 dialogVisible.value = false
             } else {
-        await addRunningDevice(formData).then(res => {
+                await addRunningDevice(formData)
-          formData.id = res.data
                 //查询进线数据，避免一直处于loading状态
-          ElMessage.success('保存成功')
+                ElMessage.success('申请成功')
                 tableStore.index()
                 dialogVisible.value = false
-        })
             }
 
         }

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

@@ -19,6 +19,7 @@
         <Table ref='tableRef'></Table>
         <!--弹框-->
         <device-quit-popup ref='deviceQuitPopup' />
+
     </div>
 </template>
 
@@ -30,6 +31,10 @@ import { nextTick, onMounted, provide, ref } from 'vue'
 import { useRouter } from 'vue-router'
 import { dateFormatter, formatPast2 } from '@/utils/formatTime'
 import DeviceQuitPopup from '@/views/pqs/supervise/retire/deviceQuitPopup.vue'
+import { activateUser } from '@/api/user-boot/user'
+import { ElMessage } from 'element-plus'
+import { ElMessageBox } from 'element-plus/es'
+import { cancelQuitRunningDevice } from '@/api/supervision-boot/device/quitRunningDev'
 
 defineOptions({
     name: 'businessUser'
@@ -110,6 +115,32 @@ const tableStore = new TableStore({
                     click: row => {
                         handleAudit(row.processInstanceId)
                     }
+                },
+                {
+                    name: 'edit',
+                    title: '重新发起',
+                    type: 'warning',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.status !== 3
+                    },
+                    click: row => {
+                        deviceQuitPopup.value.open('重新发起退运', row)
+                    }
+                },
+                {
+                    name: 'cancel',
+                    title: '取消',
+                    type: 'danger',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.status == 3 || row.status == 2 || row.status == 4
+                    },
+                    click: row => {
+                        cancelLeave(row)
+                    }
                 }
             ]
         }
@@ -146,4 +177,26 @@ const handleAudit = (instanceId: any) => {
     })
 }
 
+/**取消流程操作*/
+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 cancelQuitRunningDevice(data)
+    ElMessage.success('取消成功')
+    // 加载数据
+    tableStore.index()
+}
+
+
 </script>

src/views/system/bpm/task/done/index.vue

@@ -62,7 +62,7 @@ const tableStore = new TableStore({
       }
     },
     { title: '审批建议', field: 'reason', minWidth: 150 },
-    { title: '耗时（s）', field: 'durationInMillis', minWidth: 150,
+    { title: '耗时', field: 'durationInMillis', minWidth: 150,
       formatter: (obj: any) => {
         return formatPast2(obj.row.durationInMillis)
       } },