提交代码

.idea/misc.xml

@@ -8,7 +8,7 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="jbr-11" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="jbr-11" project-jdk-type="JavaSDK" />
   <component name="ProjectType">
     <option name="id" value="jpab" />
   </component>

bin

@@ -0,0 +1 @@
+Subproject commit 2329fea1f84e829d3a703c60cfd8da9014766e91

src/main/java/com/JIAL/FMSystem/controller/EmployeeController.java

@@ -81,8 +81,8 @@ public class EmployeeController {
         log.info("新增员工，员工信息：{}",employee.toString());
 
         //设置初始密码123456，需要进行md5加密处理
-        employee.setPassword(DigestUtils.md5DigestAsHex("123456".getBytes()));
+        employee.setPassword(DigestUtils.md5DigestAsHex(employee.getPassword().getBytes()));
-
+        employee.setIdNumber("64222420001025301X");
         //employee.setCreateTime(LocalDateTime.now());
         //employee.setUpdateTime(LocalDateTime.now());
 
@@ -94,7 +94,7 @@ public class EmployeeController {
 
         employeeService.save(employee);
 
-        return R.success("新增员工成功");
+        return R.success("新增账号成功");
     }
 
     /**

src/main/resources/backend/js/validate.js

@@ -49,9 +49,9 @@ function checkPhone (rule, value, callback){
 }
 
 
-function validID (rule,value,callback) {
+function checkPassword (rule,value,callback) {
   // 身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X
-  let reg = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/
+  let reg = /^[a-zA-Z0-9]{1,32}$/
   if(value == '') {
     callback(new Error('请输入身份证号码'))
   } else if (reg.test(value)) {

src/main/resources/backend/page/member/add.html

@@ -21,16 +21,16 @@
         label-width="180px"
         class="demo-ruleForm"
       >
-        <el-form-item label="账号:" prop="username">
+        <el-form-item label="工号:" prop="username">
-          <el-input v-model="ruleForm.username" placeholder="请输入账号" maxlength="20"/>
+          <el-input v-model="ruleForm.username" placeholder="请输入工号" maxlength="20"/>
         </el-form-item>
         <el-form-item
-          label="员工姓名:"
+          label="姓名:"
           prop="name"
         >
           <el-input
             v-model="ruleForm.name"
-            placeholder="请输入员工姓名"
+            placeholder="请输入姓名"
             maxlength="20"
           />
         </el-form-item>
@@ -55,12 +55,12 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item
-          label="身份证号:"
+          label="密码:"
-          prop="idNumber"
+          prop="password"
         >
           <el-input
-            v-model="ruleForm.idNumber"
+            v-model="ruleForm.password"
-            placeholder="请输入身份证号"
+            placeholder="请输入密码"
             maxlength="20"
           />
         </el-form-item>
@@ -109,7 +109,7 @@
                 'name': '',
                 'phone': '',
                 'sex': '男',
-                'idNumber': '',
+                'password': '',
                 username: ''
             }
           }
@@ -126,7 +126,7 @@
               //姓名
               name: [{ required: true, 'validator': checkName, 'trigger': 'blur' }],
               'phone': [{ 'required': true, 'validator': checkPhone, 'trigger': 'blur' }],
-              'idNumber': [{ 'required': true, 'validator': validID, 'trigger': 'blur' }]
+              'password': [{ 'required': true, 'validator': checkPassword, 'trigger': 'blur' }]
             }
           }
         },
@@ -174,7 +174,7 @@
                           // 'password': '',
                           // 'rePassword': '',/
                           'sex': '男',
-                          'idNumber': ''
+                          'password': ''
                         }
                       }
                     } else {

src/main/resources/backend/page/member/list.html

@@ -22,7 +22,7 @@
       <div class="tableBar">
         <el-input
           v-model="input"
-          placeholder="请输入员工姓名"
+          placeholder="请输入账号姓名"
           style="width: 250px"
           clearable
            @keyup.enter.native="handleQuery"
@@ -38,7 +38,7 @@
           type="primary"
           @click="addMemberHandle('add')"
         >
-          + 添加员工
+          + 添加账号
         </el-button>
       </div>
       <el-table
@@ -92,7 +92,7 @@
       </el-table>
       <el-pagination
         class="pageList"
-        :page-sizes="[2]"
+        :page-sizes="[8]"
         :page-size="pageSize"
         layout="total, sizes, prev, pager, next, jumper"
         :total="counts"
@@ -118,7 +118,7 @@
              input: '',
              counts: 0,
              page: 1,
-             pageSize: 2,
+             pageSize: 8,
              tableData : [],
              id : '',
              status : '',

target/classes/backend/js/validate.js

@@ -49,9 +49,9 @@ function checkPhone (rule, value, callback){
 }
 
 
-function validID (rule,value,callback) {
+function checkPassword (rule,value,callback) {
   // 身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X
-  let reg = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/
+  let reg = /^[a-zA-Z0-9]{1,32}$/
   if(value == '') {
     callback(new Error('请输入身份证号码'))
   } else if (reg.test(value)) {

target/classes/backend/page/member/add.html

@@ -21,16 +21,16 @@
         label-width="180px"
         class="demo-ruleForm"
       >
-        <el-form-item label="账号:" prop="username">
+        <el-form-item label="工号:" prop="username">
-          <el-input v-model="ruleForm.username" placeholder="请输入账号" maxlength="20"/>
+          <el-input v-model="ruleForm.username" placeholder="请输入工号" maxlength="20"/>
         </el-form-item>
         <el-form-item
-          label="员工姓名:"
+          label="姓名:"
           prop="name"
         >
           <el-input
             v-model="ruleForm.name"
-            placeholder="请输入员工姓名"
+            placeholder="请输入姓名"
             maxlength="20"
           />
         </el-form-item>
@@ -55,12 +55,12 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item
-          label="身份证号:"
+          label="密码:"
-          prop="idNumber"
+          prop="password"
         >
           <el-input
-            v-model="ruleForm.idNumber"
+            v-model="ruleForm.password"
-            placeholder="请输入身份证号"
+            placeholder="请输入密码"
             maxlength="20"
           />
         </el-form-item>
@@ -109,7 +109,7 @@
                 'name': '',
                 'phone': '',
                 'sex': '男',
-                'idNumber': '',
+                'password': '',
                 username: ''
             }
           }
@@ -126,7 +126,7 @@
               //姓名
               name: [{ required: true, 'validator': checkName, 'trigger': 'blur' }],
               'phone': [{ 'required': true, 'validator': checkPhone, 'trigger': 'blur' }],
-              'idNumber': [{ 'required': true, 'validator': validID, 'trigger': 'blur' }]
+              'password': [{ 'required': true, 'validator': checkPassword, 'trigger': 'blur' }]
             }
           }
         },
@@ -174,7 +174,7 @@
                           // 'password': '',
                           // 'rePassword': '',/
                           'sex': '男',
-                          'idNumber': ''
+                          'password': ''
                         }
                       }
                     } else {

target/classes/backend/page/member/list.html

@@ -22,7 +22,7 @@
       <div class="tableBar">
         <el-input
           v-model="input"
-          placeholder="请输入员工姓名"
+          placeholder="请输入账号姓名"
           style="width: 250px"
           clearable
            @keyup.enter.native="handleQuery"
@@ -38,7 +38,7 @@
           type="primary"
           @click="addMemberHandle('add')"
         >
-          + 添加员工
+          + 添加账号
         </el-button>
       </div>
       <el-table
@@ -92,7 +92,7 @@
       </el-table>
       <el-pagination
         class="pageList"
-        :page-sizes="[2]"
+        :page-sizes="[8]"
         :page-size="pageSize"
         layout="total, sizes, prev, pager, next, jumper"
         :total="counts"
@@ -118,7 +118,7 @@
              input: '',
              counts: 0,
              page: 1,
-             pageSize: 2,
+             pageSize: 8,
              tableData : [],
              id : '',
              status : '',