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

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

@@ -1,52 +1,52 @@
 <template>
-  <el-dialog draggable class='cn-operate-dialog' v-model='dialogVisible' :title='title'
+    <el-dialog draggable class='cn-operate-dialog' v-model='dialogVisible' :title='title'
-             style='max-width: 450px;height: 320px' top='30vh'>
+               style='max-width: 450px;height: 320px' top='30vh'>
-    <el-scrollbar>
+        <el-scrollbar>
-      <el-form :inline='false' :model='formData' label-width='120px' :rules='rules' ref='formRef'>
+            <el-form :inline='false' :model='formData' label-width='120px' :rules='rules' ref='formRef'>
 
-        <el-form-item label='设备类型' prop='deviceType'>
+                <el-form-item label='设备类型' prop='deviceType'>
-          <el-radio-group v-model='formData.deviceType' @change='changeType'>
+                    <el-radio-group v-model='formData.deviceType' @change='changeType'>
-            <el-radio border label='1'>装置设备</el-radio>
+                        <el-radio border label='1'>装置设备</el-radio>
-            <el-radio border label='2'>监测设备</el-radio>
+                        <el-radio border label='2'>监测设备</el-radio>
-          </el-radio-group>
+                    </el-radio-group>
-        </el-form-item>
+                </el-form-item>
 
-        <el-form-item label='设备' prop='deviceId'>
+                <el-form-item label='设备' prop='deviceId'>
-          <el-tree-select
+                    <el-tree-select
-              v-model='formData.deviceId'
+                        v-model='formData.deviceId'
-              :data='data'
+                        :data='data'
-              filterable
+                        filterable
-              :default-expand-all='true'
+                        :default-expand-all='true'
-              style='width: 260px'
+                        style='width: 260px'
-          />
+                    />
-        </el-form-item>
+                </el-form-item>
 
-        <el-form-item label='资产编号'>
+                <el-form-item label='资产编号'>
-          <el-input
+                    <el-input
-              v-model='formData.propertyNo'
+                        v-model='formData.propertyNo'
-              clearable
+                        clearable
-              placeholder='请输入资产编号'
+                        placeholder='请输入资产编号'
-          />
+                    />
-        </el-form-item>
+                </el-form-item>
 
 
-      </el-form>
+            </el-form>
-    </el-scrollbar>
+        </el-scrollbar>
 
-    <template #footer>
+        <template #footer>
             <span class='dialog-footer'>
                 <el-button @click='dialogVisible = false'>取消</el-button>
                 <el-button type='primary' @click='submit'>确认</el-button>
             </span>
-    </template>
+        </template>
-  </el-dialog>
+    </el-dialog>
 </template>
 <script lang='ts' setup>
 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'
 
 
 //下拉数据源
@@ -61,50 +61,76 @@ const formRef = ref()
 const dialogVisible = ref(false)
 // 注意不要和表单ref的命名冲突
 const formData = reactive({
-  id: '',
+    id: '',
-  deviceId: '',
+    deviceId: '',
-  deviceType: '',
+    deviceType: '',
-  propertyNo: ''
+    propertyNo: ''
 })
 
 //form表单校验规则
 const rules = {
-  deviceId: [{ required: true, message: '设备不能为空', trigger: 'change' }],
+    deviceId: [{ required: true, message: '设备不能为空', trigger: 'change' }],
-  deviceType: [{ required: true, message: '设备类型不能为空', trigger: 'change' }]
+    deviceType: [{ required: true, message: '设备类型不能为空', trigger: 'change' }]
 }
 const resetForm = () => {
-  if (formRef.value) {
+    if (formRef.value) {
-    formRef.value.resetFields()
+        formRef.value.resetFields()
-  }
+    }
 }
 
 const open = async (text: string, tempData?: any) => {
-  title.value = text
+    title.value = text
-  //终端
-  await getTerminalSelectTree(4).then(res => {
-    deviceList.value = res.data
-  })
-  //监测点
-  getTerminalSelectTree(6).then(res => {
-    lineList.value = res.data
-  })
 
-  if (tempData) {
+    if (tempData) {
-    // 表单赋值
+        if (tempData.deviceType == 1) {
-    for (let key in formData) {
+            //先加载装置数据并赋值
-      formData[key] = tempData[key]
+            //终端
+            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
+        } 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'
     }
-  } else {
+    dialogVisible.value = true
-    resetForm()
-    // 在此处恢复默认表单
-    for (let key in formData) {
-      formData[key] = ''
-    }
-    formData.deviceType = '1'
-    sourceData.value = deviceList.value
-    data.value = deviceList.value
-  }
-  dialogVisible.value = true
 }
 
 
@@ -112,25 +138,23 @@ const open = async (text: string, tempData?: any) => {
  * 提交用户表单数据
  */
 const submit = () => {
-  formRef.value.validate(async (valid: any) => {
+    formRef.value.validate(async (valid: any) => {
-    if (valid) {
+        if (valid) {
-      if (formData.id) {
+            if (formData.id) {
-        // await updateModel(formData)
+                await quitRunningDeviceUpdate(formData)
-        ElMessage.success('更新成功')
+                ElMessage.success('重新发起成功')
-        tableStore.index()
+                tableStore.index()
-        dialogVisible.value = false
+                dialogVisible.value = false
-      } else {
+            } else {
-        await addRunningDevice(formData).then(res => {
+                await addRunningDevice(formData)
-          formData.id = res.data
+                //查询进线数据，避免一直处于loading状态
-          //查询进线数据，避免一直处于loading状态
+                ElMessage.success('申请成功')
-          ElMessage.success('保存成功')
+                tableStore.index()
-          tableStore.index()
+                dialogVisible.value = false
-          dialogVisible.value = false
+            }
-        })
-      }
 
-    }
+        }
-  })
+    })
 }
 
 /**
@@ -138,13 +162,13 @@ const submit = () => {
  */
 
 const changeType = (event: any) => {
-  if (event == 1) {
+    if (event == 1) {
-    sourceData.value = deviceList.value
+        sourceData.value = deviceList.value
-  } else {
+    } else {
-    sourceData.value = lineList.value
+        sourceData.value = lineList.value
-  }
+    }
-  formData.deviceId = ''
+    formData.deviceId = ''
-  data.value = sourceData.value
+    data.value = sourceData.value
 }
 
 defineExpose({ open })
@@ -152,10 +176,10 @@ defineExpose({ open })
 
 <style scoped>
 .el-upload-list__item {
-  transition: none !important;
+    transition: none !important;
 }
 
 .el-select {
-  min-width: 180px;
+    min-width: 180px;
 }
 </style>

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)
       } },