diff --git a/src/views/course/AddCurriculum.vue b/src/views/course/AddCurriculum.vue index faacdcc..c5b6032 100644 --- a/src/views/course/AddCurriculum.vue +++ b/src/views/course/AddCurriculum.vue @@ -85,7 +85,8 @@ - + @@ -497,6 +498,7 @@ export default { form: { cid: this.$route.query.cid, curriculumName: "", + curriculumType: '', courseType: "", categoryId: 1, professionalCategoryId: 1, @@ -524,6 +526,9 @@ export default { expectedCourse: [ { required: true, message: "请选择预计课时", trigger: "change" } ], + curriculumType: [ + { required: true, message: "请选择课程类别", trigger: "change" } + ], professionalCategoryId: [ { required: true, message: "请选择专业类", trigger: "change" } ], @@ -974,7 +979,7 @@ export default { this.$message.info("已取消移除"); }); }, - saveAdd (fromBack) { + saveAdd () { this.$refs.form.validate((valid) => { if (valid) { if (this.submiting) return false @@ -1039,16 +1044,17 @@ export default { }); } else { this.$post(this.api.createCurriculum, form).then((res) => { - !fromBack ? this.$confirm("课程创建成功,是否马上进行课程内容设置?", "提示", { + this.loadIns.close() + this.$confirm("课程创建成功,是否马上进行课程内容设置?", "提示", { type: "success", confirmButtonText: "马上设置", cancelButtonText: "稍后操作", closeOnClickModal: false }).then(() => { - this.$router.push(`/contentSettings?cid=${res.cid}`); + this.$router.push(`/contentSettings?cid=${res.cid}&name=${form.curriculumName}`); }).catch(() => { this.$router.push('/curriculum') - }) : this.$router.push('/curriculum') + }) }).catch((res) => { this.submiting = false this.loadIns.close() @@ -1068,7 +1074,7 @@ export default { type: 'warning', closeOnClickModal: false }).then(() => { - this.saveAdd(1) + this.saveAdd() }).catch(() => { this.backPage() }) diff --git a/src/views/customer/AddCustomer.vue b/src/views/customer/AddCustomer.vue index 4913d6e..a31b2f6 100644 --- a/src/views/customer/AddCustomer.vue +++ b/src/views/customer/AddCustomer.vue @@ -1212,16 +1212,12 @@ export default { this.handlePageOrder() }).catch(res => { }) }, - // 订单模糊查询 - filterOrder () { - const { keyword } = this.form3 - const { orders } = this - this.orders = keyword ? this.orderAll.filter(e => e.orderNumber.includes(keyword) || e.orderContent.includes(keyword)) : orders - }, // 分页 handlePageOrder () { - this.orders = this.orderAll.slice((this.pageOrder - 1) * this.pageSizeOrder, this.pageOrder * this.pageSizeOrder) - this.filterOrder() + const { keyword } = this.form3 + const list = keyword ? this.orderAll.filter(e => e.orderNumber.includes(keyword) || e.orderContent.includes(keyword)) : this.orderAll + this.totalOrder = list.length + this.orders = list.slice((this.pageOrder - 1) * this.pageSizeOrder, this.pageOrder * this.pageSizeOrder) }, handleCurrentChangeOrder (val) { this.pageOrder = val diff --git a/src/views/match/manage/matchInfo.vue b/src/views/match/manage/matchInfo.vue index d3bb228..c1668b2 100644 --- a/src/views/match/manage/matchInfo.vue +++ b/src/views/match/manage/matchInfo.vue @@ -3,7 +3,7 @@
-
@@ -647,6 +647,9 @@ export default { toReport (row) { this.$router.push(`/matchReport?reportId=${row.reportId}`) }, + back () { + this.$router.push(this.$store.state.innerReferrer) + } } }; diff --git a/src/views/match/manage/matchSignup.vue b/src/views/match/manage/matchSignup.vue index 2ad5180..283ff38 100644 --- a/src/views/match/manage/matchSignup.vue +++ b/src/views/match/manage/matchSignup.vue @@ -813,7 +813,7 @@ export default { }, // 参赛信息 toInfo (row) { - this.$store.commit('setInnerReferrer', `${this.$route.fullPath}&keyword=${this.keyword}&page=${this.page}&isDisable=${this.isDisable}`) + this.$store.commit('setInnerReferrer', `${this.$route.path}?id=${this.id}&tab=tab5&name=${this.$route.query.name}&keyword=${this.keyword}&page=${this.page}&isDisable=${this.isDisable}`) this.$router.push(`/matchInfo?id=${this.id}&accountId=${row.accountId}`) }, exportAll () { diff --git a/src/views/order/AddOrder.vue b/src/views/order/AddOrder.vue index 25443c5..f7d6d00 100644 --- a/src/views/order/AddOrder.vue +++ b/src/views/order/AddOrder.vue @@ -2358,7 +2358,7 @@ export default { this.refreshCache() this.$message.success("添加订单成功"); this.loading = false; - this.renewDisabled ? this.$router.push('/order') : this.back(); + this.$router.push('/order') }).catch(err => { this.loading = false; });