diff --git a/.env.prod b/.env.prod
index d1b97bd..3276ad9 100644
--- a/.env.prod
+++ b/.env.prod
@@ -2,7 +2,7 @@
NODE_ENV = 'production'
# 页面标题
-VUE_APP_TITLE = "车联通"后台管理系统
+VUE_APP_TITLE = "车联通"管理系统
# 芋道管理系统/生产环境
# VUE_APP_BASE_API = 'https://www.nuoyunr.com'
diff --git a/src/views/drivingSchool/DriveSchoolPay/form/ExportDialog.vue b/src/views/drivingSchool/DriveSchoolPay/form/ExportDialog.vue
index 392c07d..e58f34f 100644
--- a/src/views/drivingSchool/DriveSchoolPay/form/ExportDialog.vue
+++ b/src/views/drivingSchool/DriveSchoolPay/form/ExportDialog.vue
@@ -73,6 +73,16 @@
/>
+
+
+
+
+
+
@@ -146,6 +156,9 @@
{{ stats.subject3DeductTotal }}
+
+ {{ stats.totalDiscount }}
+
@@ -162,13 +175,15 @@
-
+
+
+
-
+
@@ -271,6 +286,7 @@ export default {
payFeesTimeRange: null,
cashierConfirmTimeRange: null,
cashierConfirm: '',
+ discountIndex: null,
pageNo: 1,
pageSize: 10
},
@@ -299,12 +315,17 @@ export default {
{ value: '1', label: '已到账' },
{ value: null, label: '待确认' }
],
+ discountIndexList: [
+ { value: '0', label: '无优惠' },
+ { value: '1', label: '有优惠' }
+ ],
selectedTimeType: 'cashierConfirm',
sourceList: [],
stats: {
studentCount: 0,
totalAmount: 0,
+ totalDiscount: 0,
subject2DeductTotal: 0,
subject3DeductTotal: 0,
},
@@ -369,6 +390,7 @@ export default {
this.stats = {
studentCount: statsRes.data.studentCount || 0,
totalAmount: statsRes.data.totalAmount || 0,
+ totalDiscount: statsRes.data.totalDiscount || 0,
subject2DeductTotal: statsRes.data.subject2DeductTotal || 0,
subject3DeductTotal: statsRes.data.subject3DeductTotal || 0
};
@@ -416,6 +438,7 @@ export default {
payFeesTimeRange: null,
cashierConfirmTimeRange: null,
cashierConfirm: '',
+ discountIndex: null,
pageNo: 1,
pageSize: 10
};
diff --git a/src/views/drivingSchool/DriveSchoolPay/form/SchoolCourseOrderForm.vue b/src/views/drivingSchool/DriveSchoolPay/form/SchoolCourseOrderForm.vue
index 0b47069..081f668 100644
--- a/src/views/drivingSchool/DriveSchoolPay/form/SchoolCourseOrderForm.vue
+++ b/src/views/drivingSchool/DriveSchoolPay/form/SchoolCourseOrderForm.vue
@@ -65,31 +65,50 @@
-
-
- {{ item.label }}
-
-
-
+
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
-
+
-
-
+
+
+
+
+
+
+
+
@@ -255,6 +274,9 @@ export default {
gradTime: undefined,
schemeId: undefined,
orderRemark: undefined,
+ discount: undefined,
+ actualPayment: undefined,
+
},
ifEndRadio: [
{
@@ -444,6 +466,8 @@ export default {
gradTime: undefined,
schemeId: undefined,
orderRemark: undefined,
+ discount: undefined,
+ actualPayment: undefined,
}
this.resetForm('formRef')
}
diff --git a/src/views/drivingSchool/DriveSchoolPay/index.vue b/src/views/drivingSchool/DriveSchoolPay/index.vue
index 37b1971..d8c7b64 100644
--- a/src/views/drivingSchool/DriveSchoolPay/index.vue
+++ b/src/views/drivingSchool/DriveSchoolPay/index.vue
@@ -34,6 +34,17 @@
+
+
+
+
+
+
+
+
+
@@ -519,6 +532,7 @@ export default {
startTimeStr: null,
endTimeStr: null,
cashierConfirm:'',
+ discountIndex: null,
},
// 控制合同查看对话框显示
viewFlag: false,
@@ -553,6 +567,10 @@ export default {
{ value: '1', label: '已到账' },
{ value: null, label: '待确认' }
],
+ discountIndexList: [
+ { value: '0', label: '无优惠' },
+ { value: '1', label: '有优惠' }
+ ],
};
},
created() {
diff --git a/src/views/drivingSchool/driveSchoolExamPass/form/ExportDialog.vue b/src/views/drivingSchool/driveSchoolExamPass/form/ExportDialog.vue
index 0001909..cd97d97 100644
--- a/src/views/drivingSchool/driveSchoolExamPass/form/ExportDialog.vue
+++ b/src/views/drivingSchool/driveSchoolExamPass/form/ExportDialog.vue
@@ -136,7 +136,7 @@
-
+
diff --git a/src/views/drivingSchool/driveSchoolExamPass/index.vue b/src/views/drivingSchool/driveSchoolExamPass/index.vue
index 5a1c7e7..2ab8391 100644
--- a/src/views/drivingSchool/driveSchoolExamPass/index.vue
+++ b/src/views/drivingSchool/driveSchoolExamPass/index.vue
@@ -56,7 +56,7 @@
-
+
diff --git a/src/views/drivingSchool/process/form/processForm.vue b/src/views/drivingSchool/process/form/processForm.vue
index 0f6db81..7d9f704 100644
--- a/src/views/drivingSchool/process/form/processForm.vue
+++ b/src/views/drivingSchool/process/form/processForm.vue
@@ -86,8 +86,8 @@
-
-
+
+
@@ -110,6 +110,15 @@
+
+
+
+
+
+
+
+
+
@@ -144,7 +153,7 @@
-
+
@@ -154,6 +163,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -161,6 +184,13 @@
+
+
+
+
+
+
+
@@ -275,6 +305,9 @@ export default {
studentPay: undefined,
studentRemainingPay: undefined,
cashierConfirm: undefined,
+ discount: undefined,
+ actualPayment: undefined,
+ cashierConfirmRemark: undefined,
},
hasBeenReviewed: false,
// 表单校验
@@ -291,8 +324,8 @@ export default {
// examTime: [{ required: true, message: '考试时间不能为空', trigger: 'blur' }],
// remark: [{ required: true, message: '备注不能为空', trigger: 'blur' }],
// trainTime: [{ required: true, message: '本科目累计训练时长不能为空', trigger: 'blur' }],
- financePass: [{ required: true, message: '财务审核是否通过不能为空', trigger: 'blur' }],
- financeRemark: [{ required: true, message: '财务审核备注不能为空', trigger: 'blur' }],
+ // financePass: [{ required: true, message: '财务审核是否通过不能为空', trigger: 'blur' }],
+ // financeRemark: [{ required: true, message: '财务审核备注不能为空', trigger: 'blur' }],
},
};
},
@@ -424,6 +457,9 @@ export default {
financePass: undefined,
financeRemark: undefined,
cashierConfirm: undefined,
+ discount: undefined,
+ actualPayment: undefined,
+ cashierConfirmRemark: undefined,
};
this.resetForm("formRef");
}