班组管理问题修改 12.13

ant-design-vue-jeecg/src/views/team/GroupxList.vue

@@ -6,7 +6,7 @@
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="部门编号">
+            <a-form-item label="部门">
               <j-select-depart placeholder="请选择部门" v-model="queryParam.departId"/>
               <!-- <a-input placeholder="请输入部门编号" v-model="queryParam.departId"></a-input>-->
             </a-form-item>
@@ -145,6 +145,11 @@ export default {
           align: "center",
           dataIndex: 'departId'
         },
+        {
+          title: '部门名称',
+          align: "center",
+          dataIndex: 'departId_dictText'
+        },
         {
           title: '班组名称',
           align: "center",

ant-design-vue-jeecg/src/views/team/modules/GroupxModal.vue

@@ -12,7 +12,7 @@
     <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"/>
         </a-form-model-item>
@@ -20,10 +20,12 @@
           <a-input placeholder="请输入班组名称" v-model="model.groupName"/>
         </a-form-model-item>
         <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="enterprisesManager" label="负责人">
-          <a-input placeholder="请输入负责人" v-model="model.enterprisesManager"/>
+          <!--          <a-input placeholder="请输入负责人" v-model="model.enterprisesManager"/>-->
+          <j-select-multi-user placeholder="请选择负责人" v-model="model.enterprisesManager" @change="getMobile()"/>
         </a-form-model-item>
         <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="mobile" label="手机号">
-          <a-input placeholder="请输入手机号" v-model="model.mobile"/>
+          <a-input placeholder="请输入手机号" v-model="model.mobile" :dictCode="mobileVal"/>
+<!--          <j-dict-select-tag type="list" v-model="model.mobile" :dictCode="mobileVal"></j-dict-select-tag>-->
         </a-form-model-item>
 
       </a-form-model>
@@ -46,6 +48,7 @@ export default {
     return {
       title: "操作",
       visible: false,
+      mobileVal: "",
       model: {},
       labelCol: {
         xs: {span: 24},
@@ -59,13 +62,13 @@ export default {
       confirmLoading: false,
       validatorRules: {
         departId: [
-          {required: true},
+          {required: true, message: "部门名称不能为空"},
         ],
         groupName: [
-          {required: true},
+          {required: true, message: "班组名称不能为空"},
         ],
         enterprisesManager: [
-          {required: true},
+          {required: true, message: "负责人不能为空"},
         ],
         mobile: [
           {required: false},
@@ -82,6 +85,10 @@ export default {
   created() {
   },
   methods: {
+    getMobile() {
+      alert(this.model.enterprisesManager);
+      this.mobileVal = "sys_user,phone,username,username='" + this.model.enterprisesManager + "'";
+    },
     add() {
       //初始化默认值
       this.edit({});

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/Groupx.java

@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -34,6 +35,7 @@ public class Groupx {
 	/**部门id*/
 	@Excel(name = "部门id", width = 15)
     @ApiModelProperty(value = "部门id")
+	@Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
 	private String departId;
 	/**班组名称*/
 	@Excel(name = "班组名称", width = 15)