opt: 任务。任务配置

lms/nladmin-ui/src/views/lucene/index.vue

@@ -144,6 +144,10 @@ export default {
     toDeleteLog() {
       luceneOperation.deleteAllLog().then(res => {
         this.crud.notify('删除成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.crud.toQuery()
+      }).finally(() => {
+        this.crud.notify('删除成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.crud.toQuery()
       })
     },
     getTagList() {

lms/nladmin-ui/src/views/system/param/index.vue

@@ -10,12 +10,12 @@
           label-width="80px"
           label-suffix=":"
         >
-          <el-form-item label="参数编码">
+          <el-form-item label="模糊查询">
             <el-input
               v-model="query.code"
               clearable
               style="width: 240px"
-              placeholder="参数编码"
+              placeholder="编码/名称"
             />
           </el-form-item>
           <rrOperation />

lms/nladmin-ui/src/views/wms/sch/task/config/schBaseTaskconfig.js

@@ -7,6 +7,12 @@ export function add(data) {
     data
   })
 }
+export function getTaskConfigList() {
+  return request({
+    url: 'api/schBaseTaskconfig/getTaskConfigList',
+    method: 'post'
+  })
+}
 
 export function del(ids) {
   return request({
@@ -24,4 +30,4 @@ export function edit(data) {
   })
 }
 
-export default { add, edit, del }
+export default { add, edit, del, getTaskConfigList }

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

@@ -15,7 +15,7 @@
             <el-input
               v-model="query.task_code"
               clearable
-              style="width: 180px"
+              style="width: 240px"
               placeholder="任务号"
               @keyup.enter.native="crud.toQuery"
             />
@@ -25,16 +25,29 @@
             <el-input
               v-model="query.vehicle_code"
               clearable
-              style="width: 180px"
+              style="width: 240px"
               placeholder="载具号"
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
+          <el-form-item label="任务名称">
+            <label slot="label">任务名称:</label>
+            <el-select v-model="query.config_code" placeholder="请选择" style="width: 240px" @change="crud.toQuery" clearable>
+              <el-option
+                v-for="item in taskConfigList"
+                :key="item.config_id"
+                :label="item.task_name"
+                :value="item.config_code">
+                <span style="float: left">{{ item.config_code }}</span>
+                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.task_name }}</span>
+              </el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="点位编码">
             <el-input
               v-model="query.point_code"
               clearable
-              style="width: 180px"
+              style="width: 240px"
               placeholder="起点"
               @keyup.enter.native="crud.toQuery"
             />
@@ -179,6 +192,7 @@
         </el-table-column>
         <el-table-column prop="remark" label="提示信息" :min-width="flexWidth('remark',crud.data,'提示信息')" />
         <el-table-column prop="config_code" label="配置编码" :min-width="flexWidth('config_code',crud.data,'配置编码')" />
+        <el-table-column prop="task_name" label="配置名称" :min-width="flexWidth('task_name',crud.data,'任务名称')" />
         <el-table-column prop="point_code1" label="起点1" :min-width="flexWidth('point_code1',crud.data,'点位1')" />
         <el-table-column prop="point_code2" label="终点1" :min-width="flexWidth('point_code2',crud.data,'点位2')" />
         <el-table-column prop="point_code3" label="起点2" :min-width="flexWidth('point_code3',crud.data,'点位3')" />
@@ -244,6 +258,7 @@
 
 <script>
 import crudSchBaseTask from './schBaseTask'
+import crudSchBaseTaskconfig from './config/schBaseTaskconfig'
 import CRUD, { crud, form, header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
@@ -307,17 +322,24 @@ export default {
       },
       rules: {
       },
-      taskStatusList: []
+      taskStatusList: [],
+      taskConfigList: []
     }
   },
   created() {
     this.getTaskStatusList()
+    this.getTaskConfigList()
   },
   methods: {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据
     [CRUD.HOOK.beforeRefresh]() {
       return true
     },
+    getTaskConfigList() {
+      crudSchBaseTaskconfig.getTaskConfigList().then(res => {
+        this.taskConfigList = res
+      })
+    },
     hand(value) {
       this.crud.toQuery()
     },