feat: 合并 admin/manager 重复页 + 公示意向 + 劳务签署
页合并 (admin/manager 共用, route.path 角色感知): - expert: Experts.vue + ExpertNew.vue (list/new/edit/view 一套) - sponsor-orgs: SponsorOrgs.vue - sponsor-people: SponsorPeople.vue + SponsorPersonNew.vue + SponsorPersonDetail.vue - executor-orgs: ExecutorOrgs.vue - executor-people: ExecutorPeople.vue + ExecutorPersonNew.vue + ExecutorPersonDetail.vue - 给 SponsorPeople / ExecutorPeople op 列补上 查看/编辑 按钮 (潜在 bug 修复) - 详情弹窗统一用 el-descriptions 风格 (替代 admin 旧版 ElMessageBox.alert) 后端: - BizSignController + BizSignServiceImpl + PdfService (劳务签署 PDF 流程) - BizPublicityIntentController (公示意向: 支持/执行) - BizPublicitySupportIntent / BizPublicityExecutionIntent ExportVo - BizMeetingAttendee 字段合并 (bank_region 替代 bankProvince/bankCity) - BizExpert 字段合并 (id_card_attachments CSV, bank_region) - Excel 导入模板精简 (开户行 1 列) 前端: - doctor/SignFill + SignContract + SignSuccess (劳务签署 3 页流程) - ImportResultDialog 通用组件 - IdCardUploader 重构 (单 v-model:idCardAttachments, CSV 格式) - AreaCascader 调整 - Login.vue + AdminLayout.vue + PortalShell.vue + Home.vue 适配 DB: 字段合并 (id_card_front/back → id_card_attachments, bank_province/city → bank_region)
This commit is contained in:
@@ -4,11 +4,11 @@
|
||||
|
||||
<!-- ========== 筛选区 ========== -->
|
||||
<el-form inline :model="q" class="filter-form">
|
||||
<el-form-item label="项目编号"><el-input v-model="q.projectNo" clearable /></el-form-item>
|
||||
<el-form-item label="项目名称"><el-input v-model="q.projectName" clearable /></el-form-item>
|
||||
<el-form-item label="姓名"><el-input v-model="q.name" clearable /></el-form-item>
|
||||
<el-form-item label="工作单位"><el-input v-model="q.workUnit" clearable /></el-form-item>
|
||||
<el-form-item label="手机号"><el-input v-model="q.phone" clearable /></el-form-item>
|
||||
<el-form-item label="项目编号"><el-input v-model="q.projectNo" placeholder="输入项目编号" clearable /></el-form-item>
|
||||
<el-form-item label="项目名称"><el-input v-model="q.projectName" placeholder="输入项目名称" clearable /></el-form-item>
|
||||
<el-form-item label="姓名"><el-input v-model="q.name" placeholder="输入姓名" clearable /></el-form-item>
|
||||
<el-form-item label="工作单位"><el-input v-model="q.workUnit" placeholder="输入工作单位" clearable /></el-form-item>
|
||||
<el-form-item label="手机号"><el-input v-model="q.phone" placeholder="输入手机号" clearable /></el-form-item>
|
||||
<el-form-item label="审核状态">
|
||||
<el-select v-model="q.intentStatus" clearable style="width: 130px">
|
||||
<el-option label="待审核" value="待审核" />
|
||||
@@ -19,13 +19,12 @@
|
||||
<el-form-item>
|
||||
<el-button type="primary" @click="load">查找</el-button>
|
||||
<el-button @click="reset">重置</el-button>
|
||||
<el-button type="success" @click="exportCsv">导出CSV</el-button>
|
||||
<el-button type="success" @click="doExport">导出</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
<!-- ========== 表格 ========== -->
|
||||
<el-table :data="rows" v-loading="loading" stripe border @selection-change="onSelChange">
|
||||
<el-table-column type="selection" width="46" />
|
||||
<el-table :data="rows" v-loading="loading" stripe border>
|
||||
<el-table-column type="index" label="#" width="50" />
|
||||
<el-table-column prop="projectNo" label="意向项目编号" width="140" />
|
||||
<el-table-column prop="projectName" label="意向项目名称" min-width="180" show-overflow-tooltip />
|
||||
@@ -39,13 +38,13 @@
|
||||
<el-tag :type="row.userId ? 'success' : 'warning'">{{ row.userId ? '存在' : '不存在' }}</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="审核状态" width="100" align="center">
|
||||
<el-table-column v-if="false" label="审核状态" width="100" align="center">
|
||||
<template #default="{ row }">
|
||||
<el-tag :type="statusTagType(row.intentStatus)">{{ row.intentStatus || '待审核' }}</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="createTime" label="创建时间" width="170" />
|
||||
<el-table-column label="操作" width="220" align="center" fixed="right">
|
||||
<el-table-column v-if="false" label="操作" width="220" align="center" fixed="right">
|
||||
<template #default="{ row }">
|
||||
<el-button v-if="row.intentStatus !== '已通过'" type="primary" link size="small" @click="changeStatus(row, '已通过')">通过</el-button>
|
||||
<el-button v-if="row.intentStatus !== '已拒绝'" type="danger" link size="small" @click="changeStatus(row, '已拒绝')">拒绝</el-button>
|
||||
@@ -55,9 +54,6 @@
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div class="pager">
|
||||
<div class="pager-left">
|
||||
<el-button type="danger" :disabled="!selected.length" @click="removeBatch">批量删除 ({{ selected.length }})</el-button>
|
||||
</div>
|
||||
<el-pagination v-model:current-page="page.pageNum" v-model:page-size="page.pageSize" :total="page.total" :page-sizes="[10,20,50]" layout="total, sizes, prev, pager, next, jumper" @current-change="load" @size-change="load" />
|
||||
</div>
|
||||
</div>
|
||||
@@ -69,12 +65,12 @@ import { ElMessage, ElMessageBox } from 'element-plus'
|
||||
import {
|
||||
listPublicityExecutionIntent,
|
||||
updatePublicityExecutionIntent,
|
||||
deletePublicityExecutionIntent
|
||||
deletePublicityExecutionIntent,
|
||||
exportPublicityExecutionIntent
|
||||
} from '@/api/public'
|
||||
|
||||
const q = ref({ projectNo: '', projectName: '', name: '', workUnit: '', phone: '', intentStatus: '' })
|
||||
const rows = ref([])
|
||||
const selected = ref([])
|
||||
const loading = ref(false)
|
||||
const page = reactive({ pageNum: 1, pageSize: 10, total: 0 })
|
||||
|
||||
@@ -97,8 +93,6 @@ function reset() {
|
||||
load()
|
||||
}
|
||||
|
||||
function onSelChange(arr) { selected.value = arr }
|
||||
|
||||
function statusTagType(s) {
|
||||
if (s === '已通过') return 'success'
|
||||
if (s === '已拒绝') return 'danger'
|
||||
@@ -128,39 +122,23 @@ async function removeOne(row) {
|
||||
}
|
||||
}
|
||||
|
||||
async function removeBatch() {
|
||||
if (!selected.value.length) return
|
||||
// 后端导出 .xlsx (按当前筛选条件全量下载)
|
||||
async function doExport() {
|
||||
try {
|
||||
await ElMessageBox.confirm(`确认删除 ${selected.value.length} 条执行意向?`, '提示', { type: 'warning' })
|
||||
} catch { return }
|
||||
try {
|
||||
const ids = selected.value.map(r => r.intentId)
|
||||
await deletePublicityExecutionIntent(ids)
|
||||
ElMessage.success('已删除')
|
||||
load()
|
||||
const res = await exportPublicityExecutionIntent({ ...q.value })
|
||||
const blob = new Blob([res.data], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' })
|
||||
const url = URL.createObjectURL(blob)
|
||||
const a = document.createElement('a')
|
||||
a.href = url
|
||||
a.download = `执行意向_${new Date().toISOString().slice(0, 10)}.xlsx`
|
||||
document.body.appendChild(a); a.click(); document.body.removeChild(a)
|
||||
URL.revokeObjectURL(url)
|
||||
ElMessage.success('导出成功')
|
||||
} catch (e) {
|
||||
ElMessage.error(e?.msg || '删除失败')
|
||||
ElMessage.error(e?.msg || e?.message || '导出失败')
|
||||
}
|
||||
}
|
||||
|
||||
function exportCsv() {
|
||||
if (!rows.value.length) return ElMessage.warning('当前列表无数据')
|
||||
const headers = ['项目编号', '项目名称', '姓名', '工作单位', '部门', '职务', '手机号', '账号状态', '审核状态', '创建时间']
|
||||
const csvRows = rows.value.map(r => [
|
||||
r.projectNo, r.projectName, r.name, r.workUnit, r.department, r.position,
|
||||
r.phone, r.userId ? '存在' : '不存在', r.intentStatus || '待审核', r.createTime
|
||||
].map(v => `"` + String(v ?? '').replace(/"/g, '""') + `"`).join(','))
|
||||
const csv = '' + [headers.join(','), ...csvRows].join('\r\n')
|
||||
const blob = new Blob([csv], { type: 'text/csv;charset=utf-8' })
|
||||
const url = URL.createObjectURL(blob)
|
||||
const a = document.createElement('a')
|
||||
a.href = url
|
||||
a.download = `执行意向_${new Date().toISOString().slice(0, 10)}.csv`
|
||||
document.body.appendChild(a); a.click(); document.body.removeChild(a)
|
||||
URL.revokeObjectURL(url)
|
||||
ElMessage.success(`已导出 ${rows.value.length} 条`)
|
||||
}
|
||||
|
||||
onMounted(load)
|
||||
</script>
|
||||
|
||||
@@ -168,6 +146,5 @@ onMounted(load)
|
||||
.manager-exec-intent { padding: 16px; }
|
||||
.breadcrumb { font-size: 13px; color: #8c8c8c; margin-bottom: 12px; }
|
||||
.filter-form { margin-bottom: 12px; }
|
||||
.pager { display: flex; justify-content: space-between; align-items: center; margin-top: 12px; }
|
||||
.pager-left { display: flex; gap: 8px; }
|
||||
.pager { display: flex; justify-content: flex-end; align-items: center; margin-top: 12px; }
|
||||
</style>
|
||||
|
||||
Reference in New Issue
Block a user