This commit is contained in:
2025-10-19 17:18:40 +08:00
159 changed files with 625 additions and 424 deletions
@@ -6,10 +6,10 @@ layout("/layouts/platform.html"){
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度">
<el-date-picker placeholder="按年度查询" type="year" v-model="pageForm.year" value-format="yyyy"></el-date-picker>
<el-date-picker placeholder="请选择年度" type="year" v-model="pageForm.year" value-format="yyyy"></el-date-picker>
</search-item>
<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>
</el-card>
@@ -32,10 +32,10 @@ layout("/layouts/platform.html"){
</el-select>
</search-item>
<search-item label="姓名">
<el-input placeholder="请输入内容" clearable v-model="pageForm.userName" style="width: 100%"></el-input>
<el-input placeholder="请输入姓名" clearable v-model="pageForm.userName" style="width: 100%"></el-input>
</search-item>
<search-item label="工号">
<el-input placeholder="请输入内容" clearable v-model="pageForm.loginName" style="width: 100%"></el-input>
<el-input placeholder="请输入工号" clearable v-model="pageForm.loginName" style="width: 100%"></el-input>
</search-item>
<search-item label="所属单位">
<el-select placeholder="请选择所属单位" v-model="pageForm.unitName" clearable filterable>
@@ -26,10 +26,10 @@ layout("/layouts/platform.html"){
<el-card shadow="never">
<search @search="doSearch">
<search-item label="姓名">
<el-input placeholder="请输入内容" clearable v-model="pageForm.userName" style="width: 100%"></el-input>
<el-input placeholder="请输入姓名" clearable v-model="pageForm.userName" style="width: 100%"></el-input>
</search-item>
<search-item label="工号">
<el-input placeholder="请输入内容" clearable v-model="pageForm.loginName" style="width: 100%"></el-input>
<el-input placeholder="请输入工号" clearable v-model="pageForm.loginName" style="width: 100%"></el-input>
</search-item>
<search-item label="所属单位">
<el-select placeholder="请选择所属单位" v-model="pageForm.unitId" clearable style="width: 100%">
@@ -3,7 +3,7 @@
<el-descriptions :column="2" border>
<el-descriptions-item label="活动名称">
<el-form-item prop="activityName">
<el-input placeholder="请输入内容" style="width: 100%" v-model="formData.activityName">
<el-input placeholder="请输入活动名称" style="width: 100%" v-model="formData.activityName">
</el-input>
</el-form-item>
</el-descriptions-item>
@@ -20,13 +20,13 @@
</el-select>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="申请人姓名">
<el-form-item prop="userName">
<el-input disabled type="text" v-model="formData.userName"></el-input>
</el-form-item>
</el-descriptions-item>
<template v-if="formData.activityType == 'CLUB'">
<el-descriptions-item label="申请协会">
<el-form-item prop="clubId" label="申请协会">
@@ -49,7 +49,7 @@
</el-form-item>
</el-descriptions-item>
</template>
<el-descriptions-item label="联系方式">
<el-form-item prop="mobile">
<el-input type="text" v-model="formData.mobile" placeholder="请输入联系方式" maxlength="11"></el-input>
@@ -60,8 +60,8 @@
<el-input disabled type="text" v-model="formData.applyTime"></el-input>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="活动计划时间">
<el-form-item prop="planDate">
<el-date-picker
@@ -80,14 +80,14 @@
<el-input-number v-model="formData.activityNumber" placeholder="请输入活动人数"></el-input-number>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="活动地址" :span="2">
<el-form-item prop="activityAddress">
<el-input maxlength="150" placeholder="请填写活动地址" type="text"
v-model="formData.activityAddress"></el-input>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="活动预算费用" :span="2">
<el-form-item prop="budgets">
<el-table :data="formData.budgets" border max-height="500" size="mini" style="width: 100%">
@@ -129,13 +129,13 @@
</el-table>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="活动方案及简介" :span="2">
<el-form-item prop="activityContent">
<text-editor v-model="formData.activityContent"></text-editor>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="附件" :span="2">
<el-form-item prop="files">
<file-upload :value.sync="formData.files"
@@ -145,7 +145,7 @@
complete_result></file-upload>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="签字" :span="2">
<el-form-item prop="sign">
<pc-signature v-model="formData.sign"></pc-signature>
@@ -153,7 +153,7 @@
</el-descriptions-item>
</el-descriptions>
</el-form>
<snaker-flow-task-form-action @task-action="handleTaskAction" @save-draft="handleSaveDraft"></snaker-flow-task-form-action>
</div>
@@ -168,7 +168,7 @@
formData: {
id: GetQueryString("businessId"),
},
formRules: {
activityName: [{required: true, message: '必填', trigger: ['blur', 'change']}],
activityType: [{required: true, message: '必填', trigger: ['blur', 'change']}],
@@ -179,7 +179,7 @@
mobile: [{required: true, message: '必填', trigger: ['blur', 'change']}],
sign: [{required: true, message: '必填', trigger: ['blur', 'change']}],
},
activityDeclareReimbursementList: [],
clubList: [],
}
@@ -189,12 +189,12 @@
handleTaskAction(val) {
this.$refs.formRef.validate((valid) => {
if (valid) {
if (this.formData.planDate && this.formData.planDate.length > 0) {
this.formData.planStartTime = this.formData.planDate[0]
this.formData.planEndTime = this.formData.planDate[1]
}
if (!this.instanceId) {
this.handleApply(val)
} else {
@@ -275,7 +275,7 @@
},
// 取消
handleCancel() {
},
// 设置申报主体名称
setDeclareUnitName(val){
@@ -328,5 +328,5 @@
.el-descriptions-item__label {
width: 15% !important;
}
</style>
@@ -17,7 +17,7 @@ layout("/layouts/platform.html"){
<el-descriptions :column="2" border>
<el-descriptions-item label="活动名称">
<el-form-item prop="activityName">
<el-input placeholder="请输入内容" style="width: 100%" v-model="formData.activityName">
<el-input placeholder="请输入活动名称" style="width: 100%" v-model="formData.activityName">
</el-input>
</el-form-item>
</el-descriptions-item>
@@ -7,7 +7,7 @@ layout("/layouts/platform.html"){
<search @search="doSearch">
<search-item label="年度">
<el-date-picker
placeholder="年度"
placeholder="请选择年度"
type="year"
style="width: 100%"
v-model="pageForm.year"
@@ -7,18 +7,18 @@ layout("/layouts/platform.html"){
<search @search="doSearch">
<search-item label="年度">
<el-date-picker
placeholder="年度"
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>
<search-item label="所属协会">
<el-select clearable filterable placeholder="所属协会"
style="width: 100%;" v-model="pageForm.clubId">
@@ -28,7 +28,7 @@ layout("/layouts/platform.html"){
</search-item>
</search>
</el-card>
<el-card shadow="never" class="mt10">
<table-tool :app="this" label="审批列表">
<el-radio-group @change="doSearch" class="mr5" size="small" v-model="pageForm.audit">
@@ -36,12 +36,12 @@ layout("/layouts/platform.html"){
<el-radio-button label="false">未审核</el-radio-button>
</el-radio-group>
</table-tool>
<el-table :data="tableData" :size="tableSize" @sort-change="pageOrder"
ref="table" row-key="id" style="width: 100%">
<el-table-column :index="indexMethod" header-align="center" label="序号"
type="index" width="60px"></el-table-column>
<el-table-column
:label="column.label"
:prop="column.prop"
@@ -75,7 +75,7 @@ layout("/layouts/platform.html"){
</el-table>
<!--#include("/layouts/pagination.html"){}#-->
</el-card>
<template #edit>
<info ref="infoRef">
<div v-if="showApprovalForm">
@@ -104,7 +104,7 @@ layout("/layouts/platform.html"){
<script>
<!--#include("../common/info.js"){}#-->
new Vue({
el: "#app",
mixins: [initTableMixins],
@@ -129,7 +129,7 @@ layout("/layouts/platform.html"){
unions: [],
units: [],
clubs: [],
// 审核相关
formData: {},
showApprovalForm: false
@@ -155,7 +155,7 @@ layout("/layouts/platform.html"){
this.$refs.infoRef.onOpen(row)
})
},
handleTaskAction(val) {
this.$confirm("您确定要提交吗?", "提示", {
confirmButtonText: "确定",
@@ -176,7 +176,7 @@ layout("/layouts/platform.html"){
})
})
},
onRevoke(row) {
this.$confirm("您确定要撤回吗?", "提示", {
confirmButtonText: "确定",
@@ -7,7 +7,7 @@ layout("/layouts/platform.html"){
<search @search="doSearch">
<search-item label="年度">
<el-date-picker
placeholder="年度"
placeholder="请选择年度"
type="year"
style="width: 100%"
v-model="pageForm.year"
@@ -7,7 +7,7 @@ layout("/layouts/platform.html"){
<search @search="doSearch">
<search-item label="年度">
<el-date-picker
placeholder="年度"
placeholder="请选择年度"
type="year"
style="width: 100%"
v-model="pageForm.year"
@@ -7,7 +7,7 @@ layout("/layouts/platform.html"){
<search @search="doSearch">
<search-item label="年度">
<el-date-picker
placeholder="年度"
placeholder="请选择年度"
type="year"
style="width: 100%"
v-model="pageForm.year"
@@ -7,7 +7,7 @@ layout("/layouts/platform.html"){
<search @search="doSearch">
<search-item label="年度">
<el-date-picker
placeholder="年度"
placeholder="请选择年度"
type="year"
style="width: 100%"
v-model="pageForm.year"
@@ -7,18 +7,18 @@ layout("/layouts/platform.html"){
<search @search="doSearch">
<search-item label="年度">
<el-date-picker
placeholder="年度"
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>
<search-item label="所属协会">
<el-select clearable filterable placeholder="所属协会"
style="width: 100%;" v-model="pageForm.clubId">
@@ -28,7 +28,7 @@ layout("/layouts/platform.html"){
</search-item>
</search>
</el-card>
<el-card shadow="never" class="mt10">
<table-tool :app="this" label="审批列表">
<el-radio-group @change="doSearch" class="mr5" size="small" v-model="pageForm.audit">
@@ -36,12 +36,12 @@ layout("/layouts/platform.html"){
<el-radio-button label="false">未审核</el-radio-button>
</el-radio-group>
</table-tool>
<el-table :data="tableData" :size="tableSize" @sort-change="pageOrder"
ref="table" row-key="id" style="width: 100%">
<el-table-column :index="indexMethod" header-align="center" label="序号"
type="index" width="60px"></el-table-column>
<el-table-column
:label="column.label"
:prop="column.prop"
@@ -75,7 +75,7 @@ layout("/layouts/platform.html"){
</el-table>
<!--#include("/layouts/pagination.html"){}#-->
</el-card>
<template #edit>
<info ref="infoRef">
<div v-if="showApprovalForm">
@@ -104,7 +104,7 @@ layout("/layouts/platform.html"){
<script>
<!--#include("../common/info.js"){}#-->
new Vue({
el: "#app",
mixins: [initTableMixins],
@@ -129,7 +129,7 @@ layout("/layouts/platform.html"){
unions: [],
units: [],
clubs: [],
// 审核相关
formData: {},
showApprovalForm: false
@@ -155,7 +155,7 @@ layout("/layouts/platform.html"){
this.$refs.infoRef.onOpen(row)
})
},
handleTaskAction(val) {
this.$confirm("您确定要提交吗?", "提示", {
confirmButtonText: "确定",
@@ -176,7 +176,7 @@ layout("/layouts/platform.html"){
})
})
},
onRevoke(row) {
this.$confirm("您确定要撤回吗?", "提示", {
confirmButtonText: "确定",
@@ -7,7 +7,7 @@ layout("/layouts/platform.html"){
<search @search="doSearch">
<search-item label="年度">
<el-date-picker
placeholder="年度"
placeholder="请选择年度"
type="year"
style="width: 100%"
v-model="pageForm.year"
@@ -7,7 +7,7 @@ layout("/layouts/platform.html"){
<search @search="doSearch">
<search-item label="年度">
<el-date-picker
placeholder="年度"
placeholder="请选择年度"
type="year"
style="width: 100%"
v-model="pageForm.year"
@@ -7,7 +7,7 @@ layout("/layouts/platform.html"){
<search @search="doSearch">
<search-item label="年度">
<el-date-picker
placeholder="年度"
placeholder="请选择年度"
type="year"
style="width: 100%"
v-model="pageForm.year"
@@ -58,9 +58,9 @@ layout("/layouts/platform.html"){
<guava ref="guava">
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度">
<search-item label="年度">
<el-date-picker
placeholder="选择年度"
placeholder="选择年度"
type="year"
style="width: 100%"
v-model="pageForm.year"
@@ -68,7 +68,7 @@ layout("/layouts/platform.html"){
@change="doSearch"
></el-date-picker>
</search-item>
<search-item label="活动状态">
<search-item label="活动状态">
<el-select v-model="pageForm.activityType" @change="doSearch" style="width: 100%"
placeholder="请选择活动状态" filterable>
<el-option :value="1" label="全部"></el-option>
@@ -22,7 +22,7 @@ layout("/layouts/platform.html"){
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度">
<search-item label="年度">
<el-date-picker
@change="doSearch"
placeholder="请选择年度"
@@ -32,7 +32,7 @@ layout("/layouts/platform.html"){
value-format="yyyy"
></el-date-picker>
</search-item>
<search-item label="活动名称">
<search-item label="活动名称">
<el-input
@keyup.enter.native="doSearch"
clearable
@@ -14,7 +14,7 @@ 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"
@@ -24,7 +24,7 @@ layout("/layouts/platform.html"){
value-format="yyyy"
></el-date-picker>
</search-item>
<search-item label="活动名称">
<search-item label="活动名称">
<el-select @change="activityChange" style="width: 100%" v-model="pageForm.activityId">
<el-option :label="item.activityName" :value="item.id" v-for="item in activityList" :key="item.id"></el-option>
</el-select>
@@ -10,7 +10,7 @@ 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"
@@ -20,7 +20,7 @@ layout("/layouts/platform.html"){
value-format="yyyy"
></el-date-picker>
</search-item>
<search-item label="活动名称">
<search-item label="活动名称">
<el-select @change="activityChange" style="width: 100%" v-model="pageForm.activityId">
<el-option :label="item.activityName" :value="item.id" v-for="item in activityList" :key="item.id"></el-option>
</el-select>
@@ -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"
@@ -6,16 +6,16 @@ layout("/layouts/platform.html"){
<guava ref="guava">
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度">
<search-item label="年度">
<el-date-picker
placeholder="选择年度"
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-select @change="activityChange" style="width: 100%" v-model="pageForm.activityId">
<el-option :label="item.activityName" :value="item.id" v-for="item in activityList" :key="item.id"></el-option>
</el-select>
@@ -25,7 +25,7 @@ layout("/layouts/platform.html"){
<el-option :label="item.courseName" :value="item.id" v-for="item in courseList" :key="item.id"></el-option>
</el-select>
</search-item>
<search-item label="人员信息">
<search-item label="人员信息">
<el-input clearable placeholder="输入姓名或者工号搜索" v-model="pageForm.userKeyWord"></el-input>
</search-item>
</search>
@@ -108,8 +108,8 @@ layout("/layouts/platform.html"){
{ label: "姓名", prop: "username" },
{ label: "工号", prop: "loginname" },
{ label: "联系方式", prop: "mobile" },
{ label: "单位", prop: "unitName", sortable: true },
{ label: "分工会", prop: "unionName", sortable: true },
{ label: "单位", prop: "unitname", sortable: true },
{ label: "分工会", prop: "unionname", sortable: true },
{ label: "课程", prop: "courseNames", sortable: true },
{ label: "缺席次数", prop: "absentCount" },
{ label: "是否黑名单", prop: "isDisabled", sortable: true }
@@ -75,7 +75,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>
@@ -425,7 +425,7 @@ layout("/layouts/platform.html"){
</el-col>
<span style="color: #ac3111;margin-left: 160px;top: -15px;position: relative">如果没有天数,此项请勿填写;例如:达标80000步抽奖,请在抽奖资格步数中填写80000即可</span>
</el-row>
<el-row :gutter="20" v-if="formData.lotteryQualificationDays && formData.lotteryQualificationSteps">
<el-col :span="12">
<el-form-item label="积分模式" prop="isPoints" :rules="[{ required:true, message: '必填' }]">
@@ -435,7 +435,7 @@ layout("/layouts/platform.html"){
</el-radio-group>
</el-form-item>
</el-col>
<template v-if="formData.isPoints">
<el-col :span="12">
<el-form-item label="达标积分" prop="lotteryQualificationPoints" :rules="[{ required:true, message: '必填' }]">
@@ -453,7 +453,7 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-col>
</template>
</el-row>
</template>
@@ -18,7 +18,7 @@ layout("/layouts/platform.html"){
placeholder="选择年">
</el-date-picker>
</search-item>
<search-item label="活动">
<el-cascader
style="width: 100%"
@@ -28,12 +28,12 @@ layout("/layouts/platform.html"){
:props="{ checkStrictly: true,emitPath:false}"
:clearable="false"></el-cascader>
</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>
<template v-if="$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')">
<search-item label="所属工会">
<el-select @change="unionChange" clearable filterable style="width: 100%"
@@ -46,7 +46,7 @@ layout("/layouts/platform.html"){
</el-option>
</el-select>
</search-item>
<search-item label="所属单位">
<el-select @change="doSearch" clearable filterable style="width: 100%"
placeholder="请选择所属单位" v-model="pageForm.unitId">
@@ -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
placeholder="请选择年度"
type="year"
@@ -21,7 +21,7 @@ layout("/layouts/platform.html"){
value-format="yyyy"
></el-date-picker>
</search-item>
<search-item label="计划名称">
<search-item label="计划名称">
<el-input
@keyup.enter.native="doSearch"
clearable
@@ -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
placeholder="请选择年度"
type="year"
@@ -21,7 +21,7 @@ layout("/layouts/platform.html"){
value-format="yyyy"
></el-date-picker>
</search-item>
<search-item label="总结类型">
<search-item label="总结类型">
<el-select v-model="pageForm.summaryType" placeholder="请选择总结类型"
clearable style="width: 100%;" @change="doSearch">
<el-option v-for="item in dict.type.SUMMARY_TYPE" :label="item.name" :value="item.code" :key="item.code"></el-option>
@@ -192,7 +192,7 @@ var ACTIVITY_SPORTS_APPLY_USER = {
prop="mobile" width="150">
<template v-slot="{row}">
<el-input placeholder="请输入联系方式"
v-model="row.mobile"></el-input>
v-model="row.mobile" maxlength="11"></el-input>
</template>
</el-table-column>
@@ -18,6 +18,13 @@ layout("/layouts/platform.html"){
.el-carousel__container {
height: 250px !important;
}
.one-line {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
cursor: pointer;
}
</style>
<div id="app" v-cloak>
<guava ref="guava">
@@ -27,7 +34,7 @@ layout("/layouts/platform.html"){
<search-item label="年度">
<el-date-picker
@change="activityInfoData"
placeholder="选择年"
placeholder="选择年"
style="width: 100%"
type="year"
v-model="pageForm.year"
@@ -125,10 +132,13 @@ layout("/layouts/platform.html"){
报名未开始
</el-tag>
</div>
<div class="text e-item">
<span style="color: gray">活动地址:</span>
{{item.address}}
</div>
<el-tooltip :disabled="item.address.length <= 15"
:content="item.address" placement="top">
<div class="text e-item one-line">
<span style="color: gray">活动地址:</span>
{{ item.address }}
</div>
</el-tooltip>
<div class="text e-item">
<span style="color: gray">报名时间:</span>
{{$moment(item.applyStartTime).format('YYYY/MM/DD HH:mm')}}
@@ -7,7 +7,7 @@ layout("/layouts/platform.html"){
<template>
<el-card shadow="never">
<search @search="activityInfoData">
<search-item label="">
<search-item label="年度">
<el-date-picker
@change="activityInfoData"
placeholder="选择年"
@@ -9,7 +9,7 @@ layout("/layouts/platform.html"){
<search @search="doSearch">
<search-item label="年度">
<el-date-picker
placeholder="选择年"
placeholder="选择年"
style="width: 100%"
type="year"
v-model="pageForm.year"
@@ -40,12 +40,12 @@ layout("/layouts/platform.html"){
</el-select>
</search-item>
<search-item label="院级工会">
<search-item label="所属工会">
<el-select
@change="unionIdChange"
clearable
filterable
placeholder="院级工会筛选"
placeholder="请选择所属工会"
style="width: 100%; font-weight: bold"
v-model="pageForm.unionid"
>
@@ -10,9 +10,9 @@ layout("/layouts/platform.html"){
<guava ref="guava">
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度">
<search-item label="年度">
<el-date-picker
placeholder="选择年度"
placeholder="选择年度"
type="year"
style="width: 100%"
v-model="pageForm.year"
@@ -22,7 +22,7 @@ layout("/layouts/platform.html"){
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度">
<search-item label="年度">
<el-date-picker
@change="doSearch"
placeholder="请选择年度"
@@ -32,7 +32,7 @@ layout("/layouts/platform.html"){
value-format="yyyy"
></el-date-picker>
</search-item>
<search-item label="活动名称">
<search-item label="活动名称">
<el-input
@keyup.enter.native="doSearch"
clearable
@@ -14,7 +14,7 @@ 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"
@@ -24,7 +24,7 @@ layout("/layouts/platform.html"){
value-format="yyyy"
></el-date-picker>
</search-item>
<search-item label="活动名称">
<search-item label="活动名称">
<el-select @change="activityChange" style="width: 100%" v-model="pageForm.activityId">
<el-option :label="item.activityName" :value="item.id" v-for="item in activityList" :key="item.id"></el-option>
</el-select>
@@ -10,7 +10,7 @@ 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"
@@ -20,7 +20,7 @@ layout("/layouts/platform.html"){
value-format="yyyy"
></el-date-picker>
</search-item>
<search-item label="活动名称">
<search-item label="活动名称">
<el-select @change="activityChange" style="width: 100%" v-model="pageForm.activityId">
<el-option :label="item.activityName" :value="item.id" v-for="item in activityList" :key="item.id"></el-option>
</el-select>
@@ -206,6 +206,9 @@ const userInfo = {
async getCourse(val) {
const {data} = await this.$axios.post(loc() + "/getCourse", {activityId: val})
this.courseList = data
},
async getUnitList() {
this.unitList = await this.$businessTool.listUnit(this.registerForm.unionId)
}
},
async created() {
@@ -6,16 +6,16 @@ layout("/layouts/platform.html"){
<guava ref="guava">
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度">
<search-item label="年度">
<el-date-picker
placeholder="选择年度"
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-select @change="activityChange" style="width: 100%" v-model="pageForm.activityId">
<el-option :label="item.activityName" :value="item.id" v-for="item in activityList" :key="item.id"></el-option>
</el-select>
@@ -25,7 +25,7 @@ layout("/layouts/platform.html"){
<el-option :label="item.courseName" :value="item.id" v-for="item in courseList" :key="item.id"></el-option>
</el-select>
</search-item>
<search-item label="人员信息">
<search-item label="人员信息">
<el-input clearable placeholder="输入姓名或者工号搜索" v-model="pageForm.userKeyWord"></el-input>
</search-item>
</search>
@@ -108,8 +108,8 @@ layout("/layouts/platform.html"){
{ label: "姓名", prop: "username" },
{ label: "工号", prop: "loginname" },
{ label: "联系方式", prop: "mobile" },
{ label: "单位", prop: "unitName", sortable: true },
{ label: "分工会", prop: "unionName", sortable: true },
{ label: "单位", prop: "unitname", sortable: true },
{ label: "分工会", prop: "unionname", sortable: true },
{ label: "课程", prop: "courseNames", sortable: true },
{ label: "缺席次数", prop: "absentCount" },
{ label: "是否黑名单", prop: "isDisabled", sortable: true }
@@ -10,11 +10,11 @@ layout("/layouts/platform.html"){
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度">
<el-date-picker placeholder="按年度查询" type="year" v-model="pageForm.year"
<el-date-picker placeholder="请选择年度" type="year" v-model="pageForm.year"
value-format="yyyy"></el-date-picker>
</search-item>
<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>
</el-card>
@@ -7,7 +7,7 @@ layout("/layouts/platform.html"){
<search @search="doSearch">
<search-item label="年度">
<el-date-picker
placeholder="按年度查询"
placeholder="请选择年度"
type="year"
style="width: 100%"
v-model="pageForm.year"
@@ -4,7 +4,7 @@ const AU_FORM_TEMPLATE = {
:close-on-click-modal="false">
<el-form :model="formData" ref="formRef" size="small" label-width="80px" :rules="formRules">
<el-form-item label="活动主题" prop="activityId">
<el-select clearable placeholder="请输入内容" v-model="formData.activityId" @change="activityChange"
<el-select clearable placeholder="请输入活动主题" v-model="formData.activityId" @change="activityChange"
style="width: 100%">
<el-option v-for="item in activityOptions" :key="item.id" :label="item.name"
:value="item.id"></el-option>
@@ -7,7 +7,7 @@ layout("/layouts/platform.html"){
<search @search="doSearch">
<search-item label="年度">
<el-date-picker
placeholder="按年度查询"
placeholder="请选择年度"
type="year"
v-model="pageForm.year"
value-format="yyyy"
@@ -21,7 +21,7 @@ layout("/layouts/platform.html"){
<el-input
@keyup.enter.native="doSearch"
clearable
placeholder="请输入内容"
placeholder="请输入商品名称"
style="width: 100%"
v-model="pageForm.goodsName"
></el-input>
@@ -7,16 +7,16 @@ layout("/layouts/platform.html"){
<guava ref="guava">
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度">
<search-item label="年度">
<el-date-picker
placeholder="选择年度"
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-select v-model="pageForm.clubId" placeholder="请选择协会" filterable clearable style="width: 100%">
<el-option v-for="item in clubList" :key="item.id" :label="item.clubName" :value="item.id"></el-option>
</el-select>
@@ -8,16 +8,16 @@ layout("/layouts/platform.html"){
<template>
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度">
<search-item label="年度">
<el-date-picker
placeholder="选择年度"
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-select v-model="pageForm.clubId" placeholder="请选择协会" filterable clearable style="width: 100%">
<el-option v-for="item in clubList" :key="item.id" :label="item.clubName" :value="item.id"></el-option>
</el-select>
@@ -7,16 +7,16 @@ layout("/layouts/platform.html"){
<guava ref="guava">
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度">
<search-item label="年度">
<el-date-picker
placeholder="选择年度"
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-select v-model="pageForm.clubId" placeholder="请选择协会" filterable clearable style="width: 100%">
<el-option v-for="item in clubList" :key="item.id" :label="item.clubName" :value="item.id"></el-option>
</el-select>
@@ -11,16 +11,16 @@ layout("/layouts/platform.html"){
<guava ref="guava">
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度">
<search-item label="年度">
<el-date-picker
placeholder="选择年度"
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-select v-model="pageForm.clubId" placeholder="请选择协会" filterable clearable style="width: 100%">
<el-option v-for="item in clubList" :key="item.id" :label="item.clubName" :value="item.id"></el-option>
</el-select>
@@ -10,9 +10,9 @@ layout("/layouts/platform.html"){
<template>
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度">
<search-item label="年度">
<el-date-picker
placeholder="选择年度"
placeholder="选择年度"
type="year"
style="width: 100%"
v-model="pageForm.year"
@@ -20,7 +20,7 @@ layout("/layouts/platform.html"){
@change="doSearch"
></el-date-picker>
</search-item>
<search-item label="协会名称">
<search-item label="协会名称">
<el-select v-model="pageForm.clubId" placeholder="请选择协会" filterable clearable style="width: 100%">
<el-option v-for="item in clubList" :key="item.id" :label="item.clubName" :value="item.id"></el-option>
</el-select>
@@ -9,9 +9,9 @@ layout("/layouts/platform.html"){
<guava ref="guava">
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度">
<search-item label="年度">
<el-date-picker
placeholder="选择年度"
placeholder="选择年度"
type="year"
style="width: 100%"
v-model="pageForm.year"
@@ -19,7 +19,7 @@ layout("/layouts/platform.html"){
@change="doSearch"
></el-date-picker>
</search-item>
<search-item label="协会名称">
<search-item label="协会名称">
<el-select v-model="pageForm.clubId" placeholder="请选择协会" filterable clearable style="width: 100%">
<el-option v-for="item in clubList" :key="item.id" :label="item.clubName" :value="item.id"></el-option>
</el-select>
@@ -8,20 +8,20 @@ layout("/layouts/platform.html"){
<template>
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度">
<search-item label="年度">
<el-date-picker
placeholder="选择年度"
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
@keyup.enter.native="doSearch"
clearable
placeholder="请输入内容"
placeholder="请输入协会名称"
clearable
style="width: 100%"
v-model="pageForm.clubName"
@@ -8,20 +8,20 @@ layout("/layouts/platform.html"){
<template>
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度">
<search-item label="年度">
<el-date-picker
placeholder="选择年度"
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
@keyup.enter.native="doSearch"
clearable
placeholder="请输入内容"
placeholder="请输入协会名称"
clearable
style="width: 100%"
v-model="pageForm.clubName"
@@ -3,11 +3,11 @@ const SCHOOL_CLUB_MANAGE_TEMPLATE = {
<div>
<el-card shadow="never">
<search @search="doSearch">
<search-item label="协会名称">
<search-item label="协会名称">
<el-input
@keyup.enter.native="doSearch"
clearable
placeholder="请输入内容"
placeholder="请输入协会名称"
clearable
style="width: 100%"
v-model="pageForm.clubName"
@@ -8,20 +8,20 @@ layout("/layouts/platform.html"){
<template>
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度">
<search-item label="年度">
<el-date-picker
placeholder="选择年度"
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
@keyup.enter.native="doSearch"
clearable
placeholder="请输入内容"
placeholder="请输入协会名称"
clearable
style="width: 100%"
v-model="pageForm.clubName"
@@ -8,20 +8,20 @@ layout("/layouts/platform.html"){
<template>
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度">
<search-item label="年度">
<el-date-picker
placeholder="选择年度"
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
@keyup.enter.native="doSearch"
clearable
placeholder="请输入内容"
placeholder="请输入协会名称"
clearable
style="width: 100%"
v-model="pageForm.clubName"
@@ -8,20 +8,20 @@ layout("/layouts/platform.html"){
<template>
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度">
<search-item label="年度">
<el-date-picker
placeholder="选择年度"
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
@keyup.enter.native="doSearch"
clearable
placeholder="请输入内容"
placeholder="请输入协会名称"
clearable
style="width: 100%"
v-model="pageForm.clubName"
@@ -8,20 +8,20 @@ layout("/layouts/platform.html"){
<template>
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度">
<search-item label="年度">
<el-date-picker
placeholder="选择年度"
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
@keyup.enter.native="doSearch"
clearable
placeholder="请输入内容"
placeholder="请输入协会名称"
clearable
style="width: 100%"
v-model="pageForm.clubName"
@@ -6,7 +6,7 @@ layout("/layouts/platform.html"){
<guava ref="guava">
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度">
<search-item label="年度">
<el-date-picker
v-model="pageForm.year"
type="year"
@@ -16,15 +16,15 @@ layout("/layouts/platform.html"){
@change="doSearch"
></el-date-picker>
</search-item>
<search-item label="姓名/工号">
<search-item label="姓名/工号">
<el-input clearable placeholder="请输入姓名或工号" v-model="pageForm.searchKeyword"></el-input>
</search-item>
<search-item label="所属工会">
<search-item label="所属工会">
<el-select v-model="pageForm.unionId" placeholder="请选择所属工会" filterable clearable style="width: 100%">
<el-option v-for="item in unionList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</search-item>
<search-item label="所属单位">
<search-item label="所属单位">
<el-select v-model="pageForm.unitId" placeholder="请选择所属单位" filterable clearable style="width: 100%">
<el-option v-for="item in unitList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
@@ -6,7 +6,7 @@ layout("/layouts/platform.html"){
<guava ref="guava">
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度">
<search-item label="年度">
<el-date-picker
v-model="pageForm.year"
type="year"
@@ -6,7 +6,7 @@ layout("/layouts/platform.html"){
<guava ref="guava">
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度">
<search-item label="年度">
<el-date-picker
v-model="pageForm.year"
type="year"
@@ -16,15 +16,15 @@ layout("/layouts/platform.html"){
@change="doSearch"
></el-date-picker>
</search-item>
<search-item label="关键字">
<search-item label="关键字">
<el-input clearable placeholder="请输入姓名或者工号查询" v-model="pageForm.searchKeyword"></el-input>
</search-item>
<search-item label="所属工会">
<search-item label="所属工会">
<el-select v-model="pageForm.unionId" placeholder="请选择所属工会" filterable clearable style="width: 100%">
<el-option v-for="item in unionList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</search-item>
<search-item label="所属单位">
<search-item label="所属单位">
<el-select v-model="pageForm.unitId" placeholder="请选择所属单位" filterable clearable style="width: 100%">
<el-option v-for="item in unitList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
@@ -16,7 +16,9 @@ const fundMemberInfo = {
<el-descriptions-item label="家庭住址">{{viewData.address}}</el-descriptions-item>
<el-descriptions-item label="手机电话">{{viewData.mobile}}</el-descriptions-item>
<el-descriptions-item label="住宅号码">{{viewData.homePhone}}</el-descriptions-item>
<el-descriptions-item label="照片">{{viewData.avatar}}</el-descriptions-item>
<el-descriptions-item label="照片">
<img :src="viewData.avatar" alt="" style="width: 120px;height: 150px" v-if="viewData.avatar">
</el-descriptions-item>
</el-descriptions>
<template v-for="task in doneTasks">
@@ -64,8 +64,9 @@ layout("/layouts/platform.html"){
</el-table>
<!--#include("/layouts/pagination.html"){}#-->
</el-card>
<template #edit>
<fund-member-info ref="fundMemberInfoRef"></fund-member-info>
</template>
</guava>
</div>
@@ -82,12 +82,12 @@ layout("/layouts/platform.html"){
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="手机号码" prop="mobile">
<el-input v-model="formData.mobile" placeholder="请输入手机号码"></el-input>
<el-input v-model="formData.mobile" placeholder="请输入手机号码" maxlength="11"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="住宅号码" prop="homePhone">
<el-input v-model="formData.homePhone" placeholder="请输入住宅电话"></el-input>
<el-input v-model="formData.homePhone" placeholder="请输入住宅电话" maxlength="20"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -209,7 +209,7 @@ layout("/layouts/platform.html"){
cancelButtonText: "取消",
type: "warning"
}).then(() => {
this.$axios.post('/platform/suggestionBox/write/submitAgain', {
this.$axios.post('/platform/fundMember/write/submitAgain', {
data: JSON.stringify(this.formData),
taskId: GetQueryString("taskId")
}).then(res => {
@@ -244,10 +244,14 @@ layout("/layouts/platform.html"){
idCard: idCard
}
}
}
},
},
created() {
this.init()
if(!this.bizId){
this.$axios.post('/platform/fundMember/write/validateApply')
}
}
})
</script>
@@ -14,11 +14,11 @@ layout("/layouts/platform.html"){
type="year"
style="width: 100%"
value-format="yyyy"
placeholder="请选择">
placeholder="请选择年度">
</el-date-picker>
</search-item>
<search-item label="项目名称">
<el-input placeholder="请输入内容" clearable v-model="pageForm.name"
<el-input placeholder="请输入项目名称" clearable v-model="pageForm.name"
@keyup.enter.native="doSearch" style="width:100%"></el-input>
</search-item>
</search>
@@ -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"
@@ -108,8 +108,8 @@ layout("/layouts/platform.html"){
{ label: "姓名", prop: "username" },
{ label: "工号", prop: "loginname" },
{ label: "联系方式", prop: "mobile" },
{ label: "所属工会", prop: "unionName", sortable: true },
{ label: "所属单位", prop: "unitName", sortable: true },
{ label: "所属工会", prop: "unionname", sortable: true },
{ label: "所属单位", prop: "unitname", sortable: true },
{ label: "课程", prop: "courseNames", sortable: true },
{ label: "缺席次数", prop: "absentCount" },
{ label: "是否黑名单", prop: "isDisabled", sortable: true }
@@ -7,7 +7,7 @@ layout("/layouts/platform.html"){
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度">
<search-item label="年度">
<el-date-picker
v-model="pageForm.year"
type="year"
@@ -17,14 +17,14 @@ 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>
</search-item>
<search-item label="会议类型">
<search-item label="会议类型">
<el-select v-model="pageForm.type" @change="doSearch" style="width: 100%"
placeholder="请选择慰问类型" filterable clearable>
placeholder="请选择会议类型" filterable clearable>
<el-option v-for="item in typeOptions"
:value="item.id"
:key="item.id"
@@ -5,7 +5,7 @@ layout("/layouts/platform.html"){
<guava ref="guava">
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度">
<search-item label="年度">
<el-date-picker
v-model="pageForm.year"
type="year"
@@ -15,14 +15,14 @@ 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>
</search-item>
<search-item label="会议类型">
<search-item label="会议类型">
<el-select v-model="pageForm.type" @change="doSearch" style="width: 100%"
placeholder="请选择慰问类型" filterable clearable>
placeholder="请选择会议类型" filterable clearable>
<el-option v-for="item in typeOptions"
:value="item.id"
:key="item.id"
@@ -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>
@@ -19,7 +19,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"
@@ -29,14 +29,14 @@ 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>
</search-item>
<search-item label="会议类型">
<search-item label="会议类型">
<el-select v-model="pageForm.type" @change="doSearch" style="width: 100%"
placeholder="请选择慰问类型" filterable clearable>
placeholder="请选择会议类型" filterable clearable>
<el-option v-for="item in typeOptions"
:value="item.id"
:key="item.id"
@@ -74,7 +74,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"
@@ -84,14 +84,14 @@ 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>
</search-item>
<search-item label="会议类型">
<search-item label="会议类型">
<el-select v-model="pageForm.type" @change="doSearch" style="width: 100%"
placeholder="请选择慰问类型" filterable clearable>
placeholder="请选择会议类型" filterable clearable>
<el-option v-for="item in typeOptions"
:value="item.id"
:key="item.id"
@@ -7,7 +7,7 @@ layout("/layouts/platform.html"){
<el-card shadow="never">
<search @search="doSearch">
<search-item label="年度">
<search-item label="年度">
<el-date-picker
v-model="pageForm.year"
type="year"
@@ -17,14 +17,14 @@ 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>
</search-item>
<search-item label="会议类型">
<search-item label="会议类型">
<el-select v-model="pageForm.type" @change="doSearch" style="width: 100%"
placeholder="请选择慰问类型" filterable clearable>
placeholder="请选择会议类型" filterable clearable>
<el-option v-for="item in typeOptions"
:value="item.id"
:key="item.id"
@@ -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,14 +21,14 @@ 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>
</search-item>
<search-item label="会议类型">
<search-item label="会议类型">
<el-select v-model="pageForm.type" @change="doSearch" style="width: 100%"
placeholder="请选择慰问类型" filterable clearable>
placeholder="请选择会议类型" filterable clearable>
<el-option v-for="item in typeOptions"
:value="item.id"
:key="item.id"
@@ -11,7 +11,7 @@ layout("/layouts/platform.html"){
<template>
<el-card shadow="never">
<search @search="doSearch">
<search-item label="名称/编码">
<search-item label="名称/编码">
<el-input placeholder="请输入名称或编码查询" clearable v-model="pageForm.searchKeyword"
@keyup.enter.native="doSearch">
</el-input>
@@ -7,7 +7,7 @@ layout("/layouts/platform.html"){
<el-card shadow="never">
<search @search="doSearch">
<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>
@@ -10,7 +10,7 @@ layout("/layouts/platform.html"){
<el-date-picker
:clearable="false"
@change="listActivity"
placeholder="选择年"
placeholder="选择年"
style="width: 100%"
type="year"
v-model="pageForm.year"
@@ -64,8 +64,8 @@ layout("/layouts/platform.html"){
<el-table-column label="姓名" prop="userName" sortable></el-table-column>
<el-table-column label="工号" prop="loginName" sortable></el-table-column>
<el-table-column label="性别" prop="sex" sortable></el-table-column>
<el-table-column label="单位" prop="unitName" sortable></el-table-column>
<el-table-column label="分工会" prop="unionName" sortable></el-table-column>
<el-table-column label="所属工会" prop="unionName" sortable></el-table-column>
<el-table-column label="所属单位" prop="unitName" sortable></el-table-column>
<el-table-column label="联系方式" prop="mobile" sortable></el-table-column>
<el-table-column label="答题日期" prop="attemptDate" sortable></el-table-column>
<el-table-column label="得分" prop="totalScore" sortable></el-table-column>
@@ -9,7 +9,7 @@ layout("/layouts/platform.html"){
<search-item label="年度">
<el-date-picker
:clearable="false"
placeholder="选择年"
placeholder="选择年"
style="width: 100%"
type="year"
v-model="pageForm.year"
@@ -43,8 +43,8 @@ const report = {
<el-table :data="optionUsers" size="small">
<el-table-column label="姓名" prop="userName"></el-table-column>
<el-table-column label="工号" prop="loginName"></el-table-column>
<el-table-column label="单位" prop="unitName"></el-table-column>
<el-table-column label="分工会" prop="unionName"></el-table-column>
<el-table-column label="所属工会" prop="unionName"></el-table-column>
<el-table-column label="所属单位" prop="unitName"></el-table-column>
<el-table-column label="选择时间" prop="attemptDate"></el-table-column>
</el-table>
</el-dialog>
@@ -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>
@@ -8,14 +8,14 @@ layout("/layouts/platform.html"){
<search @search="doSearch">
<search-item label="年度">
<el-date-picker
placeholder="选择年"
placeholder="选择年"
style="width: 100%"
type="year"
v-model="pageForm.year"
value-format="yyyy"
></el-date-picker>
</search-item>
<search-item label="所属工会">
<search-item label="所属工会">
<el-select v-model="pageForm.unionId" placeholder="请选择所属工会" filterable clearable
style="width: 100%">
<el-option v-for="item in unionList" :key="item.id" :label="item.name"
@@ -7,7 +7,7 @@ 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" value-format="yyyy"></el-date-picker>
<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 @keyup.enter.native="doSearch" clearable placeholder="请输入会议名称" v-model="pageForm.searchKeyword"></el-input>
@@ -8,14 +8,14 @@ layout("/layouts/platform.html"){
<search @search="doSearch">
<search-item label="年度">
<el-date-picker
placeholder="选择年"
placeholder="选择年"
style="width: 100%"
type="year"
v-model="pageForm.year"
value-format="yyyy"
></el-date-picker>
</search-item>
<search-item label="所属工会">
<search-item label="所属工会">
<el-select v-model="pageForm.unionId" placeholder="请选择所属工会" filterable clearable
style="width: 100%">
<el-option v-for="item in unionList" :key="item.id" :label="item.name"
@@ -8,7 +8,7 @@ layout("/layouts/platform.html"){
<search @search="doSearch">
<search-item label="年度">
<el-date-picker
placeholder="选择年"
placeholder="选择年"
style="width: 100%"
type="year"
v-model="pageForm.year"
@@ -20,7 +20,7 @@ layout("/layouts/platform.html"){
v-model="pageForm.searchKeyword">
</el-input>
</search-item>
<search-item label="所属工会">
<search-item label="所属工会">
<el-select v-model="pageForm.unionId" placeholder="请选择所属工会" filterable clearable
style="width: 100%">
<el-option v-for="item in unionList" :key="item.id" :label="item.name"
@@ -7,7 +7,7 @@ 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" value-format="yyyy"></el-date-picker>
<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 @keyup.enter.native="doSearch" clearable placeholder="请输入会议名称" v-model="pageForm.searchKeyword"></el-input>
@@ -7,7 +7,7 @@ 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" value-format="yyyy"></el-date-picker>
<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 @keyup.enter.native="doSearch" clearable placeholder="请输入会议名称" v-model="pageForm.searchKeyword"></el-input>
@@ -7,10 +7,10 @@ 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="年度" style="width: 100%"></el-date-picker>
<el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="请选择年度" style="width: 100%"></el-date-picker>
</search-item>
<search-item label="标题">
<el-input v-model="pageForm.title" placeholder="标题" clearable></el-input>
<el-input v-model="pageForm.title" placeholder="请输入标题" clearable></el-input>
</search-item>
</search>
</el-card>
@@ -6,11 +6,11 @@ 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="标题">
<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>
@@ -6,11 +6,11 @@ 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="标题">
<el-input v-model="pageForm.title" placeholder="标题" clearable></el-input>
<el-input v-model="pageForm.title" placeholder="请输入标题" clearable></el-input>
</search-item>
<search-item label="所属工会">
<el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%"
@@ -6,11 +6,11 @@ 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="标题">
<el-input v-model="pageForm.title" placeholder="标题" clearable></el-input>
<el-input v-model="pageForm.title" placeholder="请输入标题" clearable></el-input>
</search-item>
<search-item label="所属工会">
<el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%"
@@ -117,7 +117,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>
@@ -6,10 +6,10 @@ 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-item label="年度">
<el-date-picker v-model="pageForm.year" type="year" placeholder="选择年度"></el-date-picker>
<el-date-picker v-model="pageForm.year" type="year" placeholder="选择年度"></el-date-picker>
</search-item>
</search>
</el-card>
@@ -87,7 +87,7 @@ layout("/layouts/platform.html"){
></el-date-picker>
</el-form-item>
<el-form-item label="经费预算" prop="budget">
<el-input placeholder="请输入内容" v-model="formData.budget" maxlength="2000"></el-input>
<el-input placeholder="请输入经费预算" v-model="formData.budget" maxlength="2000"></el-input>
</el-form-item>
</div>
<el-form-item label="场地" prop="site">
@@ -7,7 +7,7 @@ layout("/layouts/platform.html"){
<search @search="doSearch">
<search-item label="年度">
<el-date-picker
placeholder="年度"
placeholder="请选择年度"
type="year"
style="width: 100%"
v-model="pageForm.year"
@@ -7,7 +7,7 @@ layout("/layouts/platform.html"){
<search @search="doSearch">
<search-item label="年度">
<el-date-picker
placeholder="年度"
placeholder="请选择年度"
type="year"
style="width: 100%"
v-model="pageForm.year"
@@ -7,7 +7,7 @@ layout("/layouts/platform.html"){
<search @search="doSearch">
<search-item label="年度">
<el-date-picker
placeholder="年度"
placeholder="请选择年度"
type="year"
style="width: 100%"
v-model="pageForm.year"
@@ -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="姓名/工号">
@@ -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>
@@ -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="姓名/工号">
@@ -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="姓名/工号">
@@ -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.startYear"
type="year"
@@ -24,7 +24,7 @@ layout("/layouts/platform.html"){
>
</el-date-picker>
</search-item>
<search-item label="结束年度">
<search-item label="结束年度">
<el-date-picker
v-model="pageForm.endYear"
type="year"
@@ -37,7 +37,7 @@ layout("/layouts/platform.html"){
>
</el-date-picker>
</search-item>
<search-item label="旅行社">
<search-item label="旅行社">
<el-select clearable filterable style="width: 100%"
v-model="pageForm.travelAgencyId"
@change="doSearch"
@@ -49,9 +49,9 @@ layout("/layouts/platform.html"){
></el-option>
</el-select>
</search-item>
<search-item label="线路名称">
<search-item label="线路名称">
<el-input @keyup.enter.native="doSearch" clearable clearable
placeholder="请输入内容"
placeholder="请输入线路名称"
style="width: 100%"
v-model="pageForm.lineName">
</el-input>
@@ -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
placeholder="请选择年度"
type="year"
@@ -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
placeholder="请选择年度"
type="year"
@@ -21,7 +21,7 @@ layout("/layouts/platform.html"){
value-format="yyyy"
></el-date-picker>
</search-item>
<search-item label="是否回复">
<search-item label="是否回复">
<el-select v-model="pageForm.isReply" style="width: 100%" @change="doSearch">
<el-option :value="null" label="全部"></el-option>
<el-option :value="true" label="已回复"></el-option>
@@ -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
placeholder="请选择年度"
type="year"
@@ -21,7 +21,7 @@ layout("/layouts/platform.html"){
value-format="yyyy"
></el-date-picker>
</search-item>
<search-item label="是否回复">
<search-item label="是否回复">
<el-select v-model="pageForm.isReply" style="width: 100%" @change="doSearch">
<el-option :value="null" label="全部"></el-option>
<el-option :value="true" label="已回复"></el-option>

Some files were not shown because too many files have changed in this diff Show More