rev:任务查询功能修改

lms/nladmin-ui/src/views/wms/sch/task/index.vue

@@ -49,7 +49,7 @@
           </el-row>
 
           <el-row>
-            <el-col :span="8">
+            <el-col :span="6">
               <el-form-item label="任务类型">
                 <treeselect
                   v-model="query.task_type"
@@ -60,7 +60,26 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="16">
+            <el-col :span="6">
+              <el-row>
+                <el-form-item label="是否删除">
+                  <el-select
+                    v-model="query.is_delete"
+                    class="filter-item"
+                    clearable
+                    @change="handTaskStatus"
+                  >
+                    <el-option
+                      v-for="item in deleteList"
+                      :key="item.code"
+                      :label="item.name"
+                      :value="item.code"
+                    />
+                  </el-select>
+                </el-form-item>
+              </el-row>
+            </el-col>
+            <el-col :span="12">
               <el-form-item label="创建时间">
                 <el-date-picker
                   v-model="query.createTime"
@@ -73,8 +92,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="9">
-            </el-col>
+            <el-col :span="9" />
           </el-row>
           <el-row>
             <el-form-item label="任务状态">
@@ -111,6 +129,7 @@
         style="width: 100%;"
         @selection-change="crud.selectionChangeHandler"
       >
+        <el-table-column prop="task_id" label="任务标识" min-width="150" show-overflow-tooltip />
         <el-table-column prop="task_code" label="任务编码" min-width="150" show-overflow-tooltip />
         <el-table-column prop="task_type_name" label="任务类型" min-width="150" show-overflow-tooltip />
         <el-table-column prop="task_status_name" label="任务状态" width="95px" :formatter="formatTaskStatusName" />
@@ -127,11 +146,12 @@
         <el-table-column prop="create_time" label="创建时间" width="135" show-overflow-tooltip />
         <el-table-column prop="update_optname" label="修改人" width="135" show-overflow-tooltip />
         <el-table-column prop="update_time" label="修改时间" width="135" show-overflow-tooltip />
+        <el-table-column prop="remark" label="备注" width="135" show-overflow-tooltip />
         <el-table-column
           v-permission="['admin','instruction:edit','instruction:del']"
           fixed="right"
           label="操作"
-          width="160px"
+          width="240px"
           align="center"
         >
           <template slot-scope="scope">
@@ -150,6 +170,11 @@
               icon="el-icon-error"
               @click="doOperate(scope.row, 'b')"
             >取消</el-button>
+            <el-button
+              type="text"
+              icon="el-icon-warning-outline"
+              @click="doOperate(scope.row, 's')"
+            >强制完成</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -202,7 +227,7 @@ export default {
       sort: 'task_id,desc',
       crudMethod: { ...crudTask },
       query: {
-        task_code: '', vehicle_code: '', start_point_code: '', next_point_code: '', task_type: '', finished_type: '', task_status: ['-1']
+        task_code: '', is_delete: '0', vehicle_code: '', start_point_code: '', next_point_code: '', task_type: '', finished_type: '', task_status: ['-1']
       },
       optShow: {
         add: false,
@@ -221,6 +246,7 @@ export default {
       openParam: {},
       create_time: [],
       taskStatusList: [],
+      deleteList: [{ 'code': '0', 'name': '否' }, { 'code': '1', 'name': '是' }],
       taskTypeList: [],
       finishTypeList: [],
       permission: {
@@ -314,6 +340,9 @@ export default {
         case 'c':// 下发
           method_name = 'immediateNotifyAcs'
           break
+        case 's':// 强制完成
+          method_name = 'finish'
+          break
         case 'd':// 详情
           method_name = 'view'
           break