diff --git a/config/index.js b/config/index.js
index c7db639..c693b29 100644
--- a/config/index.js
+++ b/config/index.js
@@ -61,7 +61,7 @@
* then assetsPublicPath should be set to "/bar/".
* In most cases please use '/' !!!
*/
- assetsPublicPath: '/iris/',
+ assetsPublicPath: '/iris_en/',
/**
* Source Maps
diff --git a/config/index.js b/config/index.js
index c7db639..c693b29 100644
--- a/config/index.js
+++ b/config/index.js
@@ -61,7 +61,7 @@
* then assetsPublicPath should be set to "/bar/".
* In most cases please use '/' !!!
*/
- assetsPublicPath: '/iris/',
+ assetsPublicPath: '/iris_en/',
/**
* Source Maps
diff --git a/src/utils/request.js b/src/utils/request.js
index 5003756..56d7176 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -45,11 +45,11 @@
// 50008:非法的token; 50012:其他客户端登录了; 50014:Token 过期了;
if (res.code === 401 || res.code === 50012 || res.code === 50014) {
MessageBox.confirm(
- '你已被登出，可以取消继续留在该页面，或者重新登录',
- '确定登出',
+ 'You have been logged out. You can cancel remaining on this page or re-login.',
+ 'Confirm logout',
{
- confirmButtonText: '重新登录',
- cancelButtonText: '取消',
+ confirmButtonText: 'Re-login',
+ cancelButtonText: 'Cancel',
type: 'warning'
}
).then(() => {
@@ -88,12 +88,43 @@
} else {
console.log('错误:' + error.response.data.message) // for debug
// Message.error(error.response.data.message)
- Message({
- showClose: true,
- message: error.response.data.message,
- type: 'error',
- duration: 3000
- })
+ // debugger
+ if (error.response.data.message === '原密码不正确') {
+ Message({
+ showClose: true,
+ message: 'Old password error',
+ type: 'error',
+ duration: 3000
+ })
+ } else if (error.response.data.message === '该用户已经注册') {
+ Message({
+ showClose: true,
+ message: 'This account has been registered',
+ type: 'error',
+ duration: 3000
+ })
+ } else if (error.response.data.message === '未授权.没有或者登录超时') {
+ Message({
+ showClose: true,
+ message: 'Not authorized. No or login timed out',
+ type: 'error',
+ duration: 3000
+ })
+ } else if (error.response.data.message === '服务器异常') {
+ Message({
+ showClose: true,
+ message: 'Server exception',
+ type: 'error',
+ duration: 3000
+ })
+ } else {
+ Message({
+ showClose: true,
+ message: error.response.data.message,
+ type: 'error',
+ duration: 3000
+ })
+ }
}
return Promise.reject(error)
diff --git a/config/index.js b/config/index.js
index c7db639..c693b29 100644
--- a/config/index.js
+++ b/config/index.js
@@ -61,7 +61,7 @@
* then assetsPublicPath should be set to "/bar/".
* In most cases please use '/' !!!
*/
- assetsPublicPath: '/iris/',
+ assetsPublicPath: '/iris_en/',
/**
* Source Maps
diff --git a/src/utils/request.js b/src/utils/request.js
index 5003756..56d7176 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -45,11 +45,11 @@
// 50008:非法的token; 50012:其他客户端登录了; 50014:Token 过期了;
if (res.code === 401 || res.code === 50012 || res.code === 50014) {
MessageBox.confirm(
- '你已被登出，可以取消继续留在该页面，或者重新登录',
- '确定登出',
+ 'You have been logged out. You can cancel remaining on this page or re-login.',
+ 'Confirm logout',
{
- confirmButtonText: '重新登录',
- cancelButtonText: '取消',
+ confirmButtonText: 'Re-login',
+ cancelButtonText: 'Cancel',
type: 'warning'
}
).then(() => {
@@ -88,12 +88,43 @@
} else {
console.log('错误:' + error.response.data.message) // for debug
// Message.error(error.response.data.message)
- Message({
- showClose: true,
- message: error.response.data.message,
- type: 'error',
- duration: 3000
- })
+ // debugger
+ if (error.response.data.message === '原密码不正确') {
+ Message({
+ showClose: true,
+ message: 'Old password error',
+ type: 'error',
+ duration: 3000
+ })
+ } else if (error.response.data.message === '该用户已经注册') {
+ Message({
+ showClose: true,
+ message: 'This account has been registered',
+ type: 'error',
+ duration: 3000
+ })
+ } else if (error.response.data.message === '未授权.没有或者登录超时') {
+ Message({
+ showClose: true,
+ message: 'Not authorized. No or login timed out',
+ type: 'error',
+ duration: 3000
+ })
+ } else if (error.response.data.message === '服务器异常') {
+ Message({
+ showClose: true,
+ message: 'Server exception',
+ type: 'error',
+ duration: 3000
+ })
+ } else {
+ Message({
+ showClose: true,
+ message: error.response.data.message,
+ type: 'error',
+ duration: 3000
+ })
+ }
}
return Promise.reject(error)
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index 00ef6ff..cad8ec4 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -13,8 +13,8 @@
-
-
+
+
@@ -45,9 +45,10 @@
-
+
+
@@ -108,9 +109,9 @@
Upload photo
-
-
-
+
+
+
@@ -142,17 +143,17 @@
name: 'AddPerson',
components: { DeptSelect },
data() {
- const validateIDCard = (rule, value, callback) => {
- if (value !== '') {
- if ((/^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/).test(value) === false) {
- callback(new Error('Please enter a valid id number'))
- } else {
- callback()
- }
- } else {
- callback(new Error('The id number cannot be empty'))
- }
- }
+ // const validateIDCard = (rule, value, callback) => {
+ // if (value !== '') {
+ // if ((/^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/).test(value) === false) {
+ // callback(new Error('Please enter a valid IdCard'))
+ // } else {
+ // callback()
+ // }
+ // } else {
+ // callback(new Error('The IdCard cannot be empty'))
+ // }
+ // }
return {
dialogFormVisible: false, // 对话框是否显示
dialogStatus: '', // 对话框类型：create,update
@@ -187,7 +188,8 @@
rules: {
personCode: [{ required: true, message: 'Staff number is required', trigger: ['blur', 'change'] }],
name: [{ required: true, message: 'Name is required', trigger: ['blur', 'change'] }],
- idCardNo: [{ required: true, validator: validateIDCard, trigger: ['blur', 'change'] }],
+ idCardNo: [{ required: true, message: 'IdCard is required', trigger: ['blur', 'change'] },
+ { max: 32, message: 'Max length 32', trigger: ['blur', 'change'] }],
deptid: [{ required: true, message: 'Company/Department is required', trigger: 'change' }],
duty: [{ required: true, message: 'Duty is required', trigger: 'change' }],
sex: [{ required: true, message: 'Gender is required', trigger: 'blur' }],
diff --git a/config/index.js b/config/index.js
index c7db639..c693b29 100644
--- a/config/index.js
+++ b/config/index.js
@@ -61,7 +61,7 @@
* then assetsPublicPath should be set to "/bar/".
* In most cases please use '/' !!!
*/
- assetsPublicPath: '/iris/',
+ assetsPublicPath: '/iris_en/',
/**
* Source Maps
diff --git a/src/utils/request.js b/src/utils/request.js
index 5003756..56d7176 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -45,11 +45,11 @@
// 50008:非法的token; 50012:其他客户端登录了; 50014:Token 过期了;
if (res.code === 401 || res.code === 50012 || res.code === 50014) {
MessageBox.confirm(
- '你已被登出，可以取消继续留在该页面，或者重新登录',
- '确定登出',
+ 'You have been logged out. You can cancel remaining on this page or re-login.',
+ 'Confirm logout',
{
- confirmButtonText: '重新登录',
- cancelButtonText: '取消',
+ confirmButtonText: 'Re-login',
+ cancelButtonText: 'Cancel',
type: 'warning'
}
).then(() => {
@@ -88,12 +88,43 @@
} else {
console.log('错误:' + error.response.data.message) // for debug
// Message.error(error.response.data.message)
- Message({
- showClose: true,
- message: error.response.data.message,
- type: 'error',
- duration: 3000
- })
+ // debugger
+ if (error.response.data.message === '原密码不正确') {
+ Message({
+ showClose: true,
+ message: 'Old password error',
+ type: 'error',
+ duration: 3000
+ })
+ } else if (error.response.data.message === '该用户已经注册') {
+ Message({
+ showClose: true,
+ message: 'This account has been registered',
+ type: 'error',
+ duration: 3000
+ })
+ } else if (error.response.data.message === '未授权.没有或者登录超时') {
+ Message({
+ showClose: true,
+ message: 'Not authorized. No or login timed out',
+ type: 'error',
+ duration: 3000
+ })
+ } else if (error.response.data.message === '服务器异常') {
+ Message({
+ showClose: true,
+ message: 'Server exception',
+ type: 'error',
+ duration: 3000
+ })
+ } else {
+ Message({
+ showClose: true,
+ message: error.response.data.message,
+ type: 'error',
+ duration: 3000
+ })
+ }
}
return Promise.reject(error)
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index 00ef6ff..cad8ec4 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -13,8 +13,8 @@
-
-
+
+
@@ -45,9 +45,10 @@
-
+
+
@@ -108,9 +109,9 @@
Upload photo
-
-
-
+
+
+
@@ -142,17 +143,17 @@
name: 'AddPerson',
components: { DeptSelect },
data() {
- const validateIDCard = (rule, value, callback) => {
- if (value !== '') {
- if ((/^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/).test(value) === false) {
- callback(new Error('Please enter a valid id number'))
- } else {
- callback()
- }
- } else {
- callback(new Error('The id number cannot be empty'))
- }
- }
+ // const validateIDCard = (rule, value, callback) => {
+ // if (value !== '') {
+ // if ((/^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/).test(value) === false) {
+ // callback(new Error('Please enter a valid IdCard'))
+ // } else {
+ // callback()
+ // }
+ // } else {
+ // callback(new Error('The IdCard cannot be empty'))
+ // }
+ // }
return {
dialogFormVisible: false, // 对话框是否显示
dialogStatus: '', // 对话框类型：create,update
@@ -187,7 +188,8 @@
rules: {
personCode: [{ required: true, message: 'Staff number is required', trigger: ['blur', 'change'] }],
name: [{ required: true, message: 'Name is required', trigger: ['blur', 'change'] }],
- idCardNo: [{ required: true, validator: validateIDCard, trigger: ['blur', 'change'] }],
+ idCardNo: [{ required: true, message: 'IdCard is required', trigger: ['blur', 'change'] },
+ { max: 32, message: 'Max length 32', trigger: ['blur', 'change'] }],
deptid: [{ required: true, message: 'Company/Department is required', trigger: 'change' }],
duty: [{ required: true, message: 'Duty is required', trigger: 'change' }],
sex: [{ required: true, message: 'Gender is required', trigger: 'blur' }],
diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue
index d78fb84..69a6087 100644
--- a/src/views/memberManage/addPersonIris.vue
+++ b/src/views/memberManage/addPersonIris.vue
@@ -15,8 +15,8 @@
-
-
+
+
@@ -47,9 +47,10 @@
-
+
+
@@ -110,9 +111,9 @@
Upload photo
-
-
-
+
+
+
@@ -159,17 +160,17 @@
name: 'AddPersonIris',
components: { DeptSelect },
data() {
- const validateIDCard = (rule, value, callback) => {
- if (value !== '') {
- if ((/^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/).test(value) === false) {
- callback(new Error('Please enter a valid id number'))
- } else {
- callback()
- }
- } else {
- callback(new Error('The id number cannot be empty'))
- }
- }
+ // const validateIDCard = (rule, value, callback) => {
+ // if (value !== '') {
+ // if ((/^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/).test(value) === false) {
+ // callback(new Error('Please enter a valid IdCard'))
+ // } else {
+ // callback()
+ // }
+ // } else {
+ // callback(new Error('The IdCard cannot be empty'))
+ // }
+ // }
return {
dialogFormVisible: false, // 对话框是否显示
dialogStatus: '', // 对话框类型：create,update
@@ -204,7 +205,8 @@
rules: {
// personCode: [{ required: true, message: '员工编号必填', trigger: ['blur', 'change'] }],
name: [{ required: true, message: 'Name is required', trigger: ['blur', 'change'] }],
- idCardNo: [{ required: true, validator: validateIDCard, trigger: ['blur', 'change'] }],
+ idCardNo: [{ required: true, message: 'IdCard is required', trigger: ['blur', 'change'] },
+ { max: 32, message: 'Max length 32', trigger: ['blur', 'change'] }],
deptid: [{ required: true, message: 'Company/Department is required', trigger: 'change' }],
duty: [{ required: true, message: 'Duty is required', trigger: 'change' }],
sex: [{ required: true, message: 'Gender is required', trigger: 'blur' }],
diff --git a/config/index.js b/config/index.js
index c7db639..c693b29 100644
--- a/config/index.js
+++ b/config/index.js
@@ -61,7 +61,7 @@
* then assetsPublicPath should be set to "/bar/".
* In most cases please use '/' !!!
*/
- assetsPublicPath: '/iris/',
+ assetsPublicPath: '/iris_en/',
/**
* Source Maps
diff --git a/src/utils/request.js b/src/utils/request.js
index 5003756..56d7176 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -45,11 +45,11 @@
// 50008:非法的token; 50012:其他客户端登录了; 50014:Token 过期了;
if (res.code === 401 || res.code === 50012 || res.code === 50014) {
MessageBox.confirm(
- '你已被登出，可以取消继续留在该页面，或者重新登录',
- '确定登出',
+ 'You have been logged out. You can cancel remaining on this page or re-login.',
+ 'Confirm logout',
{
- confirmButtonText: '重新登录',
- cancelButtonText: '取消',
+ confirmButtonText: 'Re-login',
+ cancelButtonText: 'Cancel',
type: 'warning'
}
).then(() => {
@@ -88,12 +88,43 @@
} else {
console.log('错误:' + error.response.data.message) // for debug
// Message.error(error.response.data.message)
- Message({
- showClose: true,
- message: error.response.data.message,
- type: 'error',
- duration: 3000
- })
+ // debugger
+ if (error.response.data.message === '原密码不正确') {
+ Message({
+ showClose: true,
+ message: 'Old password error',
+ type: 'error',
+ duration: 3000
+ })
+ } else if (error.response.data.message === '该用户已经注册') {
+ Message({
+ showClose: true,
+ message: 'This account has been registered',
+ type: 'error',
+ duration: 3000
+ })
+ } else if (error.response.data.message === '未授权.没有或者登录超时') {
+ Message({
+ showClose: true,
+ message: 'Not authorized. No or login timed out',
+ type: 'error',
+ duration: 3000
+ })
+ } else if (error.response.data.message === '服务器异常') {
+ Message({
+ showClose: true,
+ message: 'Server exception',
+ type: 'error',
+ duration: 3000
+ })
+ } else {
+ Message({
+ showClose: true,
+ message: error.response.data.message,
+ type: 'error',
+ duration: 3000
+ })
+ }
}
return Promise.reject(error)
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index 00ef6ff..cad8ec4 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -13,8 +13,8 @@
-
-
+
+
@@ -45,9 +45,10 @@
-
+
+
@@ -108,9 +109,9 @@
Upload photo
-
-
-
+
+
+
@@ -142,17 +143,17 @@
name: 'AddPerson',
components: { DeptSelect },
data() {
- const validateIDCard = (rule, value, callback) => {
- if (value !== '') {
- if ((/^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/).test(value) === false) {
- callback(new Error('Please enter a valid id number'))
- } else {
- callback()
- }
- } else {
- callback(new Error('The id number cannot be empty'))
- }
- }
+ // const validateIDCard = (rule, value, callback) => {
+ // if (value !== '') {
+ // if ((/^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/).test(value) === false) {
+ // callback(new Error('Please enter a valid IdCard'))
+ // } else {
+ // callback()
+ // }
+ // } else {
+ // callback(new Error('The IdCard cannot be empty'))
+ // }
+ // }
return {
dialogFormVisible: false, // 对话框是否显示
dialogStatus: '', // 对话框类型：create,update
@@ -187,7 +188,8 @@
rules: {
personCode: [{ required: true, message: 'Staff number is required', trigger: ['blur', 'change'] }],
name: [{ required: true, message: 'Name is required', trigger: ['blur', 'change'] }],
- idCardNo: [{ required: true, validator: validateIDCard, trigger: ['blur', 'change'] }],
+ idCardNo: [{ required: true, message: 'IdCard is required', trigger: ['blur', 'change'] },
+ { max: 32, message: 'Max length 32', trigger: ['blur', 'change'] }],
deptid: [{ required: true, message: 'Company/Department is required', trigger: 'change' }],
duty: [{ required: true, message: 'Duty is required', trigger: 'change' }],
sex: [{ required: true, message: 'Gender is required', trigger: 'blur' }],
diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue
index d78fb84..69a6087 100644
--- a/src/views/memberManage/addPersonIris.vue
+++ b/src/views/memberManage/addPersonIris.vue
@@ -15,8 +15,8 @@
-
-
+
+
@@ -47,9 +47,10 @@
-
+
+
@@ -110,9 +111,9 @@
Upload photo
-
-
-
+
+
+
@@ -159,17 +160,17 @@
name: 'AddPersonIris',
components: { DeptSelect },
data() {
- const validateIDCard = (rule, value, callback) => {
- if (value !== '') {
- if ((/^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/).test(value) === false) {
- callback(new Error('Please enter a valid id number'))
- } else {
- callback()
- }
- } else {
- callback(new Error('The id number cannot be empty'))
- }
- }
+ // const validateIDCard = (rule, value, callback) => {
+ // if (value !== '') {
+ // if ((/^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/).test(value) === false) {
+ // callback(new Error('Please enter a valid IdCard'))
+ // } else {
+ // callback()
+ // }
+ // } else {
+ // callback(new Error('The IdCard cannot be empty'))
+ // }
+ // }
return {
dialogFormVisible: false, // 对话框是否显示
dialogStatus: '', // 对话框类型：create,update
@@ -204,7 +205,8 @@
rules: {
// personCode: [{ required: true, message: '员工编号必填', trigger: ['blur', 'change'] }],
name: [{ required: true, message: 'Name is required', trigger: ['blur', 'change'] }],
- idCardNo: [{ required: true, validator: validateIDCard, trigger: ['blur', 'change'] }],
+ idCardNo: [{ required: true, message: 'IdCard is required', trigger: ['blur', 'change'] },
+ { max: 32, message: 'Max length 32', trigger: ['blur', 'change'] }],
deptid: [{ required: true, message: 'Company/Department is required', trigger: 'change' }],
duty: [{ required: true, message: 'Duty is required', trigger: 'change' }],
sex: [{ required: true, message: 'Gender is required', trigger: 'blur' }],
diff --git a/src/views/memberManage/listStaff.vue b/src/views/memberManage/listStaff.vue
index 464f13a..9695f04 100644
--- a/src/views/memberManage/listStaff.vue
+++ b/src/views/memberManage/listStaff.vue
@@ -6,7 +6,7 @@
-
+
@@ -110,7 +110,7 @@
align: 'center'
},
{
- text: 'Id number',
+ text: 'IdCard',
value: 'idCardNo',
align: 'center',
width: 180
diff --git a/config/index.js b/config/index.js
index c7db639..c693b29 100644
--- a/config/index.js
+++ b/config/index.js
@@ -61,7 +61,7 @@
* then assetsPublicPath should be set to "/bar/".
* In most cases please use '/' !!!
*/
- assetsPublicPath: '/iris/',
+ assetsPublicPath: '/iris_en/',
/**
* Source Maps
diff --git a/src/utils/request.js b/src/utils/request.js
index 5003756..56d7176 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -45,11 +45,11 @@
// 50008:非法的token; 50012:其他客户端登录了; 50014:Token 过期了;
if (res.code === 401 || res.code === 50012 || res.code === 50014) {
MessageBox.confirm(
- '你已被登出，可以取消继续留在该页面，或者重新登录',
- '确定登出',
+ 'You have been logged out. You can cancel remaining on this page or re-login.',
+ 'Confirm logout',
{
- confirmButtonText: '重新登录',
- cancelButtonText: '取消',
+ confirmButtonText: 'Re-login',
+ cancelButtonText: 'Cancel',
type: 'warning'
}
).then(() => {
@@ -88,12 +88,43 @@
} else {
console.log('错误:' + error.response.data.message) // for debug
// Message.error(error.response.data.message)
- Message({
- showClose: true,
- message: error.response.data.message,
- type: 'error',
- duration: 3000
- })
+ // debugger
+ if (error.response.data.message === '原密码不正确') {
+ Message({
+ showClose: true,
+ message: 'Old password error',
+ type: 'error',
+ duration: 3000
+ })
+ } else if (error.response.data.message === '该用户已经注册') {
+ Message({
+ showClose: true,
+ message: 'This account has been registered',
+ type: 'error',
+ duration: 3000
+ })
+ } else if (error.response.data.message === '未授权.没有或者登录超时') {
+ Message({
+ showClose: true,
+ message: 'Not authorized. No or login timed out',
+ type: 'error',
+ duration: 3000
+ })
+ } else if (error.response.data.message === '服务器异常') {
+ Message({
+ showClose: true,
+ message: 'Server exception',
+ type: 'error',
+ duration: 3000
+ })
+ } else {
+ Message({
+ showClose: true,
+ message: error.response.data.message,
+ type: 'error',
+ duration: 3000
+ })
+ }
}
return Promise.reject(error)
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index 00ef6ff..cad8ec4 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -13,8 +13,8 @@
-
-
+
+
@@ -45,9 +45,10 @@
-
+
+
@@ -108,9 +109,9 @@
Upload photo
-
-
-
+
+
+
@@ -142,17 +143,17 @@
name: 'AddPerson',
components: { DeptSelect },
data() {
- const validateIDCard = (rule, value, callback) => {
- if (value !== '') {
- if ((/^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/).test(value) === false) {
- callback(new Error('Please enter a valid id number'))
- } else {
- callback()
- }
- } else {
- callback(new Error('The id number cannot be empty'))
- }
- }
+ // const validateIDCard = (rule, value, callback) => {
+ // if (value !== '') {
+ // if ((/^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/).test(value) === false) {
+ // callback(new Error('Please enter a valid IdCard'))
+ // } else {
+ // callback()
+ // }
+ // } else {
+ // callback(new Error('The IdCard cannot be empty'))
+ // }
+ // }
return {
dialogFormVisible: false, // 对话框是否显示
dialogStatus: '', // 对话框类型：create,update
@@ -187,7 +188,8 @@
rules: {
personCode: [{ required: true, message: 'Staff number is required', trigger: ['blur', 'change'] }],
name: [{ required: true, message: 'Name is required', trigger: ['blur', 'change'] }],
- idCardNo: [{ required: true, validator: validateIDCard, trigger: ['blur', 'change'] }],
+ idCardNo: [{ required: true, message: 'IdCard is required', trigger: ['blur', 'change'] },
+ { max: 32, message: 'Max length 32', trigger: ['blur', 'change'] }],
deptid: [{ required: true, message: 'Company/Department is required', trigger: 'change' }],
duty: [{ required: true, message: 'Duty is required', trigger: 'change' }],
sex: [{ required: true, message: 'Gender is required', trigger: 'blur' }],
diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue
index d78fb84..69a6087 100644
--- a/src/views/memberManage/addPersonIris.vue
+++ b/src/views/memberManage/addPersonIris.vue
@@ -15,8 +15,8 @@
-
-
+
+
@@ -47,9 +47,10 @@
-
+
+
@@ -110,9 +111,9 @@
Upload photo
-
-
-
+
+
+
@@ -159,17 +160,17 @@
name: 'AddPersonIris',
components: { DeptSelect },
data() {
- const validateIDCard = (rule, value, callback) => {
- if (value !== '') {
- if ((/^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/).test(value) === false) {
- callback(new Error('Please enter a valid id number'))
- } else {
- callback()
- }
- } else {
- callback(new Error('The id number cannot be empty'))
- }
- }
+ // const validateIDCard = (rule, value, callback) => {
+ // if (value !== '') {
+ // if ((/^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/).test(value) === false) {
+ // callback(new Error('Please enter a valid IdCard'))
+ // } else {
+ // callback()
+ // }
+ // } else {
+ // callback(new Error('The IdCard cannot be empty'))
+ // }
+ // }
return {
dialogFormVisible: false, // 对话框是否显示
dialogStatus: '', // 对话框类型：create,update
@@ -204,7 +205,8 @@
rules: {
// personCode: [{ required: true, message: '员工编号必填', trigger: ['blur', 'change'] }],
name: [{ required: true, message: 'Name is required', trigger: ['blur', 'change'] }],
- idCardNo: [{ required: true, validator: validateIDCard, trigger: ['blur', 'change'] }],
+ idCardNo: [{ required: true, message: 'IdCard is required', trigger: ['blur', 'change'] },
+ { max: 32, message: 'Max length 32', trigger: ['blur', 'change'] }],
deptid: [{ required: true, message: 'Company/Department is required', trigger: 'change' }],
duty: [{ required: true, message: 'Duty is required', trigger: 'change' }],
sex: [{ required: true, message: 'Gender is required', trigger: 'blur' }],
diff --git a/src/views/memberManage/listStaff.vue b/src/views/memberManage/listStaff.vue
index 464f13a..9695f04 100644
--- a/src/views/memberManage/listStaff.vue
+++ b/src/views/memberManage/listStaff.vue
@@ -6,7 +6,7 @@
-
+
@@ -110,7 +110,7 @@
align: 'center'
},
{
- text: 'Id number',
+ text: 'IdCard',
value: 'idCardNo',
align: 'center',
width: 180
diff --git a/src/views/memberManage/listVisitor.vue b/src/views/memberManage/listVisitor.vue
index 59deca5..e96490e 100644
--- a/src/views/memberManage/listVisitor.vue
+++ b/src/views/memberManage/listVisitor.vue
@@ -6,7 +6,7 @@
-
+
@@ -115,7 +115,7 @@
align: 'center'
},
{
- text: 'Id number',
+ text: 'IdCard',
value: 'idCardNo',
align: 'center',
width: 180
diff --git a/config/index.js b/config/index.js
index c7db639..c693b29 100644
--- a/config/index.js
+++ b/config/index.js
@@ -61,7 +61,7 @@
* then assetsPublicPath should be set to "/bar/".
* In most cases please use '/' !!!
*/
- assetsPublicPath: '/iris/',
+ assetsPublicPath: '/iris_en/',
/**
* Source Maps
diff --git a/src/utils/request.js b/src/utils/request.js
index 5003756..56d7176 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -45,11 +45,11 @@
// 50008:非法的token; 50012:其他客户端登录了; 50014:Token 过期了;
if (res.code === 401 || res.code === 50012 || res.code === 50014) {
MessageBox.confirm(
- '你已被登出，可以取消继续留在该页面，或者重新登录',
- '确定登出',
+ 'You have been logged out. You can cancel remaining on this page or re-login.',
+ 'Confirm logout',
{
- confirmButtonText: '重新登录',
- cancelButtonText: '取消',
+ confirmButtonText: 'Re-login',
+ cancelButtonText: 'Cancel',
type: 'warning'
}
).then(() => {
@@ -88,12 +88,43 @@
} else {
console.log('错误:' + error.response.data.message) // for debug
// Message.error(error.response.data.message)
- Message({
- showClose: true,
- message: error.response.data.message,
- type: 'error',
- duration: 3000
- })
+ // debugger
+ if (error.response.data.message === '原密码不正确') {
+ Message({
+ showClose: true,
+ message: 'Old password error',
+ type: 'error',
+ duration: 3000
+ })
+ } else if (error.response.data.message === '该用户已经注册') {
+ Message({
+ showClose: true,
+ message: 'This account has been registered',
+ type: 'error',
+ duration: 3000
+ })
+ } else if (error.response.data.message === '未授权.没有或者登录超时') {
+ Message({
+ showClose: true,
+ message: 'Not authorized. No or login timed out',
+ type: 'error',
+ duration: 3000
+ })
+ } else if (error.response.data.message === '服务器异常') {
+ Message({
+ showClose: true,
+ message: 'Server exception',
+ type: 'error',
+ duration: 3000
+ })
+ } else {
+ Message({
+ showClose: true,
+ message: error.response.data.message,
+ type: 'error',
+ duration: 3000
+ })
+ }
}
return Promise.reject(error)
diff --git a/src/views/memberManage/addPerson.vue b/src/views/memberManage/addPerson.vue
index 00ef6ff..cad8ec4 100644
--- a/src/views/memberManage/addPerson.vue
+++ b/src/views/memberManage/addPerson.vue
@@ -13,8 +13,8 @@
-
-
+
+
@@ -45,9 +45,10 @@
-
+
+
@@ -108,9 +109,9 @@
Upload photo
-
-
-
+
+
+
@@ -142,17 +143,17 @@
name: 'AddPerson',
components: { DeptSelect },
data() {
- const validateIDCard = (rule, value, callback) => {
- if (value !== '') {
- if ((/^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/).test(value) === false) {
- callback(new Error('Please enter a valid id number'))
- } else {
- callback()
- }
- } else {
- callback(new Error('The id number cannot be empty'))
- }
- }
+ // const validateIDCard = (rule, value, callback) => {
+ // if (value !== '') {
+ // if ((/^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/).test(value) === false) {
+ // callback(new Error('Please enter a valid IdCard'))
+ // } else {
+ // callback()
+ // }
+ // } else {
+ // callback(new Error('The IdCard cannot be empty'))
+ // }
+ // }
return {
dialogFormVisible: false, // 对话框是否显示
dialogStatus: '', // 对话框类型：create,update
@@ -187,7 +188,8 @@
rules: {
personCode: [{ required: true, message: 'Staff number is required', trigger: ['blur', 'change'] }],
name: [{ required: true, message: 'Name is required', trigger: ['blur', 'change'] }],
- idCardNo: [{ required: true, validator: validateIDCard, trigger: ['blur', 'change'] }],
+ idCardNo: [{ required: true, message: 'IdCard is required', trigger: ['blur', 'change'] },
+ { max: 32, message: 'Max length 32', trigger: ['blur', 'change'] }],
deptid: [{ required: true, message: 'Company/Department is required', trigger: 'change' }],
duty: [{ required: true, message: 'Duty is required', trigger: 'change' }],
sex: [{ required: true, message: 'Gender is required', trigger: 'blur' }],
diff --git a/src/views/memberManage/addPersonIris.vue b/src/views/memberManage/addPersonIris.vue
index d78fb84..69a6087 100644
--- a/src/views/memberManage/addPersonIris.vue
+++ b/src/views/memberManage/addPersonIris.vue
@@ -15,8 +15,8 @@
-
-
+
+
@@ -47,9 +47,10 @@
-
+
+
@@ -110,9 +111,9 @@
Upload photo
-
-
-
+
+
+
@@ -159,17 +160,17 @@
name: 'AddPersonIris',
components: { DeptSelect },
data() {
- const validateIDCard = (rule, value, callback) => {
- if (value !== '') {
- if ((/^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/).test(value) === false) {
- callback(new Error('Please enter a valid id number'))
- } else {
- callback()
- }
- } else {
- callback(new Error('The id number cannot be empty'))
- }
- }
+ // const validateIDCard = (rule, value, callback) => {
+ // if (value !== '') {
+ // if ((/^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/).test(value) === false) {
+ // callback(new Error('Please enter a valid IdCard'))
+ // } else {
+ // callback()
+ // }
+ // } else {
+ // callback(new Error('The IdCard cannot be empty'))
+ // }
+ // }
return {
dialogFormVisible: false, // 对话框是否显示
dialogStatus: '', // 对话框类型：create,update
@@ -204,7 +205,8 @@
rules: {
// personCode: [{ required: true, message: '员工编号必填', trigger: ['blur', 'change'] }],
name: [{ required: true, message: 'Name is required', trigger: ['blur', 'change'] }],
- idCardNo: [{ required: true, validator: validateIDCard, trigger: ['blur', 'change'] }],
+ idCardNo: [{ required: true, message: 'IdCard is required', trigger: ['blur', 'change'] },
+ { max: 32, message: 'Max length 32', trigger: ['blur', 'change'] }],
deptid: [{ required: true, message: 'Company/Department is required', trigger: 'change' }],
duty: [{ required: true, message: 'Duty is required', trigger: 'change' }],
sex: [{ required: true, message: 'Gender is required', trigger: 'blur' }],
diff --git a/src/views/memberManage/listStaff.vue b/src/views/memberManage/listStaff.vue
index 464f13a..9695f04 100644
--- a/src/views/memberManage/listStaff.vue
+++ b/src/views/memberManage/listStaff.vue
@@ -6,7 +6,7 @@
-
+
@@ -110,7 +110,7 @@
align: 'center'
},
{
- text: 'Id number',
+ text: 'IdCard',
value: 'idCardNo',
align: 'center',
width: 180
diff --git a/src/views/memberManage/listVisitor.vue b/src/views/memberManage/listVisitor.vue
index 59deca5..e96490e 100644
--- a/src/views/memberManage/listVisitor.vue
+++ b/src/views/memberManage/listVisitor.vue
@@ -6,7 +6,7 @@
-
+
@@ -115,7 +115,7 @@
align: 'center'
},
{
- text: 'Id number',
+ text: 'IdCard',
value: 'idCardNo',
align: 'center',
width: 180
diff --git a/src/views/query/listRecord.vue b/src/views/query/listRecord.vue
index 2265140..7f5ec77 100644
--- a/src/views/query/listRecord.vue
+++ b/src/views/query/listRecord.vue
@@ -4,10 +4,10 @@
-
+
-
+
@@ -132,13 +132,13 @@
align: 'center'
},
{
- text: 'IDCard',
+ text: 'IdCard',
value: 'idCard',
align: 'center',
width: 170
},
{
- text: 'Unit/Department',
+ text: 'Company/Department',
value: 'personDeptName',
align: 'center'
},