dianliang/lanan-system-vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

0711

Browse Source
This commit is contained in:
Lx 2025-07-11 16:43:58 +08:00
parent ce3aa9085d
commit a0f7775a0b
7 changed files with 129 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env.prod
View File

@ -2,7 +2,7 @@
NODE_ENV = 'production'
# 页面标题
VUE_APP_TITLE = "车联通"后台管理系统
VUE_APP_TITLE = "车联通"管理系统
# 芋道管理系统/生产环境
# VUE_APP_BASE_API = 'https://www.nuoyunr.com'

27
src/views/drivingSchool/DriveSchoolPay/form/ExportDialog.vue
View File

@ -73,6 +73,16 @@
/>
</el-select>
</el-form-item>
<el-form-item label="是否优惠" prop="discountIndex" >
<el-select v-model="queryParams.discountIndex" placeholder="请选择优惠情况" clearable>
<el-option
v-for="item in discountIndexList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="时间范围" label-width="120px">
<el-select v-model="selectedTimeType" placeholder="选择时间类型" style="width: 150px; margin-right: 10px;">
<el-option label="学员报名时间" value="signUp"></el-option>
@ -146,6 +156,9 @@
<el-form-item label="科三预提金额" label-width="150px">
<span style="font-weight: bold; font-size: 16px">{{ stats.subject3DeductTotal }}</span>
</el-form-item>
<el-form-item label="优惠总金额" label-width="150px">
<span style="font-weight: bold; font-size: 16px">{{ stats.totalDiscount }}</span>
</el-form-item>
</el-form>
<!-- 数据表格 -->
@ -162,13 +175,15 @@
<el-table-column label="学员手机号" prop="studentPhone" align="center" />
<el-table-column label="报名时间" prop="signUpTimeStr" align="center" />
<!-- <el-table-column label="报名时间" prop="signUpTime" align="center" :formatter="formatDate" />-->
<el-table-column label="缴费金额" prop="reserveMoney" align="center"/>
<el-table-column label="课程金额" prop="reserveMoney" align="center"/>
<el-table-column label="优惠金额" prop="discount" align="center" />
<el-table-column label="实付金额" prop="actualPayment" align="center" />
<el-table-column label="缴费时间" prop="payFeesTimeStr" align="center"/>
<!-- <el-table-column label="缴费时间" prop="payFeesTime" align="center" :formatter="formatDate" />-->
<el-table-column label="课程名称" prop="courseName" align="center" />
<el-table-column label="课程类型" prop="courseType" align="center" width="100px" />
<el-table-column label="渠道" prop="sourceStr" align="center" width="100px" />
<el-table-column label="订单备注" prop="orderRemark" align="center" />
<el-table-column label="订单备注" prop="orderRemark" align="center" show-overflow-tooltip/>
<el-table-column label="是否已面签" prop="isSignDisplay" align="center" width="100px" />
<el-table-column label="面签时间" prop="signTimeStr" align="center" />
<el-table-column label="科目二教练" prop="subject2CoachName" align="center" />
@ -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
};

60
src/views/drivingSchool/DriveSchoolPay/form/SchoolCourseOrderForm.vue
View File

@ -65,31 +65,50 @@
</el-col>
</el-row>
<el-form-item label="是否终止" prop="ifEnd">
<el-radio-group v-model="formData.ifEnd">
<el-radio v-for="item in ifEndRadio"
:key="item.value" :label="item.value"
>{{ item.label }}
</el-radio>
</el-radio-group>
</el-form-item>
<el-divider></el-divider>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="是否终止" prop="ifEnd">
<el-radio-group v-model="formData.ifEnd">
<el-radio v-for="item in ifEndRadio"
:key="item.value" :label="item.value"
>{{ item.label }}
</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="终止时间" prop="endTime">
<el-date-picker clearable v-model="formData.endTime" type="date" value-format="timestamp"
placeholder="选择终止时间"
/>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="终止原因" prop="endReason">
<el-input v-model="formData.endReason" placeholder="请输入终止原因"/>
</el-form-item>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="终止时间" prop="endTime">
<el-date-picker clearable v-model="formData.endTime" type="date" value-format="timestamp"
placeholder="选择终止时间"
<el-divider></el-divider>
<el-form-item label="缴费时间" prop="payFeesTime">
<el-date-picker clearable v-model="formData.payFeesTime" type="date" value-format="timestamp"
placeholder="选择缴费时间"
/>
</el-form-item>
</el-col>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="缴费时间" prop="payFeesTime">
<el-date-picker clearable v-model="formData.payFeesTime" type="date" value-format="timestamp"
placeholder="选择缴费时间"
/>
<el-form-item label="优惠金额" prop="discount">
<el-input-number v-model="formData.discount" placeholder="请输入优惠金额" :precision="2"
:step="0.1"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="实付金额" prop="actualPayment">
<el-input-number v-model="formData.actualPayment" placeholder="请输入实付金额" :precision="2"
:step="0.1"></el-input-number>
</el-form-item>
</el-col>
</el-row>
@ -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')
}

