dev-cl
zcx 1 month ago
parent cc8da7e8e2
commit 3d00a8f620
  1. 7
      src/views/Customer/Customer/Comp/DialogCustomer.vue
  2. 13
      src/views/Customer/Customer/index.vue
  3. 19
      src/views/Customer/ExamRecord/index.vue

@ -36,9 +36,9 @@
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="考试类型" prop="examType"> <el-form-item label="考试类型" prop="carTypeId">
<el-select <el-select
v-model="formData.examType" v-model="formData.carTypeIds"
placeholder="选择考试类型" placeholder="选择考试类型"
clearable clearable
filterable filterable
@ -144,9 +144,8 @@ const resetForm = () => {
idcard: '', idcard: '',
id: undefined, id: undefined,
sex: 1, sex: 1,
examType: [1011] carTypeIds: [1011]
} }
formRef.value?.resetFields() formRef.value?.resetFields()
} }
</script> </script>

@ -27,7 +27,7 @@
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-select <el-select
v-model="searchForm.examType" v-model="searchForm.carTypeId"
placeholder="选择考试类型" placeholder="选择考试类型"
clearable clearable
filterable filterable
@ -70,10 +70,15 @@
<el-table v-loading="loading" :data="tableList" border stripe> <el-table v-loading="loading" :data="tableList" border stripe>
<el-table-column type="index" width="50" /> <el-table-column type="index" width="50" />
<el-table-column label="姓名" prop="userName" /> <el-table-column label="姓名" prop="userName" />
<el-table-column label="性别" prop="sex" /> <el-table-column label="性别" prop="sex">
<template #default="scope">
<span v-if="scope.row.sex == 1"></span>
<span v-else></span>
</template>
</el-table-column>
<el-table-column label="手机号码" prop="phone" width="120" /> <el-table-column label="手机号码" prop="phone" width="120" />
<el-table-column label="身份证号" prop="idcard" min-width="120" /> <el-table-column label="身份证号" prop="idcard" min-width="120" />
<el-table-column label="考试类型" prop="examType" min-width="120" /> <el-table-column label="考试类型" prop="carTypeName" min-width="120" />
<el-table-column label="操作" width="260" fixed="right"> <el-table-column label="操作" width="260" fixed="right">
<template #default="scope"> <template #default="scope">
<el-button <el-button
@ -117,7 +122,7 @@ const carTypeOptions = ref([])
const searchForm = ref({ const searchForm = ref({
userName: undefined, userName: undefined,
examType: 1011, carTypeId: 1011,
pageNo: 1, pageNo: 1,
pageSize: 20 pageSize: 20
}) })

@ -27,7 +27,7 @@
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-select <el-select
v-model="searchForm.examType" v-model="searchForm.carTypeId"
placeholder="选择考试类型" placeholder="选择考试类型"
clearable clearable
filterable filterable
@ -74,7 +74,7 @@
<el-table-column label="姓名" prop="userName" /> <el-table-column label="姓名" prop="userName" />
<el-table-column label="手机号码" prop="phone" width="120" /> <el-table-column label="手机号码" prop="phone" width="120" />
<el-table-column label="身份证号" prop="idcard" min-width="120" /> <el-table-column label="身份证号" prop="idcard" min-width="120" />
<el-table-column label="考试类型" prop="examType" min-width="120" /> <el-table-column label="考试类型" prop="carTypeName" min-width="120" />
<el-table-column label="考试科目" prop="subject" min-width="120" /> <el-table-column label="考试科目" prop="subject" min-width="120" />
<el-table-column label="考试得分" prop="score" min-width="120" /> <el-table-column label="考试得分" prop="score" min-width="120" />
<el-table-column label="交卷时间" prop="createTime" min-width="120" /> <el-table-column label="交卷时间" prop="createTime" min-width="120" />
@ -92,6 +92,7 @@
<script setup name="ExamRecord"> <script setup name="ExamRecord">
import { removeNullField } from '@/utils' import { removeNullField } from '@/utils'
import * as ExamRecordApi from '@/api/customer/examRecord.js' import * as ExamRecordApi from '@/api/customer/examRecord.js'
import download from '@/utils/download'
import { getCustomerExamCarType } from '@/api/customer/customer.js' import { getCustomerExamCarType } from '@/api/customer/customer.js'
@ -102,7 +103,7 @@ const carTypeOptions = ref([])
const searchForm = ref({ const searchForm = ref({
userName: undefined, userName: undefined,
examType: 1011, carTypeId: 1011,
pageNo: 1, pageNo: 1,
pageSize: 20 pageSize: 20
}) })
@ -153,11 +154,13 @@ function handleExport() {
params.endTime = undefined params.endTime = undefined
} }
ExamRecordApi.exportRecord(params).then((res) => { ExamRecordApi.exportRecord(params).then((res) => {
if (res.code === 200) { download.excel(res, '考试成绩.xls')
message.success('导出成功')
} else { // if (res.code === 200) {
message.error(res.msg) // message.success('')
} // } else {
// message.error(res.msg)
// }
}) })
} }
</script> </script>

Loading…
Cancel
Save