RISE/school-developer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'developer' of ssh://code.cyweb.top:30033/scj/zhxy/v3/cloud-ui into developer

Browse Source
This commit is contained in:
guochunsi
2026-01-16 14:01:05 +08:00
parent 7d4da543cb 1ea71a9eb4
commit 358b08bb79
12 changed files with 68 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/views/recruit/backSchoolCheckin/tabIndex.vue
View File

@@ -30,8 +30,8 @@
/>
</el-select>
</el-form-item>
<el-form-item label="学院" prop="xy">
<el-select v-model="queryForm.xy" filterable clearable placeholder="请选择学院">
<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"
@@ -148,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>
@@ -283,7 +283,7 @@ const pushedList = ref([{ label: '未推送', value: '0' }, { label: '已推送'
// 查询表单
const queryForm = reactive({
groupId: '',
xy: '',
deptCode: '',
confirmedMajor: '',
search: '',
paystatus: '',
@@ -527,7 +527,7 @@ const showPayCode = (row: any) => {
const resetQuery = () => {
searchFormRef.value?.resetFields()
queryForm.groupId = ''
queryForm.xy = ''
queryForm.deptCode = ''
queryForm.confirmedMajor = ''
queryForm.search = ''
queryForm.paystatus = ''

2
src/views/recruit/newstucheckin/index.vue
View File

@@ -58,7 +58,7 @@
:header-cell-style="tableStyle.headerCellStyle"
>
<el-table-column type="index" label="序号" width="60" align="center" />
<el-table-column prop="xy" label="学院" align="center" show-overflow-tooltip />
<el-table-column prop="deptCode" label="学院" align="center" show-overflow-tooltip />
<el-table-column prop="classCode" label="班级" align="center" width="80" show-overflow-tooltip />
<el-table-column label="姓名/学号" align="center" width="150" show-overflow-tooltip>
<template #default="scope">

8
src/views/recruit/recruitstudentplan/index.vue
View File

@@ -41,7 +41,7 @@
>
<el-table-column type="index" label="序号" width="60" align="center" />
<el-table-column prop="majorCode" 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 />
<el-table-column prop="needStudentNum" label="拟招人数（不限男女）和拟招男女生数互斥" align="center" show-overflow-tooltip />
<el-table-column prop="needStudentBoyNum" label="拟招男生数" align="center" show-overflow-tooltip />
<el-table-column prop="needStudentGirlNum" label="拟招女生数" align="center" show-overflow-tooltip />
@@ -105,8 +105,8 @@
<el-form-item label="专业代码" prop="majorCode">
<el-input v-model="form.majorCode" placeholder="请输入专业代码" clearable />
</el-form-item>
<el-form-item label="系部" prop="xy">
<el-input v-model="form.xy" placeholder="请输入系部" clearable />
<el-form-item label="系部" prop="deptCode">
<el-input v-model="form.deptCode" placeholder="请输入系部" clearable />
</el-form-item>
<el-form-item label="拟招人数（不限男女）" prop="needStudentNum">
<el-input-number v-model="form.needStudentNum" :min="0" placeholder="请输入拟招人数" style="width: 100%" />
@@ -206,7 +206,7 @@ const queryForm = reactive({})
const form = reactive({
id: '',
majorCode: '',
xy: '',
deptCode: '',
needStudentNum: undefined,
needStudentBoyNum: undefined,
needStudentGirlNum: undefined,

6
src/views/recruit/recruitstudentschool/detaiform.vue
View File

@@ -20,8 +20,8 @@
<el-form-item label="学校名称" prop="schoolName">
<el-input v-model="dataForm.schoolName" placeholder="学校名称"></el-input>
</el-form-item>
<el-form-item label="对接学院" prop="xy">
<el-select v-model="dataForm.xy" filterable clearable placeholder="请选择对接学院">
<el-form-item label="对接学院" prop="deptCode">
<el-select v-model="dataForm.deptCode" filterable clearable placeholder="请选择对接学院">
<el-option
v-for="item in deptList"
:key="item.deptCode"
@@ -77,7 +77,7 @@ const dataForm = reactive({
id: "",
groupId: "",
area: "",
xy: "",
deptCode: "",
schoolName: ""
})

4
src/views/recruit/recruitstudentschool/index.vue
View File

@@ -63,9 +63,9 @@
>
<el-table-column type="index" label="序号" width="60" align="center" />
<el-table-column prop="schoolName" 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">
{{ getDeptName(scope.row.xy) }}
{{ getDeptName(scope.row.deptCode) }}
</template>
</el-table-column>
<el-table-column prop="area" label="所在区" align="center" show-overflow-tooltip>

4
src/views/recruit/recruitstudentsignup/dorm_analysis.vue
View File

@@ -26,13 +26,13 @@
v-loading="dataListLoading">
<el-table-column
prop="xy"
prop="deptCode"
header-align="center"
align="center"
width="120"
label="学院">
<template #default="scope">
<span>{{ getLabelValueByProps(deptList, scope.row.xy, { key: 'deptCode', value: 'deptName' }) }}</span>
<span>{{ getLabelValueByProps(deptList, scope.row.deptCode, { key: 'deptCode', value: 'deptName' }) }}</span>
</template>
</el-table-column>
<el-table-column

26
src/views/recruit/recruitstudentsignup/index.vue
View File

@@ -20,8 +20,8 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="学院" prop="xy">
<el-select v-model="dataForm.xy" filterable clearable placeholder="请选择学院">
<el-form-item label="学院" prop="deptCode">
<el-select v-model="dataForm.deptCode" filterable clearable placeholder="请选择学院">
<el-option
v-for="item in deptList"
:key="item.deptCode"
@@ -332,7 +332,7 @@
@click="handleUpdate(scope.row.id,scope.row.groupId,scope.row.feeAgency)">退学
</el-button>
<el-button v-if="permissions.recruit_recruitstudentsignup_change && scope.row.auditStatus=='20' "
type="text" size="small" icon="iconfont iconbanjiguanli1" @click="majorChange(scope.row.id)">
type="text" size="small" @click="majorChange(scope.row.id)">
调整专业
</el-button>
<el-button
@@ -340,10 +340,10 @@
type="text" icon="el-icon-tickets" size="small" plain @click="showPayCode(scope.row)">支付二维码
</el-button>
<!-- <el-button v-if="permissions.recruit_recruitstudentsignup_show && scope.row.pushed=='1' && scope.row.paiedOffline=='0' && scope.row.auditStatus=='20'" type="text" icon="el-icon-check" size="small" @click="delayPayTimeSet(scope.row)">延迟收费</el-button>-->
<el-button
v-if="permissions.recruit_recruitstudentsignup_rePush && scope.row.pushed=='0' && scope.row.auditStatus=='20'"
type="text" icon="el-icon-check" size="small" plain @click="handleRePush(scope.row)">重新推送
</el-button>
<!-- <el-button-->
<!-- v-if="permissions.recruit_recruitstudentsignup_rePush && scope.row.pushed=='0' && scope.row.auditStatus=='20'"-->
<!-- type="text" icon="el-icon-check" size="small" plain @click="handleRePush(scope.row)">重新推送-->
<!-- </el-button>-->
<el-button
v-if="permissions.recruit_recruitstudentsignup_show && ((scope.row.degreeOfEducation=='1'&& scope.row.isOut=='1' && scope.row.auditStatus=='20')
@@ -357,9 +357,9 @@
v-if="permissions.recruit_recruitstudentsignup_show && scope.row.paiedOffline!='0' && scope.row.auditStatus=='20'"
type="text" icon="el-icon-check" size="small" plain @click="infoTable(scope.row)">信息表
</el-button>
<el-button v-if="permissions.recruit_recruitstudentsignup_push && scope.row.auditStatus=='20'" type="text"
icon="el-icon-upload" size="small" plain @click="handlePushCity(scope.row.id)">推送市局
</el-button>
<!-- <el-button v-if="permissions.recruit_recruitstudentsignup_push && scope.row.auditStatus=='20'" type="text"-->
<!-- icon="el-icon-upload" size="small" plain @click="handlePushCity(scope.row.id)">推送市局-->
<!-- </el-button>-->
</template>
</el-table-column>
@@ -442,7 +442,7 @@
</el-table-column>
<el-table-column
prop="xy"
prop="deptCode"
header-align="center"
align="center"
width="120"
@@ -450,7 +450,7 @@
<template #default="scope">
<span v-if="scope.row.auditStatus==20">
{{ getLabelValueByProps(deptList, scope.row.xy, { key: 'deptCode', value: 'deptName' }) }}
{{ getLabelValueByProps(deptList, scope.row.deptCode, { key: 'deptCode', value: 'deptName' }) }}
</span> <br/>
<span v-if="scope.row.auditStatus==20">
({{scope.row.auditorName}})
@@ -592,7 +592,7 @@ const showSearch = ref(true)
const dataForm = reactive({
zlsh: '',
groupId: '',
xy: '',
deptCode: '',
confirmedMajor: '',
degreeOfEducation: '',
isAccommodation: '',

10
src/views/recruit/recruitstudentsignup/indexClass.vue
View File

@@ -20,8 +20,8 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="学院" prop="xy">
<el-select v-model="dataForm.xy" filterable clearable placeholder="请选择学院">
<el-form-item label="学院" prop="deptCode">
<el-select v-model="dataForm.deptCode" filterable clearable placeholder="请选择学院">
<el-option
v-for="item in deptList"
:key="item.deptCode"
@@ -295,13 +295,13 @@
</template>
</el-table-column>
<el-table-column
prop="xy"
prop="deptCode"
header-align="center"
align="center"
label="学院">
<template #default="scope">
<span v-if="scope.row.auditStatus==20">{{getLabelValueByPropes(deptList,scope.row.xy,{'key':'deptCode','value':'deptName'})}}</span>
<span v-if="scope.row.auditStatus==20">{{getLabelValueByPropes(deptList,scope.row.deptCode,{'key':'deptCode','value':'deptName'})}}</span>
</template>
</el-table-column>
<el-table-column
@@ -566,7 +566,7 @@ const changeForm = reactive({
const dataForm = reactive({
groupId: '',
xy: "",
deptCode: "",
confirmedMajor: "",
degreeOfEducation: "",
isAccommodation: "",

12
src/views/recruit/recruitstudentsignup/list.vue
View File

@@ -12,8 +12,8 @@
/>
</el-select>
</el-form-item>
<el-form-item label="学院" prop="xy">
<el-select v-model="queryForm.xy" filterable clearable placeholder="请选择学院">
<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"
@@ -130,9 +130,9 @@
</template>
</el-table-column>
<el-table-column prop="idNumber" label="身份证号" width="180" align="center" show-overflow-tooltip />
<el-table-column prop="xy" label="学院" width="120" align="center" show-overflow-tooltip>
<el-table-column prop="deptCode" label="学院" width="120" align="center" show-overflow-tooltip>
<template #default="scope">
{{ getDeptName(scope.row.xy) }}
{{ getDeptName(scope.row.deptCode) }}
</template>
</el-table-column>
<el-table-column prop="homeAddressDetail" label="家庭地址" align="center" show-overflow-tooltip />
@@ -260,7 +260,7 @@ const isSendList = ref([{ label: '未发送', value: 0 }, { label: '已发送',
// 查询表单
const queryForm = reactive({
groupId: '',
xy: '',
deptCode: '',
confirmedMajor: '',
search: '',
isOutFw: '',
@@ -407,7 +407,7 @@ const handleExport = async () => {
const resetQuery = () => {
searchFormRef.value?.resetFields()
queryForm.groupId = ''
queryForm.xy = ''
queryForm.deptCode = ''
queryForm.confirmedMajor = ''
queryForm.search = ''
queryForm.isOutFw = ''

20
src/views/recruit/recruitstudentsignup/static.vue
View File

@@ -58,7 +58,7 @@ import { BasicTableProps, useTable } from '/@/hooks/table'
import { useMessage } from '/@/hooks/message'
import { useDict } from '/@/hooks/dict'
import { getList } from '/@/api/recruit/recruitstudentplangroup'
import { fetchListByStatic, listPlanByCondition as planMajor } from '/@/api/recruit/recruitstudentplan'
import { listPlanByCondition as planMajor } from '/@/api/recruit/recruitstudentplan'
import { getDeptList } from '/@/api/basic/basicclass'
// @ts-ignore
import global from '/@/components/tools/commondict.vue'
@@ -88,15 +88,15 @@ const queryForm = reactive({
// 表格状态
const state: BasicTableProps = reactive<BasicTableProps>({
queryForm: queryForm,
pageList: async (params: any) => {
const response = await fetchListByStatic(params)
return {
data: {
records: response.data || [],
total: response.data?.length || 0
}
}
},
// pageList: async (params: any) => {
// const response = await fetchListByStatic(params)
// return {
// data: {
// records: response.data || [],
// total: response.data?.length || 0
// }
// }
// },
createdIsNeed: false
})