修改打包报错问题

This commit is contained in:
2026-01-16 18:42:44 +08:00
65 changed files with 3662 additions and 2967 deletions

View File

@@ -20,10 +20,10 @@
<div class="layout-padding-auto layout-padding-view">
<el-tabs v-model="activeName" @tab-click="handleTabClick">
<el-tab-pane label="回校列表" name="tab">
<tab-index ref="tabIndexRef" />
<TabIndex ref="tabIndexRef" />
</el-tab-pane>
<el-tab-pane label="回校统计" name="static">
<static-index ref="staticIndexRef" />
<StaticIndex ref="staticIndexRef" />
</el-tab-pane>
</el-tabs>
</div>
@@ -54,4 +54,13 @@ const handleTabClick = (tab: any) => {
</script>
<style lang="scss" scoped>
:deep(.el-tabs) {
height: 100%;
display: flex;
flex-direction: column;
.el-tab-pane {
height: 100%;
}
}
</style>

View File

@@ -16,12 +16,12 @@
-->
<template>
<div class="layout-padding">
<div class="layout-padding-auto layout-padding-view">
<!-- 搜索表单 -->
<el-form :model="queryForm" inline class="mb-4" ref="searchFormRef">
<div class="static-index-container">
<!-- 搜索表单 -->
<div class="search-form-wrapper">
<el-form :model="queryForm" inline ref="searchFormRef">
<el-form-item label="招生计划" prop="groupId">
<el-select v-model="queryForm.groupId" filterable clearable placeholder="请选择招生计划" @change="getTabStaticDataList" style="width: 150px;">
<el-select v-model="queryForm.groupId" filterable clearable placeholder="请选择招生计划" @change="getTabStaticDataList">
<el-option
v-for="item in planList"
:key="item.id"
@@ -32,11 +32,13 @@
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="getTabStaticDataList">查询</el-button>
<el-button type="primary" plain icon="Refresh" class="ml10" @click="resetQuery">重置</el-button>
<el-button icon="Refresh" class="ml10" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
</div>
<!-- 表格 -->
<!-- 表格 -->
<div class="table-wrapper">
<el-table
ref="tableRef"
:data="tableData"
@@ -47,13 +49,14 @@
:summary-method="getSummaries"
:cell-style="tableStyle.cellStyle"
:header-cell-style="tableStyle.headerCellStyle"
height="100%"
>
<el-table-column prop="groupId" label="招生计划" align="center" show-overflow-tooltip>
<template #default="scope">
{{ getPlanName(scope.row.groupId) }}
</template>
</el-table-column>
<el-table-column prop="zymc" label="专业名称" align="center" show-overflow-tooltip />
<el-table-column prop="majorName" label="专业名称" align="center" show-overflow-tooltip />
<el-table-column prop="wlx" label="未联系" align="center" show-overflow-tooltip />
<el-table-column prop="yjbd" label="已经报到" align="center" show-overflow-tooltip />
<el-table-column prop="tcbd" label="推迟报到" align="center" show-overflow-tooltip />
@@ -66,10 +69,8 @@
<script setup lang="ts" name="backSchoolCheckinStaticIndex">
import { ref, reactive, onMounted } from 'vue'
import { list } from '/@/api/recruit/recruitstudentplangroup'
import { getList } from '/@/api/recruit/recruitstudentplangroup'
import { getTabStaticDataList as getTabStaticDataListApi } from '/@/api/recruit/recruitstudentsignup'
// @ts-ignore
import global from '@/components/tools/commondict.vue'
import { useTable } from '/@/hooks/table'
// 表格引用
@@ -131,7 +132,7 @@ const getTabStaticDataList = async () => {
const response = await getTabStaticDataListApi(queryForm)
tableData.value = response.data || []
} catch (error) {
console.error('获取统计数据失败', error)
// 获取统计数据失败
} finally {
dataListLoading.value = false
}
@@ -150,21 +151,39 @@ const resetQuery = () => {
// 初始化
const init = async () => {
try {
const data = await list()
const data = await getList()
planList.value = data.data || []
if (planList.value.length > 0) {
queryForm.groupId = planList.value[0].id
getTabStaticDataList()
}
} catch (error) {
console.error('初始化失败', error)
// 初始化失败
}
}
defineExpose({
init
})
onMounted(() => {
init()
})
</script>
<style lang="scss" scoped>
.static-index-container {
display: flex;
flex-direction: column;
height: 100%;
overflow: hidden;
}
.search-form-wrapper {
flex-shrink: 0;
}
.table-wrapper {
flex: 1;
overflow: auto;
min-height: 0;
}
</style>

View File

@@ -101,7 +101,7 @@ import { storeToRefs } from 'pinia'
import { useUserInfo } from '/@/stores/userInfo'
import { useMessage } from '/@/hooks/message'
import { getDataStatistics } from '/@/api/recruit/newstucheckin'
import { list } from '/@/api/recruit/recruitstudentplangroup'
import { getList } from '/@/api/recruit/recruitstudentplangroup'
import { getDeptList } from '/@/api/basic/basicclass'
import { queryAllClass } from '/@/api/basic/basicclass'
import axios from 'axios'
@@ -153,7 +153,7 @@ const init = async () => {
// 查看所有入学年份
const getGradeData = async () => {
try {
const data = await list()
const data = await getList()
gradeList.value = data.data || []
} catch (error) {
console.error('获取入学年份失败', error)

View File

@@ -16,12 +16,12 @@
-->
<template>
<div class="layout-padding">
<div class="layout-padding-auto layout-padding-view">
<!-- 搜索表单 -->
<el-form :model="queryForm" inline class="mb-4" ref="searchFormRef">
<div class="tab-index-container">
<!-- 搜索表单 -->
<div class="search-form-wrapper">
<el-form :model="queryForm" inline ref="searchFormRef">
<el-form-item label="招生计划" prop="groupId">
<el-select v-model="queryForm.groupId" filterable clearable placeholder="请选择招生计划" @change="chanMajor" style="width: 150px;">
<el-select v-model="queryForm.groupId" filterable clearable placeholder="请选择招生计划" @change="chanMajor">
<el-option
v-for="item in planList"
:key="item.id"
@@ -30,8 +30,8 @@
/>
</el-select>
</el-form-item>
<el-form-item label="学院" prop="xy">
<el-select v-model="queryForm.xy" filterable clearable placeholder="请选择学院" style="width: 130px;">
<el-form-item label="学院" prop="deptCode">
<el-select v-model="queryForm.deptCode" filterable clearable placeholder="请选择学院">
<el-option
v-for="item in deptList"
:key="item.deptCode"
@@ -44,9 +44,9 @@
<el-select v-model="queryForm.confirmedMajor" filterable clearable placeholder="请选择录取专业">
<el-option
v-for="item in planMajorList"
:key="item.zydm"
:label="item.zymc + '(' + item.xz + '年制)'"
:value="item.zydm"
:key="item.majorCode"
:label="item.majorName + '(' + item.learnYear + '年制)'"
:value="item.majorCode"
/>
</el-select>
</el-form-item>
@@ -54,7 +54,7 @@
<el-input v-model="queryForm.search" clearable placeholder="唯一号/姓名/身份证号/学校名称" />
</el-form-item>
<el-form-item label="缴费状态" prop="paystatus">
<el-select v-model="queryForm.paystatus" filterable clearable placeholder="请选择缴费状态" style="width: 120px;">
<el-select v-model="queryForm.paystatus" filterable clearable placeholder="请选择缴费状态">
<el-option
v-for="item in paystatusList"
:key="item.value"
@@ -64,7 +64,7 @@
</el-select>
</el-form-item>
<el-form-item label="推送状态" prop="pushed">
<el-select v-model="queryForm.pushed" filterable clearable placeholder="请选择推送状态" style="width: 120px;">
<el-select v-model="queryForm.pushed" filterable clearable placeholder="请选择推送状态">
<el-option
v-for="item in pushedList"
:key="item.value"
@@ -74,7 +74,7 @@
</el-select>
</el-form-item>
<el-form-item label="报到状态" prop="backSchoolState">
<el-select v-model="queryForm.backSchoolState" filterable clearable placeholder="请选择报到状态" style="width: 120px;">
<el-select v-model="queryForm.backSchoolState" filterable clearable placeholder="请选择报到状态">
<el-option
v-for="item in backSchoolStateList"
:key="item.value"
@@ -85,12 +85,13 @@
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="getDataList">查询</el-button>
<el-button type="primary" plain icon="Refresh" class="ml10" @click="resetQuery">重置</el-button>
<el-button icon="Refresh" class="ml10" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
</div>
<!-- 操作按钮 -->
<div class="mb15">
<!-- 操作按钮 -->
<div class="action-buttons-wrapper mb15">
<el-button
type="warning"
plain
@@ -101,7 +102,7 @@
</el-button>
<el-button
v-if="permissions.recruit_recruitstudentsignup_allCX"
type="success"
type="primary"
plain
icon="Search"
class="ml10"
@@ -109,15 +110,17 @@
>
批量查询
</el-button>
</div>
</div>
<!-- 表格 -->
<!-- 表格 -->
<div class="table-wrapper">
<el-table
ref="tableRef"
:data="state.dataList"
v-loading="state.loading"
border
stripe
height="100%"
:cell-style="tableStyle.cellStyle"
:header-cell-style="tableStyle.headerCellStyle"
>
@@ -145,10 +148,10 @@
</template>
</el-table-column>
<el-table-column prop="serialNumber" label="唯一号" align="center" show-overflow-tooltip />
<el-table-column prop="xy" label="学院" align="center" show-overflow-tooltip>
<el-table-column prop="deptCode" label="学院" align="center" show-overflow-tooltip>
<template #default="scope">
<span v-if="scope.row.auditStatus == 20">
{{ getDeptName(scope.row.xy) }}
{{ getDeptName(scope.row.deptCode) }}
</span>
</template>
</el-table-column>
@@ -162,7 +165,7 @@
<el-table-column prop="name" label="姓名" align="center" show-overflow-tooltip />
<el-table-column prop="gender" label="性别" align="center" show-overflow-tooltip>
<template #default="scope">
{{ getGender(scope.row.gender) }}
<GenderTag :sex="scope.row.gender" />
</template>
</el-table-column>
<el-table-column prop="idNumber" label="身份证号" align="center" show-overflow-tooltip />
@@ -188,13 +191,16 @@
</el-table>
<!-- 分页 -->
<pagination
v-bind="state.pagination"
@current-change="currentChangeHandle"
@size-change="sizeChangeHandle"
/>
<div class="pagination-wrapper">
<pagination
v-bind="state.pagination"
@current-change="currentChangeHandle"
@size-change="sizeChangeHandle"
/>
</div>
</div>
<!-- 支付二维码弹窗 -->
<!-- 支付二维码弹窗 -->
<el-dialog v-model="dialogFormVisible" title="支付二维码" width="800px" @close="dialogFormVisible = false">
<el-table :data="tableData" border>
<el-table-column label="唯一号" prop="serialNumber" align="center" />
@@ -226,26 +232,24 @@
</el-dialog>
<stu-check-in ref="stuCheckInRef" @reload="refreshChange" />
</div>
</div>
</template>
<script setup lang="ts" name="backSchoolCheckinTabIndex">
import { ref, reactive, computed, onMounted, nextTick, defineAsyncComponent } from 'vue'
import { ref, reactive, computed, onMounted, nextTick, defineAsyncComponent, defineExpose } from 'vue'
import { storeToRefs } from 'pinia'
import { useUserInfo } from '/@/stores/userInfo'
import { BasicTableProps, useTable } from '/@/hooks/table'
import { useMessage, useMessageBox } from '/@/hooks/message'
import { list } from '/@/api/recruit/recruitstudentplangroup'
import { useMessage } from '/@/hooks/message'
import { getList } from '/@/api/recruit/recruitstudentplangroup'
import { backPush, backSchoolStuPage, batchPushAll } from '/@/api/recruit/recruitstudentsignup'
import { getDeptList } from '/@/api/basic/basicclass'
import { listPlanByCondition as planMajor } from '/@/api/recruit/recruitstudentplan'
import { updateFs, updateAllFS } from '/@/api/finance/financenormalstu'
import { getTypeValue } from '/@/api/admin/dict'
// @ts-ignore
import global from '@/components/tools/commondict.vue'
import { updateFs, updateAllFS as updateAllFSApi } from '/@/api/finance/financenormalstu'
import { getDicts } from '/@/api/admin/dict'
const StuCheckIn = defineAsyncComponent(() => import('./stu-check-in.vue'))
const GenderTag = defineAsyncComponent(() => import('/@/components/GenderTag/index.vue'))
// 使用 Pinia store
const userInfoStore = useUserInfo()
@@ -262,7 +266,6 @@ const permissions = computed(() => {
// 消息提示 hooks
const message = useMessage()
const messageBox = useMessageBox()
// 表格引用
const tableRef = ref()
@@ -280,7 +283,7 @@ const pushedList = ref([{ label: '未推送', value: '0' }, { label: '已推送'
// 查询表单
const queryForm = reactive({
groupId: '',
xy: '',
deptCode: '',
confirmedMajor: '',
search: '',
paystatus: '',
@@ -311,8 +314,8 @@ const getDeptName = (deptCode: string) => {
// 获取专业名称
const getMajorName = (majorCode: string) => {
const item = planMajorList.value.find(item => item.zydm === majorCode)
return item ? item.zymc : ''
const item = planMajorList.value.find(item => item.majorCode === majorCode)
return item ? item.majorName : ''
}
// 获取性别
@@ -393,7 +396,7 @@ const getMajorList = async (groupId: string) => {
const init = async () => {
try {
// 查询报到状态字典
const dictData = await getTypeValue('check_in_status')
const dictData = await getDicts('check_in_status')
backSchoolStateList.value = dictData.data || []
// 查询二级学院信息
@@ -401,7 +404,7 @@ const init = async () => {
deptList.value = deptData.data || []
// 获取招生计划列表
const planData = await list()
const planData = await getList()
planList.value = planData.data || []
if (planList.value.length > 0) {
queryForm.groupId = planList.value[0].id
@@ -437,7 +440,7 @@ const updateAllFS = async () => {
const plan = planList.value.find(e => e.id === queryForm.groupId)
if (!plan) return
const data = await updateAllFS({ year: plan.year, stuSource: '1' })
const data = await updateAllFSApi({ year: plan.year, stuSource: '1' })
if (data.data.code == '200') {
message.success('正在更新所有缴费单状态,请稍后查看更新结果')
}
@@ -524,7 +527,7 @@ const showPayCode = (row: any) => {
const resetQuery = () => {
searchFormRef.value?.resetFields()
queryForm.groupId = ''
queryForm.xy = ''
queryForm.deptCode = ''
queryForm.confirmedMajor = ''
queryForm.search = ''
queryForm.paystatus = ''
@@ -538,10 +541,46 @@ const resetQuery = () => {
getDataList()
}
// 暴露方法供父组件调用
defineExpose({
init
})
onMounted(() => {
init()
})
</script>
<style lang="scss" scoped>
.tab-index-container {
display: flex;
flex-direction: column;
height: 100%;
overflow: hidden;
}
.search-form-wrapper {
flex-shrink: 0;
}
.action-buttons-wrapper {
flex-shrink: 0;
}
.table-wrapper {
flex: 1;
overflow: hidden;
min-height: 0;
display: flex;
flex-direction: column;
}
.table-wrapper :deep(.el-table) {
flex: 1;
}
.pagination-wrapper {
flex-shrink: 0;
padding-top: 15px;
}
</style>