人员编号-》学号
This commit is contained in:
1 parent
0ad498e9bc
commit
42c2bcd4b5
4 files changed
+11
-11
No files matched your search
@@ -35,7 +35,7 @@ export function updateStudent(data) {
|
||||
})
|
||||
}
|
||||
|
||||
// 生成唯一人员编号(AA + 6位数字)
|
||||
// 生成唯一学号(AA + 6位数字)
|
||||
export function genPersonNo() {
|
||||
return request({
|
||||
url: '/train/student/gen-person-no',
|
||||
|
||||
@@ -761,7 +761,7 @@
|
||||
<el-option v-for="item in pushPersonOptions" :key="item.personNo" :label="item.personName ? item.personName + '(' + item.personNo + ')' : item.personNo" :value="item.personNo" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item v-else label="人员编号" prop="personNo">
|
||||
<el-form-item v-else label="学号" prop="personNo">
|
||||
<el-input v-model="pushForm.personNo" :placeholder="pushPersonNoPlaceholder" maxlength="32" style="width: 100%" @change="pushChangePersonNo" />
|
||||
</el-form-item>
|
||||
<el-form-item label="授权门锁" prop="deviceId">
|
||||
@@ -971,7 +971,7 @@ export default {
|
||||
if (this.pushForm && this.pushForm.authType === this.AUTH_TYPE_PASSWORD) {
|
||||
return '以 BA 开头的 8 位编号,如 BA000001(或直接录入学员学号)'
|
||||
}
|
||||
return '请输入人员编号(可直接录入学员学号)'
|
||||
return '请输入学员学号'
|
||||
},
|
||||
selectedStudentText() {
|
||||
const s = this.addDialog.selectedStudent
|
||||
@@ -1120,7 +1120,7 @@ export default {
|
||||
},
|
||||
pushValidatePersonNo(rule, value, callback) {
|
||||
if (!value) {
|
||||
callback(new Error(this.pushIsFaceAuth ? '请选择人员' : '请输入人员编号'))
|
||||
callback(new Error(this.pushIsFaceAuth ? '请选择人员' : '请输入学号'))
|
||||
return
|
||||
}
|
||||
callback()
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<div class="page-topbar">
|
||||
<div class="topbar-left">
|
||||
<h2 class="topbar-title">班级报到数据</h2>
|
||||
<span class="topbar-sub">数据取自参训记录(train_enrollment),报到状态以 enrollment_status 为准</span>
|
||||
<!--<span class="topbar-sub">数据取自参训记录(train_enrollment),报到状态以 enrollment_status 为准</span>-->
|
||||
</div>
|
||||
<div class="rd-topbar-actions">
|
||||
<el-button size="small" icon="el-icon-download" @click="handleExport">导出报到名册</el-button>
|
||||
@@ -159,12 +159,12 @@
|
||||
<el-table-column label="报到时间" prop="joinTime" width="160" align="center">
|
||||
<template slot-scope="scope">{{ scope.row.joinTime || '—' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="结课时间" prop="completeTime" width="160" align="center">
|
||||
<!-- <el-table-column label="结课时间" prop="completeTime" width="160" align="center">
|
||||
<template slot-scope="scope">{{ scope.row.completeTime || '—' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="备注" prop="remark" min-width="90" show-overflow-tooltip>
|
||||
<template slot-scope="scope">{{ scope.row.remark || '—' }}</template>
|
||||
</el-table-column>
|
||||
</el-table-column>-->
|
||||
<el-table-column label="操作" width="70" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-button type="text" size="mini" @click="showDetail(scope.row)">详情</el-button>
|
||||
@@ -187,7 +187,7 @@
|
||||
<el-dialog title="报到详情" :visible.sync="detailOpen" width="560px" append-to-body>
|
||||
<el-descriptions :column="2" size="small" border>
|
||||
<el-descriptions-item label="学员姓名">{{ detailRow.studentName }}</el-descriptions-item>
|
||||
<el-descriptions-item label="人员编号">{{ detailRow.personNo || detailRow.studentId }}</el-descriptions-item>
|
||||
<el-descriptions-item label="学号">{{ detailRow.personNo || detailRow.studentId }}</el-descriptions-item>
|
||||
<el-descriptions-item label="联系电话">{{ detailRow.phone || '—' }}</el-descriptions-item>
|
||||
<el-descriptions-item label="选派单位">{{ detailRow.deptName || '—' }}</el-descriptions-item>
|
||||
<el-descriptions-item label="报到状态">
|
||||
@@ -442,7 +442,7 @@ export default {
|
||||
this.$modal.msgWarning('当前条件下没有可导出的报到数据')
|
||||
return
|
||||
}
|
||||
const headers = ['学员姓名', '人员编号', '选派单位', '联系电话', '报到状态', '报到时间', '结课时间', '备注']
|
||||
const headers = ['学员姓名', '学号', '选派单位', '联系电话', '报到状态', '报到时间', '结课时间', '备注']
|
||||
const lines = [headers.join(',')]
|
||||
list.forEach(item => {
|
||||
const cells = [
|
||||
|
||||
@@ -45,7 +45,7 @@
|
||||
<right-toolbar :show-search.sync="showSearch" @queryTable="getList" />
|
||||
</el-row>
|
||||
<el-alert
|
||||
title="报到状态包含(0 待报到 / 1 已报到 / 2 请假 / 3 放弃 / 4 已完成);「已报到」由报到确认流程产生,人工仅可标记请假、放弃与恢复参训。"
|
||||
title="报到状态包含(0 待报到 / 1 已报到 / 2 请假 / 3 放弃 / 4 已完成);「已报到」由报到确认流程产生,人工仅可标记请假、放弃与重置状态到未报到。"
|
||||
type="info"
|
||||
:closable="false"
|
||||
show-icon
|
||||
@@ -53,7 +53,7 @@
|
||||
/>
|
||||
<el-table v-loading="loading" :data="rows" :empty-text="emptyText">
|
||||
<el-table-column label="学员姓名" prop="studentName" min-width="110" />
|
||||
<el-table-column label="人员编号" prop="personNo" width="130" show-overflow-tooltip />
|
||||
<el-table-column label="学号" prop="personNo" width="130" show-overflow-tooltip />
|
||||
<el-table-column label="手机号" prop="phone" width="120" />
|
||||
<el-table-column label="选派单位" prop="deptName" min-width="160" show-overflow-tooltip />
|
||||
<el-table-column label="报到状态" align="center" width="110">
|
||||
|
||||
Reference in new issue
Block a user