Merge remote-tracking branch 'origin/master'

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

acs2/nladmin-ui/src/i18n/langs/history/en.js

@@ -7,6 +7,7 @@ export default {
       'Status': 'Status',
       'Priority': 'Task Priority',
       'Starting_point_two': 'Starting Point Two',
+      'Transit_point': 'Transit Point',
       'Endpoint_two': 'Endpoint Two',
       'Material': 'Material',
       'Quantity': 'Quantity',

acs2/nladmin-ui/src/i18n/langs/history/in.js

@@ -7,6 +7,7 @@ export default {
       'Status': 'Status',
       'Priority': 'Prioritas Tugas',
       'Starting_point_two': 'Titik Awalan Dua',
+      'Transit_point': 'Titik transit',
       'Endpoint_two': 'Titik Akhir Dua',
       'Material': 'Bahan',
       'Quantity': 'Jumlah',

acs2/nladmin-ui/src/i18n/langs/history/zh.js

@@ -7,6 +7,7 @@ export default {
       'Status': '状态',
       'Priority': '任务优先级',
       'Starting_point_two': '起点2',
+      'Transit_point': '中转点',
       'Endpoint_two': '终点2',
       'Material': '物料',
       'Quantity': '数量',

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({

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>
@@ -122,6 +141,7 @@
         <el-table-column prop="next_point_code" :label="$t('task.select.Destination')" :min-width="flexWidth('next_point_code',crud.data,$t('task.select.Destination'))" />
         <el-table-column prop="start_point_code2" :label="$t('TaskRecord.table.Starting_point_two')" :min-width="flexWidth('start_point_code2',crud.data,$t('TaskRecord.table.Starting_point_two'))" />
         <el-table-column prop="next_point_code2" :label="$t('TaskRecord.table.Endpoint_two')" :min-width="flexWidth('next_point_code2',crud.data,$t('TaskRecord.table.Endpoint_two'))" />
+        <el-table-column prop="put_point_code" :label="$t('TaskRecord.table.Transit_point')" :min-width="flexWidth('put_point_code',crud.data,$t('TaskRecord.table.Transit_point'))" />
         <el-table-column prop="matarial" :label="$t('TaskRecord.table.Material')" :min-width="flexWidth('matarial',crud.data,$t('TaskRecord.table.Material'))" />
         <el-table-column prop="quantity" :label="$t('TaskRecord.table.Quantity')" :min-width="flexWidth('quantity',crud.data,$t('TaskRecord.table.Quantity'))" />
         <el-table-column prop="remark" :label="$t('task.select.Remark')" :min-width="flexWidth('remark',crud.data,$t('task.select.Remark'))" />
@@ -161,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 [

acs2/nladmin-ui/src/views/acs/task/index.vue

@@ -483,7 +483,6 @@
             {{ dict.label.task_type[scope.row.task_type] }}
           </template>
         </el-table-column>
-        <!--        <el-table-column prop="link_num" label="关联编号" />-->
         <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_status" :label="$t('task.txt_box.Task_status')" width="150px">
           <template slot-scope="scope">
@@ -494,35 +493,15 @@
         </el-table-column>
         <el-table-column prop="priority" :label="$t('task.txt_box.Priority')" :min-width="flexWidth('priority',crud.data,$t('task.txt_box.Priority'))" />
         <el-table-column prop="start_point_code" :label="$t('task.select.Pickup_point')" :min-width="flexWidth('start_point_code',crud.data,$t('task.select.Pickup_point'))" />
-        <!--        <el-table-column prop="put_point_code" label="倒料点" width="100" />-->
         <el-table-column prop="next_point_code" :label="$t('task.select.Delivery_point')" :min-width="flexWidth('next_point_code',crud.data,$t('task.select.Delivery_point'))" />
         <el-table-column prop="start_point_code2" :label="$t('task.select.Start_point2')" :min-width="flexWidth('start_point_code2',crud.data,$t('task.select.Start_point2'))" />
         <el-table-column prop="next_point_code2" :label="$t('task.select.Destination2')" :min-width="flexWidth('next_point_code2',crud.data,$t('task.select.Destination2'))" />
-        <!--        <el-table-column prop="compound_task" label="复合任务">-->
-        <!--          <template slot-scope="scope">-->
-        <!--            <span v-if="scope.row.compound_task==='0' ">否</span>-->
-        <!--            <span v-if="scope.row.compound_task==='1' ">是</span>-->
-        <!--          </template>-->
-        <!--        </el-table-column>-->
-        <!--        <el-table-column prop="compound_task_data" width="200" label="复合路线" />-->
-        <!--        <el-table-column prop="matarial" label="物料" />-->
-        <!--        <el-table-column prop="quantity" label="数量" />-->
+        <el-table-column prop="put_point_code" :label="$t('TaskRecord.table.Transit_point')" :min-width="flexWidth('put_point_code',crud.data,$t('TaskRecord.table.Transit_point'))" />
         <el-table-column prop="remark" :label="$t('task.select.Remark')" :min-width="flexWidth('remark',crud.data,$t('task.select.Remark'))" />
         <el-table-column prop="create_by" :label="$t('task.select.Creator')" :min-width="flexWidth('create_by',crud.data,$t('task.select.Creator'))" />
         <el-table-column prop="create_time" :label="$t('task.select.Create_time')" :min-width="flexWidth('create_time',crud.data,$t('task.select.Create_time'))" />
         <el-table-column v-permission="['admin','task:edit','task:del']" :label="$t('task.select.Operation')" width="200px" align="center">
           <template slot-scope="scope">
-            <!--            <el-dropdown trigger="click" @command="handleCommand">-->
-            <!--              <span class="el-dropdown-link">-->
-            <!--                <i class="el-icon-menu" />-->
-            <!--              </span>-->
-            <!--              <el-dropdown-menu slot="dropdown">-->
-            <!--                <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'a')">{{ $t('task.select.Completed') }}</el-dropdown-item>-->
-            <!--                <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'b')">{{ $t('task.select.Cancel') }}</el-dropdown-item>-->
-            <!--                <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'c')">{{ $t('task.select.Create_command') }}</el-dropdown-item>-->
-            <!--              </el-dropdown-menu>-->
-            <!--            </el-dropdown>-->
-            <!--          </template>-->
             <el-dropdown>
               <span class="el-dropdown-link">
                 <i class="el-icon-setting">More</i>