From 14f2eb236d4f65aabcc374abeb3fea5e23330961 Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Tue, 16 May 2023 18:54:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BB=BB=E5=8A=A1=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task/service/dao/SchBaseTaskconfig.java   |   7 +
 .../impl/SchBaseTaskconfigServiceImpl.java    |  26 ++
 .../src/views/wms/sch/task/config/index.vue   | 392 ++++++++++++++----
 3 files changed, 344 insertions(+), 81 deletions(-)

diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/SchBaseTaskconfig.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/SchBaseTaskconfig.java
index b385fed..4e74589 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/SchBaseTaskconfig.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/SchBaseTaskconfig.java
@@ -1,6 +1,7 @@
 package org.nl.wms.sch.task.service.dao;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;
@@ -9,6 +10,7 @@ import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
 import java.io.Serializable;
+import java.util.List;
 
 /**
 * @description /
@@ -134,4 +136,9 @@ public class SchBaseTaskconfig implements Serializable {
     @ApiModelProperty(value = "修改时间")
     private String update_time;
 
+    @TableField(exist = false)
+    private List<String> start_region_strs;
+
+    @TableField(exist = false)
+    private List<String> next_region_strs;
 }
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskconfigServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskconfigServiceImpl.java
index 0050f4f..90565e8 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskconfigServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskconfigServiceImpl.java
@@ -18,8 +18,10 @@ import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Arrays;
 import java.util.Map;
 import java.util.Set;
+import java.util.function.Consumer;
 
 /**
  * @author lyd
@@ -35,9 +37,21 @@ public class SchBaseTaskconfigServiceImpl extends ServiceImpl<SchBaseTaskconfigM
 
     @Override
     public IPage<SchBaseTaskconfig> queryAll(Map whereJson, PageQuery page) {
+        String blurry = ObjectUtil.isNotEmpty(whereJson.get("blurry")) ? whereJson.get("blurry").toString() : null;
+        String workshop_code = ObjectUtil.isNotEmpty(whereJson.get("workshop_code")) ? whereJson.get("workshop_code").toString() : null;
         LambdaQueryWrapper<SchBaseTaskconfig> lam = new LambdaQueryWrapper<>();
+        lam.like(ObjectUtil.isNotEmpty(blurry), SchBaseTaskconfig::getConfig_name, blurry)
+                .eq(ObjectUtil.isNotEmpty(workshop_code), SchBaseTaskconfig::getWorkshop_code, workshop_code);
         IPage<SchBaseTaskconfig> pages = new Page<>(page.getPage() + 1, page.getSize());
         schBaseTaskconfigMapper.selectPage(pages, lam);
+        pages.getRecords().forEach(config -> {
+            if (ObjectUtil.isNotEmpty(config.getStart_region_str())) {
+                config.setStart_region_strs(Arrays.asList(config.getStart_region_str().split(",")));
+            }
+            if (ObjectUtil.isNotEmpty(config.getNext_region_str())) {
+                config.setNext_region_strs(Arrays.asList(config.getNext_region_str().split(",")));
+            }
+        });
         return pages;
     }
 
@@ -51,6 +65,12 @@ public class SchBaseTaskconfigServiceImpl extends ServiceImpl<SchBaseTaskconfigM
         String nickName = SecurityUtils.getCurrentNickName();
         String now = DateUtil.now();
 
+        // 起点区域配置
+        String startRegion = String.join(",", entity.getStart_region_strs());
+        entity.setStart_region_str(startRegion);
+        // 终点区域配置
+        String nextRegion = String.join(",", entity.getNext_region_strs());
+        entity.setNext_region_str(nextRegion);
         entity.setCreate_id(currentUserId);
         entity.setCreate_name(nickName);
         entity.setCreate_time(now);
@@ -64,6 +84,12 @@ public class SchBaseTaskconfigServiceImpl extends ServiceImpl<SchBaseTaskconfigM
     public void update(SchBaseTaskconfig entity) {
         SchBaseTaskconfig dto = schBaseTaskconfigMapper.selectById(entity.getConfig_code());
         if (dto == null) throw new BadRequestException("被删除或无权限，操作失败!");
+        // 起点区域配置
+        String startRegion = String.join(",", entity.getStart_region_strs());
+        entity.setStart_region_str(startRegion);
+        // 终点区域配置
+        String nextRegion = String.join(",", entity.getNext_region_strs());
+        entity.setNext_region_str(nextRegion);
 
         String currentUserId = SecurityUtils.getCurrentUserId();
         String nickName = SecurityUtils.getCurrentNickName();
diff --git a/nladmin-ui/src/views/wms/sch/task/config/index.vue b/nladmin-ui/src/views/wms/sch/task/config/index.vue
index 0b759f1..4e273ba 100644
--- a/nladmin-ui/src/views/wms/sch/task/config/index.vue
+++ b/nladmin-ui/src/views/wms/sch/task/config/index.vue
@@ -2,22 +2,79 @@
   <div class="app-container">
     <!--工具栏-->
     <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-width="90px"
+          label-suffix=":"
+        >
+          <el-form-item label="所属车间">
+            <el-select
+              v-model="query.workshop_code"
+              clearable
+              size="mini"
+              placeholder="所属车间"
+              class="filter-item"
+            >
+              <el-option
+                v-for="item in workShopList"
+                :label="item.workshop_name"
+                :value="item.workshop_code"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="模糊搜索">
+            <el-input
+              v-model="query.blurry"
+              clearable
+              size="mini"
+              placeholder="编码名称"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <rrOperation />
+        </el-form>
+      </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission" />
       <!--表单组件-->
-      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="800px">
-        <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" :rules="rules" size="mini" label-width="115px" label-suffix=":">
-          <el-form-item label="配置编码">
+      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="820px">
+        <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" :rules="rules" size="mini" label-width="135px" label-suffix=":">
+          <el-form-item label="配置编码" prop="config_code">
             <el-input v-model="form.config_code" style="width: 240px;" />
           </el-form-item>
           <el-form-item label="配置名称">
             <el-input v-model="form.config_name" style="width: 240px;" />
           </el-form-item>
           <el-form-item label="任务取放类型">
-            <el-input v-model="form.task_qf_type" style="width: 240px;" />
+            <el-select
+              v-model="form.task_qf_type"
+              size="mini"
+              placeholder="任务取放类型"
+              style="width: 240px;"
+            >
+              <el-option
+                v-for="item in dict.task_qf_type"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
           </el-form-item>
-          <el-form-item label="acs任务类型">
-            <el-input v-model="form.acs_task_type" style="width: 240px;" />
+          <el-form-item label="acs任务类型" prop="acs_task_type">
+            <el-select
+              v-model="form.acs_task_type"
+              size="mini"
+              placeholder="acs任务类型"
+              style="width: 240px;"
+            >
+              <el-option
+                v-for="item in dict.acs_task_type"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
           </el-form-item>
           <el-form-item label="任务名字">
             <el-input v-model="form.task_name" style="width: 240px;" />
@@ -25,23 +82,55 @@
           <el-form-item label="任务类型">
             <el-input v-model="form.task_type" style="width: 240px;" />
           </el-form-item>
-          <el-form-item label="优先级">
-            <el-input v-model="form.priority" style="width: 240px;" />
+          <el-form-item label="优先级" pro="priority">
+            <el-input-number
+              v-model.number="form.priority"
+              :min="1"
+              :max="999"
+              style="width: 240px;"
+            />
           </el-form-item>
-          <el-form-item label="任务生成数上限">
-            <el-input v-model="form.task_create_num" style="width: 240px;" />
-          </el-form-item>
-          <el-form-item label="任务下发数上限">
-            <el-input v-model="form.task_issue_num" style="width: 240px;" />
+          <el-form-item label="任务生成数上限" prop="task_create_num">
+            <el-input-number
+              v-model.number="form.task_create_num"
+              :min="1"
+              :max="999"
+              style="width: 240px;"
+            />
           </el-form-item>
           <el-form-item label="是否自动下发">
-            <el-input v-model="form.is_auto_issue" style="width: 240px;" />
+            <el-radio-group v-model="form.is_auto_issue" style="width: 240px">
+              <el-radio :label="true">是</el-radio>
+              <el-radio :label="false">否</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="任务下发数上限" prop="task_issue_num">
+            <el-input-number
+              v-model.number="form.task_issue_num"
+              :min="1"
+              :max="999"
+              style="width: 240px;"
+            />
           </el-form-item>
           <el-form-item label="起点区域">
-            <el-input v-model="form.start_region_str" style="width: 240px;" />
+            <el-select v-model="form.start_region_strs" multiple placeholder="请选择" style="width: 240px;">
+              <el-option
+                v-for="item in regionList"
+                :key="item.region_code"
+                :label="item.region_name"
+                :value="item.region_code"
+              />
+            </el-select>
           </el-form-item>
           <el-form-item label="终点区域">
-            <el-input v-model="form.next_region_str" style="width: 240px;" />
+            <el-select v-model="form.next_region_strs" multiple placeholder="请选择" style="width: 240px;">
+              <el-option
+                v-for="item in regionList"
+                :key="item.region_code"
+                :label="item.region_name"
+                :value="item.region_code"
+              />
+            </el-select>
           </el-form-item>
           <el-form-item label="起点前缀">
             <el-input v-model="form.start_point_pre" style="width: 240px;" />
@@ -50,28 +139,52 @@
             <el-input v-model="form.next_region_pre" style="width: 240px;" />
           </el-form-item>
           <el-form-item label="是否校验工单">
-            <el-input v-model="form.is_check_workorder" style="width: 240px;" />
+            <el-radio-group v-model="form.is_check_workorder" style="width: 240px">
+              <el-radio :label="true">是</el-radio>
+              <el-radio :label="false">否</el-radio>
+            </el-radio-group>
           </el-form-item>
           <el-form-item label="是否判断起点锁">
-            <el-input v-model="form.is_check_start_lock" style="width: 240px;" />
+            <el-radio-group v-model="form.is_check_start_lock" style="width: 240px">
+              <el-radio :label="true">是</el-radio>
+              <el-radio :label="false">否</el-radio>
+            </el-radio-group>
           </el-form-item>
           <el-form-item label="是否立即创建">
-            <el-input v-model="form.is_immediate_create" style="width: 240px;" />
+            <el-radio-group v-model="form.is_immediate_create" style="width: 240px">
+              <el-radio :label="true">是</el-radio>
+              <el-radio :label="false">否</el-radio>
+            </el-radio-group>
           </el-form-item>
           <el-form-item label="是否判断终点锁">
-            <el-input v-model="form.is_check_next_lock" style="width: 240px;" />
+            <el-radio-group v-model="form.is_check_next_lock" style="width: 240px">
+              <el-radio :label="true">是</el-radio>
+              <el-radio :label="false">否</el-radio>
+            </el-radio-group>
           </el-form-item>
           <el-form-item label="是否起点自动">
-            <el-input v-model="form.is_start_auto" style="width: 240px;" />
+            <el-radio-group v-model="form.is_start_auto" style="width: 240px">
+              <el-radio :label="true">是</el-radio>
+              <el-radio :label="false">否</el-radio>
+            </el-radio-group>
           </el-form-item>
           <el-form-item label="是否终点自动">
-            <el-input v-model="form.is_next_auto" style="width: 240px;" />
+            <el-radio-group v-model="form.is_next_auto" style="width: 240px">
+              <el-radio :label="true">是</el-radio>
+              <el-radio :label="false">否</el-radio>
+            </el-radio-group>
           </el-form-item>
           <el-form-item label="是否锁定起点">
-            <el-input v-model="form.is_lock_start" style="width: 240px;" />
+            <el-radio-group v-model="form.is_lock_start" style="width: 240px">
+              <el-radio :label="true">是</el-radio>
+              <el-radio :label="false">否</el-radio>
+            </el-radio-group>
           </el-form-item>
           <el-form-item label="是否锁定终点">
-            <el-input v-model="form.is_lock_next" style="width: 240px;" />
+            <el-radio-group v-model="form.is_lock_next" style="width: 240px">
+              <el-radio :label="true">是</el-radio>
+              <el-radio :label="false">否</el-radio>
+            </el-radio-group>
           </el-form-item>
           <el-form-item v-if="false" label="生成任务的请求参数">
             <el-input v-model="form.request_param" style="width: 240px;" />
@@ -80,10 +193,18 @@
             <el-input v-model="form.response_param" style="width: 240px;" />
           </el-form-item>
           <el-form-item v-if="false" label="是否按组控制下发顺序">
-            <el-input v-model="form.is_group_congrol_issue_seq" style="width: 240px;" />
+            <el-radio-group v-model="form.is_group_congrol_issue_seq" style="width: 240px">
+              <el-radio :label="true">是</el-radio>
+              <el-radio :label="false">否</el-radio>
+            </el-radio-group>
           </el-form-item>
-          <el-form-item label="未完成通知时间">
-            <el-input v-model="form.unfinish_notify_time" style="width: 240px;" />
+          <el-form-item label="未完成通知时间" prop="unfinish_notify_time">
+            <el-input-number
+              v-model.number="form.unfinish_notify_time"
+              :min="0"
+              :max="999"
+              style="width: 240px;"
+            />
           </el-form-item>
           <el-form-item v-if="false" label="sql配置">
             <el-input v-model="form.sql_param" style="width: 240px;" />
@@ -104,40 +225,96 @@
       <!--表格渲染-->
       <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="config_code" label="配置编码" :min-width="flexWidth('config_code',crud.data,'配置编码')"/>
-        <el-table-column prop="config_name" label="配置名称" :min-width="flexWidth('config_name',crud.data,'配置名称')"/>
-        <el-table-column prop="task_qf_type" label="任务取放类型" :min-width="flexWidth('task_qf_type',crud.data,'任务取放类型')"/>
-        <el-table-column prop="acs_task_type" label="acs任务类型" :min-width="flexWidth('acs_task_type',crud.data,'acs任务类型')"/>
-        <el-table-column prop="task_name" label="任务名字" :min-width="flexWidth('task_name',crud.data,'任务名字')"/>
-        <el-table-column prop="task_type" label="任务类型" :min-width="flexWidth('task_type',crud.data,'任务类型')"/>
-        <el-table-column prop="priority" label="优先级" :min-width="flexWidth('priority',crud.data,'优先级')"/>
-        <el-table-column prop="task_create_num" label="任务生成数上限" :min-width="flexWidth('task_create_num',crud.data,'任务生成数上限')"/>
-        <el-table-column prop="task_issue_num" label="任务下发数上限" :min-width="flexWidth('task_issue_num',crud.data,'任务下发数上限')"/>
-        <el-table-column prop="is_auto_issue" label="是否自动下发" :min-width="flexWidth('is_auto_issue',crud.data,'是否自动下发')"/>
-        <el-table-column prop="start_region_str" label="起点区域" :min-width="flexWidth('start_region_str',crud.data,'起点区域')"/>
-        <el-table-column prop="next_region_str" label="终点区域" :min-width="flexWidth('next_region_str',crud.data,'终点区域')"/>
-        <el-table-column prop="start_point_pre" label="起点前缀" :min-width="flexWidth('start_point_pre',crud.data,'起点前缀')"/>
-        <el-table-column prop="next_region_pre" label="终点前缀" :min-width="flexWidth('next_region_pre',crud.data,'终点前缀')"/>
-        <el-table-column prop="is_check_workorder" label="是否校验工单" :min-width="flexWidth('is_check_workorder',crud.data,'是否校验工单')"/>
-        <el-table-column prop="is_check_start_lock" label="是否判断起点锁" :min-width="flexWidth('is_check_start_lock',crud.data,'是否判断起点锁')"/>
-        <el-table-column prop="is_immediate_create" label="是否立即创建" :min-width="flexWidth('is_immediate_create',crud.data,'是否立即创建')"/>
-        <el-table-column prop="is_check_next_lock" label="是否判断终点锁" :min-width="flexWidth('is_check_next_lock',crud.data,'是否判断终点锁')"/>
-        <el-table-column prop="is_start_auto" label="是否起点自动" :min-width="flexWidth('is_start_auto',crud.data,'是否起点自动')"/>
-        <el-table-column prop="is_next_auto" label="是否终点自动" :min-width="flexWidth('is_next_auto',crud.data,'是否终点自动')"/>
-        <el-table-column prop="is_lock_start" label="是否锁定起点" :min-width="flexWidth('is_lock_start',crud.data,'是否锁定起点')"/>
-        <el-table-column prop="is_lock_next" label="是否锁定终点" :min-width="flexWidth('is_lock_next',crud.data,'是否锁定终点')"/>
-        <el-table-column prop="request_param" label="生成任务的请求参数" :min-width="flexWidth('request_param',crud.data,'生成任务的请求参数')"/>
-        <el-table-column prop="response_param" label="下发任务的请求参数" :min-width="flexWidth('response_param',crud.data,'下发任务的请求参数')"/>
-        <el-table-column v-if="false" prop="is_group_congrol_issue_seq" label="是否按组控制下发顺序" :min-width="flexWidth('is_group_congrol_issue_seq',crud.data,'是否按组控制下发顺序')"/>
-        <el-table-column prop="unfinish_notify_time" label="未完成通知时间" :min-width="flexWidth('unfinish_notify_time',crud.data,'未完成通知时间')"/>
-        <el-table-column v-if="false" prop="sql_param" label="sql配置" :min-width="flexWidth('sql_param',crud.data,'sql配置')"/>
-        <el-table-column prop="workshop_code" label="车间编码" :min-width="flexWidth('workshop_code',crud.data,'车间编码')"/>
-        <el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')"/>
-<!--        <el-table-column prop="is_used" label="是否启用" :min-width="flexWidth('is_used',crud.data,'是否启用')"/>-->
-        <el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')"/>
-        <el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')"/>
-        <el-table-column prop="update_name" label="修改人" :min-width="flexWidth('update_name',crud.data,'修改人')"/>
-        <el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')"/>
+        <el-table-column prop="config_code" label="配置编码" :min-width="flexWidth('config_code',crud.data,'配置编码')" />
+        <el-table-column prop="config_name" label="配置名称" :min-width="flexWidth('config_name',crud.data,'配置名称')" />
+        <el-table-column prop="task_qf_type" label="任务取放类型" :min-width="flexWidth('task_qf_type',crud.data,'任务取放类型')">
+          <template slot-scope="scope">
+            {{ dict.label.task_qf_type[scope.row.task_qf_type] }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="acs_task_type" label="acs任务类型" :min-width="flexWidth('acs_task_type',crud.data,'acs任务类型')">
+          <template slot-scope="scope">
+            {{ dict.label.acs_task_type[scope.row.acs_task_type] }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="task_name" label="任务名字" :min-width="flexWidth('task_name',crud.data,'任务名字')" />
+        <el-table-column prop="task_type" label="任务类型" :min-width="flexWidth('task_type',crud.data,'任务类型')" />
+        <el-table-column prop="priority" label="优先级" :min-width="flexWidth('priority',crud.data,'优先级')" />
+        <el-table-column prop="task_create_num" label="任务生成数上限" :min-width="flexWidth('task_create_num',crud.data,'任务生成数上限')" />
+        <el-table-column prop="task_issue_num" label="任务下发数上限" :min-width="flexWidth('task_issue_num',crud.data,'任务下发数上限')" />
+        <el-table-column prop="is_auto_issue" label="是否自动下发" :min-width="flexWidth('is_auto_issue',crud.data,'是否自动下发')">
+          <template slot-scope="scope">
+            {{ scope.row.is_auto_issue?'是':'否' }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="start_region_str" label="起点区域" :min-width="flexWidth('start_region_str',crud.data,'起点区域')">
+          <template slot-scope="scope">
+            {{ getRegionNames(scope.row.start_region_str) }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="next_region_str" label="终点区域" :min-width="flexWidth('next_region_str',crud.data,'终点区域')">
+          <template slot-scope="scope">
+            {{ getRegionNames(scope.row.next_region_str) }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="start_point_pre" label="起点前缀" :min-width="flexWidth('start_point_pre',crud.data,'起点前缀')" />
+        <el-table-column prop="next_region_pre" label="终点前缀" :min-width="flexWidth('next_region_pre',crud.data,'终点前缀')" />
+        <el-table-column prop="is_check_workorder" label="是否校验工单" :min-width="flexWidth('is_check_workorder',crud.data,'是否校验工单')">
+          <template slot-scope="scope">
+            {{ scope.row.is_check_workorder?'是':'否' }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="is_check_start_lock" label="是否判断起点锁" :min-width="flexWidth('is_check_start_lock',crud.data,'是否判断起点锁')">
+          <template slot-scope="scope">
+            {{ scope.row.is_check_start_lock?'是':'否' }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="is_immediate_create" label="是否立即创建" :min-width="flexWidth('is_immediate_create',crud.data,'是否立即创建')">
+          <template slot-scope="scope">
+            {{ scope.row.is_immediate_create?'是':'否' }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="is_check_next_lock" label="是否判断终点锁" :min-width="flexWidth('is_check_next_lock',crud.data,'是否判断终点锁')">
+          <template slot-scope="scope">
+            {{ scope.row.is_check_next_lock?'是':'否' }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="is_start_auto" label="是否起点自动" :min-width="flexWidth('is_start_auto',crud.data,'是否起点自动')">
+          <template slot-scope="scope">
+            {{ scope.row.is_start_auto?'是':'否' }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="is_next_auto" label="是否终点自动" :min-width="flexWidth('is_next_auto',crud.data,'是否终点自动')">
+          <template slot-scope="scope">
+            {{ scope.row.is_next_auto?'是':'否' }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="is_lock_start" label="是否锁定起点" :min-width="flexWidth('is_lock_start',crud.data,'是否锁定起点')">
+          <template slot-scope="scope">
+            {{ scope.row.is_lock_start?'是':'否' }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="is_lock_next" label="是否锁定终点" :min-width="flexWidth('is_lock_next',crud.data,'是否锁定终点')">
+          <template slot-scope="scope">
+            {{ scope.row.is_lock_next?'是':'否' }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="request_param" label="生成任务的请求参数" :min-width="flexWidth('request_param',crud.data,'生成任务的请求参数')" />
+        <el-table-column prop="response_param" label="下发任务的请求参数" :min-width="flexWidth('response_param',crud.data,'下发任务的请求参数')" />
+        <el-table-column v-if="false" prop="is_group_congrol_issue_seq" label="是否按组控制下发顺序" :min-width="flexWidth('is_group_congrol_issue_seq',crud.data,'是否按组控制下发顺序')">
+          <template slot-scope="scope">
+            {{ scope.row.is_group_congrol_issue_seq?'是':'否' }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="unfinish_notify_time" label="未完成通知时间" :min-width="flexWidth('unfinish_notify_time',crud.data,'未完成通知时间')" />
+        <el-table-column v-if="false" prop="sql_param" label="sql配置" :min-width="flexWidth('sql_param',crud.data,'sql配置')" />
+        <el-table-column prop="workshop_code" label="车间编码" :min-width="flexWidth('workshop_code',crud.data,'车间编码')" />
+        <el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
+        <!--        <el-table-column prop="is_used" label="是否启用" :min-width="flexWidth('is_used',crud.data,'是否启用')"/>-->
+        <el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" />
+        <el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
+        <el-table-column prop="update_name" label="修改人" :min-width="flexWidth('update_name',crud.data,'修改人')" />
+        <el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')" />
         <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
           <template slot-scope="scope">
             <udOperation
@@ -155,11 +332,13 @@
 
 <script>
 import crudSchBaseTaskconfig from './schBaseTaskconfig'
-import CRUD, {crud, form, header, presenter} from '@crud/crud'
+import CRUD, { crud, form, header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation.vue'
 import crudOperation from '@crud/CRUD.operation.vue'
 import udOperation from '@crud/UD.operation.vue'
 import pagination from '@crud/Pagination.vue'
+import crudMdBaseWorkShop from '@/views/wms/basedata/workshop/mdBaseWorkshop'
+import crudSchBaseRegion from '@/views/wms/sch/region/schBaseRegion'
 
 const defaultForm = {
   config_code: null,
@@ -171,37 +350,34 @@ const defaultForm = {
   priority: null,
   task_create_num: null,
   task_issue_num: null,
-  is_auto_issue: null,
+  is_auto_issue: true,
   start_region_str: null,
   next_region_str: null,
   start_point_pre: null,
   next_region_pre: null,
-  is_check_workorder: null,
-  is_check_start_lock: null,
-  is_immediate_create: null,
-  is_check_next_lock: null,
-  is_start_auto: null,
-  is_next_auto: null,
-  is_lock_start: null,
-  is_lock_next: null,
+  is_check_workorder: true,
+  is_check_start_lock: false,
+  is_immediate_create: true,
+  is_check_next_lock: false,
+  is_start_auto: true,
+  is_next_auto: true,
+  is_lock_start: false,
+  is_lock_next: false,
   request_param: null,
   response_param: null,
-  is_group_congrol_issue_seq: null,
+  is_group_congrol_issue_seq: false,
   unfinish_notify_time: null,
   sql_param: null,
   workshop_code: null,
   remark: null,
-  is_used: null,
-  is_delete: null,
-  create_id: null,
-  create_name: null,
-  create_time: null,
-  update_id: null,
-  update_name: null,
-  update_time: null
+  is_used: true,
+  is_delete: false,
+  start_region_strs: null,
+  next_region_strs: null
 }
 export default {
   name: 'TaskConfig',
+  dicts: ['task_qf_type', 'acs_task_type'],
   components: { pagination, crudOperation, rrOperation, udOperation },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
@@ -210,6 +386,13 @@ export default {
       url: 'api/schBaseTaskconfig',
       idField: 'config_code',
       sort: 'config_code,desc',
+      optShow: {
+        add: true,
+        edit: false,
+        del: true,
+        download: false,
+        reset: true
+      },
       crudMethod: { ...crudSchBaseTaskconfig }
     })
   },
@@ -218,12 +401,59 @@ export default {
       permission: {
       },
       rules: {
-      }    }
+        config_code: [
+          { required: true, message: '请输入配置编码', trigger: 'blur' }
+        ],
+        acs_task_type: [
+          { required: true, message: '请输入acs类型', trigger: 'blur' }
+        ],
+        task_create_num: [
+          { required: true, message: '请输入最大任务生成数', trigger: 'blur' }
+        ],
+        task_issue_num: [
+          { required: true, message: '请输入最大任务下发数', trigger: 'blur' }
+        ],
+        unfinish_notify_time: [
+          { required: true, message: '请输入任务未完成通知时间数', trigger: 'blur' }
+        ]
+      },
+      workShopList: [],
+      regionList: []
+    }
+  },
+  computed: {
+    getRegionNames() {
+      return (nextRegionStr) => {
+        const regionCodes = nextRegionStr.split(',').map(code => code.trim())
+        const regionNames = regionCodes
+          .map(code => {
+            const region = this.regionList.find(item => item.region_code === code)
+            return region ? region.region_name : ''
+          })
+          .filter(name => name !== '')
+
+        return regionNames.join('、')
+      }
+    }
+  },
+  created() {
+    this.getWorkShopList()
+    this.getRegionList()
   },
   methods: {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据
     [CRUD.HOOK.beforeRefresh]() {
       return true
+    },
+    getWorkShopList() { // 获取车间列表
+      crudMdBaseWorkShop.getWorkShopList().then(res => {
+        this.workShopList = res
+      })
+    },
+    getRegionList() { // 获取区域列表
+      crudSchBaseRegion.getRegionList().then(res => {
+        this.regionList = res
+      })
     }
   }
 }