From b6dd29b4b7bb8064e14f4fd1af36ee2c0a45d8d6 Mon Sep 17 00:00:00 2001
From: yanps <yps00312>
Date: Sat, 11 May 2024 20:27:02 +0800
Subject: [PATCH] =?UTF-8?q?add:=20=E6=B7=BB=E5=8A=A0=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=98=BE=E7=A4=BA=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task/service/impl/TaskServiceImpl.java    |  4 ++++
 .../views/acs/history/taskRecord/index.vue    | 21 ++++++++++++++++++-
 .../acs/history/taskTreeRecord/index.vue      | 21 ++++++++++++++++++-
 3 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
index 247c199da..482d13edc 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
@@ -344,6 +344,7 @@ public class TaskServiceImpl extends CommonServiceImpl<TaskMapper, Task> impleme
         String vehicle_code = (String) whereJson.get("vehicle_code");
         String material_type = (String) whereJson.get("material_type");
         String status = (String) whereJson.get("status");
+        String taskType = (String) whereJson.get("task_type");
         String point_code = (String) whereJson.get("point_code");
         String create_time = (String) whereJson.get("createTime");
         String end_time = (String) whereJson.get("end_time");
@@ -353,6 +354,9 @@ public class TaskServiceImpl extends CommonServiceImpl<TaskMapper, Task> impleme
         if (!StrUtil.isEmpty(task_code)) {
             wrapper.eq(Task::getTask_code, task_code);
         }
+        if (!StrUtil.isEmpty(taskType)) {
+            wrapper.eq(Task::getTask_type, taskType);
+        }
         if (!StrUtil.isEmpty(vehicle_code)) {
             wrapper.like(Task::getVehicle_code, vehicle_code);
         }
diff --git a/acs2/nladmin-ui/src/views/acs/history/taskRecord/index.vue b/acs2/nladmin-ui/src/views/acs/history/taskRecord/index.vue
index 053295a72..8963547b5 100644
--- a/acs2/nladmin-ui/src/views/acs/history/taskRecord/index.vue
+++ b/acs2/nladmin-ui/src/views/acs/history/taskRecord/index.vue
@@ -60,6 +60,20 @@
               <el-option v-for="item in dict.task_status" :key="item.id" :label="item.label" :value="item.value" />
             </el-select>
           </el-form-item>
+          <el-form-item :label="$t('task.txt_box.Task_type')">
+            <el-select
+              v-model="query.task_type"
+              clearable
+              filterable
+              size="small"
+              :placeholder="$t('task.txt_box.Task_type')"
+              class="filter-item"
+              style="width: 190px"
+              @change="crud.toQuery"
+            >
+              <el-option v-for="item in dict.task_type" :key="item.id" :label="item.label" :value="item.value" />
+            </el-select>
+          </el-form-item>
           <el-form-item :label="$t('task.txt_box.Origin_or_destination')">
             <el-input
               v-model="query.point_code"
@@ -263,6 +277,11 @@
         <el-table-column v-if="false" prop="task_id" label="任务标识" />
         <el-table-column prop="task_code" :label="$t('task.txt_box.Task_code')" />
         <el-table-column prop="vehicle_code" :label="$t('task.txt_box.Vehicle_number')" />
+        <el-table-column prop="task_type" :label="$t('task.txt_box.Task_type')" :min-width="flexWidth('task_type',crud.data,$t('task.txt_box.Task_type'))">
+          <template slot-scope="scope">
+            {{ dict.label.task_type[scope.row.task_type] }}
+          </template>
+        </el-table-column>
         <el-table-column prop="task_status" :label="$t('task.txt_box.Task_status')">
           <template slot-scope="scope">
             <span v-if="scope.row.task_status=='0' ">{{ $t('task.select.Ready') }}</span>
@@ -321,7 +340,7 @@ const defaultForm = {
 export default {
   name: 'Task',
   components: { pagination, crudOperation, Search },
-  dicts: ['task_status'],
+  dicts: ['task_status', 'task_type'],
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
     return CRUD({
diff --git a/acs2/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue b/acs2/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue
index 69635b565..dd9a20f3f 100644
--- a/acs2/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue
+++ b/acs2/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue
@@ -60,6 +60,20 @@
               <el-option v-for="item in dict.task_status" :key="item.id" :label="item.label" :value="item.value" />
             </el-select>
           </el-form-item>
+          <el-form-item :label="$t('task.txt_box.Task_type')">
+            <el-select
+              v-model="query.task_type"
+              clearable
+              filterable
+              size="small"
+              :placeholder="$t('task.txt_box.Task_type')"
+              class="filter-item"
+              style="width: 190px"
+              @change="crud.toQuery"
+            >
+              <el-option v-for="item in dict.task_type" :key="item.id" :label="item.label" :value="item.value" />
+            </el-select>
+          </el-form-item>
           <el-form-item :label="$t('task.txt_box.Origin_or_destination')">
             <el-input
               v-model="query.point_code"
@@ -109,6 +123,11 @@
         <el-table-column v-if="false" prop="task_id" label="任务标识" />
         <el-table-column prop="task_code" :label="$t('TaskRecord.table.Task_number')" :min-width="flexWidth('task_code',crud.data,$t('TaskRecord.table.Task_number'))" />
         <el-table-column prop="vehicle_code" :label="$t('task.txt_box.Vehicle_number')" :min-width="flexWidth('vehicle_code',crud.data,$t('task.txt_box.Vehicle_number'))" />
+        <el-table-column prop="task_type" :label="$t('task.txt_box.Task_type')" :min-width="flexWidth('task_type',crud.data,$t('task.txt_box.Task_type'))">
+          <template slot-scope="scope">
+            {{ dict.label.task_type[scope.row.task_type] }}
+          </template>
+        </el-table-column>
         <el-table-column prop="task_status" :label="$t('TaskRecord.table.Status')" :min-width="flexWidth('task_status',crud.data,$t('TaskRecord.table.Status'))">
           <template slot-scope="scope">
             <span v-if="scope.row.task_status=='0' ">{{ $t('task.select.Ready') }}</span>
@@ -162,7 +181,7 @@ const defaultForm = {
 export default {
   name: 'Task',
   components: { pagination, crudOperation, Search },
-  dicts: ['task_status'],
+  dicts: ['task_status', 'task_type'],
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
     return [