From 0b527b9fabfc62ee2e2623c04cb8291d98b5faef Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Wed, 22 Mar 2023 20:25:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E6=B7=BB=E5=8A=A0=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E5=90=88=E5=B9=B6=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/nl/wms/sch/service/dto/RegionDto.java |  3 +++
 mes/qd/src/views/wms/sch/region/index.vue     | 22 ++++++++++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/dto/RegionDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/dto/RegionDto.java
index 0ab456c1..a0dc1651 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/dto/RegionDto.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/dto/RegionDto.java
@@ -28,6 +28,9 @@ public class RegionDto implements Serializable {
     /** 生产区域 */
     private String product_area;
 
+    /** 是否合并 **/
+    private String merge;
+
     /** 备注 */
     private String remark;
 
diff --git a/mes/qd/src/views/wms/sch/region/index.vue b/mes/qd/src/views/wms/sch/region/index.vue
index c84b72a2..777f3d7f 100644
--- a/mes/qd/src/views/wms/sch/region/index.vue
+++ b/mes/qd/src/views/wms/sch/region/index.vue
@@ -70,6 +70,20 @@
           <el-form-item label="区域名称" prop="region_name">
             <el-input v-model="form.region_name" style="width: 370px;" />
           </el-form-item>
+          <el-form-item label="是否合并任务" prop="merge">
+            <el-select
+              v-model="form.merge"
+              placeholder=""
+              style="width: 370px"
+            >
+              <el-option
+                v-for="item in dict.IS_OR_NOT"
+                :key="item.id"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
           <el-form-item label="点位类型说明">
             <el-input v-model="form.point_type_explain" type="textarea" style="width: 370px;" />
           </el-form-item>
@@ -97,6 +111,11 @@
         <el-table-column prop="region_code" label="区域编码" :min-width="flexWidth('region_code',crud.data,'区域编码')" />
         <el-table-column prop="region_name" label="区域名称" :min-width="flexWidth('region_name',crud.data,'区域名称')" />
         <el-table-column prop="product_area" label="生产区域" :min-width="flexWidth('product_area',crud.data,'生产区域')" />
+        <el-table-column prop="merge" label="是否合并任务" :min-width="flexWidth('merge',crud.data,'是否合并任务')">
+          <template slot-scope="scope">
+            {{scope.row.merge ? '是' : '否'}}
+          </template>
+        </el-table-column>
         <el-table-column prop="point_type_explain" label="点位类型说明" :min-width="flexWidth('point_type_explain',crud.data,'点位类型说明')" />
         <el-table-column prop="point_status_explain" label="点位状态说明" :min-width="flexWidth('point_status_explain',crud.data,'点位状态说明')" />
         <el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
@@ -131,6 +150,7 @@ const defaultForm = {
   product_area: 'A1',
   point_type_explain: null,
   point_status_explain: null,
+  merge: '1',
   remark: null,
   create_id: null,
   create_name: null,
@@ -141,7 +161,7 @@ const defaultForm = {
 }
 export default {
   name: 'Region',
-  dicts: ['product_area'],
+  dicts: ['product_area', 'IS_OR_NOT'],
   components: { pagination, crudOperation, rrOperation, udOperation },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {