From f68f899b69850a8c1d8514cf104d61cb3428fd2a Mon Sep 17 00:00:00 2001
From: zhc077 <565291854>
Date: Tue, 13 Dec 2022 16:45:48 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8F=AD=E7=BB=84=E7=AE=A1=E7=90=86=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9=2012.13?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/team/StationList.vue            | 14 +++----
 .../src/views/team/modules/GroupxModal.vue    | 39 +++++++++++++------
 .../src/views/team/modules/StationModal.vue   |  6 +--
 3 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/team/StationList.vue b/ant-design-vue-jeecg/src/views/team/StationList.vue
index 9814c0df..90abc0ef 100644
--- a/ant-design-vue-jeecg/src/views/team/StationList.vue
+++ b/ant-design-vue-jeecg/src/views/team/StationList.vue
@@ -10,7 +10,7 @@
             <!--            <a-form-item label="车间ID">-->
             <!--              <a-input placeholder="请输入车间ID" v-model="queryParam.departId"></a-input>-->
             <!--            </a-form-item>-->
-            <a-form-model-item label="车间编号">
+            <a-form-model-item label="车间">
               <!--          <a-input placeholder="请输入部门编号" v-model="model.departId"/>-->
               <j-select-depart placeholder="请选择车间" v-model="queryParam.departId"/>
             </a-form-model-item>
@@ -129,25 +129,25 @@ export default {
             return parseInt(index) + 1;
           }
         },
-        {
+        /*{
           title: '车间ID',
           align: "center",
           dataIndex: 'departId'
-        },
+        },*/
         {
           title: '车间名称',
           align: "center",
           dataIndex: 'departName'
         },
         {
-          title: '工位名称',
+          title: '工位序号',
           align: "center",
-          dataIndex: 'stationName'
+          dataIndex: 'stationNum'
         },
         {
-          title: '工位序号',
+          title: '工位名称',
           align: "center",
-          dataIndex: 'stationNum'
+          dataIndex: 'stationName'
         },
         {
           title: '备注',
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 845aacce..d31a4c4b 100644
--- a/ant-design-vue-jeecg/src/views/team/modules/GroupxModal.vue
+++ b/ant-design-vue-jeecg/src/views/team/modules/GroupxModal.vue
@@ -24,8 +24,8 @@
           <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" :dictCode="mobileVal"/>
-<!--          <j-dict-select-tag type="list" v-model="model.mobile" :dictCode="mobileVal"></j-dict-select-tag>-->
+          <a-input placeholder="请输入手机号" v-model="model.mobile"/>
+          <!--          <j-dict-select-tag type="list" v-model="model.mobile" :dictCode="mobileVal"></j-dict-select-tag>-->
         </a-form-model-item>
 
       </a-form-model>
@@ -34,7 +34,7 @@
 </template>
 
 <script>
-import {httpAction} from '@/api/manage'
+import {httpAction, getAction} from '@/api/manage'
 import JDictSelectTag from '@/components/dict/JDictSelectTag'
 import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
 
@@ -48,7 +48,7 @@ export default {
     return {
       title: "操作",
       visible: false,
-      mobileVal: "",
+      // mobileVal: "",
       model: {},
       labelCol: {
         xs: {span: 24},
@@ -62,23 +62,25 @@ export default {
       confirmLoading: false,
       validatorRules: {
         departId: [
-          {required: true, message: "部门名称不能为空"},
+          {required: true, message: "部门不能为空"},
         ],
         groupName: [
-          {required: true, message: "班组名称不能为空"},
+          {required: true, message: '班组名称不能为空!'},
+          {pattern: /(^[\u4e00-\u9fa5_a-zA-Z0-9_]{1,10}$)/, message: '班组名称不能为空且长度不能超过10！'}
         ],
         enterprisesManager: [
           {required: true, message: "负责人不能为空"},
         ],
-        mobile: [
-          {required: false},
-          {pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号码!'},
-        ],
+        // mobile: [
+        //   {required: false},
+        //   {pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号码!'},
+        // ],
 
       },
       url: {
         add: "/groupx/add",
         edit: "/groupx/edit",
+        sysUserList: "/sys/user/list",
       },
     }
   },
@@ -87,7 +89,22 @@ 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 + "'";
+
+      let param = {
+        "username": this.model.enterprisesManager,
+      }
+      let that = this;
+      getAction(this.url.sysUserList, param).then((res) => {
+        if (res.success) {
+          console.log("res:" + JSON.stringify(res.result.records[0]))
+          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";
+        }
+      });
+
     },
     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 046e9d00..5c7fbfc2 100644
--- a/ant-design-vue-jeecg/src/views/team/modules/StationModal.vue
+++ b/ant-design-vue-jeecg/src/views/team/modules/StationModal.vue
@@ -16,7 +16,7 @@
 <!--                           label="车间ID">-->
 <!--          <a-input placeholder="请输入车间ID" v-model="model.departId"/>-->
 <!--        </a-form-model-item>-->
-        <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>
@@ -58,10 +58,10 @@ export default {
       confirmLoading: false,
       validatorRules: {
         departId: [
-          {required: true},
+          {required: true, message: "部门不能为空"},
         ],
         stationName: [
-          {required: true},
+          {required: true,message:"工位名称不能不空"},
         ],
         stationNum: [
           {required: true},