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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
@jyuhsin
2025-09-15 16:14:39 +08:00
parent 7a062e63ea 6c276fb085
commit fec73a01e0
47 changed files with 2039 additions and 1147 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/views/platform/zhgh/activity/culture/common/applyUser.js
+1 -1
View File
@@ -34,8 +34,8 @@ const ACTIVITY_CULTURE_APPLY_USER = {
<el-card class="mt10" shadow="never">
<table-tool label="活动列表">
<el-radio-group v-model="pageForm.isEnrolled" @change="doSearch" size="mini" class="ml10">
<el-radio-button :label="false">未报名</el-radio-button>
<el-radio-button :label="true">已报名</el-radio-button>
<el-radio-button :label="false">未报名</el-radio-button>
</el-radio-group>
</table-tool>
src/main/resources/views/platform/zhgh/activity/culture/common/auditActivity.js
+6 -4
View File
@@ -210,8 +210,9 @@ const ACTIVITY_CULTURE_AUDIT_ACTIVITY = {
}
},
openAudit(row) {
this.$refs.guava.edit()
this.$refs.editInfo.findOne(row.id)
this.$refs.guava.edit(()=>{
this.$refs.editInfo.findOne(row.id)
})
this.formData = {
id: row.id,
username: this.$store.state.user.username,
@@ -220,8 +221,9 @@ const ACTIVITY_CULTURE_AUDIT_ACTIVITY = {
},
openView(row) {
const { id } = row
this.$refs.guava.view()
this.$refs.infoActivity.findOne(id)
this.$refs.guava.view(()=>{
this.$refs.infoActivity.findOne(id)
})
},
pageData() {
this.tableLoading = true
src/main/resources/views/platform/zhgh/activity/culture/common/infoActivity.js
+2 -2
View File
@@ -42,8 +42,8 @@ const ACTIVITY_CULTURE_INFO_ACTIVITY = {
</el-descriptions-item>
<el-descriptions-item label="报名方式">
<span v-if="viewData.signUpMethod===1">个人报名</span>
<span v-else-if="viewData.signUpMethod===2">分工会报名</span>
<span v-else-if="viewData.signUpMethod===3">组队报名</span>
<span v-else-if="viewData.signUpMethod===2">组队报名</span>
<span v-else-if="viewData.signUpMethod===3">分工会报名</span>
<span v-else-if="!viewData.signUpMethod">无需报名</span>
</el-descriptions-item>
<el-descriptions-item label="是否用于报名">
src/main/resources/views/platform/zhgh/activity/culture/common/singleSignUp.js
+79 -14
View File
@@ -42,8 +42,8 @@ const singleSignUp = {
</el-descriptions-item>
<el-descriptions-item label="报名方式">
<span v-if="viewData.signUpMethod===1">个人报名</span>
<span v-else-if="viewData.signUpMethod===2">分工会报名</span>
<span v-else-if="viewData.signUpMethod===3">组队报名</span>
<span v-else-if="viewData.signUpMethod===2">组队报名</span>
<span v-else-if="viewData.signUpMethod===3">分工会报名</span>
<span v-else-if="!viewData.signUpMethod">无需报名</span>
</el-descriptions-item>
<el-descriptions-item label="是否用于报名">
@@ -153,7 +153,47 @@ const singleSignUp = {
</div>
<!-- 分工会报名-->
<div v-else-if="viewData.signUpMethod===3">
<div class="process-title">选择报名人员
<span v-if="viewData.userNumberLimit===2">
，报名人数 <span style="color: red">
{{viewData.unionTeamNum}}</span>人
</span>
</div>
<el-select
v-if="inApplyTime"
v-model="searchTeammateUserId"
filterable
clearable
remote
reserve-keyword
placeholder="请输入关键词"
:remote-method="queryTeammate">
<el-option
v-for="item in teammateOptions"
:key="item.userId"
:label="item.userName + '(' + item.loginName + ')'"
:value="item.userId">
</el-option>
</el-select>
<el-button v-if="inApplyTime" class="ml5" type="primary" icon="el-icon-plus"
@click="addTeamUser">添加
</el-button>
<el-table :data="teamUsers" class="mt10">
<el-table-column label="序号" type="index" width="60px"></el-table-column>
<el-table-column prop="userName" label="姓名"></el-table-column>
<el-table-column prop="loginName" label="工号"></el-table-column>
<el-table-column prop="sex" label="性别"></el-table-column>
<el-table-column prop="unitName" label="单位"></el-table-column>
<el-table-column prop="mobile" label="手机号"></el-table-column>
<el-table-column label="操作" width="100px"
v-if="inApplyTime">
<template slot-scope="scope">
<el-button type="danger" size="mini" @click="removeTeamUser(scope.$index)">删除
</el-button>
</template>
</el-table-column>
</el-table>
</div>
<!-- 表单填写-->
@@ -242,6 +282,17 @@ const singleSignUp = {
}
})
},
//查询报名人员
listTeamUserUnion() {
this.$axios.post("/platform/activity/culture/applyUser/listTeamUserUnion", {activityId: this.id}).then((res) => {
if (res.code === 0) {
this.isSignUp = res.data.length > 0
this.teamUsers = res.data
this.defaultAddSelf()
this.customFormInit()
}
})
},
//表单回显
customFormInit() {
@@ -300,14 +351,14 @@ const singleSignUp = {
//分工会
if (this.viewData.signUpMethod === 3) {
// if (this.teamUsers.length === 0) {
// this.$message.warning("请添加报名人员后再提交！")
// return
// }
// if (this.teamUsers.length > this.viewData.teamNum) {
// this.$message.warning("您选择的人数大于" + this.viewData.teamNum + "人，请重新选择！")
// return
// }
if (this.teamUsers.length === 0) {
this.$message.warning("请添加报名人员后再提交！")
return
}
if (this.viewData.teamNum && this.teamUsers.length > this.viewData.teamNum) {
this.$message.warning("您选择的人数大于" + this.viewData.teamNum + "人，请重新选择！")
return
}
}
let formData = {
@@ -368,7 +419,7 @@ const singleSignUp = {
this.$message.warning("请添加报名人员后再提交！")
return
}
if (this.teamUsers.length > this.viewData.teamNum) {
if (this.viewData.teamNum && this.teamUsers.length > this.viewData.teamNum) {
this.$message.warning("您选择的人数大于" + this.viewData.teamNum + "人，请重新选择！")
return
}
@@ -420,7 +471,10 @@ const singleSignUp = {
//查询队友信息
queryTeammate(val) {
if (val) {
this.$axios.post("/platform/activity/culture/applyUser/queryTeammate", {keyword: val}).then((res) => {
this.$axios.post("/platform/activity/culture/applyUser/queryTeammate", {
keyword: val,
signUpMethod: this.viewData.signUpMethod
}).then((res) => {
if (res.code === 0) {
res.data.map(v => v.applyUserId = this.$store.state.user.id)
this.teammateOptions = res.data
@@ -439,7 +493,7 @@ const singleSignUp = {
this.$message.error("请勿重复添加")
return
}
if (this.teamUsers.length >= this.viewData.teamNum) {
if (this.viewData.teamNum && this.teamUsers.length >= this.viewData.teamNum) {
this.$message.error("已满员")
return
}
@@ -457,11 +511,22 @@ const singleSignUp = {
this.$axios.post("/platform/activity/culture/infoManage/activityInfo", {id: this.id}).then((res) => {
if (res.code === 0) {
this.viewData = res.data
//总人数限制
if (this.viewData.userNumberLimit === 1) {
} else if (this.viewData.userNumberLimit === 2) {
//分工会人数限制
const union = this.viewData.unionUserNumberLimit.find(v => v.id === this.$store.state.user.union.id)
this.viewData.unionTeamNum = union.limitNum
}
if (this.viewData.signUpMethod === 3) {
this.listTeamUserUnion()
} else {
this.listTeamUser()
}
if (this.viewData.formConfig) {
this.formCreateRule = formCreate.parseJson(this.viewData.formConfig.rule)
this.formCreateOption = formCreate.parseJson(this.viewData.formConfig.options)
}
this.listTeamUser()
}
})
}
src/main/resources/views/platform/zhgh/activity/sports/applyUser/applyUser.js
+409 -227
View File
@@ -12,225 +12,319 @@ const groupBy = (list, fn) => {
})
}
var ACTIVITY_SPORTS_APPLY_USER = {
template: /*language=HTML*/ `
<div>
<el-tabs tab-position="top" v-model="activeName">
<el-tab-pane :label="activityTableData.allName" name="1">
<el-card>
<el-transfer
:data="leftApplyUserList"
:filter-method="filterMethod"
:props="{key: 'id',label: 'name'}"
:titles="['可报人员名单', '当前选择']"
filterable
ref="transfer"
v-model="rightApplyUserList">
<template #right-footer>
<div class="transfer">
<el-select :clearable="false"
@change="flushApplyUser(applyUserList)"
placeholder="队伍"
size="small"
v-if="activityTableData.eveProjectType=='2'"
v-model="applyFromData.teamId">
<el-option
:key="item.id"
:label="item.name"
:value="item.id"
v-for="item in teamList">
</el-option>
</el-select>
<el-button @click="applyUser" icon="el-icon-plus"
size="small"
type="primary">
参加比赛
</el-button>
</div>
</template>
</el-transfer>
template: `
<div style="margin: 20px">
<el-tabs tab-position="top" v-model="activeName">
<el-tab-pane :label="activityTableData.allName" name="1">
<el-card>
<el-transfer
:data="leftApplyUserList"
:filter-method="filterMethod"
:props="{key: 'id',label: 'name'}"
:titles="['可报人员名单', '当前选择']"
filterable
ref="transfer"
v-model="rightApplyUserList">
<template #right-footer>
<div class="transfer">
<el-select :clearable="false"
@change="flushApplyUser(applyUserList)"
placeholder="队伍"
size="small"
v-if="activityTableData.eveProjectType=='2'"
v-model="applyFromData.teamId">
<el-option
:key="item.id"
:label="item.name"
:value="item.id"
v-for="item in teamList">
</el-option>
</el-select>
<el-button @click="applyUser" icon="el-icon-plus"
size="small"
type="primary">
参加比赛
</el-button>
</div>
</template>
</el-transfer>
<!-- 个人项目-->
<template v-if="activityTableData.eveProjectType==='1'">
<div style="display: flex;margin: 20px 0">
<el-divider content-position="left">
单项报名人数最多{{activityTableData.athleteMaxNum}}
人，该队已有{{applyUserTableData.length}}
名成员，还可报名{{activityTableData.athleteMaxNum-applyUserTableData.length}}
人
。
</el-divider>
</div>
</template>
<!-- 团体项目-->
<template v-if="activityTableData.eveProjectType==='2'">
<!-- 如果是只需要报领队 -->
<div style="display: flex;margin: 20px 0;align-items: center;"
v-if="activityTableData.isLeader">
<el-divider content-position="left">每支队伍最少运动员人数
{{activityTableData.restrictMaxNum}} 人，最多
{{activityTableData.restrictMaxNum}} 人，该队运动员已有
{{activityTableData.athleteMaxNum}} 名成员，还可报名
{{activityTableData.restrictMaxNum-applyUserTableData.filter(v=>v.identity.includes('1')).length}}
人。
</el-divider>
</div>
<!--如果是正常报名-->
<template v-if="!activityTableData.isLeader">
<div style="display: flex;margin: 20px 0;align-items: center;">
<el-divider content-position="left">每支队伍最多
{{activityTableData.restrictMaxNum}}
人，其中领队{{activityTableData.leanderNum}}人，
教练{{activityTableData.coachNum}}人，
运动员必须设置{{activityTableData.athleteMaxNum}}人，
替补{{activityTableData.substituteNum}}人。
男运动员最少{{activityTableData.restrictBoyNum?activityTableData.restrictBoyNum:'0'}}人，
女运动员最少{{activityTableData.restrictGirlNum?activityTableData.restrictGirlNum:'0'}}人【该队运动员已有
{{applyUserTableData.filter(v=>v.identity.includes('1')).length}}
人，还可报名
{{activityTableData.athleteMaxNum-applyUserTableData.filter(v=>v.identity.includes('1')).length}}人；
替补还可以报{{activityTableData.substituteNum-applyUserTableData.filter(v=>v.identity.includes('5')).length}}人（非必需）】
</el-divider>
</div>
<el-button @click="setUserRole('4')"
icon="el-icon-check"
plain
size="small" type="primary"
v-if="activityTableData.deputyDirectorNum>0">
设置处级领导
</el-button>
<el-button @click="setUserRole('3')" icon="el-icon-check" plain
size="small"
type="primary"
v-if="activityTableData.leanderNum>0">设置领队
</el-button>
<el-button @click="setUserRole('2')" icon="el-icon-check" plain
size="small" type="primary"
v-if="activityTableData.coachNum>0">
设置教练
</el-button>
<!-- 个人项目-->
<template v-if="activityTableData.eveProjectType==='1'">
<div style="display: flex;margin: 20px 0">
<el-divider content-position="left">
单项报名人数最多{{activityTableData.athleteMaxNum}}
人，该队已有{{applyUserTableData.length}}
名成员，还可报名{{activityTableData.athleteMaxNum-applyUserTableData.length}}
人
。
</el-divider>
</div>
</template>
<!-- 团体项目-->
<template v-if="activityTableData.eveProjectType==='2'">
<!-- 如果是只需要报领队 -->
<div style="display: flex;margin: 20px 0;align-items: center;"
v-if="activityTableData.isLeader">
<el-divider content-position="left">每支队伍最少运动员人数
{{activityTableData.restrictMaxNum}} 人，最多
{{activityTableData.restrictMaxNum}} 人，该队运动员已有
{{activityTableData.athleteMaxNum}} 名成员，还可报名
{{activityTableData.restrictMaxNum-applyUserTableData.filter(v=>v.identity.includes('1')).length}}
人。
</el-divider>
</div>
<!--如果是正常报名-->
<template v-if="!activityTableData.isLeader">
<div style="display: flex;margin: 20px 0;align-items: center;">
<el-divider content-position="left">每支队伍最多
{{activityTableData.restrictMaxNum}}
人，其中领队{{activityTableData.leanderNum}}人，
教练{{activityTableData.coachNum}}人，
运动员必须设置{{activityTableData.athleteMaxNum}}人，
替补{{activityTableData.substituteNum}}人。
男运动员最少{{activityTableData.restrictBoyNum?activityTableData.restrictBoyNum:'0'}}人，
女运动员最少{{activityTableData.restrictGirlNum?activityTableData.restrictGirlNum:'0'}}人【该队运动员已有
{{applyUserTableData.filter(v=>v.identity.includes('1')).length}}
人，还可报名
{{activityTableData.athleteMaxNum-applyUserTableData.filter(v=>v.identity.includes('1')).length}}人；
替补还可以报{{activityTableData.substituteNum-applyUserTableData.filter(v=>v.identity.includes('5')).length}}人（非必需）】
</el-divider>
<div style="padding-left: 10px">
<el-tooltip class="item"
content="系统中查询不到的人可以点击添加"
effect="dark"
placement="top">
<el-button
:disabled="(activityTableData.restrictMaxNum-applyUserTableData.length)<=0"
@click="openAddUser" circle icon="el-icon-plus"
type="danger"></el-button>
</el-tooltip>
</div>
</div>
<el-button @click="setUserRole('4')"
icon="el-icon-check"
plain
size="small" type="primary"
v-if="activityTableData.deputyDirectorNum>0">
设置处级领导
</el-button>
<el-button @click="setUserRole('3')" icon="el-icon-check" plain
size="small"
type="primary"
v-if="activityTableData.leanderNum>0">设置领队
</el-button>
<el-button @click="setUserRole('2')" icon="el-icon-check" plain
size="small" type="primary"
v-if="activityTableData.coachNum>0">
设置教练
</el-button>
<el-button @click="setUserRole('5')" icon="el-icon-check"
plain
size="small" type="primary"
v-if="activityTableData.substituteNum>0">
设置替补
</el-button>
<el-button @click="setUserRole('5')" icon="el-icon-check"
plain
size="small" type="primary"
v-if="activityTableData.substituteNum>0">
设置替补
</el-button>
<el-dropdown @command="changeTeam"
v-if="activityTableData.eveProjectType==2&&teamList.length>1">
<el-button size="small" type="primary">
修改小队<i class="el-icon-arrow-down el-icon--right"></i>
</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="{item}"
:key="item.id" v-for="item in teamList">
{{item.name}}
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</template>
</template>
<el-table :data="applyUserTableData"
@selection-change="handleSelectionChange" border
class="mt10" ref="multipleTable"
row-key="id" size="small"
stripe
v-loading="applyUserTabLoading">
<el-table-column :reserve-selection="true"
align="center" header-align="center"
type="selection"
width="55">
</el-table-column>
<el-table-column
align="center" header-align="center" label="序号"
type="index"
width="80">
</el-table-column>
<el-table-column
align="center" header-align="center" label="所属队"
prop="team" width="80">
</el-table-column>
<el-table-column
align="center" header-align="center" label="姓名"
prop="username" width="130">
</el-table-column>
<el-table-column
align="center" header-align="center" label="教工号"
prop="loginname" width="130">
</el-table-column>
<el-table-column
align="center" header-align="center" label="单位"
prop="unitname"
sortable>
</el-table-column>
<el-table-column
align="center" header-align="center" label="性别"
prop="sex" width="80">
</el-table-column>
<el-table-column
align="center" header-align="center" label="年龄"
prop="age" width="80">
</el-table-column>
<el-table-column
align="center" header-align="center" label="身份"
prop="identity" width="300px">
<template scope="{$index,row}">
<el-tag :disable-transitions="false"
@close="delApplyUser($index,row,'4')"
closable
effect="light"
type="info"
v-if="row.identity.includes('4')">处级领导
</el-tag>
<el-tag :disable-transitions="false"
@close="delApplyUser($index,row,'3')"
closable
effect="light"
type="warning"
v-if="row.identity.includes('3')">领队
</el-tag>
<el-tag :disable-transitions="false"
@close="delApplyUser($index,row,'2')"
closable
effect="light"
type="success"
v-if="row.identity.includes('2')">教练
</el-tag>
<el-tag :disable-transitions="false"
@close="delApplyUser($index,row,'1')"
closable
effect="light"
v-if="row.identity.includes('1')">运动员
</el-tag>
<el-tag :disable-transitions="false"
@close="delApplyUser($index,row,'5')"
closable
effect="light"
type="danger"
v-if="row.identity.includes('5')">替补
</el-tag>
<el-dropdown @command="changeTeam"
v-if="activityTableData.eveProjectType==2&&teamList.length>1">
<el-button size="small" type="primary">
修改小队<i class="el-icon-arrow-down el-icon--right"></i>
</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="{item}"
:key="item.id" v-for="item in teamList">
{{item.name}}
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</template>
</template>
</el-table-column>
</el-table>
<el-table :data="applyUserTableData"
@selection-change="handleSelectionChange" border
class="mt10" ref="multipleTable"
row-key="id" size="small"
stripe
v-loading="applyUserTabLoading">
</el-card>
</el-tab-pane>
</el-tabs>
<el-dialog
:append-to-body="true"
:visible.sync="addUserDialogVisible"
title="添加人员"
width="40%"
>
<el-form :model="formData" label-width="100px" ref="lsryform">
<el-form-item label="所在队伍" prop="teamId"
:rules="{required: true, message: '请选择所在队伍', trigger: 'blur'}">
<el-select clearable disabled placeholder="请选择所在队伍" style="width: 100%"
v-model="formData.teamId">
<el-option
:key="item.id"
:label="item.name"
:value="item.id"
v-for="item in teamList">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="姓名" prop="userId" :rules="{required: true, message: '请输入工号或者姓名查询', trigger: 'blur'}">
<el-select
:remote-method="querySearchAsync"
@change="addUserChange"
filterable
placeholder="请输入工号或者下姓名查询"
remote
reserve-keyword
style="width: 100%"
v-model="formData.userId">
<el-option
:key="item.id"
:label="item.username+'-'+item.loginname"
:value="item.id"
v-for="item in lsUserList">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="工号" prop="loginname" :rules="{required: true, message: '请填写工号', trigger: 'blur'}">
<el-input disabled maxlength="50" placeholder="请填写工号"
type="text" v-model="formData.loginname"></el-input>
</el-form-item>
<el-form-item label="性别" prop="sex" :rules="{required: true, message: '性别', trigger: 'blur'}">
<el-radio-group v-model="formData.sex">
<el-radio :label="'男'" border>男</el-radio>
<el-radio :label="'女'" border>女</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="出生年月" prop="birthday" :rules="{required: true, message: '选择出生年月', trigger: 'blur'}">
<el-date-picker
style="width: 100%"
v-model="formData.birthday"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择出生年月">
</el-date-picker>
</el-form-item>
<el-form-item label="电话" prop="mobile">
<el-input maxlength="50" placeholder="请填写电话" type="text"
v-model="formData.mobile"></el-input>
</el-form-item>
<el-form-item label="身份证号" prop="idcard">
<el-input maxlength="30" placeholder="请填写身份证号" type="text"
v-model="formData.idcard"></el-input>
</el-form-item>
<el-form-item label="所在单位" prop="unitId" :rules="{required: true, message: '请选择所在单位', trigger: 'blur'}">
<el-select clearable filterable placeholder="请选择所在单位" style="width: 100%"
v-model="formData.unitId">
<el-option
:key="item.id"
:label="item.name"
:value="item.id"
v-for="item in unitOptions">
</el-option>
</el-select>
</el-form-item>
</el-form>
<el-table-column :reserve-selection="true"
align="center" header-align="center"
type="selection"
width="55">
</el-table-column>
<el-table-column
align="center" header-align="center" label="序号"
type="index"
width="80">
</el-table-column>
<el-table-column
align="center" header-align="center" label="所属队"
prop="team" width="80">
</el-table-column>
<el-table-column
align="center" header-align="center" label="姓名"
prop="username" width="130">
</el-table-column>
<el-table-column
align="center" header-align="center" label="教工号"
prop="loginname" width="130">
</el-table-column>
<el-table-column
align="center" header-align="center" label="单位"
prop="unitname"
sortable>
</el-table-column>
<el-table-column
align="center" header-align="center" label="性别"
prop="sex" width="80">
</el-table-column>
<el-table-column
align="center" header-align="center" label="年龄"
prop="age" width="80">
</el-table-column>
<el-table-column
align="center" header-align="center" label="身份"
prop="identity" width="300px">
<template scope="{$index,row}">
<el-tag :disable-transitions="false"
@close="delApplyUser($index,row,'4')"
closable
effect="light"
type="info"
v-if="row.identity.includes('4')">处级领导
</el-tag>
<el-tag :disable-transitions="false"
@close="delApplyUser($index,row,'3')"
closable
effect="light"
type="warning"
v-if="row.identity.includes('3')">领队
</el-tag>
<el-tag :disable-transitions="false"
@close="delApplyUser($index,row,'2')"
closable
effect="light"
type="success"
v-if="row.identity.includes('2')">教练
</el-tag>
<el-tag :disable-transitions="false"
@close="delApplyUser($index,row,'1')"
closable
effect="light"
v-if="row.identity.includes('1')">运动员
</el-tag>
<el-tag :disable-transitions="false"
@close="delApplyUser($index,row,'5')"
closable
effect="light"
type="danger"
v-if="row.identity.includes('5')">替补
</el-tag>
</template>
</el-table-column>
</el-table>
</el-card>
</el-tab-pane>
</el-tabs>
</div>
`,
<span class="dialog-footer" slot="footer">
<el-button @click="addUserDialogVisible = false">取 消</el-button>
<el-button @click="doAddUser" type="primary">确 定</el-button>
</span>
</el-dialog>
</div>
`,
store,
mixins: [initTableMixins],
data() {
@@ -253,10 +347,85 @@ var ACTIVITY_SPORTS_APPLY_USER = {
applyUserTabLoading: false,
selection: [],
//全部可报名的人员
userList: []
userList: [],
addUserDialogVisible: false,
lsUserList: [],
unitOptions: []
}
},
methods: {
doAddUser() {
this.$refs["lsryform"].validate(async (valid) => {
if (valid) {
const birthDate = this.$moment(this.formData.birthday);
const age = this.$moment().diff(birthDate, 'years');
const data = {
isAddUser: true,
age: age,
unitname: this.unitOptions.find(x => x.id === this.formData.unitId).name,
...this.formData
}
const newUser = this.userList.find(a => a.id === this.formData.userId)
if (newUser) {
this.notifyWarning('该用户已存在左侧选择框内，请从左侧选择框内选择！')
return
}
this.applyUserList.push(data)
this.flushApplyUser(this.applyUserList)
this.sortApplyUserTableData()
this.$notify.success({title: '成功', message: '已添加'});
this.addUserDialogVisible = false
} else {
this.$notify.error({title: '错误', message: '存在未填写的的必填项'});
}
})
},
async addUserChange(val) {
const user = this.lsUserList.find(l => l.id === val)
this.$set(this.formData, 'eventId', this.eventData.eventId)
this.$set(this.formData, 'activityId', this.activityTableData.activityId)
this.$set(this.formData, 'team', this.applyFromData.teamName)
this.$set(this.formData, 'teamId', this.applyFromData.teamId)
this.$set(this.formData, 'userId', user ? user.id : null)
this.$set(this.formData, 'loginname', user ? user.loginname : null)
this.$set(this.formData, 'username', user ? user.username : null)
this.$set(this.formData, 'unitId', user ? user.unitId : null)
this.$set(this.formData, 'sex', user ? user.sex : null)
this.$set(this.formData, 'idcard', user ? user.idCard : null)
this.$set(this.formData, 'mobile', user ? user.mobile : null)
this.$set(this.formData, 'birthday', user ? user.birthday : null)
this.$set(this.formData, 'awardsMode', this.activityTableData.eveProjectType)
this.$set(this.formData, 'status', 2)
},
async querySearchAsync(queryString) {
/* const leftApplyUserList = this.leftApplyUserList.map(m => m.loginname)
const rightApplyUserList = this.rightApplyUserList.map(m => m.loginname)
const loginnames = leftApplyUserList.concat(rightApplyUserList)*/
const loginnames = this.applyUserTableData.map(m => m.loginname)
const {code, data} = await $.get("/platform/activity/apply/getSysUser", {
loginnames: JSON.stringify(loginnames),
queryString: queryString
})
if (code === 0) {
this.lsUserList = data
} else {
this.lsUserList = []
}
},
openAddUser() {
this.formData = {
teamName: this.applyFromData.teamName,
teamId: this.applyFromData.teamId,
identity: ['1']
}
this.addUserDialogVisible = true
if (this.$refs['lsryform']) {
this.$refs['lsryform'].resetFields()
}
},
async openUniteApply(data) {
this.activityTableData = data
//固定模式
@@ -299,7 +468,7 @@ var ACTIVITY_SPORTS_APPLY_USER = {
isMenWomenTwo: data.isMenWomen
})
if (resp.code === 0) {
const { users, awardsModeT, awardsModeG, team, activity, getEvent } = resp.data
const {users, awardsModeT, awardsModeG, team, activity, getEvent} = resp.data
this.activityData = activity
this.eventData = getEvent
this.teamList = team
@@ -332,7 +501,16 @@ var ACTIVITY_SPORTS_APPLY_USER = {
let message = null
if (flag) {
const { athletesMaxNum, restrictGirlNum, restrictBoyNum, leanderNum, coachNum, deputyDirectorNum, substituteNum, projectType } =
const {
athletesMaxNum,
restrictGirlNum,
restrictBoyNum,
leanderNum,
coachNum,
deputyDirectorNum,
substituteNum,
projectType
} =
this.eventData
const applyUserList = clone(this.applyUserList)
@@ -388,7 +566,7 @@ var ACTIVITY_SPORTS_APPLY_USER = {
message = teamName + "女运动员至少设置" + restrictGirlNum + "人"
break
}
const manYdyNum = teamApplyData[i].filter((v) => v.sex === "女" && v.identity.includes("1")).length
const manYdyNum = teamApplyData[i].filter((v) => v.sex === "男" && v.identity.includes("1")).length
if (restrictBoyNum > 0 && manYdyNum < restrictBoyNum) {
msgFlag = false
message = teamName + "男运动员至少设置" + restrictBoyNum + "人"
@@ -397,7 +575,7 @@ var ACTIVITY_SPORTS_APPLY_USER = {
}
}
if (!msgFlag && !this.activityTableData.isLeader) {
this.$notify.warning({ title: "警告", message: message })
this.$notify.warning({title: "警告", message: message})
return
}
}
@@ -406,7 +584,7 @@ var ACTIVITY_SPORTS_APPLY_USER = {
if (!flag) {
msg = "确定要保存吗？"
}
const confirm = await this.$confirm(msg, "提示", { type: "warning" })
const confirm = await this.$confirm(msg, "提示", {type: "warning"})
if (confirm === "confirm") {
const loading = this.$loading({
lock: true,
@@ -432,15 +610,15 @@ var ACTIVITY_SPORTS_APPLY_USER = {
},
//点击添加运动员操作
async applyUser() {
const { isManGirlNum, restrictGirlNum, restrictBoyNum } = this.eventData
const {isManGirlNum, restrictGirlNum, restrictBoyNum} = this.eventData
if (!this.rightApplyUserList.length) {
this.$notify.warning({ title: "警告", message: "请在右侧列表中选择人员" })
this.$notify.warning({title: "警告", message: "请在右侧列表中选择人员"})
return
}
//如果是单项
if (this.activityTableData.eveProjectType === "1") {
if (this.activityTableData.eveProjectType === '1') {
if (this.applyUserTableData.length + this.rightApplyUserList.length > this.activityTableData.athleteMaxNum) {
this.$notify({
title: "警告",
@@ -492,7 +670,7 @@ var ACTIVITY_SPORTS_APPLY_USER = {
}
}
const resp = await this.$axios.post(loc() + "/getActivityData", { activityId: this.activityData.id })
const resp = await this.$axios.post(loc() + "/getActivityData", {activityId: this.activityData.id})
const aa = resp.data.filter((v) => {
return this.rightApplyUserList.includes(v.userId)
})
@@ -532,7 +710,7 @@ var ACTIVITY_SPORTS_APPLY_USER = {
this.applyUserList.push(data)
//如果是单项判断每个人可以报几项
if (this.eventData.restrictRegNumber >= 0 && this.activityTableData.eveProjectType === "1") {
if (this.eventData.restrictRegNumber >= 0 && this.activityTableData.eveProjectType === '1') {
cc.forEach((z) => {
if (z[0]) {
const index = this.applyUserList.findIndex((x) => x.userId === z[0].userId && x.id === null)
@@ -545,7 +723,7 @@ var ACTIVITY_SPORTS_APPLY_USER = {
})
//如果是单项判断每个人可以报几项
if (this.eventData.restrictRegNumber >= 0 && this.activityTableData.eveProjectType === "1") {
if (this.eventData.restrictRegNumber >= 0 && this.activityTableData.eveProjectType === '1') {
const usernames = cc.map((v) => v[0].username).join(",")
if (usernames) {
this.$notify({
@@ -586,7 +764,7 @@ var ACTIVITY_SPORTS_APPLY_USER = {
this.$refs.multipleTable.clearSelection()
},
changeTeam(command) {
const { item } = command
const {item} = command
if (!this.selection.length) {
this.$notify({
title: "警告",
@@ -616,7 +794,7 @@ var ACTIVITY_SPORTS_APPLY_USER = {
this.$refs.multipleTable.clearSelection()
},
async findUserOne(id) {
const { data } = await this.$axios.post(loc() + "/findUserOne", { id })
const {data} = await this.$axios.post(loc() + "/findUserOne", {id})
return data
},
async delApplyUser(index, row, num) {
@@ -666,6 +844,7 @@ var ACTIVITY_SPORTS_APPLY_USER = {
getTransProp(user) {
return {
id: user.id,
loginname: user.loginname,
name: user.username + "（" + (user.sex ? user.sex : "") + "-" + user.loginname + "）"
}
},
@@ -681,5 +860,8 @@ var ACTIVITY_SPORTS_APPLY_USER = {
this.userList = []
}
},
async created() {}
async created() {
this.unitOptions = await this.$businessTool.listUnit()
}
}
src/main/resources/views/platform/zhgh/activity/sports/applyUser/index.html
+1 -1
View File
@@ -237,7 +237,7 @@ layout("/layouts/platform.html"){
</template>
<template #public>
<activity-sports-delete-user @flip="flip" ref="activityDeleteUser"></activity-sports-delete-user>
<activity-sports-delete-user @flip="doSearch" ref="activityDeleteUser"></activity-sports-delete-user>
</template>
</guava>
src/main/resources/views/platform/zhgh/activity/sports/infoManage/addActivity.js
+1 -1
View File
@@ -270,7 +270,7 @@ let ACTIVITY_SPORTS_ADD_ACTIVITY = {
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item prop="files" label="封面图" v-if="formData.applyWay.includes(1)">
<el-form-item prop="files" label="封面图" >
<file-upload
:value.sync="formData.image"
:upload_number="1"
src/main/resources/views/platform/zhgh/dayofficework/evaluation/apply/apply.js
+3 -2
View File
@@ -2,7 +2,7 @@ const apply_component = {
template: /*language=HTML*/ `
<el-dialog title="填写申请" :visible.sync="dialogVisible" width="70%" top="50px" class="ele-dialog-form">
<el-form :model="formData" ref="formRef" :rules="formRules" label-width="120px">
<template v-if="this.formData.honorType == '个人荣誉'">
<template v-if="this.formData.honorTypeName == '个人荣誉'">
<el-row :gutter="20">
<el-col :span="12">
<el-form-item prop="userName" label="姓名">
@@ -175,9 +175,10 @@ const apply_component = {
this.$set(this.formData, "evaluateId", activity.id)
this.$set(this.formData, "honorTypeId", activity.honorTypeId)
this.$set(this.formData, "honorType", activity.honorType)
this.$set(this.formData, "honorTypeName", activity.honorTypeName)
this.$set(this.formData, "honorId", activity.honorId)
if (activity.honorType.includes('集体')) {
if (activity.honorTypeName.includes('集体')) {
this.getCollectiveInfo()
}
})
src/main/resources/views/platform/zhgh/dayofficework/warmthCondolence/apply/index.html
+1
View File
@@ -146,6 +146,7 @@ layout("/layouts/platform.html"){
.then((res) => {
if (res.code === 0) {
this.$message.success(res.msg)
this.$store.dispatch("pjaxRoute", "/platform/warmthCondolence/mine")
}
})
}
src/main/resources/views/platform/zhgh/dayofficework/warmthCondolence/notice/index.html
+2 -2
View File
@@ -129,13 +129,13 @@ layout("/layouts/platform.html"){
}
})
},
doDelete(id) {
doDelete(row) {
this.$confirm("您确定要删除吗？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
this.$axios.post("/platform/warmthCondolenceNotice/delete", { id: id }).then((res) => {
this.$axios.post("/platform/warmthCondolenceNotice/delete", { id: row.id }).then((res) => {
if (res.code === 0) {
this.$message.success(res.msg)
this.doSearch()
src/main/resources/views/platform/zhgh/staffmanage/member/common/audit/memberAuditChangeInfo.js
+6 -2
View File
@@ -17,12 +17,16 @@ const MEMBER_AUDIT_CHANGE_INFO = {
<el-descriptions-item label="在职状态">{{ viewData.userState }}</el-descriptions-item>
<template v-if="viewData.retireDate">
<el-descriptions-item label="退休时间">{{ $moment(viewData.retireDate).format('YYYY-MM-DD') }}</el-descriptions-item>
<el-descriptions-item label="人员类型">{{ viewData.personType }}</el-descriptions-item>
</template>
<template>
<el-descriptions-item label="人员类型">{{ viewData.personType }}</el-descriptions-item>
<el-descriptions-item></el-descriptions-item>
</template>
<el-descriptions-item label="人员类型">{{ viewData.personType }}</el-descriptions-item>
<el-descriptions-item label="学历">{{ viewData.education }}</el-descriptions-item>
<el-descriptions-item label="政治面貌">{{ viewData.political }}</el-descriptions-item>
<el-descriptions-item label="婚姻状况">{{ viewData.marriage || '' }}</el-descriptions-item>
<el-descriptions-item label="证件号码" span="2">{{ viewData.idCard }}</el-descriptions-item>
<el-descriptions-item label="证件号码">{{ viewData.idCard }}</el-descriptions-item>
<el-descriptions-item label="联系电话">{{ viewData.mobile }}</el-descriptions-item>
<el-descriptions-item label="电子邮箱">{{ viewData.email }}</el-descriptions-item>
<el-descriptions-item label="是否会员">{{ viewData.member ? '是' : '否' }}</el-descriptions-item>
src/main/resources/views/platform/zhgh/staffmanage/member/common/audit/memberAuditTable.js
+7 -6
View File
@@ -48,28 +48,29 @@ const MEMBER_AUDIT_TABLE = {
<el-table :data="tableData" :size="tableSize" @sort-change="pageOrder" ref="table" row-key="id" style="width: 100%">
<el-table-column :index="indexMethod" align="center" header-align="center"
label="序号" type="index" width="80px"></el-table-column>
<el-table-column :label="column.label" :prop="column.prop"
<el-table-column v-for="column in tableColumns" :label="column.label"
:prop="column.prop" :key="column.prop"
:sortable="column.sortable" :width="column.width"
align="center" header-align="center" min-width="100px"
show-overflow-tooltip v-for="column in tableColumns">
<template scope="{row}" v-if="column.prop=='loginname'">
show-overflow-tooltip>
<template slot-scope="{row}" v-if="column.prop=='loginname'">
<el-link @click="openView(row.userId)" type="primary">{{row.loginname}}</el-link>
</template>
</el-table-column>
<el-table-column header-align="center" label="变更类型" prop="changeType" show-overflow-tooltip sortable>
<template scope="{row}">
<template slot-scope="{row}">
<span style="color: #0e78c5;cursor: pointer" @click="openChangeView(row)">
{{getChangeTypes(row.changeTypes)}}
</span>
</template>
</el-table-column>
<el-table-column header-align="center" label="变更时间" prop="applyDateTime" show-overflow-tooltip sortable>
<template scope="{row}">
<template slot-scope="{row}">
<span>{{ row.applyDateTime }}</span>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="200px">
<template scope="{row}">
<template slot-scope="{row}">
<el-button size="mini" type="primary" @click="openChangeView(row)">查看</el-button>
<el-button v-if="row.processInstanceTaskStatus==='ACTIVE'
&& !(row.processInstanceNodeCode == 10 && row.changeOrigin == 'BRANCH_UNION')"
src/main/resources/views/platform/zhgh/staffmanage/member/common/change/memberChangeInfo.js
+8 -4
View File
@@ -10,10 +10,14 @@ const MEMBER_CHANGE_INFO = {
<el-descriptions-item label="性别">{{ viewData.sex }}</el-descriptions-item>
<el-descriptions-item label="民族">{{ viewData.nation }}</el-descriptions-item>
<el-descriptions-item label="在职状态">{{ viewData.userState }}</el-descriptions-item>
<template v-if="viewData.retireDate">
<el-descriptions-item label="退休时间">{{ $moment(viewData.retireDate).format('YYYY-MM-DD') }}</el-descriptions-item>
</template>
<el-descriptions-item label="人员类型">{{ viewData.personType }}</el-descriptions-item>
<template v-if="viewData.retireDate">
<el-descriptions-item label="退休时间">{{ $moment(viewData.retireDate).format('YYYY-MM-DD') }}</el-descriptions-item>
<el-descriptions-item label="人员类型">{{ viewData.personType }}</el-descriptions-item>
</template>
<template>
<el-descriptions-item label="人员类型">{{ viewData.personType }}</el-descriptions-item>
<el-descriptions-item></el-descriptions-item>
</template>
<el-descriptions-item label="学历">{{ viewData.education }}</el-descriptions-item>
<el-descriptions-item label="政治面貌">{{ viewData.political }}</el-descriptions-item>
<el-descriptions-item label="婚姻状况">{{ viewData.marriage || '' }}</el-descriptions-item>
src/main/resources/views/platform/zhgh/staffmanage/member/statistics/comprehensive/index.html
+37 -8
View File
@@ -1,11 +1,10 @@
<!--#
layout("/layouts/platform.html"){
#-->
<style></style>
<div id="app">
<guava ref="guava">
<template>
<query-form @query="assignmentTableData" ref="queryFormRef"></query-form>
<query-form @search="search" ref="queryFormRef"></query-form>
<el-card shadow="never">
<table-tool label="会员列表">
<el-select
@@ -151,14 +150,44 @@ layout("/layouts/platform.html"){
pageForm.userStates = JSON.stringify(this.pageForm.userStates)
this.$downLoad("/platform/member/statistics/comprehensive/doExport", pageForm)
},
assignmentTableData(data) {
this.tableData = data.list
this.pageForm = this.$refs.queryFormRef.pageForm
this.pageForm.totalCount = data.totalCount
search(pageForm) {
this.pageForm = {
...this.pageForm,
...pageForm,
}
this.pageData()
},
pageData() {
this.$refs.queryFormRef.pageForm = this.pageForm
this.$refs.queryFormRef.pageData()
const pageForm = clone(this.pageForm)
pageForm.age = JSON.stringify(this.pageForm.age)
pageForm.unionId = JSON.stringify(this.pageForm.unionId)
pageForm.unitId = JSON.stringify(this.pageForm.unitId)
pageForm.sexTypes = JSON.stringify(this.pageForm.sexTypes)
pageForm.memberTypes = JSON.stringify(this.pageForm.memberTypes)
pageForm.personTypes = JSON.stringify(this.pageForm.personTypes)
pageForm.preparedBys = JSON.stringify(this.pageForm.preparedBys)
pageForm.memberStatus = JSON.stringify(this.pageForm.memberStatus)
pageForm.userStates = JSON.stringify(this.pageForm.userStates)
if (pageForm.birthdayRange && pageForm.birthdayRange.length > 0) {
pageForm.startDate = pageForm.birthdayRange[0]
pageForm.endDate = pageForm.birthdayRange[1]
}
if (pageForm.joinMemberRange && pageForm.joinMemberRange.length > 0) {
pageForm.startJoinDate = pageForm.joinMemberRange[0]
pageForm.endJoinDate = pageForm.joinMemberRange[1]
}
if (pageForm.leaveMemberRange && pageForm.leaveMemberRange.length > 0) {
pageForm.startLeaveDate = pageForm.leaveMemberRange[0]
pageForm.endLeaveDate = pageForm.leaveMemberRange[1]
}
this.$axios.post("/platform/member/statistics/comprehensive/pageData", pageForm).then((res) => {
if (res.code === 0) {
this.tableData = res.data.list
this.pageForm.totalCount = res.data.totalCount
} else {
this.$message.error(res.msg)
}
})
}
}
})
src/main/resources/views/platform/zhgh/staffmanage/member/statistics/comprehensive/queryForm.js
+59 -48
View File
@@ -12,6 +12,16 @@ const MEMBER_STATISTICS_COMPREHENSIVE_QUERY_FORM = {
placeholder="选择年" :clearable="false">
</el-date-picker>
</search-item>
<search-item label="入校月份">
<el-date-picker
type="month"
style="width: 100%"
v-model="pageForm.month"
placeholder="请选择入校月份搜索">
</el-date-picker>
</search-item>
<search-item label="姓名工号">
<el-input placeholder="请输入姓名或者工号" clearable v-model="pageForm.searchKeyword"></el-input>
</search-item>
@@ -77,22 +87,37 @@ const MEMBER_STATISTICS_COMPREHENSIVE_QUERY_FORM = {
</search-item>
<search-item label="出生日期">
<el-date-picker
v-model="pageForm.startDate"
type="date"
@change="determineStartDate"
v-model="pageForm.birthdayRange"
type="daterange"
style="width: 100%"
placeholder="选择开始出生日期">
</el-date-picker>
</search-item>
<search-item label="出生日期">
<el-date-picker
v-model="pageForm.endDate"
type="date"
@change="determineEndDate"
style="width: 100%"
placeholder="选择结束出生日期">
value-format="yyyy-MM-dd"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
</search-item>
<search-item label="入会日期">
<el-date-picker
v-model="pageForm.joinMemberRange"
type="daterange"
style="width: 100%"
value-format="yyyy-MM-dd"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
</search-item>
<search-item label="离会日期">
<el-date-picker
v-model="pageForm.leaveMemberRange"
type="daterange"
style="width: 100%"
value-format="yyyy-MM-dd"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
</search-item>
<search-item label="年龄区间">
<div style="display: flex;align-items: center">
<el-slider
@@ -145,6 +170,7 @@ const MEMBER_STATISTICS_COMPREHENSIVE_QUERY_FORM = {
userStates: [],
memberStatus: [],
year: moment().format("YYYY"),
month: "",
roleIds: [],
age: [0, 0],
minAge: 0,
@@ -153,8 +179,10 @@ const MEMBER_STATISTICS_COMPREHENSIVE_QUERY_FORM = {
sexTypes: [],
reverseSelection: false,
activityUserCnd: "",
startDate: "",
endDate: ""
// 出生年月日期范围
birthdayRange: [],
joinMemberRange: [],
leaveMemberRange: [],
},
personTypeOptions: [],
preparedByOptions: [],
@@ -176,6 +204,16 @@ const MEMBER_STATISTICS_COMPREHENSIVE_QUERY_FORM = {
components: {
"member-cnd": httpVueLoader("/components/module/member/MemberCnd.vue?v=" + new Date().getTime())
},
computed: {
monthPickerOptions() {
return {
disabledDate(time) {
// 只能选择与 `year` 相同的年份
return time.getFullYear() !== parseInt(this.pageForm.year);
}
};
}
},
methods: {
determineEndDate() {
if (this.pageForm.startDate) {
@@ -186,15 +224,6 @@ const MEMBER_STATISTICS_COMPREHENSIVE_QUERY_FORM = {
}
this.pageForm.endDate = this.pageForm.endDate.toLocaleDateString().replaceAll("/", "-")
},
determineStartDate() {
if (this.pageForm.endDate) {
if (Date.parse(this.pageForm.startDate) > Date.parse(this.pageForm.endDate)) {
this.pageForm.startDate = ""
this.$notify.warning("开始时间不能大于结束时间")
}
}
this.pageForm.startDate = this.pageForm.startDate.toLocaleDateString().replaceAll("/", "-")
},
tagClick(key, val) {
let idx = this.pageForm[key].indexOf(val)
if (idx !== -1) {
@@ -259,8 +288,9 @@ const MEMBER_STATISTICS_COMPREHENSIVE_QUERY_FORM = {
this.pageForm.activityUserCnd = ""
this.pageForm.age = [0, 0]
this.pageForm.reverseSelection = false
this.pageForm.startDate = ""
this.pageForm.endDate = ""
this.pageForm.birthdayRange = []
this.pageForm.joinMemberRange = []
this.pageForm.leaveMemberRange = []
this.doSearch()
},
getMenuOptions() {
@@ -270,9 +300,6 @@ const MEMBER_STATISTICS_COMPREHENSIVE_QUERY_FORM = {
}
})
},
setNowYear() {
this.$set(this.pageForm, "year", moment().format("YYYY"))
},
async initData() {
if (this.$auth.hasRoleOr(["SYSADMIN", "SCHOOL_UNION_ADMIN"])) {
this.unions = await this.$businessTool.listUnion(this.pageForm.unionId)
@@ -308,28 +335,12 @@ const MEMBER_STATISTICS_COMPREHENSIVE_QUERY_FORM = {
this.pageForm.isUnion = params.isUnion
this.pageData()
},
pageData() {
const pageForm = clone(this.pageForm)
pageForm.age = JSON.stringify(this.pageForm.age)
pageForm.unionId = JSON.stringify(this.pageForm.unionId)
pageForm.unitId = JSON.stringify(this.pageForm.unitId)
pageForm.sexTypes = JSON.stringify(this.pageForm.sexTypes)
pageForm.memberTypes = JSON.stringify(this.pageForm.memberTypes)
pageForm.personTypes = JSON.stringify(this.pageForm.personTypes)
pageForm.preparedBys = JSON.stringify(this.pageForm.preparedBys)
pageForm.memberStatus = JSON.stringify(this.pageForm.memberStatus)
pageForm.userStates = JSON.stringify(this.pageForm.userStates)
this.$axios.post("/platform/member/statistics/comprehensive/pageData", pageForm).then((data) => {
if (data.code === 0) {
this.$emit("query", data.data)
} else {
this.$message.error(data.msg)
}
})
doSearch() {
this.$emit('search', this.pageForm)
}
},
created() {
this.initData()
this.pageData()
this.doSearch()
}
}
src/main/resources/views/platform/zhgh/welfare/select/optionSelect.js
+39 -7
View File
@@ -138,16 +138,24 @@ const optionSelect = {
<!-- 联系电话输入 -->
<div class="confirm-mobile-section">
<div class="confirm-section-title">联系信息</div>
<el-form :model="contactForm" ref="contactForm" :rules="contactRules">
<el-form-item prop="mobile">
<el-form :model="contactForm" ref="contactForm" :rules="contactRules" label-width="80px">
<el-form-item prop="mobile" label="联系电话">
<el-input
v-model="contactForm.mobile"
placeholder="请输入手机号码"
maxlength="11"
clearable>
<template slot="prepend">联系电话</template>
</el-input>
</el-form-item>
<el-form-item v-if="projectInfo.provideMode == 3" prop="receiveAddress" label="收货地址" :rules="[{ required: true, message: '请选择收货地址', trigger: 'change' }]">
<el-select v-model="contactForm.receiveAddress" placeholder="请选择收货地址" style="width: 100%">
<el-option v-for="item in addressOptions"
:key="item.id"
:label="item.userName + ' ' + item.tel + ' ' + item.province + ' ' + item.city + ' ' + item.county + ' ' + item.addressDetail"
:value="item.userName + ' ' + item.tel + ' ' + item.province + ' ' + item.city + ' ' + item.county + ' ' + item.addressDetail">
</el-option>
</el-select>
</el-form-item>
</el-form>
</div>
@@ -222,7 +230,8 @@ const optionSelect = {
showOptionDetailDialog: false, // 选项详情弹窗
selectedOption: null, // 当前选中的选项
contactForm: {
mobile: "" // 联系电话
mobile: "", // 联系电话,
receiveAddress: ""
},
contactRules: {
mobile: [
@@ -316,7 +325,8 @@ const optionSelect = {
this.selectedRadioId = null
this.contactForm = {
mobile: ""
mobile: "",
receiveAddress: ""
}
this.getProjectInfo()
@@ -329,6 +339,11 @@ const optionSelect = {
this.projectInfo = res.data
this.deadlineTime = this.projectInfo.choiceTimeEnd
// 获取收货地址
if (this.projectInfo.provideMode === 3) {
this.getAddress()
}
// 初始化选项的selectNum为0
if (this.projectInfo.options) {
this.projectInfo.options.forEach((option) => {
@@ -365,6 +380,13 @@ const optionSelect = {
this.contactForm.mobile = this.userSelection[0]?.mobile
}
// 地址回显
if (this.projectInfo.provideMode === 3) {
if (this.userSelection && this.userSelection[0].receiveAddress) {
this.contactForm.receiveAddress = this.userSelection[0].receiveAddress
}
}
// 设置已选择的选项
if (this.projectInfo.options && this.userSelection.length > 0) {
// 单选模式
@@ -411,7 +433,8 @@ const optionSelect = {
{
selectOptionId: this.selectedRadioId,
selectNum: 1,
mobile: this.contactForm.mobile
mobile: this.contactForm.mobile,
receiveAddress: this.contactForm.receiveAddress
}
]
}
@@ -421,7 +444,8 @@ const optionSelect = {
selections = this.selectedOptions.map((option) => ({
selectOptionId: option.id,
selectNum: option.selectNum,
mobile: this.contactForm.mobile
mobile: this.contactForm.mobile,
receiveAddress: this.contactForm.receiveAddress
}))
}
@@ -501,6 +525,14 @@ const optionSelect = {
event.stopPropagation()
this.selectedOption = option
this.showOptionDetailDialog = true
},
// 获取收货地址
async getAddress() {
const resp = await this.$axios.post("/platform/welfare/addressManage/selectUserAddress")
if (resp.code === 0) {
this.addressOptions = resp.data
}
}
},
watch: {
src/main/resources/views/platform/zhgh/welfare/selectionSituation/index.html
+6
View File
@@ -99,6 +99,9 @@ layout("/layouts/platform.html"){
show-overflow-tooltip
v-for="column in tableColumns"
></el-table-column>
<el-table-column label="收货地址" prop="receiveAddress" v-if="provideMode===3"></el-table-column>
<el-table-column align="center" fixed="right" header-align="center" label="操作" width="100px">
<template slot-scope="{row}">
<el-button size="mini" type="primary" @click="proxySelect(row)">代选</el-button>
@@ -152,6 +155,9 @@ layout("/layouts/platform.html"){
return this.projectOptions.find((item) => item.id === this.pageForm.projectId).options
}
return []
},
provideMode() {
return this.projectOptions.find((item) => item.id === this.pageForm.projectId).provideMode
}
},
methods: {
src/main/resources/views/platform/zhghh5/activity/culture/signUp.html
+92 -10
View File
@@ -191,8 +191,8 @@ layout("/layouts/platform_h5.html"){
<van-icon name="location-o"></van-icon>
报名方式：
<span v-if="viewData.signUpMethod===1" style="color: var(--color-primary)">个人报名</span>
<span v-if="viewData.signUpMethod===2" style="color: var(--color-primary)">分工会报名</span>
<span v-if="viewData.signUpMethod===3" style="color: var(--color-primary)">组队报名</span>
<span v-if="viewData.signUpMethod===2" style="color: var(--color-primary)">组队报名</span>
<span v-if="viewData.signUpMethod===3" style="color: var(--color-primary)">分工会报名</span>
</div>
<div class="info-item" v-if="viewData.signUpMethod==3">
<van-icon name="location-o"></van-icon>
@@ -277,6 +277,51 @@ layout("/layouts/platform_h5.html"){
</div>
</div>
<!-- 分工会报名-->
<div v-else-if="viewData.signUpMethod===3" class="block">
<div class="notice-title left-tag-title">选择报名人员
<span v-if="viewData.userNumberLimit===2">
，报名人数 <span style="color: red">
{{viewData.unionTeamNum}}</span>人
</span>
</div>
<el-select
v-if="inApplyTime"
v-model="searchTeammateUserId"
filterable
clearable
remote
reserve-keyword
placeholder="请输入关键词"
:remote-method="queryTeammate">
<el-option
v-for="item in teammateOptions"
:key="item.userId"
:label="item.userName + '(' + item.loginName + ')'"
:value="item.userId">
</el-option>
</el-select>
<el-button v-if="inApplyTime" class="ml5" type="primary" icon="el-icon-plus"
@click="addTeamUser">添加
</el-button>
<el-table :data="teamUsers" class="mt10">
<el-table-column label="序号" type="index" width="60px"></el-table-column>
<el-table-column prop="userName" label="姓名"></el-table-column>
<el-table-column prop="loginName" label="工号"></el-table-column>
<!-- <el-table-column prop="sex" label="性别"></el-table-column>-->
<!-- <el-table-column prop="unitName" label="单位"></el-table-column>-->
<!-- <el-table-column prop="mobile" label="手机号"></el-table-column>-->
<el-table-column label="操作" width="100px"
v-if="inApplyTime">
<template slot-scope="scope">
<el-button type="danger" size="mini" @click="removeTeamUser(scope.$index)">删除
</el-button>
</template>
</el-table-column>
</el-table>
</div>
<div class="form-create-h5" v-if="isCustomForm">
<div class="notice-title left-tag-title">填写报名信息</div>
<form-create :value.sync="dynamicFormData" v-model="fapi" :rule="formCreateRule"
@@ -362,11 +407,22 @@ layout("/layouts/platform_h5.html"){
this.$axios.post("/platform/activity/culture/infoManage/activityInfo", {id: this.id}).then((res) => {
if (res.code === 0) {
this.viewData = res.data
//总人数限制
if (this.viewData.userNumberLimit === 1) {
} else if (this.viewData.userNumberLimit === 2) {
//分工会人数限制
const union = this.viewData.unionUserNumberLimit.find(v => v.id === this.$store.state.user.union.id)
this.viewData.unionTeamNum = union.limitNum
}
if (this.viewData.signUpMethod === 3) {
this.listTeamUserUnion()
} else {
this.listTeamUser()
}
if (this.viewData.formConfig) {
this.formCreateRule = formCreate.parseJson(this.viewData.formConfig.rule)
this.formCreateOption = formCreate.parseJson(this.viewData.formConfig.options)
}
this.listTeamUser()
}
})
}
@@ -382,6 +438,17 @@ layout("/layouts/platform_h5.html"){
}
})
},
//查询报名人员
listTeamUserUnion() {
this.$axios.post("/platform/activity/culture/applyUser/listTeamUserUnion", {activityId: this.id}).then((res) => {
if (res.code === 0) {
this.isSignUp = res.data.length > 0
this.teamUsers = res.data
this.defaultAddSelf()
this.customFormInit()
}
})
},
//表单回显
customFormInit() {
if (this.teamUsers && this.teamUsers.length > 0) {
@@ -467,7 +534,7 @@ layout("/layouts/platform_h5.html"){
})
return
}
if (this.teamUsers.length > this.viewData.teamNum) {
if (this.viewData.teamNum && this.teamUsers.length > this.viewData.teamNum) {
this.$dialog
.alert({
title: "提示",
@@ -499,7 +566,11 @@ layout("/layouts/platform_h5.html"){
this.$axios.post("/platform/activity/culture/applyUser/signUp", formData).then((res) => {
if (res.code === 0) {
this.$toast.success(res.msg)
this.listTeamUser()
if (this.viewData.signUpMethod === 3) {
this.listTeamUserUnion()
} else {
this.listTeamUser()
}
}
})
})
@@ -568,7 +639,7 @@ layout("/layouts/platform_h5.html"){
})
return
}
if (this.teamUsers.length > this.viewData.teamNum) {
if (this.viewData.teamNum && this.teamUsers.length > this.viewData.teamNum) {
this.$dialog
.alert({
title: "提示",
@@ -601,7 +672,11 @@ layout("/layouts/platform_h5.html"){
this.$axios.post("/platform/activity/culture/applyUser/signUp", formData).then((res) => {
if (res.code === 0) {
this.$toast.success(res.msg)
this.listTeamUser()
if (this.viewData.signUpMethod === 3) {
this.listTeamUserUnion()
} else {
this.listTeamUser()
}
}
})
})
@@ -618,7 +693,11 @@ layout("/layouts/platform_h5.html"){
this.$axios.post("/platform/activity/culture/applyUser/cancelSignUp", {activityId: this.id}).then((res) => {
if (res.code === 0) {
this.$toast.success(res.msg)
this.listTeamUser()
if (this.viewData.signUpMethod === 3) {
this.listTeamUserUnion()
} else {
this.listTeamUser()
}
this.fapi.resetFields()
}
})
@@ -628,7 +707,10 @@ layout("/layouts/platform_h5.html"){
//查询队友信息
queryTeammate(val) {
if (val) {
this.$axios.post("/platform/activity/culture/applyUser/queryTeammate", {keyword: val}).then((res) => {
this.$axios.post("/platform/activity/culture/applyUser/queryTeammate", {
keyword: val,
signUpMethod: this.viewData.signUpMethod
}).then((res) => {
if (res.code === 0) {
res.data.map(v => {
v.applyUserId = this.$store.state.user.id
@@ -663,7 +745,7 @@ layout("/layouts/platform_h5.html"){
})
return
}
if (this.teamUsers.length >= this.viewData.teamNum) {
if (this.viewData.teamNum && this.teamUsers.length >= this.viewData.teamNum) {
this.$dialog
.alert({
title: "提示",
src/main/resources/views/platform/zhghh5/activity/sports/applyUser.html
+16 -12
View File
@@ -8,7 +8,8 @@ layout("/layouts/platform_h5.html"){
</style>
<div id="app" v-cloak>
<van-nav-bar title="活动列表" @click-left="()=>this.$pjaxReplace('/platform/home')" left-arrow left-text="返回" placeholder fixed></van-nav-bar>
<van-nav-bar title="活动列表" @click-left="()=>this.$pjaxReplace('/platform/home')" left-arrow left-text="返回"
placeholder fixed></van-nav-bar>
<van-sticky offset-top="46px">
<van-dropdown-menu>
<year-van-dropdown-item :num="5" @change="pageData" v-model="pageForm.year"></year-van-dropdown-item>
@@ -81,16 +82,17 @@ layout("/layouts/platform_h5.html"){
<script>
<!--#include("eventNotification.js"){}#-->
new Vue({
const vue = new Vue({
el: "#app",
data() {
return {
activityId: GetQueryString("activityId"),
tableData: [],
finished: false,
loading: false,
pageForm: {
isActivity: 2,
applyStatus: 2,
applyStatus: 1,
year: new Date().getFullYear(),
pageNumber: 1,
pageSize: 5,
@@ -119,18 +121,20 @@ layout("/layouts/platform_h5.html"){
this.viewData = row
this.$refs.eventNotification.viewShow = true
},
pageData() {
async pageData() {
this.loading = true
this.$axios.post("/platform/h5/activity/apply/activityData", this.pageForm).then((res) => {
this.tableData = res.data
this.finished = true
this.loading = false
})
const res = await this.$axios.post("/platform/h5/activity/apply/activityData", this.pageForm)
this.tableData = res.data
this.finished = true
this.loading = false
}
},
created() {
this.pageData()
async created() {
await this.pageData()
if (this.activityId) {
const activity = this.tableData.find(v => v.id === this.activityId)
this.openView(activity)
}
}
})
</script>
src/main/resources/views/platform/zhghh5/activity/sports/eventList.html
+127 -23
View File
@@ -5,16 +5,17 @@ layout("/layouts/platform_h5.html"){
<div id="app" v-cloak>
<van-sticky>
<van-nav-bar
@click-left="()=>this.$pjaxReplace('/platform/h5/activity/apply/applyUser')"
left-arrow
left-text="返回"
placeholder
title="项目列表"
@click-left="()=>this.$pjaxReplace('/platform/h5/activity/apply/applyUser')"
left-arrow
left-text="返回"
placeholder
title="项目列表"
></van-nav-bar>
</van-sticky>
<div>
<van-list :finished="finished" @load="pageData" finished-text="没有更多了" v-if="tableData.length>0" v-model="loading">
<van-list :finished="finished" @load="pageData" finished-text="没有更多了" v-if="tableData.length>0"
v-model="loading">
<div class="table-list">
<div :key="row.id" class="table-card" v-for="row in tableData">
<van-image :src="row.image" fit="cover" height="200" v-if="row.image" width="100%"></van-image>
@@ -25,11 +26,16 @@ layout("/layouts/platform_h5.html"){
</div>
</template>
<template #right-icon>
<div style="display: flex; justify-content: flex-end" v-if="row.status">
<div style="display: flex; justify-content: flex-end" v-if="row.status&&row.applyWay.length===1&&row.applyWay.includes(1)">
<van-tag type="primary" v-if="row.status===1">待审核</van-tag>
<van-tag type="success" v-if="row.status===2">已成功报名</van-tag>
<van-tag type="danger" v-if="row.status===3">审核不通过</van-tag>
</div>
<div style="display: flex; justify-content: flex-end" v-else>
<van-tag type="primary" v-if="row.status2===0">待审核</van-tag>
<van-tag type="success" v-if="row.status2===2">已成功报名</van-tag>
<van-tag type="danger" v-if="row.status2===3">审核不通过</van-tag>
</div>
</template>
</van-cell>
<van-cell title="可报队数" v-if="row.eveProjectType==='2'">
@@ -54,31 +60,54 @@ layout("/layouts/platform_h5.html"){
<span v-else>0人</span>
</template>
</van-cell>
<van-cell title="已报名人员" v-if="JSON.parse(row.applyWay).length===1">
<van-cell title="已报名人员"
v-if="row.userApplyNames&&row.applyWay.length===1&&row.applyWay.includes(1)">
<template #right-icon>
<span @click="openApplyUser(row)" v-if="row.userApplyNames">{{ row.userApplyNames}}</span>
<span v-else>暂无</span>
</template>
</van-cell>
<!--<van-cell class="table-card-footer">
<template>
<van-button :loading="subLoading" @click="openView(row)" round
<van-cell class="table-card-footer">
<div v-if="row.applyWay.length===1&&row.applyWay.includes(1)">
<van-button :loading="subLoading" @click="signUpUser(row)" round
size="small"
type="primary">
报名
type="primary" v-if="activityData.applyWay.includes(1)&&row.userApply===0">
报 名
</van-button>
</template>
</van-cell>-->
<van-button :loading="subLoading" @click="cancelApply(row)" round
size="small"
color="#dd6363"
type="primary" v-if="activityData.applyWay.includes(1)&&row.userApply>0">
取消报名
</van-button>
</div>
<div v-else>
<van-button :loading="subLoading" @click="signUpUser(row)" round
size="small"
type="primary" v-if="activityData.applyWay.includes(1)&&row.userApply2===0">
报 名
</van-button>
<van-button :loading="subLoading" @click="cancelApply(row)" round
size="small"
color="#dd6363"
type="primary" v-if="activityData.applyWay.includes(1)&&row.userApply2>0">
取消报名
</van-button>
</div>
</van-cell>
</div>
</div>
</van-list>
<van-empty image="/assets/platform/plugins/vant-green/images/nodata/nodata.png" description="暂无数据" v-else></van-empty>
<van-empty image="/assets/platform/plugins/vant-green/images/nodata/nodata.png" description="暂无数据"
v-else></van-empty>
</div>
</div>
<script>
new Vue({
const vue = new Vue({
el: "#app",
store,
data() {
return {
tableData: [],
@@ -90,16 +119,75 @@ layout("/layouts/platform_h5.html"){
pageSize: 5,
totalCount: 0
},
subLoading: false
subLoading: false,
activityData: {}
}
},
components: {},
methods: {
openApplyUser() {},
openView(row) {},
openApplyUser() {
},
cancelApply(row) {
this.$dialog.confirm({
title: "提示",
message: "确认要取消报名吗?"
}).then(() => {
/* if (row.applyUser !== this.$store.state.user.id) {
this.$dialog.alert({
title: '温馨提示',
message: "报名人不是您，请联系报名人取消！",
}).then(() => {
})
return;
}*/
this.$axios.post("/platform/h5/activity/apply/cancelApply", {
activityId: row.activityId,
eventId: row.eventId,
schoolEventId: row.id
}).then(resp => {
if (resp.code === 0) {
this.doSearch()
this.$dialog.alert({
title: '温馨提示',
message: resp.msg,
}).then(() => {
})
}
})
})
},
signUpUser(row) {
this.$dialog.confirm({
title: "提示",
message: "确认要报名吗?"
}).then(async () => {
const teamList = await this.listTeamList(row)
if (teamList.length > 0 ) {
row.teamId = teamList[0].id
}
this.$axios.post("/platform/h5/activity/apply/signUpUser", {
activityId: row.activityId,
teamId: row.teamId,
eventId: row.eventId,
schoolEventId: row.id
}).then(resp => {
if (resp.code === 0) {
this.doSearch()
this.$dialog.alert({
title: '温馨提示',
message: resp.msg,
}).then(() => {
// on close
});
}
})
})
},
openView(row) {
},
pageData() {
this.loading = true
this.$axios.post("/platform/h5/activity/apply/pageData", { data: JSON.stringify(this.pageForm) }).then((res) => {
this.$axios.post("/platform/h5/activity/apply/pageData", {data: JSON.stringify(this.pageForm)}).then((res) => {
this.tableData = this.tableData.concat(res.data.list)
if (this.tableData.length === res.data.totalCount) {
this.finished = true
@@ -110,9 +198,25 @@ layout("/layouts/platform_h5.html"){
this.loading = false
})
},
async listTeamList(row) {
const resp = await this.$axios.post("/platform/h5/activity/apply/listTeamList", {
activityId: row.activityId,
eventId: row.eventId,
})
if (resp.code === 0) {
return resp.data
}
},
doSearch() {
this.tableKey = new Date().getTime()
this.pageForm.pageNumber = 1
this.pageForm.totalCount = 0
this.tableData = []
this.pageData()
},
findOneActivity() {
this.$axios.post("/platform/h5/activity/apply/findOneActivity", { activityId: this.pageForm.activityId }).then((res) => {
if (res.code === 200) {
this.$axios.post("/platform/h5/activity/apply/findOneActivity", {activityId: this.pageForm.activityId}).then((res) => {
if (res.code === 0) {
this.activityData = res.data
}
})
src/main/resources/views/platform/zhghh5/welfare/address/list.html
+1 -5
View File
@@ -74,11 +74,7 @@ layout("/layouts/platform_h5.html"){
}, 500)
},
back() {
if (this.projectId) {
this.$pjaxReplace("/platform/h5/welfare/userChoose/index?id=" + this.projectId)
} else {
this.$pjaxReplace("/platform/h5/home")
}
this.historyBack()
},
onEdit(row) {
this.title = "编辑地址"
src/main/resources/views/platform/zhghh5/welfare/mine/selectView.js
+5 -1
View File
@@ -56,6 +56,10 @@ const selectView = {
<div class="info-row__label">联系电话</div>
<div class="info-row__value">{{ mergedSelections[0]?.mobile || '暂无' }}</div>
</div>
<div class="info-row">
<div class="info-row__label">收货地址</div>
<div class="info-row__value">{{ mergedSelections[0]?.receiveAddress || '暂无' }}</div>
</div>
</div>
</div>
@@ -73,7 +77,7 @@ const selectView = {
:key="item.id"
@click="showOptionDetail(item)">
<div class="selection-item__image">
<img :src="item.imgUrl || '/static/images/default-welfare.png'"
<img :src="item.imgUrl"
alt="福利图片"
@error="handleImageError">
</div>
src/main/resources/views/platform/zhghh5/welfare/select/index.html
+84 -15
View File
@@ -678,18 +678,17 @@ layout("/layouts/platform_h5.html"){
maxlength="11"
required
></van-field>
<!--
收货地址字段预留位置
<!--收货地址-->
<van-field
v-if="projectInfo.needAddress"
v-model="formData.address"
v-if="projectInfo.provideMode == 3"
v-model="formData.receiveAddress"
label="收货地址"
placeholder="请输入收货地址"
type="textarea"
rows="2"
placeholder="请选择收货地址"
readonly
is-link
@click="showAddressSheet = true"
required
></van-field>
-->
></van-field>
</div>
<!-- 选择内容 -->
@@ -733,6 +732,35 @@ layout("/layouts/platform_h5.html"){
<div class="welfare-detail-content" v-html="selectedOption.description"></div>
</div>
</van-popup>
<!-- 收货地址选择弹窗 -->
<van-action-sheet v-model="showAddressSheet" title="选择收货地址" :round="true">
<div style="padding: 16px 0 0">
<div
v-for="address in addressOptions"
:key="address.id"
class="address-item"
@click="selectAddress(address)"
style="padding: 12px 16px; border-bottom: 1px solid #f0f0f0; cursor: pointer"
>
<div style="display: flex; justify-content: space-between; align-items: flex-start">
<div style="flex: 1">
<div style="font-size: 16px; font-weight: 500; color: #323233; margin-bottom: 4px">
{{ address.userName }} {{ address.tel }}
</div>
<div style="font-size: 14px; color: #646566; line-height: 1.4">
{{ address.province }}{{ address.city }}{{ address.county }}{{ address.addressDetail }}
</div>
</div>
<van-tag v-if="address.isDefault" type="primary" size="mini" style="margin-left: 8px">默认</van-tag>
</div>
</div>
<div v-if="addressOptions.length === 0" style="text-align: center; padding: 40px 16px; color: #969799">暂无收货地址</div>
</div>
<div style="padding: 16px; border-top: 1px solid #f0f0f0; background: #fafafa">
<van-button type="info" block round @click="goToAddressManage">收货地址管理</van-button>
</div>
</van-action-sheet>
</div>
</div>
@@ -757,8 +785,12 @@ layout("/layouts/platform_h5.html"){
formData: {
userSign: "", // 用户签名
mobile: "", // 手机号码
address: "" // 收货地址(预留)
}
address: "" // 收货地址
},
addressOptions: [],
showAddressSheet: false, // 收货地址选择弹窗
selectedAddressText: "" // 选中的收货地址显示文本
}
},
@@ -815,6 +847,11 @@ layout("/layouts/platform_h5.html"){
if (res.code === 0) {
this.projectInfo = res.data
// 获取收货地址
if (this.projectInfo.provideMode === 3) {
this.getAddress()
}
// 初始化选项的selectNum为0
if (this.projectInfo.options) {
this.projectInfo.options.forEach((option) => {
@@ -846,10 +883,16 @@ layout("/layouts/platform_h5.html"){
}
} else if (this.$store.user && this.$store.user.mobile) {
// 如果没有选择过，使用store中的默认手机号
debugger
this.formData.mobile = this.$store.user.mobile
}
// 地址回显
if (this.projectInfo.provideMode === 3) {
if (this.userSelection && this.userSelection[0].receiveAddress) {
this.formData.receiveAddress = this.userSelection[0].receiveAddress
}
}
// 设置已选择的选项
if (this.projectInfo.options && this.userSelection.length > 0) {
// 单选模式
@@ -898,6 +941,12 @@ layout("/layouts/platform_h5.html"){
return
}
// 如果需要邮寄
if (this.projectInfo.provideMode === 3 && !this.formData.receiveAddress) {
this.$toast.fail("请填写邮寄地址")
return
}
if (this.isSubmitting) return
this.isSubmitting = true
@@ -937,10 +986,10 @@ layout("/layouts/platform_h5.html"){
})
}
// 未来可扩展添加收货地址
if (this.formData.address) {
// 收货地址
if (this.projectInfo.provideMode === 3 && this.formData.receiveAddress) {
selections.forEach((selection) => {
selection.address = this.formData.address
selection.receiveAddress = this.formData.receiveAddress
})
}
@@ -1082,6 +1131,18 @@ layout("/layouts/platform_h5.html"){
}
},
// 选择收货地址
selectAddress(address) {
this.formData.receiveAddress =
address.userName + " " + address.tel + " " + address.province + address.city + address.county + address.addressDetail
this.showAddressSheet = false
},
// 跳转到地址管理页面
goToAddressManage() {
this.$pjaxReplace("/platform/h5/welfare/address/list")
},
// 切换选项选中状态
toggleOption(option) {
if (this.projectInfo.isCheckBox === "radio") {
@@ -1120,6 +1181,14 @@ layout("/layouts/platform_h5.html"){
}
}
}
},
// 获取收货地址
async getAddress() {
const resp = await this.$axios.post("/platform/welfare/addressManage/selectUserAddress")
if (resp.code === 0) {
this.addressOptions = resp.data
}
}
},