diff --git a/src/layouts/components/Tools/userInfo.vue b/src/layouts/components/Tools/userInfo.vue index 3458e8f..fe07943 100644 --- a/src/layouts/components/Tools/userInfo.vue +++ b/src/layouts/components/Tools/userInfo.vue @@ -36,7 +36,7 @@ account: [{ required: true, message: '账号不能为空', trigger: ['blur', 'change'] }], name: [{ required: true, message: '姓名不能为空', trigger: ['blur', 'change'] }], email: [{ required: false, message: '请输入邮箱地址', trigger: 'blur' }, { type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }], - phone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }], + // phone: [{ required: false, pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }], avatar: [{ required: true, message: '人员类别必选', trigger: ['blur', 'change'] }], })// 前端校验规则 // 弹窗初始化 @@ -64,18 +64,21 @@ dataFormRef.value?.clearValidate() }) // 查询用户组织 - getDeptList({ deptName: data.deptName }).then((res) => { + getDeptList({ deptName: data.deptName }).then((res1) => { + console.log(data.deptName, 'data.deptName') let fullDeptName = '' - if (res.data.list.length) { + if (res1.data.list.length) { getDeptTree({ limit: 999999, offset: 1 }).then((res) => { const all = res.data.list - const depts = res.data.list[0].pids.split(',')?.filter((item: any) => item)?.map((item: any) => clearSymbol(item)) + const depts = res1.data.list[0].pids.split(',')?.filter((item: any) => item)?.map((item: any) => clearSymbol(item)) if (!depts.length) { userForm.value.deptAllName = data.deptName return } + console.log(depts, 'depts') depts.forEach((citem: any) => { const data = all.filter((item: any) => item.deptId === citem) + console.log(data, 'data') if (data.length) { fullDeptName = `${fullDeptName}${data[0].fullName === '顶级' ? '' : '/'}${data[0].fullName}` } diff --git a/src/layouts/components/Tools/userInfo.vue b/src/layouts/components/Tools/userInfo.vue index 3458e8f..fe07943 100644 --- a/src/layouts/components/Tools/userInfo.vue +++ b/src/layouts/components/Tools/userInfo.vue @@ -36,7 +36,7 @@ account: [{ required: true, message: '账号不能为空', trigger: ['blur', 'change'] }], name: [{ required: true, message: '姓名不能为空', trigger: ['blur', 'change'] }], email: [{ required: false, message: '请输入邮箱地址', trigger: 'blur' }, { type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }], - phone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }], + // phone: [{ required: false, pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }], avatar: [{ required: true, message: '人员类别必选', trigger: ['blur', 'change'] }], })// 前端校验规则 // 弹窗初始化 @@ -64,18 +64,21 @@ dataFormRef.value?.clearValidate() }) // 查询用户组织 - getDeptList({ deptName: data.deptName }).then((res) => { + getDeptList({ deptName: data.deptName }).then((res1) => { + console.log(data.deptName, 'data.deptName') let fullDeptName = '' - if (res.data.list.length) { + if (res1.data.list.length) { getDeptTree({ limit: 999999, offset: 1 }).then((res) => { const all = res.data.list - const depts = res.data.list[0].pids.split(',')?.filter((item: any) => item)?.map((item: any) => clearSymbol(item)) + const depts = res1.data.list[0].pids.split(',')?.filter((item: any) => item)?.map((item: any) => clearSymbol(item)) if (!depts.length) { userForm.value.deptAllName = data.deptName return } + console.log(depts, 'depts') depts.forEach((citem: any) => { const data = all.filter((item: any) => item.deptId === citem) + console.log(data, 'data') if (data.length) { fullDeptName = `${fullDeptName}${data[0].fullName === '顶级' ? '' : '/'}${data[0].fullName}` } diff --git a/src/views/system/user/userAdd.vue b/src/views/system/user/userAdd.vue index 213da24..f6e142f 100644 --- a/src/views/system/user/userAdd.vue +++ b/src/views/system/user/userAdd.vue @@ -72,7 +72,7 @@ deptId: [{ required: true, message: '组织机构必选', trigger: ['blur', 'change'] }], roleId: [{ required: true, message: '角色必选', trigger: ['blur', 'change'] }], email: [{ required: false, message: '请输入邮箱地址', trigger: 'blur' }, { type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }], - phone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }], + // phone: [{ required: false, pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }], avatar: [{ required: true, message: '人员类别必选', trigger: ['blur', 'change'] }], })// 前端校验规则 const roleName = ref()// 角色名,展示用 diff --git a/src/layouts/components/Tools/userInfo.vue b/src/layouts/components/Tools/userInfo.vue index 3458e8f..fe07943 100644 --- a/src/layouts/components/Tools/userInfo.vue +++ b/src/layouts/components/Tools/userInfo.vue @@ -36,7 +36,7 @@ account: [{ required: true, message: '账号不能为空', trigger: ['blur', 'change'] }], name: [{ required: true, message: '姓名不能为空', trigger: ['blur', 'change'] }], email: [{ required: false, message: '请输入邮箱地址', trigger: 'blur' }, { type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }], - phone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }], + // phone: [{ required: false, pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }], avatar: [{ required: true, message: '人员类别必选', trigger: ['blur', 'change'] }], })// 前端校验规则 // 弹窗初始化 @@ -64,18 +64,21 @@ dataFormRef.value?.clearValidate() }) // 查询用户组织 - getDeptList({ deptName: data.deptName }).then((res) => { + getDeptList({ deptName: data.deptName }).then((res1) => { + console.log(data.deptName, 'data.deptName') let fullDeptName = '' - if (res.data.list.length) { + if (res1.data.list.length) { getDeptTree({ limit: 999999, offset: 1 }).then((res) => { const all = res.data.list - const depts = res.data.list[0].pids.split(',')?.filter((item: any) => item)?.map((item: any) => clearSymbol(item)) + const depts = res1.data.list[0].pids.split(',')?.filter((item: any) => item)?.map((item: any) => clearSymbol(item)) if (!depts.length) { userForm.value.deptAllName = data.deptName return } + console.log(depts, 'depts') depts.forEach((citem: any) => { const data = all.filter((item: any) => item.deptId === citem) + console.log(data, 'data') if (data.length) { fullDeptName = `${fullDeptName}${data[0].fullName === '顶级' ? '' : '/'}${data[0].fullName}` } diff --git a/src/views/system/user/userAdd.vue b/src/views/system/user/userAdd.vue index 213da24..f6e142f 100644 --- a/src/views/system/user/userAdd.vue +++ b/src/views/system/user/userAdd.vue @@ -72,7 +72,7 @@ deptId: [{ required: true, message: '组织机构必选', trigger: ['blur', 'change'] }], roleId: [{ required: true, message: '角色必选', trigger: ['blur', 'change'] }], email: [{ required: false, message: '请输入邮箱地址', trigger: 'blur' }, { type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }], - phone: [{ required: false, pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }], + // phone: [{ required: false, pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号', trigger: ['blur', 'change'] }], avatar: [{ required: true, message: '人员类别必选', trigger: ['blur', 'change'] }], })// 前端校验规则 const roleName = ref()// 角色名,展示用 diff --git a/src/views/tested/device/model/components/list.vue b/src/views/tested/device/model/components/list.vue index c31a212..3142975 100644 --- a/src/views/tested/device/model/components/list.vue +++ b/src/views/tested/device/model/components/list.vue @@ -132,7 +132,7 @@ } // 导出列表 const exportList = () => { - if (selectList.value.length) { + if (list.value.length) { const loading = ElLoading.service({ lock: true, text: 'Loading', @@ -156,7 +156,7 @@ }) } else { - ElMessage.warning('请选择需要导出的数据') + ElMessage.warning('暂无可导出数据') } } // 打开文件