返回已办的办理人

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java

@@ -877,6 +877,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             flowTask.setStartUserId(startUser.getNickName());
             flowTask.setStartUserName(startUser.getNickName());
             flowTask.setStartDeptName(startUser.getDept().getDeptName());
+            flowTask.setAssigneeId(Long.parseLong(histTask.getAssignee()));
             hisTaskList.add(flowTask);
         }
         page.setTotal(taskInstanceQuery.count());

oa-ui/src/views/oa/device/detail.vue

@@ -894,7 +894,7 @@ export default {
       if (row == '3') {
         return 'primary'
       }
-      if (row == '3') {
+      if (row == '4') {
         return 'info'
       }
     }

oa-ui/src/views/oa/device/index.vue

@@ -1,14 +1,30 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-
+      <el-form-item label="设备状态" prop="status">
+        <el-select v-model="queryParams.status" clearable @keyup.enter.native="handleQuery">
+          <el-option key="0" label="被领用" value="0">
+          </el-option>
+          <el-option key="1" label="可领用" value="1">
+          </el-option>
+          <el-option key="2" label="维修中" value="2">
+          </el-option>
+          <el-option key="3" label="已停用" value="3">
+          </el-option>
+          <el-option key="4" label="已报废" value="4">
+          </el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="设备名称" prop="name">
         <el-input v-model="queryParams.name" placeholder="请输入设备名称" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item>
-      <el-form-item label="规格型号" prop="series">
-        <el-input v-model="queryParams.series" placeholder="请输入规格型号" clearable @keyup.enter.native="handleQuery" />
+      <el-form-item label="设备品牌" prop="brand">
+        <el-input v-model="queryParams.brand" placeholder="请输入设备品牌" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
+      <el-form-item>
+        <el-form-item label="规格型号" prop="series">
+          <el-input v-model="queryParams.series" placeholder="请输入规格型号" clearable @keyup.enter.native="handleQuery" />
+        </el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
@@ -351,6 +367,9 @@ export default {
       if (row == '3') {
         return '已停用'
       }
+      if (row == '4') {
+        return '已报废'
+      }
     },
     statusTypeStyle(row) {
       if (row == '0') {
@@ -362,6 +381,9 @@ export default {
       if (row == '2') {
         return 'danger'
       }
+      if (row == '3') {
+        return 'primary'
+      }
       if (row == '3') {
         return 'info'
       }

oa-ui/src/views/oa/supply/index.vue

@@ -1,8 +1,19 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="设备状态" prop="name">
-        <el-input v-model="queryParams.name" placeholder="请输入设备名称" clearable @keyup.enter.native="handleQuery" />
+      <el-form-item label="设备状态" prop="status">
+        <el-select v-model="queryParams.status" clearable @keyup.enter.native="handleQuery">
+          <el-option key="0" label="被领用" value="0">
+          </el-option>
+          <el-option key="1" label="可领用" value="1">
+          </el-option>
+          <el-option key="2" label="维修中" value="2">
+          </el-option>
+          <el-option key="3" label="已停用" value="3">
+          </el-option>
+          <el-option key="4" label="已报废" value="4">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="设备名称" prop="name">
         <el-input v-model="queryParams.name" placeholder="请输入设备名称" clearable @keyup.enter.native="handleQuery" />
@@ -332,6 +343,9 @@ export default {
       if (row == '3') {
         return '已停用'
       }
+      if (row == '4') {
+        return '已报废'
+      }
     },
     statusTypeStyle(row) {
       if (row == '0') {
@@ -344,6 +358,9 @@ export default {
         return 'danger'
       }
       if (row == '3') {
+        return 'primary'
+      }
+      if (row == '4') {
         return 'info'
       }
     }