diff --git a/src/components/page/AddProject.vue b/src/components/page/AddProject.vue index a600106..c536079 100644 --- a/src/components/page/AddProject.vue +++ b/src/components/page/AddProject.vue @@ -1034,7 +1034,7 @@ // if(systemId == 4 || systemId == 5) systemId = 1 this.handleCacheData() this.setCookie("systemId",systemId) - this.setCookie("userId",this.userId) + this.setCookie("userId",this.userLoginId) this.setCookie("projectId",this.id) this.setCookie("token",this.token) let href = '' diff --git a/src/components/page/Staff.vue b/src/components/page/Staff.vue index 19864f1..8505da6 100644 --- a/src/components/page/Staff.vue +++ b/src/components/page/Staff.vue @@ -291,9 +291,6 @@ export default { emailNoAdd: '', managerNumberNoAdd: true, teacherNumberNoAdd: true, - studentNumberNoAdd: true, - managerNumberNoAdd1: true, - teacherNumberNoAdd1: true, platformId: this.$store.state.platformId, isManager: false, isTeacher: false, @@ -584,45 +581,31 @@ export default { } }, async OnlyId(type){ - let workNumber = type == 13 ? this.encodeString(this.teacherForm.managerWorkNumber) : this.encodeString(this.teacherForm.teacherWorkNumber) - let data = { - workNumber, - roleId: 13, - schoolId: this.teacherForm.schoolId - } - let data1 = { - workNumber, - roleId: 14, - schoolId: this.teacherForm.schoolId - } - let data2 = { - workNumber, - roleId: 4, - schoolId: this.teacherForm.schoolId - } - let res = await this.$get(this.api.queryWorkNumberIsExist, data) - let res1 = await this.$get(this.api.queryWorkNumberIsExist, data1) - let res2 = await this.$get(this.api.queryWorkNumberIsExist, data2) - if(type == 13 && JSON.stringify(res.message) != '{}'){ - this.$message.warning('该工号已存在'); - this.managerNumberNoAdd = false - }else if(type == 14 && JSON.stringify(res1.message) != '{}'){ - this.$message.warning('该工号已存在'); - this.teacherNumberNoAdd = false - }else if(JSON.stringify(res2.message) != '{}'){ - this.$message.warning('该工号已绑定学生角色'); - this.studentNumberNoAdd = false - }else if(type == 14 && JSON.stringify(res.message) != '{}'){ - this.$message.warning('该工号已绑定管理员角色'); - this.managerNumberNoAdd1 = false - }else if(type == 13 && JSON.stringify(res1.message) != '{}'){ - this.$message.warning('该工号已绑定老师角色'); - this.teacherNumberNoAdd1 = false + let data = {}; + let msg = ''; + if(type == 13){ + data = { + workNumber: this.encodeString(this.teacherForm.managerWorkNumber), + roleId: 13, + schoolId: this.teacherForm.schoolId + } + msg = '该管理员工号已存在' + }else if(type == 14){ + data = { + workNumber: this.encodeString(this.teacherForm.teacherWorkNumber), + roleId: 14, + schoolId: this.teacherForm.schoolId + } + msg = '该老师工号已存在' } - if(JSON.stringify(res.message) == '{}' && JSON.stringify(res1.message) == '{}' && JSON.stringify(res2.message) == '{}'){ + let res = await this.$get(this.api.queryWorkNumberIsExist, data); + if(JSON.stringify(res.message) != '{}'){ + this.$message.warning(msg); + type == 2 ? (this.managerNumberNoAdd = false) : (this.teacherNumberNoAdd = false) + }else{ let timestamp = Date.parse(new Date()); this.teacherForm.uniqueIdentificationAccount = `${this.schoolId}${this.teacherForm.uniqueIdentificationAccount}${timestamp}` - type == 13 ? (this.managerNumberNoAdd = true) : (this.teacherNumberNoAdd = true) + type == 2 ? (this.managerNumberNoAdd = true) : (this.teacherNumberNoAdd = true) } }, async saveSure(teacherForm){ @@ -644,9 +627,6 @@ export default { } if(!this.managerNumberNoAdd) return this.$message.warning('该管理员工号已存在'); if(!this.teacherNumberNoAdd) return this.$message.warning('该老师工号已存在'); - if(!this.managerNumberNoAdd1) return this.$message.warning('该工号已绑定管理员角色'); - if(!this.teacherNumberNoAdd1) return this.$message.warning('该工号已绑定老师角色'); - if(!this.studentNumberNoAdd) return this.$message.warning('该工号已绑定学生角色'); let roleId = [] this.teacherForm.roleValue.forEach((n,k) => { diff --git a/src/components/page/project.vue b/src/components/page/project.vue index a979cde..9b0f3a5 100644 --- a/src/components/page/project.vue +++ b/src/components/page/project.vue @@ -98,10 +98,10 @@ {{transferStatus(scope.row.state)}} - +