fix: 修复任务类型信息，添加acs任务类型

mes/qd/src/api/wms/sch/task.js

@@ -37,6 +37,12 @@ export function getTaskType() {
     method: 'get'
   })
 }
+export function getAcsTaskType() {
+  return request({
+    url: 'api/task/acsTaskType',
+    method: 'get'
+  })
+}
 
 export function getFinishType() {
   return request({
@@ -60,5 +66,6 @@ export default {
   operation,
   getTaskStatus,
   getTaskType,
+  getAcsTaskType,
   getFinishType
 }

mes/qd/src/views/wms/sch/task/index.vue

@@ -56,14 +56,32 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
+<!--          <el-form-item label="任务类型">-->
+<!--            <treeselect-->
+<!--              v-model="query.task_type"-->
+<!--              :load-options="loadChildNodes"-->
+<!--              :options="classes1"-->
+<!--              style="width: 180px"-->
+<!--              placeholder="请选择"-->
+<!--            />-->
+<!--          </el-form-item>-->
           <el-form-item label="任务类型">
-            <treeselect
+            <el-select
               v-model="query.task_type"
-              :load-options="loadChildNodes"
-              :options="classes1"
               style="width: 180px"
-              placeholder="请选择"
-            />
+              placeholder="任务类型"
+              class="filter-item"
+              clearable
+              @change="hand"
+            >
+              <el-option
+                v-for="item in taskTypeList"
+                :key="item.code"
+                clearable
+                :label="item.name"
+                :value="item.code"
+              />
+            </el-select>
           </el-form-item>
           <el-form-item label="完成方式">
             <el-select
@@ -133,14 +151,12 @@
         <el-table-column v-if="true" prop="task_id" label="任务标识" min-width="150" show-overflow-tooltip />
         <el-table-column v-if="true" prop="material_id" label="物料标识" min-width="150" show-overflow-tooltip />
         <el-table-column prop="task_code" label="任务编码" min-width="100" show-overflow-tooltip />
-        <el-table-column prop="class_name" label="任务类型" min-width="100"/>
         <el-table-column prop="acs_task_type" label="acs任务类型" min-width="120" show-overflow-tooltip>
           <template slot-scope="scope">
-            {{ dict.label.SCH_TASK_TYPE_DTL[scope.row.acs_task_type] }}
+            {{ acsTaskTypeList[scope.row.acs_task_type - 1] }}
           </template>
         </el-table-column>
-        <el-table-column prop="task_name" label="任务描述" min-width="120" show-overflow-tooltip />
-        <el-table-column v-if="false" prop="task_type_name" label="任务类型" min-width="120" show-overflow-tooltip />
+        <el-table-column prop="task_name" label="任务类型" min-width="120" show-overflow-tooltip />
         <el-table-column v-if="false" prop="task_status" label="任务状态" />
         <el-table-column prop="product_area" label="生产区域" />
         <el-table-column prop="task_status_name" label="任务状态" width="120px" :formatter="formatTaskStatusName" />
@@ -269,6 +285,7 @@ export default {
       create_time: [],
       taskStatusList: [],
       taskTypeList: [],
+      acsTaskTypeList: [],
       finishTypeList: [],
       permission: {
 
@@ -285,6 +302,12 @@ export default {
     crudTask.getFinishType().then(data => {
       this.finishTypeList = data
     })
+    crudTask.getTaskType().then(res => {
+      this.taskTypeList = res
+    })
+    crudTask.getAcsTaskType().then(res => {
+      this.acsTaskTypeList = res
+    })
     // this.crud.query.task_status = ['-1']
     // this.crud.toQuery()
   },