{{ studentDialog.studentInfo.remark || '-' }}
@@ -348,6 +322,7 @@ import SchoolCourseOrderForm from '@/views/drivingSchool/DriveSchoolPay/form/Sch
import AssignmentCoach from "@/views/drivingSchool/DriveSchoolPay/form/assignmentCoach.vue";
import EndOrder from "@/views/drivingSchool/DriveSchoolPay/form/endOrder.vue";
import SchoolCourseOrderFastAddForm from "@/views/drivingSchool/DriveSchoolPay/form/SchoolCourseOrderFastAddForm.vue";
+import { getSourceUserById } from '@/views/drivingSchool/DriveSchoolPay/api'
export default {
name: "SchoolCourseOrder",
components: {
@@ -398,7 +373,9 @@ export default {
loading: false,
// 学员信息
studentInfo: {}
- }
+ },
+ sourceList: this.getDictDatas("drive_school_channel"),
+ sourceUser:null
};
},
created() {
@@ -452,6 +429,14 @@ export default {
if (!photoStr) return [];
return photoStr.split(',').map(item => this.baseImageUrl + item.trim());
},
+ getSourceLabel(value) {
+ const item = this.sourceList.find(item => item.value === value);
+ return item ? item.label : value; // 如果找不到匹配项，显示原始值
+ },
+ getDictLabel(dictType, value) {
+ const dict = this.getDictDatas(dictType).find(item => item.value === value);
+ return dict ? dict.label : value;
+ },
/* async viewContract(row) {
try {
this.loading = true;
@@ -464,6 +449,19 @@ export default {
this.loading = false;
}
}, */
+ getSourceUserId(userId){
+ getSourceUserById(userId).then(res => {
+ console.log(res)
+ this.sourceUser = res.data.name
+ })
+ },
+ formatReceiptReview(row, column, value) {
+ const map = {
+ 1: '待审核',
+ 0: '已审核'
+ };
+ return map[value] ?? '未知类型';
+ },
async viewContract(row) {
try {
this.loading = true;
@@ -488,6 +486,9 @@ export default {
// 这里调用API获取学员详细信息
const res = await SchoolCourseOrderApi.getStudentDetail(row.userId)
this.studentDialog.studentInfo = res.data
+ if(this.studentDialog.studentInfo.sourceUserId != null){
+ this.getSourceUserId(this.studentDialog.studentInfo.sourceUserId)
+ }
console.log('res',res.data)
} finally {
this.studentDialog.loading = false
@@ -515,6 +516,54 @@ export default {
this.exportLoading = false;
}
},
+ 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}`;
+ },
+
+ formatPayChannel(row, column, value) {
+ const map = {
+ '1': '微信支付',
+ '2': '线下支付'
+ };
+ return map[value] ?? '-';
+ },
+ formatSignType(row, column, value) {
+ const map = {
+ '1': '代报名'
+ };
+ return map[value] ?? '-';
+ },
+
+
}
};
+
+
diff --git a/src/views/drivingSchool/StudentScoreInput/api/index.js b/src/views/drivingSchool/StudentScoreInput/api/index.js
index fdefa83..61b1cff 100644
--- a/src/views/drivingSchool/StudentScoreInput/api/index.js
+++ b/src/views/drivingSchool/StudentScoreInput/api/index.js
@@ -35,7 +35,7 @@ export function getProcessAndBatch(id) {
}
// 获得驾校-学员课程进度分页
-export function getprocessPage(params) {
+export function getProcessPage(params) {
return request({
url: '/process/page',
method: 'get',
diff --git a/src/views/drivingSchool/StudentScoreInput/index.vue b/src/views/drivingSchool/StudentScoreInput/index.vue
index 3744a33..c3bdb00 100644
--- a/src/views/drivingSchool/StudentScoreInput/index.vue
+++ b/src/views/drivingSchool/StudentScoreInput/index.vue
@@ -129,7 +129,7 @@ export default {
async getList() {
try {
this.loading = true;
- const res = await processApi.getprocessPage(this.queryParams);
+ const res = await processApi.getProcessPage(this.queryParams);
this.list = res.data.records;
this.total = res.data.total;
} finally {
diff --git a/src/views/drivingSchool/driveSchoolExamPass/index.vue b/src/views/drivingSchool/driveSchoolExamPass/index.vue
index eb0df8c..45d2706 100644
--- a/src/views/drivingSchool/driveSchoolExamPass/index.vue
+++ b/src/views/drivingSchool/driveSchoolExamPass/index.vue
@@ -45,6 +45,8 @@
+
+
+
+
+
+
@@ -25,6 +52,15 @@
新增
+
+ 只显示已通过考试学员
+
查看
@@ -83,13 +120,17 @@
+
diff --git a/src/views/drivingSchool/workReport/ReportForm.vue b/src/views/drivingSchool/workReport/ReportForm.vue
index 2ab5ae4..c10bafc 100644
--- a/src/views/drivingSchool/workReport/ReportForm.vue
+++ b/src/views/drivingSchool/workReport/ReportForm.vue
@@ -27,7 +27,7 @@
-
+
+
+ 查看附件
+
+ 无附件
+
+
打印
@@ -56,11 +69,60 @@
-
-
- 打印
-
+
+
+
-
diff --git a/src/views/sso.vue b/src/views/sso.vue
index 047c4df..c189b47 100644
--- a/src/views/sso.vue
+++ b/src/views/sso.vue
@@ -9,7 +9,7 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ getFileName(row) }}
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 
diff --git a/src/views/index1.vue b/src/views/index1.vue
new file mode 100644
index 0000000..e144eb8
--- /dev/null
+++ b/src/views/index1.vue
@@ -0,0 +1,235 @@
+
+
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
- 临期提醒
-
-
-
-
-
-
- {{ parseTime(scope.row.createTime) }}
-
-
-
-
-
-
-
-
-
-
-
-
- 消息通知
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/login.vue b/src/views/login.vue
index 703eb29..d8cb2d7 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -9,7 +9,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 临期提醒
+
+
+
+
+
+
+ {{ parseTime(scope.row.createTime) }}
+
+
+
+
+
+
+
+
+
+
+
+
+ 消息通知
+