From ce8ffdc3dbdc39816a84dad3c0d82f3c360bc60f Mon Sep 17 00:00:00 2001 From: aiyadc <565548447@qq.com> Date: Thu, 28 May 2020 20:40:56 +0800 Subject: [PATCH] =?UTF-8?q?[fix][V]:=E5=AE=8C=E5=96=84=E5=91=A8=E6=AC=A1?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- element-vue/src/components/manager/navBar.vue | 2 +- .../src/components/supManager/addLab.vue | 12 +- .../src/components/supManager/navBar.vue | 2 +- .../{components => pages}/manager/home.vue | 0 .../{applyRecord.vue => managerCheck.vue} | 31 +++- .../{components => pages}/supManager/home.vue | 5 + .../supManager/labManage.vue | 77 +++++----- element-vue/src/pages/supManager/supCheck.vue | 137 ++++++++++++++++++ .../supManager/userManage.vue | 0 .../src/pages/teacher/courseManagement.vue | 47 ++++-- element-vue/src/pages/test.vue | 2 +- element-vue/src/router.js | 20 +-- 12 files changed, 256 insertions(+), 79 deletions(-) rename element-vue/src/{components => pages}/manager/home.vue (100%) rename element-vue/src/pages/manager/{applyRecord.vue => managerCheck.vue} (74%) rename element-vue/src/{components => pages}/supManager/home.vue (88%) rename element-vue/src/{components => pages}/supManager/labManage.vue (83%) create mode 100644 element-vue/src/pages/supManager/supCheck.vue rename element-vue/src/{components => pages}/supManager/userManage.vue (100%) diff --git a/element-vue/src/components/manager/navBar.vue b/element-vue/src/components/manager/navBar.vue index d4bd4f3..dac4585 100644 --- a/element-vue/src/components/manager/navBar.vue +++ b/element-vue/src/components/manager/navBar.vue @@ -10,7 +10,7 @@ active-text-color="#ffd04b" router> 首页 - 审核 + 审核 实验室管理 diff --git a/element-vue/src/components/supManager/addLab.vue b/element-vue/src/components/supManager/addLab.vue index edecffe..a7278e9 100644 --- a/element-vue/src/components/supManager/addLab.vue +++ b/element-vue/src/components/supManager/addLab.vue @@ -4,13 +4,13 @@ :visible.sync="addLabDialog" width="48%">
- + - + - + @@ -23,15 +23,15 @@ - + - + - +
diff --git a/element-vue/src/components/supManager/navBar.vue b/element-vue/src/components/supManager/navBar.vue index 18158c2..6562bfc 100644 --- a/element-vue/src/components/supManager/navBar.vue +++ b/element-vue/src/components/supManager/navBar.vue @@ -12,7 +12,7 @@ 首页 实验室管理 用户管理 - 审核 + 审核
diff --git a/element-vue/src/components/manager/home.vue b/element-vue/src/pages/manager/home.vue similarity index 100% rename from element-vue/src/components/manager/home.vue rename to element-vue/src/pages/manager/home.vue diff --git a/element-vue/src/pages/manager/applyRecord.vue b/element-vue/src/pages/manager/managerCheck.vue similarity index 74% rename from element-vue/src/pages/manager/applyRecord.vue rename to element-vue/src/pages/manager/managerCheck.vue index da15166..34012ca 100644 --- a/element-vue/src/pages/manager/applyRecord.vue +++ b/element-vue/src/pages/manager/managerCheck.vue @@ -4,7 +4,7 @@
- +
@@ -51,8 +51,8 @@ @@ -77,6 +77,7 @@ }, data() { return { + search:'', isCheck:0, tableData: [] } @@ -99,10 +100,28 @@ computed:{ tableDataComputed(){ if (this.isCheck===0){ - return this.tableData.filter(data=>data.status===0) - }else { - return this.tableData.filter(data=>data.status===1 || data.status===2) + return this.tableData.filter(data=>data.status===0 && (!this.search || + data.classes.toLowerCase().includes(this.search.toLowerCase()) + || data.course_name.toLowerCase().includes(this.search.toLowerCase()) + || data.lab_name.toLowerCase().includes(this.search.toLowerCase()) + ||data.population.toString().includes(this.search) + ||data.position.toLowerCase().includes(this.search.toLowerCase()) + ||data.year.includes(this.search) + ||data.day.toString().includes(this.search) + ) + ) + }else { + return this.tableData.filter(data=>(data.status===1 || data.status===2) && (!this.search || + data.classes.toLowerCase().includes(this.search.toLowerCase()) + || data.course_name.toLowerCase().includes(this.search.toLowerCase()) + || data.lab_name.toLowerCase().includes(this.search.toLowerCase()) + ||data.population.toString().includes(this.search) + ||data.position.toLowerCase().includes(this.search.toLowerCase()) + ||data.year.includes(this.search) + ||data.day.toString().includes(this.search) + ) + ) } } diff --git a/element-vue/src/components/supManager/home.vue b/element-vue/src/pages/supManager/home.vue similarity index 88% rename from element-vue/src/components/supManager/home.vue rename to element-vue/src/pages/supManager/home.vue index eb0c545..6f23b58 100644 --- a/element-vue/src/components/supManager/home.vue +++ b/element-vue/src/pages/supManager/home.vue @@ -36,6 +36,11 @@ name: '个人中心', func: () => { this.$router.push('/supManager/index/personal') } + }, + { + name: '审核', func: () => { + this.$router.push('/supManager/index/check') + } } ] } diff --git a/element-vue/src/components/supManager/labManage.vue b/element-vue/src/pages/supManager/labManage.vue similarity index 83% rename from element-vue/src/components/supManager/labManage.vue rename to element-vue/src/pages/supManager/labManage.vue index a63faa9..379c095 100644 --- a/element-vue/src/components/supManager/labManage.vue +++ b/element-vue/src/pages/supManager/labManage.vue @@ -175,7 +175,7 @@ computed: { tableDataComputed() { - this.currenttableData=this.tableData.filter(data => !this.search + return this.currenttableData=this.tableData.filter(data => !this.search || data.name.toLowerCase().includes(this.search.toLowerCase()) || data.position.toLowerCase().includes(this.search.toLowerCase()) || data.software.toLowerCase().includes(this.search.toLowerCase()) @@ -183,21 +183,6 @@ || data.tel.toLowerCase().includes(this.search.toLowerCase()) ) - if (this.currenttableData.name===null&& - this.currenttableData.position===null&& - this.currenttableData.software===null&& - this.currenttableData.nickname===null&& - this.currenttableData.tel===null) { - return null - } - else { - return this.tableData.filter(data => !this.search - || data.name.toLowerCase().includes(this.search.toLowerCase()) - || data.position.toLowerCase().includes(this.search.toLowerCase()) - || data.software.toLowerCase().includes(this.search.toLowerCase()) - || data.nickname.toLowerCase().includes(this.search.toLowerCase()) - || data.tel.toLowerCase().includes(this.search.toLowerCase())) - } } }, @@ -221,34 +206,38 @@ this.dialogFormVisible = true }, async submit() { - this.$refs.addLab.form.capacity = parseInt(this.$refs.addLab.form.capacity) - this.$refs.addLab.form.managerId = this.$refs.addLab.form.manager_id - if (this.$refs.addLab.form.lab_id) { - // 编辑 - await showDialog('确认要编辑吗？', this) - this.$refs.addLab.form.labId = this.$refs.addLab.form.lab_id - await post('lb/lab/updateLab', this.$refs.addLab.form).then(async () => { - await this.load() - showSuccess('编辑成功', this) - }).catch(() => { - showFail('编辑失败', this) - }) - - } else { - // 新增 - await showDialog('确认要新增吗？', this) - await showDialogWithReject('是否需要为该实验室添加' + parseInt(this.time.year) + '-' + (parseInt(this.time.year) + 1) + '学年第' + this.time.semester + '学期16周的所有时间段？', this).then(async () => { - this.$refs.addLab.form.fastInsert = true - this.$refs.addLab.form.year = this.time.year - this.$refs.addLab.form.semester = this.time.semester - console.log(this.$refs.addLab.form) - await this.addLab() - }).catch(async () => { - this.$refs.addLab.form.fastInsert = false - await this.addLab() - }) - } - this.$refs.addLab.addLabDialog = false + this.$refs.addLab.$refs.form.validate(async (valid)=> { + if (valid) { + this.$refs.addLab.form.capacity = parseInt(this.$refs.addLab.form.capacity) + this.$refs.addLab.form.managerId = this.$refs.addLab.form.manager_id + if (this.$refs.addLab.form.lab_id) { + // 编辑 + await showDialog('确认要编辑吗？', this) + this.$refs.addLab.form.labId = this.$refs.addLab.form.lab_id + await post('lb/lab/updateLab', this.$refs.addLab.form).then(async () => { + await this.load() + showSuccess('编辑成功', this) + }).catch(() => { + showFail('编辑失败', this) + } + ) + } else { + // 新增 + await showDialog('确认要新增吗？', this) + await showDialogWithReject('是否需要为该实验室添加' + parseInt(this.time.year) + '-' + (parseInt(this.time.year) + 1) + '学年第' + this.time.semester + '学期16周的所有时间段？', this).then(async () => { + this.$refs.addLab.form.fastInsert = true + this.$refs.addLab.form.year = this.time.year + this.$refs.addLab.form.semester = this.time.semester + console.log(this.$refs.addLab.form) + await this.addLab() + }).catch(async () => { + this.$refs.addLab.form.fastInsert = false + await this.addLab() + }) + } + this.$refs.addLab.addLabDialog = false + } + }) }, async addLab() { const loading = showLoading('正在新增...', this) diff --git a/element-vue/src/pages/supManager/supCheck.vue b/element-vue/src/pages/supManager/supCheck.vue new file mode 100644 index 0000000..34012ca --- /dev/null +++ b/element-vue/src/pages/supManager/supCheck.vue @@ -0,0 +1,137 @@ + + + + + diff --git a/element-vue/src/components/supManager/userManage.vue b/element-vue/src/pages/supManager/userManage.vue similarity index 100% rename from element-vue/src/components/supManager/userManage.vue rename to element-vue/src/pages/supManager/userManage.vue diff --git a/element-vue/src/pages/teacher/courseManagement.vue b/element-vue/src/pages/teacher/courseManagement.vue index 91c4c84..7d68524 100644 --- a/element-vue/src/pages/teacher/courseManagement.vue +++ b/element-vue/src/pages/teacher/courseManagement.vue @@ -12,17 +12,22 @@ 查询 + + 多选删除 +
- - - - - - - - + + + + + + + - +