diff --git a/ant-design-vue-jeecg/src/views/productplan/ZyPlanProcessDataList.vue b/ant-design-vue-jeecg/src/views/productplan/ZyPlanProcessDataList.vue
index 8c80fde8..bef4569a 100644
--- a/ant-design-vue-jeecg/src/views/productplan/ZyPlanProcessDataList.vue
+++ b/ant-design-vue-jeecg/src/views/productplan/ZyPlanProcessDataList.vue
@@ -95,7 +95,7 @@
                 </span>
             <span>
             <a :disabled="editingKey !== ''" @click="() => edit(index)">Edit66</a>
-            </span>
+            </span> b
           </div>
         </template>-->
       </a-table>
diff --git a/ant-design-vue-jeecg/src/views/productplan/modules/ZyProductPlanForm.vue b/ant-design-vue-jeecg/src/views/productplan/modules/ZyProductPlanForm.vue
index d7c93fad..ec5597e6 100644
--- a/ant-design-vue-jeecg/src/views/productplan/modules/ZyProductPlanForm.vue
+++ b/ant-design-vue-jeecg/src/views/productplan/modules/ZyProductPlanForm.vue
@@ -20,7 +20,7 @@
             <a-form-model-item label="车间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="workshopId">
               <!--              <j-select-depart placeholder="请选择车间" v-model="model.workshopId" @change="groupxValChange()"/>-->
               <j-dict-select-tag type="list" v-model="model.workshopId"
-                                 dictCode="sys_depart,depart_name,id,org_type='1'" @change="getGroupxValChange()"
+                                 dictCode="sys_depart,depart_name,id,org_type='2'" @change="getGroupxValChange()"
                                  placeholder="请选择车间"/>
             </a-form-model-item>
           </a-col>
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 276fb66d..00d985ea 100644
--- a/ant-design-vue-jeecg/src/views/team/modules/GroupxModal.vue
+++ b/ant-design-vue-jeecg/src/views/team/modules/GroupxModal.vue
@@ -15,7 +15,8 @@
         <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_type='1'"
+          <j-dict-select-tag type="list" v-model="model.departId" dictCode="sys_depart,depart_name,id,org_category='2'"
+                             @change="getEnterprisesManagerValChange()"
                              placeholder="请选择部门"/>
 
         </a-form-model-item>
@@ -24,16 +25,23 @@
         </a-form-model-item>
 
 
-<!--        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="enterprisesManager" label="负责人">-->
-<!--          <j-select-user-by-dep placeholder="请选择负责人" v-model="model.enterprisesManager" :multi="false"-->
-<!--                                @change="getMobile"></j-select-user-by-dep>-->
-<!--          {{ model.enterprisesManager }}-->
-<!--        </a-form-model-item>-->
+        <!--        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="enterprisesManager" label="负责人">-->
+        <!--          <j-select-user-by-dep placeholder="请选择负责人" v-model="model.enterprisesManager" :multi="false"-->
+        <!--                                @change="getMobile"></j-select-user-by-dep>-->
+        <!--          {{ model.enterprisesManager }}-->
+        <!--        </a-form-model-item>-->
 
 
         <a-form-model-item :label-col="labelCol" :wrapper-col="wrapperCol" prop="enterprisesManager" label="负责人">
-          <!--          <j-select-user-by-dep v-model="model.userId" :multi="false"></j-select-user-by-dep>-->
-          <j-select-multi-user placeholder="请选择负责人" v-model="model.enterprisesManager" @change="getMobile()" :multiple="false" ></j-select-multi-user>
+          <!--          <a-select :allowClear="true"-->
+          <!--                    style="width: 100%" v-model="model.enterprisesManager">-->
+          <!--            <a-select-option v-for="record in this.model.records" :key="record.id " :disabled="model.departId==null">-->
+          <!--              {{ record.username }}-->
+          <!--            </a-select-option>-->
+          <!--          </a-select>-->
+          <j-dict-select-tag type="list" v-model="model.enterprisesManager"
+                             placeholder="请选择负责人" :dict-code="enterprisesManager" @change="getMobile()"
+                             :disabled="model.departId==null"/>
         </a-form-model-item>
 
         <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="mobile" label="手机号">
@@ -59,10 +67,13 @@ export default {
   },
   data() {
     return {
+      enterprisesManager: "sys_user,username,id",
       title: "操作",
       visible: false,
       // mobileVal: "",
-      model: {},
+      model: {
+        // records: [],
+      },
       labelCol: {
         xs: {span: 24},
         sm: {span: 5},
@@ -105,45 +116,31 @@ export default {
   },
   methods: {
 
+    getEnterprisesManagerValChange() {
+      this.enterprisesManager = "sys_user,username,username,id in (select user_id from sys_user_depart where dep_id='" + this.model.departId + "')";
+      // this.enterprisesManager = "zy_process,process_name,id,id in(select process_id from zy_product_process where product_id='1')";
+    },
+
     getMobile() {
       let that = this;
-      //  alert(userIds);
       let param = {
         "username": that.model.enterprisesManager,
+        // "departId": that.model.departId,
       }
+      // alert(param.toString());
       getAction(that.url.sysUserList, param).then((res) => {
         if (res.success) {
+          // console.log("----------" + JSON.stringify(res.result.records))
           let phone = JSON.stringify(res.result.records[0].phone);
-          console.log("phone:",phone)
           if (phone.length > 11) {
             phone = phone.substring(1, 12);
-          }else {
+          } else {
             phone = "";
           }
           that.model = Object.assign(that.model, {'mobile': phone});
           this.$forceUpdate();
         }
       });
-
-    // getMobile(userIds) {
-    //   let that = this;
-    //   //  alert(userIds);
-    //   let param = {
-    //     "username": userIds,
-    //   }
-    //   getAction(this.url.sysUserList, param).then((res) => {
-    //     if (res.success) {
-    //
-    //       let phone = JSON.stringify(res.result.records[0].phone);
-    //       if (phone.length > 11) {
-    //         phone = phone.substring(1, 12);
-    //       }else {
-    //         phone = "";
-    //       }
-    //       that.model = Object.assign(that.model, {'mobile': phone});
-    //       this.$forceUpdate();
-    //     }
-    //   });
     },
     add() {
       //初始化默认值
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 f0b3dfa1..9c9926b3 100644
--- a/ant-design-vue-jeecg/src/views/team/modules/StationModal.vue
+++ b/ant-design-vue-jeecg/src/views/team/modules/StationModal.vue
@@ -19,7 +19,7 @@
         <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_type='1'" placeholder="请选择车间" />
+          <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="工位名称">
           <a-input placeholder="请输入工位名称" v-model="model.stationName"/>