更改
This commit is contained in:
JyuHsin
@@ -112,7 +112,7 @@ layout("/mobile/platform.html"){
|
||||
}
|
||||
|
||||
.middle_item_text {
|
||||
font-size: 12px;
|
||||
font-size: 14px;
|
||||
margin-top: 6px;
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
@@ -236,7 +236,7 @@ layout("/mobile/platform.html"){
|
||||
</van-icon>
|
||||
{{ item.name }}
|
||||
</div>
|
||||
<div style="margin-top: 6px; color: grey; font-size: 11px">
|
||||
<div style="margin-top: 6px; color: grey; font-size: 12px">
|
||||
<div>开始时间：{{ moment(item.startDate).format('MM/DD HH:mm') }}
|
||||
</div>
|
||||
<div>结束时间：{{ moment(item.endDate).format('MM/DD HH:mm') }}
|
||||
|
||||
@@ -103,45 +103,15 @@ layout("/mobile/platform.html"){
|
||||
<div id="app" v-cloak>
|
||||
<van-sticky>
|
||||
<van-nav-bar title="活动详情" left-arrow
|
||||
@click-left="location.replace('/platform/mobile/trainSignUpActivity/trainList')"></van-nav-bar>
|
||||
@click-left="pjaxReplace('/platform/mobile/trainSignUpActivity/trainList')"></van-nav-bar>
|
||||
</van-sticky>
|
||||
|
||||
<!--<van-image :height="$(window).height() * 0.28" v-if="this.activity.cover && this.activity.cover.filepath" :src="'${AppFileDomain!}' + this.activity.cover.filepath"></van-image>
|
||||
<van-image :height="$(window).height() * 0.28" v-else src=""></van-image>-->
|
||||
<van-image height="186" src="/assets/mobile/img/3quhtakfd4heeqsk6irqhft60p.png"></van-image>
|
||||
<van-image height="186" :src="CREATE_PREVIEW_URL(activity?.cover[0].id)"></van-image>
|
||||
<div class="title">{{activity.activityName}}</div>
|
||||
|
||||
<van-tabs v-model:active="tabActive" shrink>
|
||||
<van-tab title="详细信息" name="a">
|
||||
<!--<div class="content_title">关于{{activity.activityName}}的通知</div>-->
|
||||
<div class="pre_text" v-html="activity.introduce"></div>
|
||||
<!--<div v-for="(value, key, index) in activityMap" style="margin-bottom: 30px">
|
||||
<div class="van-sidebar-item van-sidebar-item--select">
|
||||
{{key}}<span style="color: #1867b0">（左划查看更多）</span>
|
||||
</div>
|
||||
<div style="width: 100%; overflow-x: auto">
|
||||
<table class="custable">
|
||||
<tr>
|
||||
<td>序号</td>
|
||||
<td>{{trainType}}名称</td>
|
||||
<!–<td>课次</td>–>
|
||||
<td>时间</td>
|
||||
<td>{{trainType}}地点</td>
|
||||
<td>{{trainType === '培训班' ? '讲师' : '负责人'}}</td>
|
||||
</tr>
|
||||
<tr v-for="(o, num) in value">
|
||||
<td>{{num + 1}}</td>
|
||||
<td>{{o.courseName}}</td>
|
||||
<!–<td>{{o.courseTimeList.length}}</td>–>
|
||||
<td style="line-height: 26px;">
|
||||
<div v-for="t in o.timeList">{{t}}</div>
|
||||
</td>
|
||||
<td>{{o.courseLocation}}</td>
|
||||
<td>{{o.courseInstructor}}</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</div>-->
|
||||
</van-tab>
|
||||
</van-tabs>
|
||||
|
||||
|
||||
@@ -157,7 +157,7 @@ layout("/mobile/platform.html"){
|
||||
<div id="app" v-cloak>
|
||||
<van-sticky>
|
||||
<van-nav-bar :title="trainType + '列表'" left-arrow
|
||||
@click-left="pjaxReplace('/platform/mobile/trainSignUpActivity/trainList?type=' + type)"></van-nav-bar>
|
||||
@click-left="window.history.go(-1)"></van-nav-bar>
|
||||
<van-dropdown-menu active-color="#1867b0">
|
||||
<van-dropdown-item @change="tabChange" v-model="activityStatus"
|
||||
:options="activityOptions"></van-dropdown-item>
|
||||
|
||||
@@ -169,7 +169,7 @@ layout("/mobile/platform.html"){
|
||||
|
||||
pageForm: {
|
||||
year: '',
|
||||
activityStatus: null
|
||||
activityStatus: 2
|
||||
},
|
||||
activityLevelList: [],
|
||||
activityStatusList: [
|
||||
@@ -179,7 +179,8 @@ layout("/mobile/platform.html"){
|
||||
{text: '报名中', value: 2},
|
||||
{text: '进行中', value: 3},
|
||||
{text: '已结束', value: 4}
|
||||
]
|
||||
],
|
||||
id: '',
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
@@ -210,7 +211,7 @@ layout("/mobile/platform.html"){
|
||||
})
|
||||
return
|
||||
}
|
||||
pjaxReplace('/platform/mobile/trainSignUpActivity/trainInfo?activityId=' + o.id + '&endTime=' + o.activitySignUpEndTime)
|
||||
pjaxReplace('/platform/mobile/trainSignUpActivity/activityInfo?activityId=' + o.id + '&endTime=' + o.activitySignUpEndTime)
|
||||
}
|
||||
},
|
||||
async pageData() {
|
||||
@@ -242,8 +243,9 @@ layout("/mobile/platform.html"){
|
||||
this.closeLoading()
|
||||
},
|
||||
async init(){
|
||||
this.$set(this.pageForm, "activityStatus", 1)
|
||||
this.$set(this.pageForm, "activityStatus", 2)
|
||||
this.$set(this.pageForm, "year", new Date().getFullYear())
|
||||
this.$set(this.pageForm, "id", GetQueryString('id'))
|
||||
}
|
||||
},
|
||||
async created() {
|
||||
|
||||
@@ -160,6 +160,19 @@ layout("/mobile/platform.html"){
|
||||
fit="cover"></van-image>
|
||||
</div>
|
||||
|
||||
<van-cell-group class="van-cell-group--inset">
|
||||
<van-cell>
|
||||
<div style="font-weight: bold;font-size: 15px;">
|
||||
温馨提醒
|
||||
</div>
|
||||
<div>
|
||||
<div>1.本次慰问品共3种套餐，教职工可任选其中1种套餐快递(1个顺丰快递)，快递地址仅限江浙沪(江苏，浙江，上海)。</div>
|
||||
<div>2.快递预计于5月28日前投递完成，请保持联系电话畅通并及时接听。</div>
|
||||
<div>3.填写截止时间:5月12日10点。</div>
|
||||
</div>
|
||||
</van-cell>
|
||||
</van-cell-group>
|
||||
|
||||
<!--基本信息-->
|
||||
<van-cell-group class="van-cell-group--inset">
|
||||
<van-cell>
|
||||
|
||||
@@ -152,27 +152,27 @@ layout("/layouts/platform.html"){
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
}).then(async () => {
|
||||
const url = "/platform/sourcechange/manage/doBatchChange"
|
||||
await this.doOperate(url, ids, false)
|
||||
// let isSendMsg = false
|
||||
// const isHasNewTeacher = this.checkUsers.some(v=> v.changeInfosStr === '新入职')
|
||||
//
|
||||
// const ids = this.checkUsers.map(item => item.id)
|
||||
// if (isHasNewTeacher) {
|
||||
// this.$confirm('勾选用户中有新入职教工，是否对新入职教职工发送入会邀请？', '提示', {
|
||||
// confirmButtonText: '确定',
|
||||
// cancelButtonText: '取消',
|
||||
// type: 'warning'
|
||||
// }).then(() => {
|
||||
// isSendMsg = true
|
||||
// this.doOperate(url, ids, isSendMsg)
|
||||
// }).catch(() => {
|
||||
// isSendMsg = false
|
||||
// this.doOperate(url, ids, isSendMsg)
|
||||
// })
|
||||
// } else {
|
||||
// await this.doOperate(url, ids, isSendMsg)
|
||||
// }
|
||||
const url = "/platform/sourcechange/manage/doBatchChange"
|
||||
// await this.doOperate(url, ids, false)
|
||||
let isSendMsg = false
|
||||
const isHasNewTeacher = this.checkUsers.some(v=> v.changeInfosStr === '新入职')
|
||||
|
||||
const ids = this.checkUsers.map(item => item.id)
|
||||
if (isHasNewTeacher) {
|
||||
this.$confirm('勾选用户中有新入职教工，是否对新入职教职工发送入会邀请？', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
}).then(() => {
|
||||
isSendMsg = true
|
||||
this.doOperate(url, ids, isSendMsg)
|
||||
}).catch(() => {
|
||||
isSendMsg = false
|
||||
this.doOperate(url, ids, isSendMsg)
|
||||
})
|
||||
} else {
|
||||
await this.doOperate(url, ids, isSendMsg)
|
||||
}
|
||||
})
|
||||
},
|
||||
tableHandleSelectionChange(val){
|
||||
|
||||
@@ -254,7 +254,7 @@ layout("/layouts/platform.html"){
|
||||
|
||||
},
|
||||
openCode(id) {
|
||||
this.$refs.openQRCode.openCode("/platform/mobile/trainSignUpActivity/trainList")
|
||||
this.$refs.openQRCode.openCode("/platform/mobile/trainSignUpActivity/activityInfo?activityId=" + id)
|
||||
},
|
||||
makeCode(row) {
|
||||
this.clickRow = row
|
||||
|
||||
@@ -243,9 +243,12 @@ layout("/layouts/platform.html"){
|
||||
<el-dropdown-item :command="{type:'view',data:row}">
|
||||
查看
|
||||
</el-dropdown-item>
|
||||
<!-- <el-dropdown-item :command="{type:'edit',data:row}" v-if="judgmentAuthority">-->
|
||||
<!-- 编辑-->
|
||||
<!-- </el-dropdown-item>-->
|
||||
<!--<el-dropdown-item :command="{type:'edit',data:row}" v-if="judgmentAuthority">
|
||||
编辑
|
||||
</el-dropdown-item>-->
|
||||
<el-dropdown-item :command="{type:'updateRemark',data:row}">
|
||||
修改备注
|
||||
</el-dropdown-item>
|
||||
<el-dropdown-item :command="{type:'delete',data:row}">
|
||||
移除
|
||||
</el-dropdown-item>
|
||||
@@ -494,6 +497,21 @@ layout("/layouts/platform.html"){
|
||||
</span>
|
||||
</el-dialog>
|
||||
|
||||
<el-dialog
|
||||
title="修改备注"
|
||||
:visible.sync="updateRemarkDialogVisible"
|
||||
width="30%">
|
||||
<el-form label-position="left" label-width="80px">
|
||||
<el-form-item label="添加模式">
|
||||
<el-input v-model="remarkRow.remark"></el-input>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button @click="updateRemarkDialogVisible = false">取 消</el-button>
|
||||
<el-button type="primary" @click="onUpdateRemark">确 定</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
</div>
|
||||
|
||||
@@ -507,6 +525,8 @@ layout("/layouts/platform.html"){
|
||||
mixins: [initTableMixins],
|
||||
data() {
|
||||
return {
|
||||
updateRemarkDialogVisible: false,
|
||||
remarkRow: {},
|
||||
importCheckVisible: false,
|
||||
addMemberLoading: false,
|
||||
selectUserLoading: false,
|
||||
@@ -540,6 +560,7 @@ layout("/layouts/platform.html"){
|
||||
{prop: 'unionname', label: '所属工会', sortable: true},
|
||||
{prop: 'unitname', label: '所属单位', sortable: true},
|
||||
{prop: 'member', label: '是否会员', sortable: true},
|
||||
{prop: 'remark', label: '备注', sortable: false},
|
||||
// {prop: 'threeUnitName', label: '所在科室', sortable: true, checked: 0},
|
||||
// {prop: 'unionGroupName', label: '工会小组', sortable: true, checked: 0}
|
||||
],
|
||||
@@ -845,9 +866,27 @@ layout("/layouts/platform.html"){
|
||||
} else if (type == 'editCampus') {
|
||||
this.$set(data, 'modifiedCampusId', data.campusId)
|
||||
this.$set(data, 'editCampus', true)
|
||||
} else if (type == 'updateRemark') {
|
||||
this.updateRemark(data)
|
||||
}
|
||||
},
|
||||
async updateRemark(row) {
|
||||
this.remarkRow = row
|
||||
this.updateRemarkDialogVisible = true
|
||||
},
|
||||
async onUpdateRemark() {
|
||||
const resp = await $.post(loc() + "/updateRemark", {
|
||||
userId: this.remarkRow.id,
|
||||
remark: this.remarkRow.remark,
|
||||
})
|
||||
if (resp.code === 0) {
|
||||
this.$message.success(resp.msg)
|
||||
this.pageData()
|
||||
this.updateRemarkDialogVisible = false
|
||||
} else {
|
||||
this.$message.warning(resp.msg)
|
||||
}
|
||||
},
|
||||
|
||||
async joinWelfareMember(memData) {
|
||||
await $.post(welfareCommonUrl + "/joinWelfareMember", {userIds: JSON.stringify([memData.id])})
|
||||
},
|
||||
|
||||
@@ -4,7 +4,13 @@ layout("/layouts/platform.html"){
|
||||
|
||||
<style>
|
||||
|
||||
|
||||
.el-alert {
|
||||
padding: 4px 16px;
|
||||
margin-bottom: 6px;
|
||||
}
|
||||
.el-alert__title {
|
||||
font-size: 16px;
|
||||
}
|
||||
.optionImg {
|
||||
display: grid;
|
||||
place-items: center;
|
||||
@@ -150,6 +156,10 @@ layout("/layouts/platform.html"){
|
||||
</template>
|
||||
|
||||
<template #edit>
|
||||
<vi-title title="温馨提醒"></vi-title>
|
||||
<el-alert title="1.本次慰问品共3种套餐，教职工可任选其中1种套餐快递(1个顺丰快递)，快递地址仅限江浙沪(江苏，浙江，上海)。" type="warning" effect="dark"></el-alert>
|
||||
<el-alert title="2.快递预计于5月28日前投递完成，请保持联系电话畅通并及时接听。" type="warning" effect="dark"></el-alert>
|
||||
<el-alert title="3.填写截止时间:5月12日10点。" type="warning" effect="dark"></el-alert>
|
||||
<el-card shadow="never">
|
||||
<el-form :model="formData" label-width="120px" ref="addForm">
|
||||
<el-form-item label="福利名称">
|
||||
@@ -774,6 +784,7 @@ layout("/layouts/platform.html"){
|
||||
getEnumOptions("WelfareSignMode").then(res => {
|
||||
this.welfareSignMode = res
|
||||
})
|
||||
this.dzOptions = this.dzOptions.filter(d => ['江苏省', '浙江省', '上海市'].includes(d.label))
|
||||
}
|
||||
})
|
||||
|
||||
|
||||
Reference in New Issue
Block a user