Compare commits
No commits in common. "bcd991376ac74b85e8b7b70a2a62130a952d0632" and "88490acc72da561d4a25f727d0b2f557cf1f65d4" have entirely different histories.
bcd991376a
...
88490acc72
|
@ -8,7 +8,7 @@
|
||||||
</list>
|
</list>
|
||||||
</option>
|
</option>
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="jbr-11" project-jdk-type="JavaSDK" />
|
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="jbr-11" project-jdk-type="JavaSDK" />
|
||||||
<component name="ProjectType">
|
<component name="ProjectType">
|
||||||
<option name="id" value="jpab" />
|
<option name="id" value="jpab" />
|
||||||
</component>
|
</component>
|
||||||
|
|
1
bin
1
bin
|
@ -1 +0,0 @@
|
||||||
Subproject commit 2329fea1f84e829d3a703c60cfd8da9014766e91
|
|
|
@ -10,9 +10,9 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
|
||||||
@SpringBootApplication
|
@SpringBootApplication
|
||||||
@ServletComponentScan
|
@ServletComponentScan
|
||||||
@EnableTransactionManagement
|
@EnableTransactionManagement
|
||||||
public class FWApplication {
|
public class ReggieApplication {
|
||||||
public static void main(String[] args) {
|
public static void main(String[] args) {
|
||||||
SpringApplication.run(FWApplication.class,args);
|
SpringApplication.run(ReggieApplication.class,args);
|
||||||
log.info("项目启动成功...");
|
log.info("项目启动成功...");
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -81,8 +81,8 @@ public class EmployeeController {
|
||||||
log.info("新增员工,员工信息:{}",employee.toString());
|
log.info("新增员工,员工信息:{}",employee.toString());
|
||||||
|
|
||||||
//设置初始密码123456,需要进行md5加密处理
|
//设置初始密码123456,需要进行md5加密处理
|
||||||
employee.setPassword(DigestUtils.md5DigestAsHex(employee.getPassword().getBytes()));
|
employee.setPassword(DigestUtils.md5DigestAsHex("123456".getBytes()));
|
||||||
employee.setIdNumber("64222420001025301X");
|
|
||||||
//employee.setCreateTime(LocalDateTime.now());
|
//employee.setCreateTime(LocalDateTime.now());
|
||||||
//employee.setUpdateTime(LocalDateTime.now());
|
//employee.setUpdateTime(LocalDateTime.now());
|
||||||
|
|
||||||
|
@ -94,7 +94,7 @@ public class EmployeeController {
|
||||||
|
|
||||||
employeeService.save(employee);
|
employeeService.save(employee);
|
||||||
|
|
||||||
return R.success("新增账号成功");
|
return R.success("新增员工成功");
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -49,9 +49,9 @@ function checkPhone (rule, value, callback){
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function checkPassword (rule,value,callback) {
|
function validID (rule,value,callback) {
|
||||||
// 身份证号码为15位或者18位,15位时全为数字,18位前17位为数字,最后一位是校验位,可能为数字或字符X
|
// 身份证号码为15位或者18位,15位时全为数字,18位前17位为数字,最后一位是校验位,可能为数字或字符X
|
||||||
let reg = /^[a-zA-Z0-9]{1,32}$/
|
let reg = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/
|
||||||
if(value == '') {
|
if(value == '') {
|
||||||
callback(new Error('请输入身份证号码'))
|
callback(new Error('请输入身份证号码'))
|
||||||
} else if (reg.test(value)) {
|
} else if (reg.test(value)) {
|
||||||
|
|
|
@ -21,16 +21,16 @@
|
||||||
label-width="180px"
|
label-width="180px"
|
||||||
class="demo-ruleForm"
|
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>
|
||||||
<el-form-item
|
<el-form-item
|
||||||
label="姓名:"
|
label="员工姓名:"
|
||||||
prop="name"
|
prop="name"
|
||||||
>
|
>
|
||||||
<el-input
|
<el-input
|
||||||
v-model="ruleForm.name"
|
v-model="ruleForm.name"
|
||||||
placeholder="请输入姓名"
|
placeholder="请输入员工姓名"
|
||||||
maxlength="20"
|
maxlength="20"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
@ -55,12 +55,12 @@
|
||||||
</el-radio-group>
|
</el-radio-group>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item
|
<el-form-item
|
||||||
label="密码:"
|
label="身份证号:"
|
||||||
prop="password"
|
prop="idNumber"
|
||||||
>
|
>
|
||||||
<el-input
|
<el-input
|
||||||
v-model="ruleForm.password"
|
v-model="ruleForm.idNumber"
|
||||||
placeholder="请输入密码"
|
placeholder="请输入身份证号"
|
||||||
maxlength="20"
|
maxlength="20"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
@ -109,7 +109,7 @@
|
||||||
'name': '',
|
'name': '',
|
||||||
'phone': '',
|
'phone': '',
|
||||||
'sex': '男',
|
'sex': '男',
|
||||||
'password': '',
|
'idNumber': '',
|
||||||
username: ''
|
username: ''
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -126,7 +126,7 @@
|
||||||
//姓名
|
//姓名
|
||||||
name: [{ required: true, 'validator': checkName, 'trigger': 'blur' }],
|
name: [{ required: true, 'validator': checkName, 'trigger': 'blur' }],
|
||||||
'phone': [{ 'required': true, 'validator': checkPhone, 'trigger': 'blur' }],
|
'phone': [{ 'required': true, 'validator': checkPhone, 'trigger': 'blur' }],
|
||||||
'password': [{ 'required': true, 'validator': checkPassword, 'trigger': 'blur' }]
|
'idNumber': [{ 'required': true, 'validator': validID, 'trigger': 'blur' }]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -174,7 +174,7 @@
|
||||||
// 'password': '',
|
// 'password': '',
|
||||||
// 'rePassword': '',/
|
// 'rePassword': '',/
|
||||||
'sex': '男',
|
'sex': '男',
|
||||||
'password': ''
|
'idNumber': ''
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
<div class="tableBar">
|
<div class="tableBar">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="input"
|
v-model="input"
|
||||||
placeholder="请输入账号姓名"
|
placeholder="请输入员工姓名"
|
||||||
style="width: 250px"
|
style="width: 250px"
|
||||||
clearable
|
clearable
|
||||||
@keyup.enter.native="handleQuery"
|
@keyup.enter.native="handleQuery"
|
||||||
|
@ -38,7 +38,7 @@
|
||||||
type="primary"
|
type="primary"
|
||||||
@click="addMemberHandle('add')"
|
@click="addMemberHandle('add')"
|
||||||
>
|
>
|
||||||
+ 添加账号
|
+ 添加员工
|
||||||
</el-button>
|
</el-button>
|
||||||
</div>
|
</div>
|
||||||
<el-table
|
<el-table
|
||||||
|
@ -92,7 +92,7 @@
|
||||||
</el-table>
|
</el-table>
|
||||||
<el-pagination
|
<el-pagination
|
||||||
class="pageList"
|
class="pageList"
|
||||||
:page-sizes="[8]"
|
:page-sizes="[2]"
|
||||||
:page-size="pageSize"
|
:page-size="pageSize"
|
||||||
layout="total, sizes, prev, pager, next, jumper"
|
layout="total, sizes, prev, pager, next, jumper"
|
||||||
:total="counts"
|
:total="counts"
|
||||||
|
@ -118,7 +118,7 @@
|
||||||
input: '',
|
input: '',
|
||||||
counts: 0,
|
counts: 0,
|
||||||
page: 1,
|
page: 1,
|
||||||
pageSize: 8,
|
pageSize: 2,
|
||||||
tableData : [],
|
tableData : [],
|
||||||
id : '',
|
id : '',
|
||||||
status : '',
|
status : '',
|
||||||
|
|
|
@ -49,9 +49,9 @@ function checkPhone (rule, value, callback){
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function checkPassword (rule,value,callback) {
|
function validID (rule,value,callback) {
|
||||||
// 身份证号码为15位或者18位,15位时全为数字,18位前17位为数字,最后一位是校验位,可能为数字或字符X
|
// 身份证号码为15位或者18位,15位时全为数字,18位前17位为数字,最后一位是校验位,可能为数字或字符X
|
||||||
let reg = /^[a-zA-Z0-9]{1,32}$/
|
let reg = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/
|
||||||
if(value == '') {
|
if(value == '') {
|
||||||
callback(new Error('请输入身份证号码'))
|
callback(new Error('请输入身份证号码'))
|
||||||
} else if (reg.test(value)) {
|
} else if (reg.test(value)) {
|
||||||
|
|
|
@ -21,16 +21,16 @@
|
||||||
label-width="180px"
|
label-width="180px"
|
||||||
class="demo-ruleForm"
|
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>
|
||||||
<el-form-item
|
<el-form-item
|
||||||
label="姓名:"
|
label="员工姓名:"
|
||||||
prop="name"
|
prop="name"
|
||||||
>
|
>
|
||||||
<el-input
|
<el-input
|
||||||
v-model="ruleForm.name"
|
v-model="ruleForm.name"
|
||||||
placeholder="请输入姓名"
|
placeholder="请输入员工姓名"
|
||||||
maxlength="20"
|
maxlength="20"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
@ -55,12 +55,12 @@
|
||||||
</el-radio-group>
|
</el-radio-group>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item
|
<el-form-item
|
||||||
label="密码:"
|
label="身份证号:"
|
||||||
prop="password"
|
prop="idNumber"
|
||||||
>
|
>
|
||||||
<el-input
|
<el-input
|
||||||
v-model="ruleForm.password"
|
v-model="ruleForm.idNumber"
|
||||||
placeholder="请输入密码"
|
placeholder="请输入身份证号"
|
||||||
maxlength="20"
|
maxlength="20"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
@ -109,7 +109,7 @@
|
||||||
'name': '',
|
'name': '',
|
||||||
'phone': '',
|
'phone': '',
|
||||||
'sex': '男',
|
'sex': '男',
|
||||||
'password': '',
|
'idNumber': '',
|
||||||
username: ''
|
username: ''
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -126,7 +126,7 @@
|
||||||
//姓名
|
//姓名
|
||||||
name: [{ required: true, 'validator': checkName, 'trigger': 'blur' }],
|
name: [{ required: true, 'validator': checkName, 'trigger': 'blur' }],
|
||||||
'phone': [{ 'required': true, 'validator': checkPhone, 'trigger': 'blur' }],
|
'phone': [{ 'required': true, 'validator': checkPhone, 'trigger': 'blur' }],
|
||||||
'password': [{ 'required': true, 'validator': checkPassword, 'trigger': 'blur' }]
|
'idNumber': [{ 'required': true, 'validator': validID, 'trigger': 'blur' }]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -174,7 +174,7 @@
|
||||||
// 'password': '',
|
// 'password': '',
|
||||||
// 'rePassword': '',/
|
// 'rePassword': '',/
|
||||||
'sex': '男',
|
'sex': '男',
|
||||||
'password': ''
|
'idNumber': ''
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
<div class="tableBar">
|
<div class="tableBar">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="input"
|
v-model="input"
|
||||||
placeholder="请输入账号姓名"
|
placeholder="请输入员工姓名"
|
||||||
style="width: 250px"
|
style="width: 250px"
|
||||||
clearable
|
clearable
|
||||||
@keyup.enter.native="handleQuery"
|
@keyup.enter.native="handleQuery"
|
||||||
|
@ -38,7 +38,7 @@
|
||||||
type="primary"
|
type="primary"
|
||||||
@click="addMemberHandle('add')"
|
@click="addMemberHandle('add')"
|
||||||
>
|
>
|
||||||
+ 添加账号
|
+ 添加员工
|
||||||
</el-button>
|
</el-button>
|
||||||
</div>
|
</div>
|
||||||
<el-table
|
<el-table
|
||||||
|
@ -92,7 +92,7 @@
|
||||||
</el-table>
|
</el-table>
|
||||||
<el-pagination
|
<el-pagination
|
||||||
class="pageList"
|
class="pageList"
|
||||||
:page-sizes="[8]"
|
:page-sizes="[2]"
|
||||||
:page-size="pageSize"
|
:page-size="pageSize"
|
||||||
layout="total, sizes, prev, pager, next, jumper"
|
layout="total, sizes, prev, pager, next, jumper"
|
||||||
:total="counts"
|
:total="counts"
|
||||||
|
@ -118,7 +118,7 @@
|
||||||
input: '',
|
input: '',
|
||||||
counts: 0,
|
counts: 0,
|
||||||
page: 1,
|
page: 1,
|
||||||
pageSize: 8,
|
pageSize: 2,
|
||||||
tableData : [],
|
tableData : [],
|
||||||
id : '',
|
id : '',
|
||||||
status : '',
|
status : '',
|
||||||
|
|
Binary file not shown.
Loading…
Reference in New Issue