From 59139615e1761b0f2670de2ff23aeac79cfd3a0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=85=81=E6=9E=9E?= <3422692813@qq.com>
Date: Wed, 2 Apr 2025 10:56:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../form/SchoolCourseOrderFastAddForm.vue | 3 +-
.../DriveSchoolPay/form/assignmentCoach.vue | 42 +++++++++++++++++--
.../drivingSchool/DriveSchoolPay/index.vue | 4 +-
src/views/drivingSchool/process/api/index.js | 8 ++++
4 files changed, 49 insertions(+), 8 deletions(-)
diff --git a/src/views/drivingSchool/DriveSchoolPay/form/SchoolCourseOrderFastAddForm.vue b/src/views/drivingSchool/DriveSchoolPay/form/SchoolCourseOrderFastAddForm.vue
index 8e171bc..d32fb4e 100644
--- a/src/views/drivingSchool/DriveSchoolPay/form/SchoolCourseOrderFastAddForm.vue
+++ b/src/views/drivingSchool/DriveSchoolPay/form/SchoolCourseOrderFastAddForm.vue
@@ -127,10 +127,11 @@ export default {
const selected = this.courseList.find(item => item.id === this.formData.courseId);
if (selected) {
this.formData.courseName = selected.name;
- this.formData.courseType = selected.courseType;
+ this.formData.courseType = selected.type;
} else {
this.formData.courseName = '';
}
+ console.log('当前课程', this.formData)
},
handleCoachChange() {
const selected = this.coachList.find(item => item.id === this.formData.coachUserId);
diff --git a/src/views/drivingSchool/DriveSchoolPay/form/assignmentCoach.vue b/src/views/drivingSchool/DriveSchoolPay/form/assignmentCoach.vue
index ee0e5dd..d3277a1 100644
--- a/src/views/drivingSchool/DriveSchoolPay/form/assignmentCoach.vue
+++ b/src/views/drivingSchool/DriveSchoolPay/form/assignmentCoach.vue
@@ -12,7 +12,8 @@
-
+
import * as SchoolCourseOrderApi from '@/views/drivingSchool/DriveSchoolPay/api';
import {getCoachByCourseId} from "@/views/drivingSchool/schoolCoachCourse/api/achoolCoachCourse";
-import {saveProcess} from "@/views/drivingSchool/process/api";
+import {getAllByUserIdAndCourseId, saveProcess} from "@/views/drivingSchool/process/api";
+import {nextTick} from "vue";
export default {
name: "AssignmentCoach",
@@ -48,6 +50,7 @@ export default {
// 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
formLoading: false,
process: [],
+ selectCoach: [],
// 表单校验
formRules: {},
orderId: '',
@@ -58,6 +61,7 @@ export default {
async open(data) {
this.dialogVisible = true;
this.orderId = data.id
+ await this.getAllByUserIdAndCourseId(data.userId, data.courseId)
this.getData(data)
this.reset();
},
@@ -101,6 +105,8 @@ export default {
for (let i = 1; i <= 4; i++) {
//根据res中subject判断与当前i相同的教练
const coachArr = res.data.filter(item => item.subject === i + '')
+
+
const item = {
subject: i,
subjectStr: subjectArr[i - 1],
@@ -113,8 +119,10 @@ export default {
userId: data.userId,
userName: data.userName,
userMobile: data.userPhone,
- status: 0
+ status: 0,
+ disable: false
}
+
//判断data中的教练id是否在coachArr中，如果在设置默认教练
if (data.coachUserId) {
const selectedCoach = coachArr.find(item => item.coachId == data.coachUserId);
@@ -126,9 +134,35 @@ export default {
if (i === 1) {
item.status = 1
}
- this.process.push(item)
+
+ //在this.selectCoach中是否i等于里面的subject
+ if (this.selectCoach.some(item => item.subject == i)) {
+ const selectedCoach = this.selectCoach.find(item => item.subject == i)
+ const selectedCoachId = selectedCoach.coachId + ''
+ const selectedCoachName = selectedCoach.coachName
+ // 设置默认值
+ item.coachId = selectedCoachId
+ item.coachName = selectedCoachName
+ item.disable = true
+ //判断coachArr中是否有当前的id
+ if (!coachArr.some(item => item.coachId == selectedCoachId)) {
+ // 设置disable为true
+ item.coachList.push(selectedCoach)
+ }
+ }
+ nextTick(() => {
+ this.$set(this.process, this.process.length, item)
+ })
}
},
+ async getAllByUserIdAndCourseId(userId, courseId) {
+ const params = {
+ userId: userId,
+ courseId: courseId
+ }
+ const res = await getAllByUserIdAndCourseId(params)
+ this.selectCoach = res.data
+ },
handleChange(row) {
// 你可以在这里处理选择变化后的逻辑
//找出该行的selectedCoachId对应的coachList中的name
diff --git a/src/views/drivingSchool/DriveSchoolPay/index.vue b/src/views/drivingSchool/DriveSchoolPay/index.vue
index cea6c23..eab542a 100644
--- a/src/views/drivingSchool/DriveSchoolPay/index.vue
+++ b/src/views/drivingSchool/DriveSchoolPay/index.vue
@@ -73,7 +73,7 @@
修改
- 分配教练
+ 分配教练
终止
快速创建订单
删除
@@ -170,12 +170,10 @@ export default {
},
/** 分配教练*/
openAssignmentCoach(data) {
- console.log('data',data)
this.$refs["assignmentCoachRef"].open(data);
},
/** 分配教练*/
openEndOrder(data) {
- console.log('data',data)
this.$refs["endOrderRef"].open(data);
},
/** 删除按钮操作 */
diff --git a/src/views/drivingSchool/process/api/index.js b/src/views/drivingSchool/process/api/index.js
index a89f220..262f81e 100644
--- a/src/views/drivingSchool/process/api/index.js
+++ b/src/views/drivingSchool/process/api/index.js
@@ -51,3 +51,11 @@ export function saveProcess(data) {
data: data
})
}
+// 根据用户id和课程id查询进度
+export function getAllByUserIdAndCourseId(params) {
+ return request({
+ url: '/process/getAllByUserIdAndCourseId',
+ method: 'get',
+ params
+ })
+}