elink-star
/
epmet-work-pc-chengyang
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

限额为0，不限额为1

feature
是小王呀\24601 1 year ago
parent
50f9844589
commit
a422b90288
7 changed files with 89 additions and 91 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 30
      src/views/modules/volunteer/VolManage/activeRecord.vue
  2. 28
      src/views/modules/volunteer/VolManage/index.vue
  3. 49
      src/views/modules/volunteer/VolManage/integral.vue
  4. 39
      src/views/modules/volunteer/activityArchive/add.vue
  5. 20
      src/views/modules/volunteer/activityArchive/index.vue
  6. 12
      src/views/modules/volunteer/activityArchive/realselect.vue
  7. 2
      src/views/modules/volunteer/pointsRedemption/index.vue

30
src/views/modules/volunteer/VolManage/activeRecord.vue
View File

@ -1,21 +1,9 @@
<template> <template>
<div class="g-main "> <div class="g-main"style="padding: 30px;">
<div class=""> <div class="">
<!-- <div class="flex flex-center1 flex-center2 ">
<div>活动查询：</div>
<el-input placeholder="请输入内容" v-model="SearchForm.content" style="width: 200px" clearable>
</el-input>
</div>
<div class="flex" style="align-items: center;">
<div>状态：</div>
<el-select v-model="SearchForm.Stutas" placeholder="请选择" clearable>
<el-option v-for="item in optionsStatus" :key="item.value" :label="item.label" :value="item.value" >
</el-option>
</el-select>
</div> -->
<el-form :inline="true" :model="SearchForm" class="demo-form-inline" style=""> <el-form :inline="true" :model="SearchForm" class="demo-form-inline" style="">
<el-form-item label="活动查询"> <el-form-item label="活动查询">
<el-input placeholder="请输入内容" v-model="SearchForm.content" style="width: 150px" clearable> <el-input placeholder="请输入内容" v-model="SearchForm.content" clearable>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="状态" label-width="80px"> <el-form-item label="状态" label-width="80px">
@ -30,21 +18,21 @@
</el-form> </el-form>
</div> </div>
<div class="m-bot50"> <div >
<el-table class="table" :data="tableData" border style="width: 700px"> <el-table :data="tableData" border >
<el-table-column label="序号" width="80" header-align="center" align="center" type="index"></el-table-column> <el-table-column label="序号" width="80" header-align="center" align="center" type="index"></el-table-column>
<el-table-column prop="agencyName" header-align="center" align="center" label="主办方"> <el-table-column prop="agencyName" header-align="center" align="center" label="主办方" :show-overflow-tooltip="true">
</el-table-column> </el-table-column>
<el-table-column prop="address" header-align="center" align="center" label="活动地点"> <el-table-column prop="address" header-align="center" align="center" label="活动地点" :show-overflow-tooltip="true">
</el-table-column> </el-table-column>
<el-table-column prop="title" header-align="center" align="center" label="活动标题"> <el-table-column prop="title" header-align="center" align="center" label="活动标题" :show-overflow-tooltip="true">
</el-table-column> </el-table-column>
. <el-table-column prop="strTime" header-align="center" align="center" label="活动时间"> . <el-table-column prop="strTime" header-align="center" align="center" label="活动时间" :show-overflow-tooltip="true">
</el-table-column> </el-table-column>
<el-table-column prop="endTime" header-align="center" align="center" label="状态"> <el-table-column prop="statusType" header-align="center" align="center" label="状态" :show-overflow-tooltip="true">
</el-table-column> </el-table-column>
<!-- <el-table-column label="操作" fixed="right" width="250" header-align="center" align="center" class="operate"> <!-- <el-table-column label="操作" fixed="right" width="250" header-align="center" align="center" class="operate">
<template slot-scope="scope"> <template slot-scope="scope">

28
src/views/modules/volunteer/VolManage/index.vue
View File

