From ce5383d68d30e42a0901584cc6ac9d76add91617 Mon Sep 17 00:00:00 2001
From: Gitea <gitea@fake.local>
Date: Sat, 13 May 2023 15:50:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=91=E5=BD=A2=E7=BB=93=E6=9E=84=E6=9A=82?=
 =?UTF-8?q?=E6=97=B6=E6=94=B9=E4=B8=BA=E4=B8=8B=E6=8B=89=E6=A1=86=E7=BB=93?=
 =?UTF-8?q?=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/team/modules/GroupxModal.vue             | 10 +++++++---
 .../src/views/team/modules/StationModal.vue            |  8 ++++++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/team/modules/GroupxModal.vue b/ant-design-vue-jeecg/src/views/team/modules/GroupxModal.vue
index a18ee2b0..1faa7bfa 100644
--- a/ant-design-vue-jeecg/src/views/team/modules/GroupxModal.vue
+++ b/ant-design-vue-jeecg/src/views/team/modules/GroupxModal.vue
@@ -11,14 +11,14 @@
 
     <a-spin :spinning="confirmLoading">
       <a-form-model ref="form" :model="model" :rules="validatorRules">
-        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="departId" label="部门">
+        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="departId" label="车间名称">
           <!--          <a-input placeholder="请输入部门编号" v-model="model.departId"/>-->
           <!--          <j-select-depart placeholder="请选择部门" v-model="model.departId"/>-->
           <!--          <j-dict-select-tag type="list" v-model="model.departId" dictCode="sys_depart,depart_name,id,org_category='2'"-->
           <!--                             @change="getEnterprisesManagerValChange()"-->
           <!--                             placeholder="请选择部门"/>-->
 
-          <j-tree-select v-model="model.departId"
+<!--          <j-tree-select v-model="model.departId"
                          dict="sys_depart,depart_name,id"
                          pidField="parent_id"
                          placeholder="请选择车间"
@@ -26,7 +26,11 @@
                          hasChildField="1"
                          @change="getEnterprisesManagerValChange()"
           >
-          </j-tree-select>
+          </j-tree-select>-->
+
+          <j-dict-select-tag type="list" v-model="model.departId"
+                             dictCode="sys_depart,depart_name,id,org_category='2'"
+                             placeholder="请选择车间"/>
 
         </a-form-model-item>
         <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="groupName" label="班组名称">
diff --git a/ant-design-vue-jeecg/src/views/team/modules/StationModal.vue b/ant-design-vue-jeecg/src/views/team/modules/StationModal.vue
index 0ab73814..3e3d1eaf 100644
--- a/ant-design-vue-jeecg/src/views/team/modules/StationModal.vue
+++ b/ant-design-vue-jeecg/src/views/team/modules/StationModal.vue
@@ -16,14 +16,18 @@
         <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="departId" label="车间名称">
 <!--          <j-dict-select-tag type="list"  v-model="model.departId" dictCode="sys_depart,depart_name,id,org_category='2'" placeholder="请选择车间" />-->
 
-          <j-tree-select v-model="model.departId"
+<!--          <j-tree-select v-model="model.departId"
                          dict="sys_depart,depart_name,id"
                          pidField="parent_id"
                          placeholder="请选择车间"
                          condition='{"org_category":"2"}'
                          hasChildField="1"
           >
-          </j-tree-select>
+          </j-tree-select>-->
+
+          <j-dict-select-tag type="list" v-model="model.departId"
+                             dictCode="sys_depart,depart_name,id,org_category='2'"
+                             placeholder="请选择车间"/>
 
         </a-form-model-item>
         <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="stationName" label="工位名称">