c-zhouhf1/zhgh_ncu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4

Browse Source 
# Conflicts:
#	src/main/java/com/budwk/app/zhgh/democratic/executiveCommittee/service/impl/ExecutiveCommitteeMemberServiceImpl.java
#	src/main/resources/views/platform/zhgh/dayofficework/evaluation/activity/index.html
#	src/main/resources/views/platform/zhgh/dayofficework/honor/manage/index.html
#	src/main/resources/views/platform/zhgh/dayofficework/honor/registration/index.html
This commit is contained in:
c-zhouhf1
2025-10-19 18:55:16 +08:00
parent 1cc6e62f07 6e5c612600
commit 4afee184cf
59 changed files with 180 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/views/platform/bpm/processDefine/index.html
+2 -2
View File
@@ -16,10 +16,10 @@ layout("/layouts/platform.html"){
<el-card shadow="never">
<search @search="doSearch">
<search-item label="名称">
<el-input placeholder="名称" v-model="pageForm.displayName"></el-input>
<el-input placeholder="请输入名称" v-model="pageForm.displayName"></el-input>
</search-item>
<search-item label="编码">
<el-input placeholder="编码" v-model="pageForm.name"></el-input>
<el-input placeholder="请输入编码" v-model="pageForm.name"></el-input>
</search-item>
</search>
</el-card>
src/main/resources/views/platform/flow/definition/index.html
+2 -2
View File
@@ -13,10 +13,10 @@ layout("/layouts/platform.html"){
<el-card shadow="never">
<search @search="doSearch">
<search-item label="名称">
<el-input v-model="pageForm.displayName" placeholder="名称" clearable></el-input>
<el-input v-model="pageForm.displayName" placeholder="请输入名称" clearable></el-input>
</search-item>
<search-item label="编码">
<el-input v-model="pageForm.name" placeholder="编码" clearable></el-input>
<el-input v-model="pageForm.name" placeholder="请输入编码" clearable></el-input>
</search-item>
</search>
</el-card>
src/main/resources/views/platform/zhgh/activity/trainSignUp/userAdjust/userInfo.js
-1
View File
@@ -51,7 +51,6 @@ const userInfo = {
<el-table-column label="单选" width="160">
<template v-slot="{row}">
<el-radio
:label="row.id"
@change.native="getCurrentRow(row)"
:disabled="(row.courseReservedNumber + row.registerNum) >= row.coursePeopleNumber"
v-model="afterAdjustCourse"
src/main/resources/views/platform/zhgh/dayofficework/birthdayWishes/plan/index.html
+1 -1
View File
@@ -7,7 +7,7 @@ layout("/layouts/platform.html"){
<el-card shadow="never">
<search @search="doSearch">
<search-item label="名称">
<el-input placeholder="名称" clearable v-model="pageForm.searchKeyword"></el-input>
<el-input placeholder="请输入名称" clearable v-model="pageForm.searchKeyword"></el-input>
</search-item>
</search>
</el-card>
src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/activity/index.html
+4 -4
View File
@@ -5,11 +5,11 @@ layout("/layouts/platform.html"){
<div id="app" v-cloak>
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度：">
<el-date-picker placeholder="选择年度" type="year" style="width: 100%" v-model="pageForm.year" value-format="yyyy"></el-date-picker>
<search-item label="年度">
<el-date-picker placeholder="请选择年度" type="year" style="width: 100%" v-model="pageForm.year" value-format="yyyy"></el-date-picker>
</search-item>
<search-item label="活动名称：">
<el-input placeholder="请输入活动名称查询" clearable v-model="pageForm.searchKeyword"></el-input>
<search-item label="活动名称">
<el-input placeholder="请输入活动名称" clearable v-model="pageForm.searchKeyword"></el-input>
</search-item>
</search>
</el-card>
src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/collect/index.html
+1 -1
View File
@@ -11,7 +11,7 @@ layout("/layouts/platform.html"){
type="year"
:clearable="false"
value-format="yyyy"
placeholder="年度"
placeholder="请选择年度"
style="width: 100%"
@change="getActivityByYear">
</el-date-picker>
src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/mine/index.html
+4 -4
View File
@@ -5,11 +5,11 @@ layout("/layouts/platform.html"){
<guava ref="guava">
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度：">
<search-item label="年度">
<el-date-picker placeholder="选择年度" type="year" style="width: 100%" v-model="pageForm.year" value-format="yyyy"></el-date-picker>
</search-item>
<search-item label="活动名称：">
<el-input placeholder="请输入活动名称查询" clearable v-model="pageForm.searchKeyword"></el-input>
<search-item label="活动名称">
<el-input placeholder="请输入活动名称" clearable v-model="pageForm.searchKeyword"></el-input>
</search-item>
</search>
</el-card>
@@ -32,7 +32,7 @@ layout("/layouts/platform.html"){
<el-table-column label="操作" fixed="right" width="300px">
<template slot-scope="{row}">
<el-button @click="onView(row)" size="mini" type="primary">查看</el-button>
<el-button v-if="row.canRevoke" @click="onCancelSignUp(row)" size="mini" type="danger">取消报名
<el-button @click="onCancelSignUp(row)" size="mini" type="danger">取消报名
</el-button>
</template>
</el-table-column>
src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/schoolAudit/index.html
+1 -1
View File
@@ -10,7 +10,7 @@ layout("/layouts/platform.html"){
v-model="pageForm.year"
type="year"
value-format="yyyy"
placeholder="年度"
placeholder="请选择年度"
style="width: 100%"
@change="getActivityByYear">
</el-date-picker>
src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/signUp/index.html
+4 -4
View File
@@ -5,11 +5,11 @@ layout("/layouts/platform.html"){
<div id="app" v-cloak>
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度：">
<el-date-picker placeholder="选择年度" type="year" style="width: 100%" v-model="pageForm.year" value-format="yyyy"></el-date-picker>
<search-item label="年度">
<el-date-picker placeholder="请选择年度" type="year" style="width: 100%" v-model="pageForm.year" value-format="yyyy"></el-date-picker>
</search-item>
<search-item label="活动名称：">
<el-input placeholder="请输入活动名称查询" clearable v-model="pageForm.searchKeyword"></el-input>
<search-item label="活动名称">
<el-input placeholder="请输入活动名称" clearable v-model="pageForm.searchKeyword"></el-input>
</search-item>
</search>
</el-card>
src/main/resources/views/platform/zhgh/dayofficework/evaluation/activity/index.html
+3 -3
View File
@@ -5,10 +5,10 @@ layout("/layouts/platform.html"){
<div id="app" v-cloak>
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度：">
<el-date-picker placeholder="选择年度" type="year" style="width: 100%" v-model="pageForm.year" value-format="yyyy"></el-date-picker>
<search-item label="年度">
<el-date-picker placeholder="请选择年度" type="year" style="width: 100%" v-model="pageForm.year" value-format="yyyy"></el-date-picker>
</search-item>
<search-item label="名称：">
<search-item label="名称">
<el-input placeholder="请输入评优评先名称查询" clearable v-model="pageForm.searchKeyword"></el-input>
</search-item>
</search>
src/main/resources/views/platform/zhgh/dayofficework/evaluation/apply/index.html
+4
View File
@@ -60,6 +60,10 @@ layout("/layouts/platform.html"){
},
methods: {
openApply(row) {
if(this.$moment().isAfter(this.$moment(row.endTime))) {
this.$message.warning('申请时间已截止')
return
}
$.post("/platform/evaluate/apply/valid", {id: row.id}).then((res) => {
if (res.code === 0) {
const {msg, data} = res
src/main/resources/views/platform/zhgh/dayofficework/exerciseCard/query/index.html
+1 -1
View File
@@ -6,7 +6,7 @@ layout("/layouts/platform.html"){
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度">
<el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="年度"
<el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="请选择"
style="width: 100%"></el-date-picker>
</search-item>
<search-item label="姓名/工号">
src/main/resources/views/platform/zhgh/dayofficework/fund/member/branchUnionApproval/index.html
+1 -1
View File
@@ -6,7 +6,7 @@ layout("/layouts/platform.html"){
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度">
<el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="年度"
<el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="请选择年度"
style="width: 100%"></el-date-picker>
</search-item>
<search-item label="姓名/工号">
src/main/resources/views/platform/zhgh/dayofficework/fund/member/changeRecord/index.html
+1 -1
View File
@@ -6,7 +6,7 @@ layout("/layouts/platform.html"){
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度">
<el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="年度"
<el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="请选择年度"
style="width: 100%"></el-date-picker>
</search-item>
<search-item label="姓名/工号">
src/main/resources/views/platform/zhgh/dayofficework/fund/member/his/index.html
+1 -1
View File
@@ -6,7 +6,7 @@ layout("/layouts/platform.html"){
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度">
<el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="年度"
<el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="请选择年度"
style="width: 100%"></el-date-picker>
</search-item>
<search-item label="姓名/工号">
src/main/resources/views/platform/zhgh/dayofficework/fund/member/mine/index.html
+1 -1
View File
@@ -6,7 +6,7 @@ layout("/layouts/platform.html"){
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度">
<el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="年度"
<el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="请选择年度"
style="width: 100%"></el-date-picker>
</search-item>
</search>
src/main/resources/views/platform/zhgh/dayofficework/fund/member/query/index.html
+1 -1
View File
@@ -6,7 +6,7 @@ layout("/layouts/platform.html"){
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度">
<el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="年度"
<el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="请选择年度"
style="width: 100%"></el-date-picker>
</search-item>
<search-item label="姓名/工号">
src/main/resources/views/platform/zhgh/dayofficework/fund/member/schoolUnionApproval/index.html
+1 -1
View File
@@ -6,7 +6,7 @@ layout("/layouts/platform.html"){
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度">
<el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="年度"
<el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="请选择年度"
style="width: 100%"></el-date-picker>
</search-item>
<search-item label="工号/姓名">
src/main/resources/views/platform/zhgh/dayofficework/fund/subsidy/query/index.html
+1 -1
View File
@@ -6,7 +6,7 @@ layout("/layouts/platform.html"){
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度">
<el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="年度"
<el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="请选择年度"
style="width: 100%"></el-date-picker>
</search-item>
<search-item label="姓名/工号">
src/main/resources/views/platform/zhgh/dayofficework/meeting/delegationApproval/index.html
+1 -1
View File
@@ -18,7 +18,7 @@ layout("/layouts/platform.html"){
></el-date-picker>
</search-item>
<search-item label="名称/地点">
<el-input placeholder="请输入名称或地点查询" clearable v-model="pageForm.searchKeyword"
<el-input placeholder="请输入名称或地点" clearable v-model="pageForm.searchKeyword"
@keyup.enter.native="doSearch">
</el-input>
</search-item>
src/main/resources/views/platform/zhgh/dayofficework/meeting/leave/index.html
+1 -1
View File
@@ -16,7 +16,7 @@ layout("/layouts/platform.html"){
></el-date-picker>
</search-item>
<search-item label="名称/地点">
<el-input placeholder="请输入名称或地点查询" clearable v-model="pageForm.searchKeyword"
<el-input placeholder="请输入名称或地点" clearable v-model="pageForm.searchKeyword"
@keyup.enter.native="doSearch">
</el-input>
</search-item>
src/main/resources/views/platform/zhgh/dayofficework/meeting/manage/basicForm.js
+4
View File
@@ -231,6 +231,10 @@ const basicForm = {
},
methods: {
next() {
if(!this.formData.typeId) {
this.$message.warning('请选择会议类型')
return
}
const type = this.typeOptions.find(o => o.id === this.formData.typeId)
if(type.designId === 'JDHHY' && !this.formData.teacherCongressSessionId) {
this.$message.warning('请选择所属教代会')
src/main/resources/views/platform/zhgh/dayofficework/meeting/manage/index.html
+1 -1
View File
@@ -22,7 +22,7 @@ layout("/layouts/platform.html"){
></el-date-picker>
</search-item>
<search-item label="名称/地点">
<el-input placeholder="请输入名称或地点查询" clearable v-model="pageForm.searchKeyword"
<el-input placeholder="请输入名称或地点" clearable v-model="pageForm.searchKeyword"
@keyup.enter.native="doSearch">
</el-input>
</search-item>
src/main/resources/views/platform/zhgh/dayofficework/meeting/mine/index.html
+1 -1
View File
@@ -30,7 +30,7 @@ layout("/layouts/platform.html"){
></el-date-picker>
</search-item>
<search-item label="名称/地点">
<el-input placeholder="请输入名称或地点查询" clearable v-model="pageForm.searchKeyword"
<el-input placeholder="请输入名称或地点" clearable v-model="pageForm.searchKeyword"
@keyup.enter.native="doSearch">
</el-input>
</search-item>
src/main/resources/views/platform/zhgh/dayofficework/meeting/online/index.html
+1 -1
View File
@@ -85,7 +85,7 @@ layout("/layouts/platform.html"){
></el-date-picker>
</search-item>
<search-item label="名称/地点">
<el-input placeholder="请输入名称或地点查询" clearable v-model="pageForm.searchKeyword"
<el-input placeholder="请输入名称或地点" clearable v-model="pageForm.searchKeyword"
@keyup.enter.native="doSearch">
</el-input>
</search-item>
src/main/resources/views/platform/zhgh/dayofficework/meeting/schoolUnionApproval/index.html
+1 -1
View File
@@ -18,7 +18,7 @@ layout("/layouts/platform.html"){
></el-date-picker>
</search-item>
<search-item label="名称/地点">
<el-input placeholder="请输入名称或地点查询" clearable v-model="pageForm.searchKeyword"
<el-input placeholder="请输入名称或地点" clearable v-model="pageForm.searchKeyword"
@keyup.enter.native="doSearch">
</el-input>
</search-item>
src/main/resources/views/platform/zhgh/dayofficework/meeting/statistics/index.html
+1 -1
View File
@@ -22,7 +22,7 @@ layout("/layouts/platform.html"){
></el-date-picker>
</search-item>
<search-item label="名称/地点">
<el-input placeholder="请输入名称或地点查询" clearable v-model="pageForm.searchKeyword"
<el-input placeholder="请输入名称或地点" clearable v-model="pageForm.searchKeyword"
@keyup.enter.native="doSearch">
</el-input>
</search-item>
src/main/resources/views/platform/zhgh/dayofficework/meeting/type/index.html
+1 -1
View File
@@ -12,7 +12,7 @@ layout("/layouts/platform.html"){
<el-card shadow="never">
<search @search="doSearch">
<search-item label="名称/编码">
<el-input placeholder="请输入名称或编码查询" clearable v-model="pageForm.searchKeyword"
<el-input placeholder="请输入名称或编码" clearable v-model="pageForm.searchKeyword"
@keyup.enter.native="doSearch">
</el-input>
</search-item>
src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/applyStatistics/index.html
+3 -3
View File
@@ -10,7 +10,7 @@ layout("/layouts/platform.html"){
<search-item label="年度">
<el-date-picker
@change="doSearch"
placeholder="选择年度"
placeholder="请选择年度"
style="width: 100%" type="year"
v-model="pageForm.year"
:clearable="false"
@@ -21,11 +21,11 @@ layout("/layouts/platform.html"){
<el-input v-model="pageForm.activityMatter" placeholder="请输入活动项目"
clearable></el-input>
</search-item>
<search-item label="分工会"
<search-item label="所属工会"
v-if="!pageForm.outlayManageSource||pageForm.outlayManageSource==='ACTIVITY_BUDGET_TYPE_TWO'">
<el-select v-model="pageForm.unionId" filterable
clearable
placeholder="请选择工会" style="width: 100%;">
placeholder="请选择所属工会" style="width: 100%;">
<el-option v-for="item in unionList" :label="item.name"
:value="item.id">
</el-option>
src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/schoolAudit/index.html
+3 -3
View File
@@ -9,7 +9,7 @@ layout("/layouts/platform.html"){
<search-item label="年度">
<el-date-picker
@change="doSearch"
placeholder="选择年"
placeholder="请选择年度"
style="width: 100%"
type="year"
v-model="pageForm.year"
@@ -24,11 +24,11 @@ layout("/layouts/platform.html"){
<el-input v-model="pageForm.activityMatter" placeholder="请输入活动项目"
clearable></el-input>
</search-item>
<search-item label="分工会"
<search-item label="所属工会"
v-if="!pageForm.outlayManageSource||pageForm.outlayManageSource==='ACTIVITY_BUDGET_TYPE_TWO'">
<el-select v-model="pageForm.unionId" filterable
clearable
placeholder="请选择工会" style="width: 100%;">
placeholder="请选择所属工会" style="width: 100%;">
<el-option v-for="item in unionList" :label="item.name"
:value="item.id">
</el-option>
src/main/resources/views/platform/zhgh/dayofficework/qsv/activity/index.html
+2 -2
View File
@@ -7,11 +7,11 @@ layout("/layouts/platform.html"){
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度">
<el-date-picker placeholder="年度" style="width: 100%" type="year" v-model="pageForm.year"
<el-date-picker placeholder="请选择年度" style="width: 100%" type="year" v-model="pageForm.year"
value-format="yyyy"></el-date-picker>
</search-item>
<search-item label="标题">
<el-input placeholder="标题" v-model="pageForm.title" clearable></el-input>
<el-input placeholder="请输入标题" v-model="pageForm.title" clearable></el-input>
</search-item>
</search>
src/main/resources/views/platform/zhgh/dayofficework/qsv/activity/optionImg.js
+3 -3
View File
@@ -1,9 +1,9 @@
const optionImg = {
template: /*language=HTML*/ `
<el-dialog :visible="visible" title="设置图片" append-to-body width="700px">
<el-dialog :visible.sync="visible" title="设置图片" append-to-body width="700px">
<div style="background: #f7f8f9;text-align: center;border: solid 1px #d7d8d9;border-radius: 4px;">
<el-upload
action="/file_server/uploadFile"
action="/platform/sys/file/uploadDynamicReturnUrl"
:show-file-list="false"
:on-success="handleSuccess"
:before-upload="beforeUpload">
@@ -38,7 +38,7 @@ const optionImg = {
console.log(file)
console.log(fileList)
if (response.code === 0) {
this.img = FILE_STREAM_PREVIEW_ADDRESS + "?id=" + response.data.filepath
this.img = response.data
// this.img = "/platform/sys/file/download?id=t38dmq4beuhrupqb54prl52t4u"
this.$message.success("图片上传成功")
}
src/main/resources/views/platform/zhgh/dayofficework/qsv/activity/setting.js
+1
View File
@@ -32,6 +32,7 @@ const setting = {
},
onConfirm(){
this.$emit('confirm', { option:this.formData,ext:this.ext })
this.visible = false
}
}
src/main/resources/views/platform/zhgh/dayofficework/rest/activity/index.html
+3 -3
View File
@@ -6,10 +6,10 @@ layout("/layouts/platform.html"){
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度：">
<el-date-picker placeholder="选择年度" type="year" style="width: 100%" v-model="pageForm.year" value-format="yyyy"></el-date-picker>
<el-date-picker placeholder="请选择年度" type="year" style="width: 100%" v-model="pageForm.year" value-format="yyyy"></el-date-picker>
</search-item>
<search-item label="名称：">
<el-input placeholder="请输入名称查询" clearable v-model="pageForm.searchKeyword"></el-input>
<search-item label="名称">
<el-input placeholder="请输入名称" clearable v-model="pageForm.searchKeyword"></el-input>
</search-item>
</search>
</el-card>
src/main/resources/views/platform/zhgh/dayofficework/rest/signUp/index.html
+4 -4
View File
@@ -5,11 +5,11 @@ layout("/layouts/platform.html"){
<div id="app" v-cloak>
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度：">
<el-date-picker placeholder="选择年度" type="year" style="width: 100%" v-model="pageForm.year" value-format="yyyy"></el-date-picker>
<search-item label="年度">
<el-date-picker placeholder="请选择年度" type="year" style="width: 100%" v-model="pageForm.year" value-format="yyyy"></el-date-picker>
</search-item>
<search-item label="名称：">
<el-input placeholder="请输入名称查询" clearable v-model="pageForm.searchKeyword"></el-input>
<search-item label="名称">
<el-input placeholder="请输入名称" clearable v-model="pageForm.searchKeyword"></el-input>
</search-item>
</search>
</el-card>
src/main/resources/views/platform/zhgh/dayofficework/retiresouvenirs/batch/index.html
+2 -2
View File
@@ -11,7 +11,7 @@ layout("/layouts/platform.html"){
<template>
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度：">
<search-item label="年度">
<el-date-picker
v-model="pageForm.year"
type="year"
@@ -21,7 +21,7 @@ layout("/layouts/platform.html"){
style="width: 100%"
></el-date-picker>
</search-item>
<search-item label="批次名称：">
<search-item label="批次名称">
<el-input placeholder="请输入批次名称查询" clearable v-model="pageForm.searchKeyword"
@keyup.enter.native="doSearch">
</el-input>
src/main/resources/views/platform/zhgh/dayofficework/retiresouvenirs/ledger/index.html
+1 -1
View File
@@ -74,7 +74,7 @@ layout("/layouts/platform.html"){
<search-item label="姓名/工号">
<el-input v-model="pageForm.searchKeyword" placeholder="请输入姓名或工号" clearable></el-input>
</search-item>
<search-item label="所属工会：">
<search-item label="所属工会">
<el-select v-model="pageForm.unionId"
placeholder="请选择所属工会"
filterable
src/main/resources/views/platform/zhgh/dayofficework/site/manage/index.html
+2 -2
View File
@@ -16,8 +16,8 @@ layout("/layouts/platform.html"){
@change="doSearch" value-format="yyyy">
</el-date-picker>
</search-item>
<search-item label="名称/地址：">
<el-input placeholder="请输入名称或地址查询" clearable v-model="pageForm.searchKeyword"
<search-item label="名称/地址">
<el-input placeholder="请输入名称或地址" clearable v-model="pageForm.searchKeyword"
@keyup.enter.native="doSearch">
</el-input>
</search-item>
src/main/resources/views/platform/zhgh/dayofficework/site/type/index.html
+2 -2
View File
@@ -11,8 +11,8 @@ layout("/layouts/platform.html"){
<template>
<el-card shadow="never">
<search @search="doSearch">
<search-item label="名称/编码：">
<el-input placeholder="请输入名称或编码查询" clearable v-model="pageForm.searchKeyword"
<search-item label="名称/编码">
<el-input placeholder="请输入名称或编码" clearable v-model="pageForm.searchKeyword"
@keyup.enter.native="doSearch">
</el-input>
</search-item>
src/main/resources/views/platform/zhgh/democratic/teachercongress/prepare/file/index.html
+1 -1
View File
@@ -6,7 +6,7 @@ layout("/layouts/platform.html"){
<el-card shadow="never">
<search @search="doSearch">
<search-item label="名称">
<el-input clearable placeholder="请输入关键字查询" v-model="pageForm.searchKeyword"></el-input>
<el-input clearable placeholder="请输入名称" v-model="pageForm.searchKeyword"></el-input>
</search-item>
<search-item label="教代会">
<el-select v-model="pageForm.sessionId" clearable>
src/main/resources/views/platform/zhgh/staffbenefit/condolence/type/index.html
+2 -2
View File
@@ -11,8 +11,8 @@ layout("/layouts/platform.html"){
<template>
<el-card shadow="never">
<search @search="doSearch">
<search-item label="名称/编码：">
<el-input placeholder="请输入名称或编码查询" clearable v-model="pageForm.searchKeyword"
<search-item label="名称/编码">
<el-input placeholder="请输入名称或编码" clearable v-model="pageForm.searchKeyword"
@keyup.enter.native="doSearch">
</el-input>
</search-item>
src/main/resources/views/platform/zhgh/staffbenefit/contribution/type/index.html
+2 -2
View File
@@ -11,8 +11,8 @@ layout("/layouts/platform.html"){
<template>
<el-card shadow="never">
<search @search="doSearch">
<search-item label="名称/编码：">
<el-input placeholder="请输入名称或编码查询" clearable v-model="pageForm.searchKeyword"
<search-item label="名称/编码">
<el-input placeholder="请输入名称或编码" clearable v-model="pageForm.searchKeyword"
@keyup.enter.native="doSearch">
</el-input>
</search-item>
src/main/resources/views/platform/zhgh/staffbenefit/huimin/manage/index.html
+1 -1
View File
@@ -7,7 +7,7 @@ layout("/layouts/platform.html"){
<el-card shadow="never">
<search @search="doSearch">
<search-item label="名称">
<el-input v-model="pageForm.searchKeyword" placeholder="名称" clearable></el-input>
<el-input v-model="pageForm.searchKeyword" placeholder="请输入名称" clearable></el-input>
</search-item>
</search>
</el-card>
src/main/resources/views/platform/zhgh/staffmanage/childManage/write/index.html
+17 -133
View File
@@ -13,7 +13,7 @@ layout("/layouts/platform.html"){
<el-form-item prop="childRelationship">
<dict-select v-model="formData.childRelationship" code="CHILD_MANAGE_GRADE" style="width: 100%" placeholder="请选择就读年级">
</dict-select>
</el-form-item></el-descriptions-item>
</el-form-item></el-descriptions-item>
<el-descriptions-item label="入学年份">
<el-form-item prop="childrenBirthday">
<el-date-picker
@@ -82,31 +82,13 @@ layout("/layouts/platform.html"){
</el-form-item></el-descriptions-item>
</el-descriptions-item>
</el-descriptions>
<table-tool label="监护人信息"></table-tool>
<table-tool label="监护人信息"></table-tool>
<el-descriptions :column="2" border>
<el-descriptions-item label="监护人1">
<el-form-item label="监护人1" prop="guardianUserName1">
<el-select
style="width: 100%"
v-model="formData.guardianUserName1"
filterable
clearable
remote
reserve-keyword
placeholder="请输入姓名或工号查询"
:remote-method="createRemoteMethod(userOptions)"
@change="handleFatherChange"
@clear="clearUserInfo"
allow-create
default-first-option>
<el-option
v-for="item in userOptions"
:key="item.id"
:label="item.userName+'（'+item.loginName+'）'+'（'+item.unitName+'）'+'（'+item.sex+'）'"
:value="item.id">
</el-option>
</el-select>
</el-form-item></el-descriptions-item>
<el-input v-model="formData.guardianUserName1" readonly></el-input>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="工号" >
<el-form-item prop="guardianLoginName1">{{formData.guardianLoginName1}}
</el-form-item>
@@ -118,35 +100,17 @@ layout("/layouts/platform.html"){
</el-descriptions-item>
<el-descriptions-item label="所在单位">
<el-form-item prop="unitName1">
<el-input v-model="formData.guardianUnitName1" placeholder="请输入所在单位" maxlength="100"></el-input>
<el-input v-model="formData.guardianUnitName1" readonly></el-input>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="监护人2">
<el-form-item label="监护人2" prop="guardianUserName2">
<el-select
style="width: 100%"
v-model="formData.guardianUserName2"
filterable
clearable
remote
reserve-keyword
placeholder="请输入姓名或工号查询"
:remote-method="createRemoteMethod(userOptions2)"
@change="handleMotherChange"
@clear="clearUserInfo2"
allow-create
default-first-option>
<el-option
v-for="item in userOptions2"
:key="item.id"
:label="item.userName+'（'+item.loginName+'）'+'（'+item.unitName+'）'+'（'+item.sex+'）'"
:value="item.id">
</el-option>
</el-select>
<el-input v-model="formData.guardianUserName2" placeholder="请输入监护人姓名" maxlength="30"></el-input>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="工号">
<el-form-item prop="guardianLoginName2">{{formData.guardianLoginName2}}
<el-form-item prop="guardianLoginName2">
<el-input v-model="formData.guardianLoginName2" placeholder="没有则不填" maxlength="30"></el-input>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="手机号码">
@@ -181,8 +145,6 @@ layout("/layouts/platform.html"){
return {
bizId: GetQueryString("bizId"),
formData: {},
userOptions: [],
userOptions2: [],
formRules: {
childRelationship: [{ required: true, message: '请选择就读年级', trigger: 'change' }],
childrenYear: [{ required: true, message: '请选择入学年份', trigger: 'change' }],
@@ -196,92 +158,6 @@ layout("/layouts/platform.html"){
}
},
methods: {
clearUserInfo() {
// 清空监护人1相关信息
this.$set(this.formData, "guardianUserName1", "")
this.$set(this.formData, "guardianLoginName1", "")
this.$set(this.formData, "guardianMobile1", "")
this.$set(this.formData, "guardianUnitName1", "")
},
clearUserInfo2() {
// 清空监护人2相关信息
this.$set(this.formData, "guardianUserName2", "")
this.$set(this.formData, "guardianLoginName2", "")
this.$set(this.formData, "guardianMobile2", "")
this.$set(this.formData, "guardianUnitName2", "")
},
createRemoteMethod(options) {
return (keyword) => {
this.selectQueryUser(keyword, options)
}
},
// 查询监护人对象
selectQueryUser(keyword, options) {
options.length = 0
this.$axios.post("/platform/childManage/write/listUser", {keyword: keyword}).then((res) => {
if (res.code === 0) {
options.push(...res.data)
}
})
},
// 监护人1选择变化处理（支持手动输入）
handleFatherChange(val) {
// 先查找是否是选择的用户
const user = this.userOptions.find(o => o.userName === val || o.id === val);
if (user) {
// 如果是选择的用户，保存完整信息
this.$set(this.formData, "guardianUserName1", user.userName);
this.$set(this.formData, "guardianUserId1", user.id);
this.$set(this.formData, "guardianLoginName1", user.loginName);
this.$set(this.formData, "guardianUnionId1", user.unionId);
this.$set(this.formData, "guardianUnionName1", user.unionName);
this.$set(this.formData, "guardianMobile1", user.mobile);
this.$set(this.formData, "guardianUnitId1", user.unitId);
this.$set(this.formData, "guardianUnitName1", user.unitName);
} else {
// 如果是手动输入的姓名，只设置姓名，其他字段清空
this.$set(this.formData, "guardianUserName1", val || "")
this.$set(this.formData, "guardianUserId1", "")
this.$set(this.formData, "guardianLoginName1", "")
this.$set(this.formData, "guardianUnionId1", "")
this.$set(this.formData, "guardianUnionName1", "")
this.$set(this.formData, "guardianMobile1", "")
this.$set(this.formData, "guardianUnitId1", "")
this.$set(this.formData, "guardianUnitName1", "")
}
},
// 监护人2选择变化处理（支持手动输入）
handleMotherChange(val) {
// 先查找是否是选择的用户
const user = this.userOptions2.find(o => o.userName === val || o.id === val);
if (user) {
// 如果是选择的用户，保存完整信息
this.$set(this.formData, "guardianUserId2", user.id);
this.$set(this.formData, "guardianUserName2", user.userName);
this.$set(this.formData, "guardianLoginName2", user.loginName);
this.$set(this.formData, "guardianUnionId2", user.unionId);
this.$set(this.formData, "guardianUnionName2", user.unionName);
this.$set(this.formData, "guardianMobile2", user.mobile);
this.$set(this.formData, "guardianUnitId2", user.unitId);
this.$set(this.formData, "guardianUnitName2", user.unitName);
} else {
// 如果是手动输入的姓名，只设置姓名，其他字段清空
this.$set(this.formData, "guardianUserName2", val || "")
this.$set(this.formData, "guardianUserId2", "")
this.$set(this.formData, "guardianLoginName2", "")
this.$set(this.formData, "guardianUnionId2", "")
this.$set(this.formData, "guardianUnionName2", "")
this.$set(this.formData, "guardianMobile2", "")
this.$set(this.formData, "guardianUnitId2", "")
this.$set(this.formData, "guardianUnitName2", "")
}
},
async getIsRepeatByIdCard() {
if (!this.formData.childrenIdCard) {
this.$message.error("请填写子女身份证号码")
@@ -343,6 +219,14 @@ layout("/layouts/platform.html"){
unionName: union.name,
unionId: union.id,
mobile: mobile,
// 自动填充监护人1信息
guardianUserName1: username,
guardianLoginName1: loginname,
guardianMobile1: mobile,
guardianUnitName1: unit.name,
guardianUnitId1: unit.id,
guardianUnionName1: union.name,
guardianUnionId1: union.id
}
}
}
src/main/resources/views/platform/zhghh5/activity/family/list/index.html
+25
View File
@@ -30,6 +30,12 @@ layout("/layouts/platform_h5.html"){
</van-dropdown-menu>
</van-sticky>
<van-tabs v-if="assortList.length > 0" type="card" color="#1867B0"
style="margin-top: 10px" @click="tabClick">
<van-tab v-for="item in assortList" :name="item" :title="item">
</van-tab>
</van-tabs>
<table-list api="/platform/family/apply/pageData"
:page_form.sync="pageForm"
ref="tableListRef"
@@ -117,6 +123,7 @@ layout("/layouts/platform_h5.html"){
courseTypeId: null,
activityId: GetQueryString('id'),
dataType: GetQueryString('dataType'),
assortTypes: [],
},
typeOptions: [],
assortOptions: [],
@@ -125,10 +132,18 @@ layout("/layouts/platform_h5.html"){
introduceRow: {},
activity: {},
assortList: [],
weekdayCNMap: {0: '周日', 1: '周一', 2: '周二', 3: '周三', 4: '周四', 5: '周五', 6: '周六'},
}
},
methods: {
tabClick(name) {
this.pageForm.assortTypes = []
this.pageForm.assortTypes.push(name)
this.pageForm.assortTypes = JSON.stringify(this.pageForm.assortTypes)
this.doSearch()
},
refresh() {
this.doSearch()
},
@@ -197,6 +212,7 @@ layout("/layouts/platform_h5.html"){
}
},
async onReady() {
this.queryCourseAssort()
const typeList = await this.getCourseTypeList()
this.sourceTypeOptions = clone(typeList)
this.typeOptions = [
@@ -221,6 +237,15 @@ layout("/layouts/platform_h5.html"){
const resp = await this.$axios.post("/platform/family/type/getAllType")
return resp.data
},
queryCourseAssort() {
this.$axios.post("/platform/family/apply/queryCourseAssort", {activityId: this.pageForm.activityId})
.then((resp) => {
this.assortList = resp.data
if(this.assortList.length > 0) {
this.pageForm.assortTypes = JSON.stringify([this.assortList[0]])
}
})
},
doSearch() {
this.$nextTick(() => {
this.pageForm.pageNumber = 1
src/main/resources/views/platform/zhghh5/activity/trainSignUp/list/index.html
+24
View File
@@ -24,6 +24,12 @@ layout("/layouts/platform_h5.html"){
</van-dropdown-menu>
</van-sticky>
<van-tabs v-if="assortList.length > 0" type="card" color="#1867B0"
style="margin-top: 10px" @click="tabClick">
<van-tab v-for="item in assortList" :name="item" :title="item">
</van-tab>
</van-tabs>
<table-list api="/platform/trainSignUp/apply/pageData"
:page_form.sync="pageForm"
ref="tableListRef"
@@ -110,6 +116,7 @@ layout("/layouts/platform_h5.html"){
courseTypeId: null,
activityId: GetQueryString('id'),
dataType: GetQueryString('dataType'),
assortTypes: [],
},
typeOptions: [],
assortOptions: [],
@@ -118,11 +125,18 @@ layout("/layouts/platform_h5.html"){
introduceRow: {},
activity: {},
assortList: [],
weekdayCNMap: {0: '周日', 1: '周一', 2: '周二', 3: '周三', 4: '周四', 5: '周五', 6: '周六'},
}
},
methods: {
tabClick(name) {
this.pageForm.assortTypes = []
this.pageForm.assortTypes.push(name)
this.pageForm.assortTypes = JSON.stringify(this.pageForm.assortTypes)
this.doSearch()
},
refresh() {
this.doSearch()
},
@@ -191,6 +205,7 @@ layout("/layouts/platform_h5.html"){
}
},
async onReady() {
this.queryCourseAssort()
const typeList = await this.getCourseTypeList()
this.sourceTypeOptions = clone(typeList)
this.typeOptions = [
@@ -215,6 +230,15 @@ layout("/layouts/platform_h5.html"){
const resp = await this.$axios.post("/platform/trainSignUp/type/getAllType")
return resp.data
},
queryCourseAssort() {
this.$axios.post("/platform/trainSignUp/apply/queryCourseAssort", {activityId: this.pageForm.activityId})
.then((resp) => {
this.assortList = resp.data
if(this.assortList.length > 0) {
this.pageForm.assortTypes = JSON.stringify([this.assortList[0]])
}
})
},
doSearch() {
this.$nextTick(() => {
this.pageForm.pageNumber = 1
src/main/resources/views/platform/zhghh5/dayofficework/literacy/list/index.html
+24
View File
@@ -24,6 +24,12 @@ layout("/layouts/platform_h5.html"){
</van-dropdown-menu>
</van-sticky>
<van-tabs v-if="assortList.length > 0" type="card" color="#1867B0"
style="margin-top: 10px" @click="tabClick">
<van-tab v-for="item in assortList" :name="item" :title="item">
</van-tab>
</van-tabs>
<table-list api="/platform/literacy/apply/pageData"
:page_form.sync="pageForm"
ref="tableListRef"
@@ -110,6 +116,7 @@ layout("/layouts/platform_h5.html"){
courseTypeId: null,
activityId: GetQueryString('id'),
dataType: GetQueryString('dataType'),
assortTypes: [],
},
typeOptions: [],
assortOptions: [],
@@ -118,11 +125,18 @@ layout("/layouts/platform_h5.html"){
introduceRow: {},
activity: {},
assortList: [],
weekdayCNMap: {0: '周日', 1: '周一', 2: '周二', 3: '周三', 4: '周四', 5: '周五', 6: '周六'},
}
},
methods: {
tabClick(name) {
this.pageForm.assortTypes = []
this.pageForm.assortTypes.push(name)
this.pageForm.assortTypes = JSON.stringify(this.pageForm.assortTypes)
this.doSearch()
},
refresh() {
this.doSearch()
},
@@ -191,6 +205,7 @@ layout("/layouts/platform_h5.html"){
}
},
async onReady() {
this.queryCourseAssort()
const typeList = await this.getCourseTypeList()
this.sourceTypeOptions = clone(typeList)
this.typeOptions = [
@@ -215,6 +230,15 @@ layout("/layouts/platform_h5.html"){
const resp = await this.$axios.post("/platform/literacy/type/getAllType")
return resp.data
},
queryCourseAssort() {
this.$axios.post("/platform/literacy/apply/queryCourseAssort", {activityId: this.pageForm.activityId})
.then((resp) => {
this.assortList = resp.data
if(this.assortList.length > 0) {
this.pageForm.assortTypes = JSON.stringify([this.assortList[0]])
}
})
},
doSearch() {
this.$nextTick(() => {
this.pageForm.pageNumber = 1
src/main/resources/views/platform/zhghh5/staffmanage/childmanage/write/index.html
-1
View File
@@ -104,7 +104,6 @@ layout("/layouts/platform_h5.html"){
<van-field
label="手机号码"
v-model="formData.guardianMobile1"
readonly
placeholder="读取信息中心数据"
:rules="formRules.guardianMobile1"
></van-field>