@ -23,7 +23,7 @@
</el-form> </el-form>
</div> </div>
<div class="m-table"> <div class="m-table">
<el-button style="" class="diy-button--add" size="small" @click="handleExportModule()">下载模板</el-button> <!-- <el-button style="" class="diy-button--add" size="small" @click="handleExportModule()">下载模板</el-button>
<el-button class="diy-button--white" size="small"> <el-button class="diy-button--white" size="small">
<el-upload :headers="$getElUploadHeaders()" ref="upload" class="upload-btn" action="uploadUlr" :limit="1" <el-upload :headers="$getElUploadHeaders()" ref="upload" class="upload-btn" action="uploadUlr" :limit="1"
:accept="'.xls,.xlsx'" :with-credentials="true" :show-file-list="false" :auto-upload="true" :accept="'.xls,.xlsx'" :with-credentials="true" :show-file-list="false" :auto-upload="true"
@ -31,29 +31,29 @@
:http-request="uploadHttpRequest"> :http-request="uploadHttpRequest">
导入 导入
</el-upload> </el-upload>
</el-button> </el-button> -->
<el-table class="table" :data="tableData" border v-loading="tableLoading" style="width: 100%"> <el-table class="table" :data="tableData" border v-loading="tableLoading" style="width: 100%">
<el-table-column label="序号" header-align="center" align="center" type="index"></el-table-column> <el-table-column label="序号" header-align="center" align="center" type="index" width="80"></el-table-column>
<el-table-column prop="agencyName" header-align="center" align="center" label="所属社区"> <el-table-column prop="agencyName" header-align="center" align="center" label="所属社区":show-overflow-tooltip="true">
</el-table-column> </el-table-column>
<el-table-column prop="nickName" header-align="center" align="center" label="昵称"> <el-table-column prop="nickName" header-align="center" align="center" label="昵称" :show-overflow-tooltip="true">
<!-- <template slot-scope="scope"> <!-- <template slot-scope="scope">
<span>{{ scope.row.enabled === 1 ? '关闭' : '显示' }}</span> <span>{{ scope.row.enabled === 1 ? '关闭' : '显示' }}</span>
</template> --> </template> -->
</el-table-column> </el-table-column>
<el-table-column prop="name" header-align="center" align="center" label="姓名"> <el-table-column prop="name" header-align="center" align="center" label="姓名" :show-overflow-tooltip="true">
</el-table-column> </el-table-column>
<el-table-column prop="identityTypeNames" header-align="center" align="center" label="身份信息"> <el-table-column prop="identityTypeNames" header-align="center" align="center" label="身份信息" :show-overflow-tooltip="true">
</el-table-column> </el-table-column>
<el-table-column prop="mobile" header-align="center" align="center" label="手机号"> <el-table-column prop="mobile" header-align="center" align="center" label="手机号" :show-overflow-tooltip="true">
</el-table-column> </el-table-column>
<el-table-column prop="idCard" header-align="center" align="center" label="身份证号"> <el-table-column prop="idCard" header-align="center" align="center" label="身份证号" :show-overflow-tooltip="true">
</el-table-column> </el-table-column>
<el-table-column prop="createdTime" header-align="center" align="center" label="注册时间"> <el-table-column prop="createdTime" header-align="center" align="center" label="注册时间" :show-overflow-tooltip="true">
</el-table-column> </el-table-column>
<el-table-column prop="points" header-align="center" align="center" label="积分"> <el-table-column prop="points" header-align="center" align="center" label="积分":show-overflow-tooltip="true">
</el-table-column> </el-table-column>
<el-table-column prop="actNum" header-align="center" align="center" label="活动次数"> <el-table-column prop="actNum" header-align="center" align="center" label="活动次数":show-overflow-tooltip="true">
</el-table-column> </el-table-column>
<el-table-column label="操作" fixed="right" width="250" header-align="center" align="center" class="operate"> <el-table-column label="操作" fixed="right" width="250" header-align="center" align="center" class="operate">
<template slot-scope="scope"> <template slot-scope="scope">
@ -70,11 +70,11 @@
</el-pagination> </el-pagination>
</div> </div>
<el-dialog :visible.sync="Record" :close-on-click-modal="false" :close-on-press-escape="false" title="活动记录" <el-dialog :visible.sync="Record" :close-on-click-modal="false" :close-on-press-escape="false" title="活动记录"
width="750px" top="10vh" class="dialog-h" @closed="summDetailClose"> width="1000px" top="10vh" class="dialog-h" @closed="summDetailClose">
<Record v-if="Record" :list="fmData" @summDetailClose="summDetailClose" /> <Record v-if="Record" :list="fmData" @summDetailClose="summDetailClose" />
</el-dialog> </el-dialog>
<el-dialog :visible.sync="formShow" :close-on-click-modal="false" :close-on-press-escape="false" title="查看" <el-dialog :visible.sync="formShow" :close-on-click-modal="false" :close-on-press-escape="false" title="查看"
width="750px" top="10vh" class="dialog-h"> width="1000px" top="10vh" class="dialog-h">
<see v-if="formShow" :list="fmData" /> <see v-if="formShow" :list="fmData" />
</el-dialog> </el-dialog>
<el-dialog :visible.sync="integral" :close-on-click-modal="false" :close-on-press-escape="false" title="积分调整" <el-dialog :visible.sync="integral" :close-on-click-modal="false" :close-on-press-escape="false" title="积分调整"

