chore: 保存盘点开发前改动

ruoyi-ui/src/views/out/job/index.vue

@@ -9,10 +9,20 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="任务状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择任务状态" clearable>
+          <el-option
+            v-for="dict in dict.type.mydo_job_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="任务类型" prop="inOrOut">
         <el-select v-model="queryParams.inOrOut" placeholder="请选择任务类型" clearable>
           <el-option
-            v-for="dict in dict.type.mydo_job_status"
+            v-for="dict in dict.type.out_job_type"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -115,11 +125,15 @@
     <el-table v-loading="loading" :data="jobList" @selection-change="handleSelectionChange" @row-click="handleRowClick" highlight-current-row>
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="任务ID" align="center" prop="jobId" />
-      <el-table-column label="任务状态" align="center" prop="status" />
+      <el-table-column label="任务状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.mydo_job_status" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
       <el-table-column label="任务号" align="center" prop="taskNo" />
       <el-table-column label="任务类型" align="center" prop="inOrOut">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.mydo_job_status" :value="scope.row.inOrOut"/>
+          <dict-tag :options="dict.type.out_job_type" :value="scope.row.inOrOut"/>
         </template>
       </el-table-column>
       <el-table-column label="执行阶段" align="center" prop="executionPhase">
@@ -137,7 +151,7 @@
 <!--      <el-table-column label="重量" align="center" prop="weight" />-->
       <el-table-column label="创建时间" align="center" prop="createTime" width="160">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="开始时间" align="center" prop="startTime" width="160">
@@ -218,7 +232,7 @@ import { listJobdetail } from "@/api/out/jobdetail"
 
 export default {
   name: "Job",
-  dicts: ['mydo_job_execution_phase', 'mydo_job_status'],
+  dicts: ['mydo_job_execution_phase', 'mydo_job_status', 'out_job_type'],
   data() {
     return {
       // 遮罩层
@@ -260,7 +274,8 @@ export default {
       detailQueryParams: {
         pageNum: 1,
         pageSize: 10,
-        jobId: null
+        jobId: null,
+        status: null
       }
     }
   },
@@ -334,6 +349,7 @@ export default {
     handleRowClick(row) {
       this.currentJob = row
       this.detailQueryParams.jobId = row.jobId
+      this.detailQueryParams.status = row.status
       this.detailQueryParams.pageNum = 1
       this.getJobDetailList()
     },