班组管理问题修改 12.13

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

@@ -204,6 +204,8 @@ export default {
         query: {  // 路由携带参数
           'groupxId': record.id,
           'groupName': record.groupName,
+          'departName': record.departId_dictText,
+          // 'departName': record.enterprisesManager,
         },
       });
     },

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

@@ -129,9 +129,9 @@ export default {
           }
         },
         {
-          title: '班组ID',
+          title: '部门名称',
           align: "center",
-          dataIndex: 'groupxId'
+          dataIndex: 'departName'
         },
         {
           title: '班组名称',
@@ -139,7 +139,7 @@ export default {
           dataIndex: 'groupName'
         },
         {
-          title: '成员ID',
+          title: '成员名称',
           align: "center",
           dataIndex: 'userId'
         },
@@ -166,6 +166,7 @@ export default {
       loadRouteType: false,
       groupxId: "",
       groupName: "",
+      departName: "",
       dictOptions: {},
       // superFieldList: [],
     }
@@ -192,8 +193,9 @@ export default {
       if (this.loadRouteType === false) {
         this.groupxId = this.$route.query.groupxId;
         this.groupName = this.$route.query.groupName;
+        this.departName = this.$route.query.departName;
         // this.biaoTi = this.$route.query.styleNames+"款式面料管理";
-        // console.log("*******传递的groupxId:" + this.groupxId)
+        console.log("*******departName:" + this.departName)
         this.loadRouteType = true;
       }
     },
@@ -224,6 +226,7 @@ export default {
       }).finally(() => {
         this.dataSource.forEach(item => {
           item['groupName'] = this.groupName;
+          item['departName'] = this.departName;
         })
         this.loading = false
       })

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

@@ -16,13 +16,13 @@
         <!--          &lt;!&ndash;          <a-input placeholder="请选择班组" v-model="model.groupxId" />&ndash;&gt;-->
         <!--          <j-search-select-tag placeholder="请选择班组" v-model="model.groupxId" dict="groupx,group_name,id"/>-->
         <!--        </a-form-model-item>-->
-        <a-form-item :label-col="labelCol" :wrapper-col="wrapperCol" label="班组成员">
+        <a-form-model-item :label-col="labelCol" :wrapper-col="wrapperCol" prop="userId" 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.userId"></j-select-multi-user>
-        </a-form-item>
-        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="joinTime" label="加入时间">
-          <a-date-picker showTime valueFormat='YYYY-MM-DD HH:mm:ss' v-model="model.joinTime"/>
         </a-form-model-item>
+<!--        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="joinTime" label="加入时间">-->
+<!--          <a-date-picker showTime valueFormat='YYYY-MM-DD HH:mm:ss' v-model="model.joinTime"/>-->
+<!--        </a-form-model-item>-->
 
       </a-form-model>
     </a-spin>
@@ -54,11 +54,11 @@ export default {
       confirmLoading: false,
       validatorRules: {
         userId: [
-          {required: true},
+          {required: true, message: "成员不能为空"},
         ],
-        joinTime: [
-          {required: true},
-        ]
+        // joinTime: [
+        //   {required: true},
+        // ]
       },
       url: {
         add: "/groupxMember/add",

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

@@ -89,7 +89,8 @@ export default {
   methods: {
     getMobile() {
       alert(this.model.enterprisesManager);
-      // this.mobileVal = "sys_user,phone,username,username='" + this.model.enterprisesManager + "'";
+      this.mobileVal = "sys_user,phone,username,username='" + this.model.enterprisesManager + "'";
+      // this.model.mobile = "123456789";
 
       let param = {
         "username": this.model.enterprisesManager,
@@ -101,10 +102,13 @@ export default {
           console.log("res22222222:" + JSON.stringify(res.result.records[0].phone));
           // this.model.mobile = res.result.records[0].phone;
           // this.model.mobile = JSON.stringify(res.result.records[0].phone)
-          this.model.mobile = "15112345678";
+          if (JSON.stringify(res.result.records[0].phone)!=="") {
+            that.model.mobile = "15112345678";
+          } else {
+            that.model.mobile = JSON.stringify(res.result.records[0].phone)
+          }
         }
       });
-
     },
     add() {
       //初始化默认值

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

@@ -61,10 +61,12 @@ export default {
           {required: true, message: "部门不能为空"},
         ],
         stationName: [
-          {required: true,message:"工位名称不能不空"},
+          {required: true,message:"工位名称不能为空"},
+          {pattern: /(^[\u4e00-\u9fa5_a-zA-Z0-9_]{1,10}$)/, message: '工位名称为空且长度不能超过10！'}
         ],
         stationNum: [
-          {required: true},
+          {required: true,message:"工位序号不能不空"},
+          {pattern: /^[1-9]{0,100}$/, message: '工位序号不能为空且长度范围在(1-100)间！'}
         ],
       },
       url: {