update

src/modules/admin/components/ModifyUser.vue

@@ -16,7 +16,7 @@
       :rules="rules"
       label-position="top"
     >
-      <el-form-item prop="loginName" label="用户名：">
+      <el-form-item prop="loginName" label="用户名/工号：">
         <el-input
           v-model.trim="modalForm.loginName"
           placeholder="请输入用户名"
@@ -37,13 +37,13 @@
           clearable
         ></el-input>
       </el-form-item>
-      <el-form-item prop="code" label="工号：">
+      <!-- <el-form-item prop="code" label="工号：">
         <el-input
           v-model.trim="modalForm.code"
           placeholder="请输入工号"
           clearable
         ></el-input>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item prop="roleIds" label="角色：">
         <el-select
           style="width: 100%"
@@ -79,7 +79,7 @@ const initModalForm = {
   id: "",
   loginName: "",
   realName: "",
-  code: "",
+  // code: "",
   mobileNumber: "",
   roleIds: [],
 };
@@ -125,12 +125,12 @@ export default {
         loginName: [
           {
             required: true,
-            message: "请输入用户名",
+            message: "请输入用户名/工号",
             trigger: "change",
           },
           {
             max: 50,
-            message: "用户名不能超过50",
+            message: "用户名/工号不能超过50",
             trigger: "change",
           },
         ],
@@ -146,18 +146,18 @@ export default {
             trigger: "change",
           },
         ],
-        code: [
-          {
-            required: true,
-            message: "请输入工号",
-            trigger: "change",
-          },
-          {
-            max: 50,
-            message: "工号不能超过50",
-            trigger: "change",
-          },
-        ],
+        // code: [
+        //   {
+        //     required: true,
+        //     message: "请输入工号",
+        //     trigger: "change",
+        //   },
+        //   {
+        //     max: 50,
+        //     message: "工号不能超过50",
+        //     trigger: "change",
+        //   },
+        // ],
         roleIds: [
           {
             required: true,

src/modules/base/components/ModifyUser.vue

@@ -16,10 +16,10 @@
       :rules="rules"
       label-width="100px"
     >
-      <el-form-item prop="loginName" label="用户名：">
+      <el-form-item prop="loginName" label="用户名/工号：">
         <el-input
           v-model.trim="modalForm.loginName"
-          placeholder="请输入用户名"
+          placeholder="请输入用户名/工号"
           :disabled="isEdit"
         ></el-input>
       </el-form-item>
@@ -30,13 +30,13 @@
           clearable
         ></el-input>
       </el-form-item>
-      <el-form-item prop="code" label="工号：">
+      <!-- <el-form-item prop="code" label="工号：">
         <el-input
           v-model.trim="modalForm.code"
           placeholder="请输入工号"
           clearable
         ></el-input>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item prop="mobileNumber" label="手机号：">
         <el-input
           v-model.trim="modalForm.mobileNumber"
@@ -105,7 +105,7 @@ const initModalForm = {
   id: "",
   loginName: "",
   realName: "",
-  code: "",
+  //   code: "",
   mobileNumber: "",
   allowManualCard: 0,
   roleIds: [],
@@ -204,18 +204,18 @@ export default {
             trigger: "change",
           },
         ],
-        code: [
-          {
-            required: true,
-            message: "请输入工号",
-            trigger: "change",
-          },
-          {
-            max: 50,
-            message: "工号不能超过50",
-            trigger: "change",
-          },
-        ],
+        // code: [
+        //   {
+        //     required: true,
+        //     message: "请输入工号",
+        //     trigger: "change",
+        //   },
+        //   {
+        //     max: 50,
+        //     message: "工号不能超过50",
+        //     trigger: "change",
+        //   },
+        // ],
         roleIds: [
           {
             required: true,

src/modules/base/views/UserManage.vue

@@ -112,18 +112,18 @@
           width="70"
           :index="indexMethod"
         ></el-table-column>
-        <el-table-column prop="loginName" label="用户名"></el-table-column>
+        <el-table-column prop="loginName" label="用户名/工号"></el-table-column>
         <el-table-column
           prop="realName"
           label="姓名"
           width="120"
         ></el-table-column>
-        <el-table-column prop="code" label="工号"></el-table-column>
+        <!-- <el-table-column prop="code" label="工号"></el-table-column>
         <el-table-column
           prop="mobileNumber"
           label="手机号"
           width="120"
-        ></el-table-column>
+        ></el-table-column> -->
         <el-table-column prop="orgName" label="所在机构"></el-table-column>
         <el-table-column prop="roles" label="角色">
           <template slot-scope="scope">