49
src/views/modules/volunteer/VolManage/integral.vue
View File

@ -30,42 +30,26 @@
label="描述文字"></el-input-number> label="描述文字"></el-input-number>
</el-form-item> </el-form-item>
</el-form> --> </el-form> -->
<div class="flex flex-wrap flex-end"> <el-form :inline="true" :model="SearchForm" class="demo-form-inline" style="">
<div class="flex flex-center1 flex-center2 m-bottom10 " style=""> <el-form-item label="积分类型">
<div>积分类型</div> <el-select v-model="formData.classKey" placeholder="请选择" clearable>
<el-select v-model="formData.classKey" placeholder="请选择" clearable>
<el-option v-for="item in formData.optionsStatus" :key="item.code" :label="item.name" <el-option v-for="item in formData.optionsStatus" :key="item.code" :label="item.name"
:value="item.code"> :value="item.code">
</el-option> </el-option>
</el-select> </el-select>
</div> </el-form-item>
<div class="flex flex-center1 flex-center2 m-bottom10" style=""> <el-form-item label="积分时间" label-width="100px">
<div>积分时间</div>
<div>
<el-date-picker v-model="formData.createdTimeFrom" type="datetime" placeholder="开始时间" <el-date-picker v-model="formData.createdTimeFrom" type="datetime" placeholder="开始时间"
format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"> format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss">
</el-date-picker>至 <el-date-picker v-model="formData.createdTimeTo" type="datetime" placeholder="结束时间" </el-date-picker>至 <el-date-picker v-model="formData.createdTimeTo" type="datetime" placeholder="结束时间"
format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"> format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" @change="actcontrolTime">
</el-date-picker> </el-date-picker>
</div> </el-form-item>
</div> </el-form>
<!-- <div class="flex flex-center1 flex-center2 m-bottom10" style=""> <div style="display: flex; justify-content: flex-end; margin-bottom: 10px;">
<div>状态：</div> <el-button type="primary" @click="handleSearch">查询</el-button>
<el-select v-model="StatusName" placeholder="请选择"> </div>
<el-option v-for="item in Status" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</div>
<div class="flex flex-center1 flex-center2 m-bottom10" style="">
<div>兑换时间选择：</div>
<el-date-picker v-model="ExchangeTime" type="date" placeholder="选择日期">
</el-date-picker>
</div> -->
<div>
<el-button type="primary" class="m-bottom10" @click="handleSearch">查询</el-button>
</div>
</div>
<div > <div >
<el-table :data="tableData" border height="250" > <el-table :data="tableData" border height="250" >
<el-table-column label="序号" width="80" header-align="center" align="center" type="index"></el-table-column> <el-table-column label="序号" width="80" header-align="center" align="center" type="index"></el-table-column>
@ -163,6 +147,15 @@ export default {
}, },
methods: { methods: {
//控制活动时间
actcontrolTime(){
console.log("dislfj");
if(this.formData.createdTimeFrom>this.formData.createdTimeTo){
this.$message.error('活动结束时间不能在活动开始时间之前');
this.formData.createdTimeTo=''
return
}
},
//查询 //查询
handleSearch(val) { handleSearch(val) {
this.pageNo = 1; this.pageNo = 1;

39
src/views/modules/volunteer/activityArchive/add.vue
View File

@ -38,9 +38,9 @@
</el-form-item> </el-form-item>
<el-form-item label="活动名额" prop="points" required> <el-form-item label="活动名额" prop="points" required>
<div style="display: flex; flex-direction: column;"> <div style="display: flex; flex-direction: column;">
<el-input-number :disabled="formData.notQuota === '0'" v-model.trim="formData.quota" <el-input-number :disabled="formData.notQuota =='0'" v-model.trim="formData.quota" :min="0"
label="描述文字" type="number"></el-input-number> label="描述文字" type="number"></el-input-number>
<el-radio style="margin-top: 20px;" v-model="formData.notQuota" label="0">不限名额</el-radio> <el-checkbox style="margin-top: 20px;" v-model="checked">不限名额</el-checkbox>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="活动类型" prop="type" required> <el-form-item label="活动类型" prop="type" required>
@ -156,6 +156,7 @@ var geocoder // 新建一个正逆地址解析类
export default { export default {
data () { data () {
return { return {
checked:false,
loading: false, loading: false,
searchOptions: [], searchOptions: [],
orgOptionProps: { orgOptionProps: {
@ -186,7 +187,7 @@ export default {
signOutTime:"", signOutTime:"",
quota:'', quota:'',
conditions:"", conditions:"",
notQuota:'', notQuota:1,
linkman:"", linkman:"",
linkMobile:"", linkMobile:"",
address:"", address:"",
@ -244,12 +245,18 @@ export default {
} }
}, },
watch: { watch: {
'formData.notQuota'(newValue) { 'checked'(newValue) {
console.log(newValue,'newvalue'); console.log(newValue,'newvalue');
// 当 notQuota 变为 '0' 时，清空 quota // 当 notQuota 变为 '0' 时，清空 quota
if (newValue === '0') { //不限为0，限为1
this.formData.quota = ''; if (newValue) {
this.formData.quota = 0;
this.formData.notQuota=0
}else{
this.formData.notQuota=1
} }
console.log( this.formData.quota); console.log( this.formData.quota);
} }
@ -356,17 +363,17 @@ export default {
} }
console.log(parms,"parms"); console.log(parms,"parms");
await requestPost(url,parms).then((res)=>{ // await requestPost(url,parms).then((res)=>{
console.log(res,"res"); // console.log(res,"res");
if (res.code==0) { // if (res.code==0) {
this.$message.success('添加成功'); // this.$message.success('添加成功');
this.$emit('AddClose') // this.$emit('AddClose')
// this.$router.push({path:'/volunteer/activityArchive'}) // // this.$router.push({path:'/volunteer/activityArchive'})
}else{ // }else{
this.$message.error(res.msg); // this.$message.error(res.msg);
} // }
}) // })
}, },
addDomain() { addDomain() {
console.log(this.formData.sponsors,this.tableDate,); console.log(this.formData.sponsors,this.tableDate,);

20
src/views/modules/volunteer/activityArchive/index.vue
View File

@ -35,34 +35,34 @@
<div class="m-table"> <div class="m-table">
<el-button style="" class="diy-button--add" size="small" @click="handleAdd">新增</el-button> <el-button style="" class="diy-button--add" size="small" @click="handleAdd">新增</el-button>
<el-table class="table" :data="tableData" border v-loading="tableLoading" style="width: 100%"> <el-table class="table" :data="tableData" border v-loading="tableLoading" style="width: 100%">
<el-table-column label="序号" header-align="center" align="center" type="index"></el-table-column> <el-table-column label="序号" header-align="center" align="center" type="index" width="80"></el-table-column>
<el-table-column prop="title" header-align="center" align="center" label="活动标题"> <el-table-column prop="title" header-align="center" align="center" label="活动标题" :show-overflow-tooltip="true">
</el-table-column> </el-table-column>
<el-table-column prop="address" header-align="address" align="center" label="活动地点"></el-table-column> <el-table-column prop="address" header-align="address" align="center" label="活动地点" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="strTime" header-align="center" align="center" label="活动时间"> <el-table-column prop="strTime" header-align="center" align="center" label="活动时间" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.strTime }}至{{ scope.row.endTime }}</span> <span>{{ scope.row.strTime }}至{{ scope.row.endTime }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="deadline" header-align="center" align="center" label="报名截止时间"> <el-table-column prop="deadline" header-align="center" align="center" label="报名截止时间" :show-overflow-tooltip="true">
</el-table-column> </el-table-column>
<el-table-column prop="agencyName" header-align="center" align="center" label="主办方"> <el-table-column prop="agencyName" header-align="center" align="center" label="主办方" :show-overflow-tooltip="true">
</el-table-column> </el-table-column>
<el-table-column prop="updatedTime" header-align="center" align="center" label="发布时间"> <el-table-column prop="updatedTime" header-align="center" align="center" label="发布时间" :show-overflow-tooltip="true">
</el-table-column> </el-table-column>
<el-table-column prop="statusType" header-align="center" align="center" label="状态"> <el-table-column prop="statusType" header-align="center" align="center" label="状态" :show-overflow-tooltip="true">
<!-- <template slot-scope="scope"> <!-- <template slot-scope="scope">
<span>{{ scope.row.online === 0 ? '下线' : '上线' }}</span> <span>{{ scope.row.online === 0 ? '下线' : '上线' }}</span>
</template> --> </template> -->
</el-table-column> </el-table-column>
<el-table-column prop="Points" header-align="center" align="center" label="来源"> <el-table-column prop="Points" header-align="center" align="center" label="来源" :show-overflow-tooltip="true">
管理端 管理端
</el-table-column> </el-table-column>
<!-- <el-table-column prop="ActivityCount" header-align="center" align="center" label="所属项目"> <!-- <el-table-column prop="ActivityCount" header-align="center" align="center" label="所属项目">
</el-table-column> --> </el-table-column> -->
<el-table-column label="操作" fixed="right" width="250" header-align="center" align="center" class="operate"> <el-table-column label="操作" fixed="right" width="250" header-align="center" align="center" class="operate" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" v-if="scope.row.statusType=='未发布'" style="color:#1C6AFD;" size="small" @click="handleDetail(scope.row)">修改</el-button> <el-button type="text" v-if="scope.row.statusType=='未发布'" style="color:#1C6AFD;" size="small" @click="handleDetail(scope.row)">修改</el-button>
<el-button type="text" style="color:#1C6AFD;" size="small" @click="handleselect(scope.row)">查看</el-button> <el-button type="text" style="color:#1C6AFD;" size="small" @click="handleselect(scope.row)">查看</el-button>

12
src/views/modules/volunteer/activityArchive/realselect.vue
View File

@ -44,7 +44,17 @@
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="活动类型" prop="type" required> <el-form-item label="活动类型" prop="type" required>
{{ formData.type }} <template slot-scope="scope">
<span v-if="formData.type === 1">线上活动</span>
<span v-if="formData.type === 2">线下活动</span>
</template>
</el-form-item>
<el-form-item label="活动地址" prop="address" required>
<el-input v-model.trim="formData.address" placeholder="请输入活动地址" style="width: 300px;"></el-input>
</el-form-item>
<el-form-item label="活动对象" prop="activityObject" required>
<template slot-scope="scope">{{ scope.row.strTime }}至{{ scope.row.endTime }}</span>
</template>
</el-form-item> </el-form-item>
<el-form-item label=" 联系人" prop="linkman" required> <el-form-item label=" 联系人" prop="linkman" required>
{{ formData.linkman }} {{ formData.linkman }}

2
src/views/modules/volunteer/pointsRedemption/index.vue
View File

@ -43,7 +43,7 @@
<div class="m-table"> <div class="m-table">
<el-button style="" class="diy-button--add" size="small" @click="handleAdd">新增</el-button> <el-button style="" class="diy-button--add" size="small" @click="handleAdd">新增</el-button>
<el-table class="table" :data="tableData" border v-loading="tableLoading" style="width: 100%"> <el-table class="table" :data="tableData" border v-loading="tableLoading" style="width: 100%">
<el-table-column label="序号" header-align="center" align="center" type="index"></el-table-column> <el-table-column label="序号" header-align="center" align="center" type="index" width="80"> </el-table-column>
<el-table-column prop="redeemerOrgName" header-align="center" align="center" label="发布区域"> <el-table-column prop="redeemerOrgName" header-align="center" align="center" label="发布区域">
</el-table-column> </el-table-column>
<el-table-column prop="className" header-align="center" align="center" label="分类"> <el-table-column prop="className" header-align="center" align="center" label="分类">

Write Preview
Loading…
Cancel
Save