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

限制活动档案积分兑换组织级别

xiaowang-social
mk 1 year ago
parent
fbf6026b25
commit
63a1b7b44a
4 changed files with 174 additions and 310 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 26
      src/views/modules/volunteer/activityArchive/add.vue
  2. 422
      src/views/modules/volunteer/activityArchive/select.vue
  3. 15
      src/views/modules/volunteer/pointsRedemption/add.vue
  4. 17
      src/views/modules/volunteer/pointsRedemption/update.vue

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

@ -758,7 +758,7 @@ export default {
} else {
console.log("dk.sjfl");
this.orgOptions = [];
this.orgOptions.push(res.data);
this.orgOptions= this.filterTreeDataByLevel([res.data]);
console.log(this.orgOptions,"this.orgOptions");
// this.orgOptions = [];
// // this.funOrgTreeData(res.data, 'community')
@ -787,20 +787,18 @@ export default {
}
})
},
//递归遍历当前组织
funOrgTreeData(data,level) {
console.log(data,"lksdjflsjl");
const arr= data.forEach(item => {
console.log(item,"skaclakj");
if (item.level === level) {
item.subAgencyList = []; // 清空当前项的 children
} else if (item.subAgencyList) {
clearChildren(item.subAgencyList); // 递归处理子集
}
});
console.log("arr",arr);
filterTreeDataByLevel(data) {
return data.map(node => {
// 如果当前节点的 level 是 "community"，则将 children 设置为空
if (node.level === 'community') {
node.subAgencyList = null;
} else if (node.subAgencyList && node.subAgencyList.length > 0) {
// 递归处理子节点
node.subAgencyList = this.filterTreeDataByLevel(node.subAgencyList);
}
return node;
});
},
handleCancle () {
console.log( "kdsljk");

422
src/views/modules/volunteer/activityArchive/select.vue
View File

@ -2,212 +2,129 @@
<div>
<div class="dialog-h-content scroll-h"
style="display: flex; flex-direction: row; justify-content:space-between; padding: 20px;">
<el-form ref="ref_form" :inline="true" :model="formData" class="form" label-width="120px" :rules="rules">
<el-row>
<el-col :span="12"> <el-form-item label="主办方" prop="agencyId" required>
<el-cascader class="list_item_width_1" ref="myCascader" clearable style="width: 280px;"
v-model.trim="formData.agencyId" :options="orgOptions" :props="orgOptionProps"
@change="handleChangeAgency"></el-cascader>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="所属项目" prop="typeId" >
<el-select v-model.trim="formData.projectTitle" filterable style="width: 280px" remote :reserve-keyword="true"
placeholder="请输入关键词" :remote-method="remoteMethod1" :loading="loading">
<el-option v-for="(item, index) in typeList" @click.native="handleClickKey1(item.id)"
style="width: 280px;" :key="item.id" :label="item.projectTitle" :value="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12"> <el-form-item label="活动类型" prop="type" required>
<el-select v-model.trim="formData.type" placeholder="请选择" clearable style="width: 280px">
<el-option v-for="item in ServicetypeListName" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="活动标题" prop="title" required>
<el-input placeholder="请输入活动标题" v-model="formData.title" style="width: 280px; ">
</el-input>
</el-form-item>
</el-col>
<el-col :span="12"> <el-form-item label="活动级别" prop="serviceLevel" >
<el-select v-model.trim="formData.serviceLevel" placeholder="请选择" clearable style="width: 280px">
<el-option v-for="item in serviceLevelList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12"> <el-form-item label="活动区域" prop="district" required>
<el-cascader class="list_item_width_1" ref="myCascader" clearable style="width: 280px;"
v-model.trim="formData.district" :options="orgOptions" :props="orgOptionProps"
@change="handleChangeAgency"></el-cascader>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="活动名额" prop="points" required>
<div style="display: flex; justify-items:center; align-items: center;">
<el-input-number :disabled="formData.notQuota == '0'" v-model.trim="formData.quota" :min="0"
label="描述文字" type="number"></el-input-number>
<el-checkbox style="margin-left: 20px;" v-model="checked">不限名额</el-checkbox>
</div>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="服务时长" prop="serviceTime" required>
<div style="display: flex; justify-items:center; align-items: center;" >
<el-input-number v-model.trim="formData.serviceTime" :min="1"
label="描述文字" type="number"></el-input-number>
</div>
</el-form-item>
</el-col>
<el-col :span="12">
<div style="width: 48%; ">
<el-form ref="ref_form" :inline="true" :model="formData" class="form" label-width="90px" :rules="rules">
<el-form-item label="主办方" prop="agencyId" required>
<el-cascader class="list_item_width_1" ref="myCascader" clearable style="width: 300px;"
v-model.trim="formData.agencyId" :options="orgOptions" :props="orgOptionProps"
@change="handleChangeAgency"></el-cascader>
</el-form-item>
<el-form-item label="活动标题" prop="title" required>
<el-input type="textarea" style="width: 300px;" placeholder="请输入活动标题，不超过50子" v-model="formData.title"
maxlength="50" show-word-limit>
</el-input>
</el-form-item>
<el-form-item label="活动详情" prop="content" style="display: block" required>
<div style="width: 300px;">
<Tinymce class="tinymce_view " v-model.trim="formData.content" :height="150" placeholder="请输入活动内容" />
</div>
</el-form-item>
<el-form-item label="照片" prop="activityImgs" required>
<div>
<el-upload :headers="$getElUploadHeaders()" class="avatar-uploader" :action="uploadUrl"
:show-file-list="true" :data="{ customerId: customerId }" :file-list="formData.activityImgs"
:on-preview="handleImgPreview" :on-success="handleImgSuccess" :on-remove="handleImgRemove"
:on-exceed="handleImgExceed" :before-upload="beforeImgUpload" list-type="picture-card" >
<i class="el-icon-plus avatar-uploader-icon" style="width: 50px;height: 50px;" ></i> </el-upload>
</div>
</el-form-item>
<el-form-item label="活动时间" prop="strTime" required>
<el-date-picker v-model="formData.strTime" type="datetime" placeholder="开始时间" format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss" style="width: 150px;">
</el-date-picker>至 <el-date-picker v-model="formData.endTime" type="datetime" placeholder="结束时间"
format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" style="width: 150px;"
@change="actcontrolTime">
</el-date-picker>
</el-form-item>
<el-form-item label="活动名额" prop="points" required>
<div style="display: flex; flex-direction: column;">
<el-input-number :disabled="formData.notQuota === '0'" v-model.trim="formData.quota" label="描述文字"
type="number"></el-input-number>
<el-radio style="margin-top: 20px;" v-model="formData.notQuota" label="0">不限名额</el-radio>
</div>
</el-form-item>
<el-form-item label="活动类型" prop="type" required>
<el-select v-model.trim="formData.type" placeholder="请选择" clearable style="width: 300px;">
<el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label=" 联系人" prop="linkman" required>
<el-input v-model="formData.linkman" placeholder="请输入" style="width: 300px;"></el-input>
</el-form-item>
<el-form-item label=" 联系电话" prop="linkMobile" required>
<el-input v-model="formData.linkMobile" placeholder="请输入" style="width: 300px;"></el-input>
</el-form-item>
</el-form>
</div>
<div style="width: 50%;">
<el-form ref="ref_form" :inline="true" :model="formData" class="form" label-width="115px">
<div>
<el-form-item label="活动积分" prop="integral">
<el-input-number v-model="formData.points" :min="0" label="描述文字" :step="0.1" :precision="1" ></el-input-number>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="报名截止时间" prop="deadline" required>
<el-date-picker v-model="formData.deadline" type="datetime" placeholder="选择日期时间" style="width: 280px;"
value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss">
</el-date-picker>
<el-input-number v-model="formData.points" :min="1" :max="10" label="描述文字"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label=" 联系人" prop="linkman" required>
<el-input v-model="formData.linkman" placeholder="请输入" style="width: 280px;"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label=" 联系电话" prop="linkMobile" required>
<el-input v-model="formData.linkMobile" placeholder="请输入" style="width: 280px;"></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="活动时间" prop="strTime" required>
<!-- <el-date-picker
v-model="value1"
type="datetimerange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
</div> -->
<el-date-picker v-model="formData.strTime" type="datetime" placeholder="开始时间" format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss" style="width:195px">
</el-date-picker> <span style="margin: 0 10px">至</span> <el-date-picker v-model="formData.endTime"
type="datetime" placeholder="结束时间" format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
style="width:195px" @change="actcontrolTime">
</el-date-picker>
<!-- <el-form-item label="所属项目" prop="typeId" required>
<el-select class="item_width_1" v-model.trim="formData.typeId" placeholder="请选择" clearable>
<el-option v-for="item in typeList" :key="item.nametypeName" :label="item.typeName"
:value="item.id">
</el-option>
</el-select>
</el-form-item> -->
<el-form-item label="报名条件" prop="conditions" style="display: block">
<el-input type="textarea" placeholder="请输入活动标题，不超过50子" v-model="formData.conditions" maxlength="200"
show-word-limit style="width: 300px;">
</el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="签到时间" prop="signInTime" required>
<el-date-picker v-model.trim="formData.signInTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd HH:mm:ss" placeholder="开始时间" style="width:195px">
</el-date-picker> <span style="margin: 0 10px">至</span>
format="yyyy-MM-dd HH:mm:ss" placeholder="开始时间" style="width:150px">
</el-date-picker>至
<el-date-picker v-model.trim="formData.signOutTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd HH:mm:ss" placeholder="结束时间" style="width:195px" @change="controlTime ">
format="yyyy-MM-dd HH:mm:ss" placeholder="结束时间" style="width:150px" @change="controlTime ">
</el-date-picker>
</el-form-item>
</el-col>
<!-- <el-col :span="12">
<el-form-item label="活动名额" prop="points" required>
<div style="display: flex; justify-items:center; align-items: center;">
<el-input-number :disabled="formData.notQuota == '0'" v-model.trim="formData.quota" :min="0"
label="描述文字" type="number"></el-input-number>
<el-checkbox style="margin-left: 20px;" v-model="checked">不限名额</el-checkbox>
</div>
</el-form-item>
</el-col> -->
<!-- <el-col :span="12">
<el-form-item label="活动积分" prop="integral" >
<el-input-number v-model="formData.points" :min="1" :max="10" label="描述文字"></el-input-number>
</el-form-item>
</el-col> -->
<el-col :span="24">
<el-form-item label="活动详情" prop="content" style="display: block" required>
<div style="width: 756px;">
<Tinymce class="tinymce_view " v-model.trim="formData.content" :height="150" placeholder="请输入活动内容" />
</div>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="报名条件" prop="conditions">
<el-input type="textarea" placeholder="请输入活动标题，不超过50子" :height="150" v-model="formData.conditions"
maxlength="200" show-word-limit style="width: 756px;">
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="活动地点" prop="searchValue">
<div style="width: 300px">
<el-select v-model.trim="searchValue" filterable style="width: 300px" remote :reserve-keyword="true"
placeholder="请输入关键词" :remote-method="remoteMethod" :loading="loading">
<el-option v-for="(item, index) in searchOptions" @click.native="handleClickKey(index)"
style="width: 400px;" :key="item.value || index" :label="item.label" :value="item.value">
</el-option>
</el-select>
<div id="app_activity" class="div_map"></div>
</div>
<el-form-item label="报名截止时间" prop="deadline" required>
<el-date-picker v-model="formData.deadline" type="datetime" placeholder="选择日期时间"
value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<!-- <el-col :span="12"> -->
<el-form-item v-if="formType !== 'records'" label="上线" style="display: block" prop="peopleCount">
<el-form-item v-if="formType!=='records'" label="上线" style="display: block" prop="peopleCount">
<el-switch v-model="formData.online" :active-value='1' :inactive-value='0'
@change="handleSwitchChange"></el-switch>
</el-form-item>
<!-- </el-col> -->
<!-- <el-form-item label="活动积分" prop="integral" >
<el-input-number v-model="formData.points" :min="1" :max="10" label="描述文字"></el-input-number>
</el-form-item> -->
<!-- <el-col :span="12"> -->
<el-form-item label="照片" prop="activityImgs" required>
<div>
<el-upload :headers="$getElUploadHeaders()" class="avatar-uploader" :action="uploadUrl"
:show-file-list="true" :data="{ customerId: customerId }" :file-list="formData.activityImgs"
:on-preview="handleImgPreview" :on-success="handleImgSuccess" :on-remove="handleImgRemove"
:on-exceed="handleImgExceed" :before-upload="beforeImgUpload" list-type="picture-card" :limit="1">
<i class="el-icon-plus avatar-uploader-icon" style="width: 50px;height: 50px;"></i> </el-upload>
</div>
</el-form-item>
<!-- </el-col> -->
<!-- <el-col :span="24"> -->
<!-- </el-col> -->
</el-col>
<el-col :span="12">
<div v-if="formData.sponsors" style="display: flex;">
<div style="">
<div v-for="(item, index) in formData.sponsors" :label="index" :key="item.name" :prop=index>
<el-form-item label="赞助单位" prop="sponsors" style="margin-bottom:20px">
<el-input v-model="item.name" placeholder="请输入" style="width: 280px;"></el-input>
<i class="el-icon-remove-outline" @click="removeDomain(item)"
style="font-size: 20px; margin-left: 20px;"></i>
</el-form-item>
<el-form-item label="联系电话" prop="sponsors">
<el-input v-model="item.phone" placeholder="请输入" style="width: 280px;"></el-input>
</el-form-item>
</div>
</div>
<i class="el-icon-circle-plus" @click="addDomain" style="font-size: 20px; margin-top:7px;"></i>
</div>
<el-form-item label="活动地点" prop="searchValue">
<div style="width: 300px">
<el-select v-model.trim="searchValue" filterable style="width: 300px" remote :reserve-keyword="true"
placeholder="请输入关键词" :remote-method="remoteMethod" :loading="loading">
<el-option v-for="(item, index) in searchOptions" @click.native="handleClickKey(index)"
style="width: 400px;" :key="item.value || index" :label="item.label" :value="item.value">
</el-option>
</el-select>
</div>
<div id="app_activity" class="div_map"></div>
</el-form-item>
<div style="display: flex;">
<div style="">
<div v-for="(item, index) in formData.sponsors" :label="index" :key="item.name" :prop=index>
<el-form-item label="赞助单位" prop="sponsors" style="margin-bottom:20px" label-width="110px">
<el-input v-model="item.name" placeholder="请输入" style="width: 300px;"></el-input>
<i class="el-icon-remove-outline" @click.prevent="removeDomain(item)" style="font-size: 20px; margin-left: 20px;"></i>
</el-form-item>
<el-form-item label="联系电话" prop="sponsors">
<el-input v-model="item.phone" placeholder="请输入" style="width: 300px;"></el-input>
</el-form-item>
</div>
</el-col>
</el-row>
</el-form>
<!-- <i class="el-icon-circle-plus" @click="addDomain" style="font-size: 20px;"></i> -->
</div>
<i class="el-icon-circle-plus" @click="addDomain" style="font-size: 20px; margin-top:7px;" ></i> </div>
</el-form>
</div>
</div>
<div class="div_btn1">
<el-button size="small" @click="handleCancle">取 消</el-button>
@ -234,7 +151,6 @@ var geocoder // 新建一个正逆地址解析类
export default {
data () {
return {
checked:false,
loading: false,
searchOptions: [],
orgOptionProps: {
@ -252,7 +168,6 @@ export default {
btnDisable: false,
searchValue:"",
formData: {
projectTitle:"",
title:"",
agencyId:"",
projectId:"",
@ -278,26 +193,17 @@ export default {
]
},
ServicetypeListName:[],
//活动级别
serviceLevelList:[
{
id:0,
name:"市区级"
},
activityImgs:[],//图片
typeList:[
{
id:1,
name:"街道级"
id:"1",
name:"线上活动"
},
{
id:2,
name:"社区级"
id:"2",
name:"线下活动"
}
],
activityImgs:[],//图片
typeList:[
],
uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadvariedfile',
tableDate:{},
@ -329,97 +235,27 @@ export default {
}
},
watch: {
'checked'(newValue) {
'formData.notQuota'(newValue) {
console.log(newValue,'newvalue');
// 当 notQuota 变为 '0' 时，清空 quota
//不限为0，限为1
if (newValue) {
this.formData.quota = 0;
this.formData.notQuota=0
}else{
this.formData.notQuota=1
if (newValue === '0') {
this.formData.quota = '';
}
console.log( this.formData.quota);
}
},
components: { fileList,Tinymce,UploadImage},
async mounted () {
this.getTableData1()
this.getTableData()
// this.startLoading()
// await this.loadInfo()
// this.endLoading()
this.getOrgTreeList()
this.volunteerservicetype()
},
methods: {
async getTableData1() {
const url = "/voluntary/project/admin/list";
let params={
projectTitle:this.formData.projectTitle,
pageSize:9999,
pageNo:1,
onlineStatus:1
// ...this.formData
}
const { data, code, msg } = await requestGet(url,params);
if (code === 0) {
console.log("列表请求成功！！！！！！！！！！！！！！");
this.total = data.total || 0;
this.typeList = data.list
} else {
}
},
// 获取志愿组织服务类型
volunteerservicetype() {
console.log("skldfjlsdfjlksjfd");
const url = "/sys/dict/data/dictlist"
let params = {
dictType: 'voluntary_project_service_class'
}
requestPost(url, params).then(res=>{
console.log(res,"res");
this.ServicetypeListName=res.data
})
// console.log(data,"sdlkfjlsdkf");
// if (code === 0) {
// this.ServicetypeListName = data;
// } else {
// this.$message.error(msg)
// }
console.log(this.ServicetypeListName," this.ServicetypeListName ");
},
// 获取志愿组织服务类型
volunteerservicetype() {
console.log("skldfjlsdfjlksjfd");
const url = "/sys/dict/data/dictlist"
let params = {
dictType: 'voluntary_project_service_class'
}
requestPost(url, params).then(res=>{
console.log(res,"res");
this.ServicetypeListName=res.data
})
// console.log(data,"sdlkfjlsdkf");
// if (code === 0) {
// this.ServicetypeListName = data;
// } else {
// this.$message.error(msg)
// }
console.log(this.ServicetypeListName," this.ServicetypeListName ");
},
//删除动态
removeDomain(item) {
if (item.id) {
@ -446,12 +282,8 @@ export default {
if (res.code == 0) {
this.formData=res.data;
this.formData.sponsors=res.data.sponsors,
this.formData.type=res.data.type.toString()
this.searchValue=res.data.address
this.formData.activityImgs=[{url:res.data.imgs}]
if ( this.formData.notQuota==0) {
this.checked=true
}
} else {
this.$message.error(res.msg);
@ -550,7 +382,7 @@ export default {
await requestPost(url,parms).then((res)=>{
console.log(res,"res");
if (res.code==0) {
this.$message.success('修改成功');
this.$message.success('添加成功');
this.$emit('updateClose')
// this.$router.push({path:'/volunteer/activityArchive'})
}else{
@ -749,10 +581,7 @@ export default {
return this.$message.error(res.msg);
} else {
this.orgOptions = [];
this.orgOptions.push(res.data);
console.log(this.orgOptions,"this.orgOptions");
this.orgOptions= this.filterTreeDataByLevel([res.data]);
}
})
.catch(() => {
@ -770,6 +599,19 @@ export default {
}
})
},
filterTreeDataByLevel(data) {
return data.map(node => {
// 如果当前节点的 level 是 "community"，则将 children 设置为空
if (node.level === 'community') {
node.subAgencyList = null;
} else if (node.subAgencyList && node.subAgencyList.length > 0) {
// 递归处理子节点
node.subAgencyList = this.filterTreeDataByLevel(node.subAgencyList);
}
return node;
});
},
handleCancle () {
console.log( "kdsljk");

15
src/views/modules/volunteer/pointsRedemption/add.vue
View File

@ -250,7 +250,7 @@ export default {
return this.$message.error(res.msg);
} else {
this.orgOptions = [];
this.orgOptions.push(res.data);
this.orgOptions= this.filterTreeDataByLevel([res.data]);
console.log(this.orgOptions, "this.orgOptions");
}
@ -259,6 +259,19 @@ export default {
return this.$message.error("网络错误");
});
},
filterTreeDataByLevel(data) {
return data.map(node => {
// 如果当前节点的 level 是 "community"，则将 children 设置为空
if (node.level === 'community') {
node.subAgencyList = null;
} else if (node.subAgencyList && node.subAgencyList.length > 0) {
// 递归处理子节点
node.subAgencyList = this.filterTreeDataByLevel(node.subAgencyList);
}
return node;
});
},
handleChangeAgency(val) {
console.log(val);
this.redeemerOrgId = val

17
src/views/modules/volunteer/pointsRedemption/update.vue
View File

@ -303,15 +303,26 @@
return this.$message.error(res.msg);
} else {
this.orgOptions = [];
this.orgOptions.push(res.data);
console.log(this.orgOptions,"this.orgOptions");
this.orgOptions= this.filterTreeDataByLevel([res.data]);
}
})
.catch(() => {
return this.$message.error("网络错误");
});
},
filterTreeDataByLevel(data) {
return data.map(node => {
// 如果当前节点的 level 是 "community"，则将 children 设置为空
if (node.level === 'community') {
node.subAgencyList = null;
} else if (node.subAgencyList && node.subAgencyList.length > 0) {
// 递归处理子节点
node.subAgencyList = this.filterTreeDataByLevel(node.subAgencyList);
}
return node;
});
},
handleChangeAgency(val){
console.log(val);
this.redeemerOrgId=val

Write Preview
Loading…
Cancel
Save