diff --git a/src/views/setting/info.vue b/src/views/setting/info.vue
index bf7efa2..78addc1 100644
--- a/src/views/setting/info.vue
+++ b/src/views/setting/info.vue
@@ -70,6 +70,10 @@
:value="item.value">
+
-
-
-
+
+
-
@@ -397,6 +401,7 @@ export default {
userInfo.account = userAccount.account
userInfo.phone = userAccount.phone
userInfo.workNumber = userAccount.workNumber
+ userInfo.id = userAccount.id
this.form = userInfo
this.originAccount = this.form.account
this.archivesList = result.personalFileList
@@ -498,11 +503,6 @@ export default {
})
let data = {
userId: form.userId,
- userAccountList: [{
- id: form.accountId,
- account: form.account,
- userId: form.userId,
- }],
hrUserInfo: {
provinceId: form.provinceId,
cityId: form.cityId,
@@ -516,6 +516,10 @@ export default {
userName: form.userName,
wechatId: form.wechatId
},
+ userAccount: {
+ workNumber: form.workNumber,
+ id: form.id
+ },
personalFileList,
}
this.$post(this.api.updatePersonCenter, data).then(res => {
diff --git a/src/views/system/staff.vue b/src/views/system/staff.vue
index c77acb5..e9bf3ff 100644
--- a/src/views/system/staff.vue
+++ b/src/views/system/staff.vue
@@ -182,19 +182,6 @@ export default {
}
}
}
- const workNumberPass = (rule, value, callback) => {
- if (value === '') {
- callback(new Error('请输入工号'))
- } else {
- const pattern = /^[A-Za-z0-9]*$/
- if (pattern.test(value)) {
- this.worknumberChange()
- callback()
- } else {
- callback(new Error('请输入正确工号格式'))
- }
- }
- }
const phonePass = (rule, value, callback) => {
if (value) {
const pattern = /^1[3456789]\d{9}$/
@@ -262,9 +249,6 @@ export default {
userName: [
{ required: true, validator: userNamePass, trigger: "blur" }
],
- workNumber: [
- { required: true, validator: workNumberPass, trigger: 'blur' }
- ],
roleList: [
{ required: true, message: "请选择授权角色", trigger: "change" }
],
@@ -284,7 +268,6 @@ export default {
staffVisible: false,
accountReapeat: false,
workNumberReapeat: false,
- originWorkNumber: '',
phoneRepeat: false,
emailRepeat: false,
casProps: {
@@ -539,7 +522,6 @@ export default {
data.staffArchitectureId = archId
}
this.form = data
- this.originWorkNumber = data.workNumber
}).catch(res => { })
},
// 获取角色数据
@@ -548,21 +530,6 @@ export default {
this.roleList = res.rolePage.records
}).catch(res => { })
},
- // 工号判重
- worknumberChange () {
- const form = this.form
- const { workNumber } = form
- if (workNumber === this.originWorkNumber) {
- this.workNumberReapeat = false
- } else {
- const { accountId } = form
- this.$post(`${this.api.checkWorkNumOrAccount}?platformId=${Setting.platformId}&type=2&workNumber=${workNumber}${accountId ? `&accountId=${accountId}` : ''}`).then(res => {
- this.workNumberReapeat = false
- }).catch(err => {
- this.workNumberReapeat = true
- })
- }
- },
// 手机号判重
phoneChange () {
const form = this.form