代码更新

lms/nladmin-system/src/main/java/org/nl/system/controller/param/SysParamController.java

@@ -10,6 +10,7 @@ import org.nl.common.domain.query.PageQuery;
 import org.nl.modules.logging.annotation.Log;
 import org.nl.system.service.param.ISysParamService;
 import org.nl.system.service.param.dao.Param;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
@@ -33,7 +34,6 @@ import java.util.Map;
 @RequestMapping("/api/param")
 @RequiredArgsConstructor
 class SysParamController {
-
     private final ISysParamService paramService;
     @GetMapping
     @Log("查询系统参数")

lms/nladmin-ui/src/views/wms/basedata/master/interfaceback/index.vue

@@ -84,7 +84,7 @@
       <!--表格渲染-->
       <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" width="55" />
-        <el-table-column prop="interface_type" label="回传类型" :formatter="formatType" :min-width="flexWidth('interface_type',crud.data,'类型')" />
+        <el-table-column prop="interface_type" label="回传类型" :formatter="formatType" :min-width="flexWidth('interface_type',crud.data,'回传类型')" />
         <el-table-column prop="interface_name" label="接口名称" :min-width="flexWidth('interface_name',crud.data,'接口名称')"/>
         <el-table-column prop="is_back" label="是否回传" :formatter="formatBack" :min-width="flexWidth('is_back',crud.data,'是否回传')"/>
         <el-table-column prop="remark" label="接口描述" :min-width="flexWidth('remark',crud.data,'接口描述')"/>

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

@@ -112,7 +112,7 @@
         @selection-change="crud.selectionChangeHandler"
       >
         <el-table-column prop="task_code" label="任务编码" min-width="100" show-overflow-tooltip />
-        <el-table-column prop="task_type_name" label="任务类型" min-width="120" 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" />
         <el-table-column prop="point_code1" label="取货点1" width="100" show-overflow-tooltip />
         <el-table-column prop="point_code2" label="放货点1" width="100" show-overflow-tooltip />
@@ -161,11 +161,11 @@
       width="30%"
     >
       <!--  组件-->
-      <component
+      <!--<component
         :is="currentComponent"
         :task-uuid="task_id"
         :dialog-visible="viewDialogVisible"
-      />
+      />-->
       <span slot="footer" class="dialog-footer">
         <el-button @click="viewDialogVisible = false">取 消</el-button>
         <el-button type="primary" @click="viewDialogVisible = false">确 定</el-button>
@@ -200,7 +200,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: ''
+        task_code: '', vehicle_code: '', start_point_code: '', next_point_code: '', task_type: '', finished_type: '', task_status: ['-1']
       },
       optShow: {
         add: false,
@@ -236,10 +236,14 @@ export default {
     crudTask.getFinishType().then(data => {
       this.finishTypeList = data
     })
-    this.crud.query.task_status = ['-1']
-    this.crud.toQuery()
+    // this.crud.query.task_status = ['-1']
+    // this.crud.toQuery()
   },
   methods: {
+    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
+    [CRUD.HOOK.beforeRefresh]() {
+      return true
+    },
     initClass1() {
       const param = {
         parent_class_code: 'task_type'
@@ -263,6 +267,7 @@ export default {
     // 获取子节点数据
     loadChildNodes({ action, parentNode, callback }) {
       if (action === LOAD_CHILDREN_OPTIONS) {
+        debugger
         crudClassstandard.getClass({ pid: parentNode.id }).then(res => {
           parentNode.children = res.content.map(function(obj) {
             if (obj.hasChildren) {
@@ -277,9 +282,11 @@ export default {
       }
     },
     hand(value) {
+      debugger
       this.crud.toQuery()
     },
     handTaskStatus(value) {
+      debugger
       if (value) {
         this.query.task_status = this.task_status.toString()
       }