add:新增一楼立库任务类型以及行架报警信息

acs2/nladmin-ui/src/views/acs/history/taskRecord/index.vue

@@ -278,8 +278,10 @@
         <el-table-column prop="task_code" :label="$t('task.txt_box.Task_code')" :min-width="flexWidth('task_code',crud.data,$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')" width="100px">
+          debugger
           <template slot-scope="scope">
-            {{ dict.label.task_type[scope.row.task_type] }}
+            <span v-if="scope.row.class_type!=null && scope.row.class_type.length===2 ">{{ dict.label.task_type[scope.row.class_type] }}</span>
+            <span v-else>{{ dict.label.task_type[scope.row.task_type] }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="task_status" :label="$t('task.txt_box.Task_status')">
@@ -327,6 +329,7 @@ const defaultForm = {
   vehicle_code: null,
   vehicle_type: null,
   task_type: null,
+  class_type: null,
   task_status: null,
   priority: 0,
   start_point_code: null,

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

@@ -528,7 +528,8 @@
         />
         <el-table-column prop="task_type" :label="$t('task.txt_box.Task_type')" width="100px">
           <template slot-scope="scope">
-            {{ dict.label.task_type[scope.row.task_type] }}
+            <span v-if="scope.row.class_type!=null && scope.row.class_type.length===2">{{ dict.label.task_type[scope.row.class_type] }}</span>
+            <span v-else>{{ dict.label.task_type[scope.row.task_type] }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="agv_action_type" :label="$t('task.txt_box.Action_type')"
@@ -707,6 +708,7 @@ export default {
         { key: '取放货二次分配', value: 4 }
       ],
       task_type: [],
+      class_type: [],
       fromYList: [],
       fromZList: [],
       toYList: [],