18
src/views/drivingSchool/DriveSchoolPay/index.vue
View File

@ -34,6 +34,17 @@
</el-date-picker>
</el-form-item>
<el-form-item label="是否优惠" prop="discountIndex" >
<el-select v-model="queryParams.discountIndex" placeholder="请选择优惠情况" clearable>
<el-option
v-for="item in discountIndexList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="是否确认收款" prop="cashierConfirm" label-width="120px" v-if="showCashierColumn">
<el-select v-model="queryParams.cashierConfirm" placeholder="请选择收款情况">
<el-option
@ -96,6 +107,8 @@
</el-table-column>
<el-table-column label="订金金额" align="center" prop="reserveMoney" />
<el-table-column label="尾款" align="center" prop="restMoney" />
<el-table-column label="优惠金额" prop="discount" align="center" />
<el-table-column label="实付金额" prop="actualPayment" align="center" />
<el-table-column label="支付渠道" align="center" prop="payChannel" :formatter="formatPayChannel"/>
<el-table-column label="支付类型" align="center" prop="payType">
<template v-slot="scope">
@ -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() {

2
src/views/drivingSchool/driveSchoolExamPass/form/ExportDialog.vue
View File

@ -136,7 +136,7 @@
<el-table-column label="学员姓名" prop="studentName" align="center" width="100px" />
<el-table-column label="学员身份证号" prop="studentIdCard" align="center" />
<el-table-column label="课程名称" prop="courseName" align="center" />
<el-table-column label="缴纳学费金额" prop="studentPay" align="center" />
<el-table-column label="课程金额" prop="studentPay" align="center" />
<el-table-column label="渠道" prop="sourceStr" align="center" />
<el-table-column label="课程类型" prop="courseType" align="center" width="100px" />
<el-table-column label="科目" prop="subject" align="center" width="100px" />

2
src/views/drivingSchool/driveSchoolExamPass/index.vue
View File

@ -56,7 +56,7 @@
<el-table-column label="学生身份证号" align="center" prop="studentIdCard" width="180px"/>
<el-table-column label="课程名称" align="center" prop="courseName" />
<el-table-column label="课程类型" align="center" prop="courseType" />
<el-table-column label="学员缴费金额" align="center" prop="studentPay" />
<el-table-column label="课程金额" align="center" prop="studentPay" />
<el-table-column label="提成金额" align="center" prop="commissionAmount" />
<el-table-column label="科目" align="center" prop="subject" />
<el-table-column label="考试通过时间" align="center" prop="examTime" :formatter="formatDate"/>

46
src/views/drivingSchool/process/form/processForm.vue
View File

@ -86,8 +86,8 @@
<el-row>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input type="textarea" :readonly="readonly" v-model="formData.remark" placeholder="请输入备注" />
<el-form-item label="考试备注" prop="financeRemark">
<el-input type="textarea" :readonly="readonly" v-model="formData.financeRemark" placeholder="暂无备注" disabled=""/>
</el-form-item>
</el-col>
<el-col :span="24">
@ -110,6 +110,15 @@
</el-col>
</el-row>
<el-form-item label="业务来源" prop="channel">
<el-input :readonly="readonly" v-model="formData.channel" placeholder="暂未填写来源" disabled/>
</el-form-item>
<el-form-item label="订单备注" prop="orderRemark">
<el-input type="textarea" :readonly="readonly" v-model="formData.orderRemark" placeholder="暂无备注" disabled/>
</el-form-item>
</el-collapse-item>
<el-collapse-item title="各科目成绩信息" name="2">
@ -144,7 +153,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="缴纳金额" prop="studentPay">
<el-form-item label="课程金额" prop="studentPay">
<el-input :readonly="readonly" v-model="formData.studentPay" :disabled="true"/>
</el-form-item>
</el-col>
@ -154,6 +163,20 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="优惠金额" prop="discount">
<el-input :readonly="readonly" v-model="formData.discount" :disabled="true"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="实付金额" prop="actualPayment">
<el-input :readonly="readonly" v-model="formData.actualPayment" :disabled="true"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="出纳确认到账情况:" prop="cashierConfirm" label-width="150px">
@ -161,6 +184,13 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="出纳备注" prop="cashierConfirmRemark">
<el-input type="textarea" :readonly="readonly" v-model="formData.cashierConfirmRemark" placeholder="暂无备注" disabled/>
</el-form-item>
</el-col>
</el-row>
</el-collapse-item>
<el-collapse-item title="财务审核" name="4">
@ -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");
}