From d5cefa31f827eb9f044bfeba2b57ca8f965d6c59 Mon Sep 17 00:00:00 2001
From: Lx <935448346@qq.com>
Date: Thu, 19 Jun 2025 15:34:26 +0800
Subject: [PATCH] 0619
---
.../form/SchoolCourseOrderFastAddForm.vue | 4 +-
.../drivingSchool/DriveSchoolPay/index.vue | 67 ++++++++++++++++-
.../StudentScoreInput/form/scoreInputForm.vue | 24 +++++-
.../driveSchoolExamPass/index.vue | 17 ++++-
.../process/form/processForm.vue | 75 +++++++++++++++++--
src/views/drivingSchool/process/index.vue | 7 +-
6 files changed, 180 insertions(+), 14 deletions(-)
diff --git a/src/views/drivingSchool/DriveSchoolPay/form/SchoolCourseOrderFastAddForm.vue b/src/views/drivingSchool/DriveSchoolPay/form/SchoolCourseOrderFastAddForm.vue
index b8f177b..66a6857 100644
--- a/src/views/drivingSchool/DriveSchoolPay/form/SchoolCourseOrderFastAddForm.vue
+++ b/src/views/drivingSchool/DriveSchoolPay/form/SchoolCourseOrderFastAddForm.vue
@@ -14,7 +14,7 @@
-
+
@@ -105,7 +105,7 @@ export default {
const coachRes = await listCoach()
this.coachList = coachRes.data
console.log('当前数据', this.coachList);
-
+
this.formLoading = false;
},
/** 提交按钮 */
diff --git a/src/views/drivingSchool/DriveSchoolPay/index.vue b/src/views/drivingSchool/DriveSchoolPay/index.vue
index 56385c9..6e4d52a 100644
--- a/src/views/drivingSchool/DriveSchoolPay/index.vue
+++ b/src/views/drivingSchool/DriveSchoolPay/index.vue
@@ -83,14 +83,79 @@
合同信息
-
+
+
+
+
+
+ 该订单已终止
+
+
+
+
+
+ 修改
+
+
+
+ 分配教练
+
+
+
+ 终止
+
+
+
+ 删除
+
+
+
+
+
+ 快速创建订单
+
+
diff --git a/src/views/drivingSchool/StudentScoreInput/form/scoreInputForm.vue b/src/views/drivingSchool/StudentScoreInput/form/scoreInputForm.vue
index 0b666a7..da6e773 100644
--- a/src/views/drivingSchool/StudentScoreInput/form/scoreInputForm.vue
+++ b/src/views/drivingSchool/StudentScoreInput/form/scoreInputForm.vue
@@ -141,6 +141,28 @@
-->
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -167,7 +189,7 @@ export default {
dialogTitle: "",
// 是否显示弹出层
dialogVisible: false,
- activeNames: ['1','2'],
+ activeNames: ['1','2','3'],
// 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
formLoading: false,
addressList:[],
diff --git a/src/views/drivingSchool/driveSchoolExamPass/index.vue b/src/views/drivingSchool/driveSchoolExamPass/index.vue
index 45d2706..728a465 100644
--- a/src/views/drivingSchool/driveSchoolExamPass/index.vue
+++ b/src/views/drivingSchool/driveSchoolExamPass/index.vue
@@ -30,7 +30,7 @@
-
+
+
+
+
@@ -379,6 +382,18 @@ export default {
this.form.studentName = null; // 清空学生名称
}
},
+ formatDate(row, column, cellValue) {
+ return this.formatTimestampToDate(cellValue);
+ },
+ formatTimestampToDate(timestamp) {
+ if (!timestamp) return '';
+ const date = new Date(timestamp);
+ const year = date.getFullYear();
+ const month = String(date.getMonth() + 1).padStart(2, '0');
+ const day = String(date.getDate()).padStart(2, '0');
+
+ return `${year}-${month}-${day}`;
+ },
// /** 删除按钮操作 */
// async handleDelete(row) {
diff --git a/src/views/drivingSchool/process/form/processForm.vue b/src/views/drivingSchool/process/form/processForm.vue
index 2a4af72..cda51f6 100644
--- a/src/views/drivingSchool/process/form/processForm.vue
+++ b/src/views/drivingSchool/process/form/processForm.vue
@@ -96,12 +96,47 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+ {{ getSubjectName(scope.row.subject) }}
+
+
+
+
+ {{ getExamStatusName(scope.row.examStatus) }}
+
+
+
+
+ {{ formatDate(scope.row.examTime) }}
+
+
+
+
+ {{ scope.row.examScore || '-' }}
+
+
+
+
+
@@ -121,7 +156,7 @@
-
+
@@ -167,7 +202,7 @@ export default {
dialogTitle: "",
// 是否显示弹出层
dialogVisible: false,
- activeNames: ['1','2','3'],
+ activeNames: ['1','3','4'],
// 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
formLoading: false,
statusOptions:[
@@ -303,6 +338,34 @@ export default {
this.formLoading = false;
}
},
+ getSubjectName(subject) {
+ const subjectMap = {
+ 1: '科目一',
+ 2: '科目二',
+ 3: '科目三',
+ 4: '科目四'
+ };
+ return subjectMap[subject] || subject;
+ },
+ getExamStatusName(status) {
+ const statusMap = {
+ '0': '未通过',
+ '1': '已通过',
+ '9': '已送考',
+ 'null': '未送考'
+ };
+ return statusMap[status] || status;
+ },
+ formatDate(timestamp) {
+ if (!timestamp) return '-'; // 如果无时间戳，返回占位符
+
+ const date = new Date(timestamp);
+ const year = date.getFullYear();
+ const month = String(date.getMonth() + 1).padStart(2, '0'); // 补零
+ const day = String(date.getDate()).padStart(2, '0'); // 补零
+
+ return `${year}-${month}-${day}`;
+ },
/** 表单重置 */
reset() {
this.formData = {
diff --git a/src/views/drivingSchool/process/index.vue b/src/views/drivingSchool/process/index.vue
index 84a0b88..fac775a 100644
--- a/src/views/drivingSchool/process/index.vue
+++ b/src/views/drivingSchool/process/index.vue
@@ -130,7 +130,7 @@ export default {
data() {
return {
activeTab: 'all',
- showPassedOnly: false,
+ showPassedOnly: true,
// 遮罩层
loading: true,
// 导出遮罩层
@@ -162,6 +162,7 @@ export default {
},
created() {
+ this.queryParams.examStatus = '1';
this.getList();
},
methods: {
@@ -185,8 +186,8 @@ export default {
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
- this.showPassedOnly = false;
- this.queryParams.examStatus = undefined;
+ this.showPassedOnly = true;
+ this.queryParams.examStatus = '1';
this.handleQuery();
},
/** 添加/修改操作 */