Browse Source

志愿者..

feature
是小王呀\24601 1 year ago
parent
commit
ca92153cbc
  1. 4
      src/views/modules/volunteer/VolManage/index.vue
  2. 155
      src/views/modules/volunteer/VolManage/integral.vue
  3. 166
      src/views/modules/volunteer/activityArchive/add.vue
  4. 37
      src/views/modules/volunteer/activityArchive/index.vue
  5. 500
      src/views/modules/volunteer/activityArchive/select.vue
  6. 2
      src/views/modules/volunteer/pointsRedemption/Select.vue
  7. 7
      src/views/modules/volunteer/pointsRedemption/add.vue
  8. 12
      src/views/modules/volunteer/pointsRedemption/index.vue
  9. 272
      src/views/modules/volunteer/pointsRedemption/update.vue

4
src/views/modules/volunteer/VolManage/index.vue

@ -78,7 +78,7 @@
<see v-if="formShow" :list="fmData" />
</el-dialog>
<el-dialog :visible.sync="integral" :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">
<integral v-if="integral" :list="fmData" @summDetailClose="summDetailClose" />
</el-dialog>
</div>
@ -109,7 +109,7 @@
formShow:false,
// pageType: "list", // list dispose info issue-info
pageNo: 1,
pageSize: window.localStorage.getItem("pageSize") || 20,
pageSize:20,
total: 1,
tableData: [],
Record:false,

155
src/views/modules/volunteer/VolManage/integral.vue

@ -1,6 +1,6 @@
<template>
<div class="g-main" style="padding: 30px;">
<el-form ref="ref_form" :label-position="labelPosition" :model="tableData" style="margin-left: 80px; margin-bottom: 30px;" >
<div class="g-main" style="padding: 30px;">
<!-- <el-form ref="ref_form" :label-position="labelPosition" :model="tableData" style="margin-left: 80px; margin-bottom: 30px;" >
<el-form-item label="姓名" prop="name">
{{ tableData.name }}
</el-form-item>
@ -29,10 +29,82 @@
<el-input-number v-model="integralnum" @change="handleadjustment" :min="1" :max="10"
label="描述文字"></el-input-number>
</el-form-item>
</el-form>
</el-form> -->
<div class="flex flex-wrap flex-end">
<div class="flex flex-center1 flex-center2 m-bottom10 " style="">
<div>积分类型</div>
<el-select v-model="formData.classKey" placeholder="请选择">
<el-option v-for="item in formData.optionsStatus" :key="item.code" :label="item.name"
:value="item.code">
</el-option>
</el-select>
</div>
<div class="flex flex-center1 flex-center2 m-bottom10" style="">
<div>积分时间</div>
<div>
<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">
</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">
</el-date-picker>
</div>
</div>
<!-- <div class="flex flex-center1 flex-center2 m-bottom10" style="">
<div>状态</div>
<el-select v-model="StatusName" placeholder="请选择">
<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 >
<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 prop="pointsClassName" header-align="center" align="center" label="积分类型">
</el-table-column>
<el-table-column prop="createdTime" header-align="center" align="center" label="积分时间">
</el-table-column>
<!-- <el-table-column prop="ActivityCount" header-align="center" align="center" label="姓名">
</el-table-column> -->
. <el-table-column prop="operationName" header-align="center" align="center" label="名称">
</el-table-column>
<el-table-column prop="pointsDelta" header-align="center" align="center" label="类型">
</el-table-column>
<el-table-column prop="pointsClass" header-align="center" align="center" label="积分">
</el-table-column>
<!-- <el-table-column prop="ActivityCount" header-align="center" align="center" label="核销时间">
</el-table-column>
<el-table-column prop="ActivityCount" header-align="center" align="center" label="状态">
</el-table-column> -->
<!-- <el-table-column label="操作" fixed="right" width="250" header-align="center" align="center" class="operate">
<template slot-scope="scope">
<el-button type="text" style="color:#1C6AFD;" size="small" @click="handleDetail(scope.row)">查看</el-button>
<el-button type="text" style="color:#1C6AFD;" size="small"
@click="handleEdit(scope.row)">活动记录</el-button>
<el-button type="text" style="color:#1C6AFD;" size="small"
@click="handleDelete(scope.row)">积分调整</el-button>
</template>
</el-table-column> -->
</el-table>
<div>
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="pageNo"
:page-sizes="[10, 20, 50]" :page-size="pageSize" layout="sizes, prev, pager, next, total" :total="total">
</el-pagination>
</div>
</div>
<div class="flex flex-center1 flex-center2">
<el-button type="info" @click="handleremove" >取消</el-button>
<el-button type="danger" @click="getTableData" >确定</el-button>
<el-button type="info" @click="handleremove">取消</el-button>
<el-button type="danger" @click="getTableData">确定</el-button>
</div>
<div>
</div>
@ -45,6 +117,12 @@ export default {
name: "see",
data() {
return {
formData:{
createdTimeTo:"",
createdTimeTo:"",
classKey:"",
optionsStatus: [],
},
labelPosition: 'right',
tableData: [],
integralnum: 1,
@ -55,6 +133,9 @@ export default {
description:"",
pointsDelta:"",
Positive:'',
pageSize: 10,
pageNo: 1,
total: 0,
};
},
props:{
@ -65,14 +146,30 @@ export default {
},
created() {
console.log(this.list,"list");
this.tableData=this.list
this.getpoints()
this.getlist()
this.getpoint1s()
},
computed:{
},
methods: {
//
handleSearch(val) {
this.pageNo = 1;
this.getlist();
},
handleSizeChange(val) {
console.log(`每页 ${val}`);
this.pageSize = val;
window.localStorage.setItem("pageSize", val);
this.getlist();
},
handleCurrentChange(val) {
console.log(`当前页: ${val}`);
this.pageNo = val;
this.getlist();
},
//+-
handleRadioChange(val){
console.log(val);
@ -80,22 +177,24 @@ export default {
console.log(this.Positive);
},
//
async getpoints() {
async getpoint1s() {
const url = "/voluntary/points/adjustVolunteerPoints/reasonsList";
let params={
}
await requestGet(url,params).then((res)=>{
if (res.code === 0) {
console.log("列表请求成功!!!!!!!!!!!!!!");
this.options = res.data
this.optionsStatus = res.data
console.log(this.optionsStatus);
} else {
}
})
},
//
async getTableData() {
async getTableData() {
const url = "/voluntary/points/adjustVolunteerPoints/commit";
let params={
volunteerId:this.tableData.id,
@ -120,7 +219,39 @@ await requestGet(url,params).then((res)=>{
} else {
}
},
async getlist() {
const url = "/voluntary/points/listPointsChangeRecord";
let params={
volunteerId:this.list.id,
createdTimeFrom:this.formData.createdTimeFrom,
createdTimeTo:this.formData.createdTimeTo,
description:this.description,
pageNo:this.pageNo,
pageSize:this.pageSize,
// pointsDelta:this.Positive+this.integralnum,
primaryPoints:this.tableData.points
// volunteerId:this.list.id,
// mobile:this.formData.phone,
// name:this.formData.name
}
console.log(params,"params");
const { data, code, msg } = await requestGet(url,params);
if (code === 0) {
this.tableData=data.list
this.total=data.total
console.log("列表请求成功!!!!!!!!!!!!!!");
// console.log("");
// this.$message({
// message: "",
// type: "success",
// });
// this.$emit('summDetailClose')
} else {
}
},
handleSubmit(){
this.$emit('summDetailClose')
},

166
src/views/modules/volunteer/activityArchive/add.vue

@ -19,7 +19,6 @@
<Tinymce class="tinymce_view " v-model.trim="formData.content" :height="250" placeholder="请输入活动内容" />
</div>
</el-form-item>
<<<<<<< HEAD
<el-form-item label="照片" prop="activityImgs">
<div>
<el-upload :headers="$getElUploadHeaders()" class="avatar-uploader" :action="uploadUrl"
@ -33,25 +32,12 @@
<el-form-item label="活动时间" prop="activeTime">
<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">
=======
<el-form-item label="图片" prop="coverPic">
<template>
<upload-image :defaultFileList="formData.imgs" :limit="1" @change="onChangeFileList"
@file-removed="removedImg"></upload-image>
</template>
</el-form-item>
<el-form-item label="活动时间" prop="activeTime">
<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">
>>>>>>> 926ea0e06d536998682803c35c3ca75539b31a2a
</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">
</el-date-picker>
</el-form-item>
<el-form-item label="活动名额" prop="points">
<div style="display: flex; flex-direction: column;">
<<<<<<< HEAD
<el-input-number :disabled="formData.notQuota === '0'" v-model.trim="formData.quota" :max="10"
label="描述文字"></el-input-number>
<el-radio style="margin-top: 20px;" v-model="formData.notQuota" label="0">不限名额</el-radio>
@ -60,16 +46,6 @@
<el-form-item label="活动类型" prop="type" required>
<el-select v-model.trim="formData.type" placeholder="请选择" clearable>
<el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id">
=======
<el-input-number vdisabled="radio === '1'? true:false" v-model.trim="formData.quota"
:min="1" :max="10" label="描述文字"></el-input-number>
<el-radio style="margin-top: 20px;" v-model="formData.notQuota" label="1">不限名额</el-radio>
</div>
</el-form-item>
<el-form-item label="活动类型" prop="typeId" required>
<el-select v-model.trim="formData.typeId" placeholder="请选择" clearable>
<el-option v-for="item in formData.typeList" :key="item.id" :label="item.name" :value="item.id">
>>>>>>> 926ea0e06d536998682803c35c3ca75539b31a2a
</el-option>
</el-select>
</el-form-item>
@ -82,18 +58,11 @@
</el-form>
</div>
<div style="width: 49%;">
<<<<<<< HEAD
<el-form ref="ref_form" :inline="true" :model="formData" class="form">
<div>
<el-form-item label="活动积分" prop="integral">
<el-input-number v-model="formData.points" :min="1" :max="10" label="描述文字"></el-input-number>
=======
<el-form ref="ref_form" :inline="true" :model="formData" class="form">
<div>
<el-form-item label="活动积分" prop="integral">
<el-input-number v-model="formData.points" :min="1" :max="10"
label="描述文字"></el-input-number>
>>>>>>> 926ea0e06d536998682803c35c3ca75539b31a2a
</el-form-item>
<!-- <el-form-item label="所属项目" prop="typeId" required>
@ -103,11 +72,7 @@
</el-option>
</el-select>
</el-form-item> -->
<<<<<<< HEAD
<el-form-item label="报名条件" prop="conditions" style="display: block">
=======
<el-form-item label="报名条件" prop="condition" style="display: block">
>>>>>>> 926ea0e06d536998682803c35c3ca75539b31a2a
<div class="item_width_1">
<Tinymce class="tinymce_view " v-model.trim="formData.conditions" :height="250" placeholder="请输入活动内容" />
</div>
@ -115,7 +80,6 @@
<el-form-item label="签到时间" prop="Checktime">
<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:280px">
<<<<<<< HEAD
</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:280px">
@ -124,18 +88,10 @@
<el-form-item label="报名截止时间" prop="deadline">
<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-form-item label="报名截止时间" prop="deadline">
<el-date-picker v-model="formData.signOutTime" type="datetime" placeholder="选择日期时间"value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd HH:mm:ss" >
>>>>>>> 926ea0e06d536998682803c35c3ca75539b31a2a
</el-date-picker>
</el-form-item>
<el-form-item v-if="formType!=='records'" label="上线" style="display: block" prop="peopleCount">
<<<<<<< HEAD
<el-switch v-model="formData.online" :active-value='1' :inactive-value='0'
@change="handleSwitchChange"></el-switch>
</el-form-item>
@ -162,58 +118,25 @@
</div>
</el-form-item>
</el-form>
=======
<el-switch v-model="formData.online" active-value=1 inactive-value=0></el-switch>
</el-form-item>
</div>
<el-form-item label="赞助单位" prop="sponsor">
<el-input v-model="formData.sponsor" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label=" 联系电话" prop="number">
<el-input v-model="formData.number" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="活动地点" prop="address" style="display: block">
<div>
<el-select v-model.trim="formData.address" filterable remote :reserve-keyword="true" placeholder="请输入关键词"
>
<!-- <el-option v-for="(item, index) in searchOptions" @click.native="handleClickKey(index)"
: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>
</el-form>
>>>>>>> 926ea0e06d536998682803c35c3ca75539b31a2a
</div>
</div>
<div class="div_btn1">
<el-button size="small" @click="handleCancle"> </el-button>
<<<<<<< HEAD
<el-button size="small" v-if="formType != 'detail'" type="primary" :disabled="btnDisable"
@click="handleComfirm">确定</el-button>
=======
<el-button size="small" v-if="formType != 'detail'" type="primary" :disabled="btnDisable" @click="handleComfirm">确定</el-button>
>>>>>>> 926ea0e06d536998682803c35c3ca75539b31a2a
</div>
</div>
</template>
<script>
<<<<<<< HEAD
import { Loading } from 'element-ui' // Loading
=======
>>>>>>> 926ea0e06d536998682803c35c3ca75539b31a2a
import { mapGetters } from 'vuex'
import { requestPost, requestGet } from '@/js/dai/request'
import fileList from '@/views/components/fileList'
import Tinymce from '@c/tinymce2/index.vue'
import UploadImage from '@/views/modules/plugins/rent/upload-image.vue'
import daiMap from "@/utils/dai-map";
<<<<<<< HEAD
var map
var search
var markers
@ -224,11 +147,6 @@ export default {
return {
loading: false,
searchOptions: [],
=======
export default {
data () {
return {
>>>>>>> 926ea0e06d536998682803c35c3ca75539b31a2a
orgOptionProps: {
value: 'agencyId',
label: 'agencyName',
@ -237,7 +155,6 @@ export default {
multiple: false,
checkStrictly: true
},
<<<<<<< HEAD
customerId: localStorage.getItem('customerId'),
uploadUrl: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
orgOptions:[],
@ -277,30 +194,6 @@ export default {
}
]
=======
orgOptions:[],
btnDisable: false,
formData: {
online:0,
content:"",
points:"",
contacts:"",
integral:"",
condition:"",
imgs:[],
notQuota:0,
typeList:[
{
id:1,
name:"线上活动"
},
{
id:2,
name:"线下活动"
}
]
>>>>>>> 926ea0e06d536998682803c35c3ca75539b31a2a
},
activityImgs:[],//
@ -339,7 +232,6 @@ export default {
},
methods: {
<<<<<<< HEAD
handleClickKey(index) {
let selPosition = this.resultList[index]
@ -531,42 +423,6 @@ export default {
this.formData.imgs = '';
}
},
=======
handleChangeAgency(val) {
console.log(val);
this.formData.agencyId = val
},
//
handleComfirm() {
console.log(this.formData,"this,formD");
let url="/voluntary/activityInfo/saveInfo";
let parms={
...this.formData
}
console.log(parms,"parms");
requestPost(url,parms).then((res)=>{
console.log(res,"res");
})
},
//
removedImg() {
this.formData.imgs = ''
},
onChangeFileList(e) {
console.log(e, 'sssssb');
this.formData.$slotsimgs = e.length > 0 ? e.map(item => ({
fileType: '0',
fileUrl: item.response.data.url
})) : []; // efileList
if (e.length > 0) {
this.formData.imgs = e[0].response.data.url;
} else {
this.formData.imgs = '';
}
},
>>>>>>> 926ea0e06d536998682803c35c3ca75539b31a2a
//
getOrgTreeList() {
this.$http
@ -585,10 +441,7 @@ export default {
return this.$message.error("网络错误");
});
this.$nextTick(() => {
<<<<<<< HEAD
console.log(map,"mao");
=======
>>>>>>> 926ea0e06d536998682803c35c3ca75539b31a2a
if (!map) {
this.initMap(this.formData.latitude, this.formData.longitude);
console.log("map", map,this.formData.latitude, this.formData.longitude)
@ -598,17 +451,12 @@ export default {
console.log("mapmapmap", map)
}
})
<<<<<<< HEAD
=======
>>>>>>> 926ea0e06d536998682803c35c3ca75539b31a2a
},
handleCancle () {
this.$emit('diaDetailClose')
},
<<<<<<< HEAD
//
startLoading() {
loading = Loading.service({
@ -624,8 +472,6 @@ export default {
loading.close()
}
}
=======
>>>>>>> 926ea0e06d536998682803c35c3ca75539b31a2a
},
computed: {
},
@ -639,20 +485,16 @@ export default {
type: String,
required: ''
},
defaultTime: {
type: String,
required: ''
},
list:{
type: Object,
default: () => {}
}
}
}
</script>
<style lang="scss" scoped>
<<<<<<< HEAD
.div_map{
width: 400px;
}
=======
>>>>>>> 926ea0e06d536998682803c35c3ca75539b31a2a
</style>

37
src/views/modules/volunteer/activityArchive/index.vue

@ -14,13 +14,8 @@
value-format="yyyy-MM-dd HH:mm:ss">
</el-date-picker>
</el-form-item>
<<<<<<< HEAD
<el-form-item label="发布状态">
<el-select v-model="formData.online" placeholder="请选择" clearable >
=======
<el-form-item label="状态">
<el-select v-model="formData.statusType" placeholder="请选择" clearable >
>>>>>>> 926ea0e06d536998682803c35c3ca75539b31a2a
<el-option v-for="item in formData.optionsStatus" :key="item.value" :label="item.label"
:value="item.value">
</el-option>
@ -96,21 +91,17 @@
width="1000px" top="10vh" class="dialog-h" @closed="diaClose">
<add v-if="add" :list="fmData" />
</el-dialog>
<el-dialog :visible.sync="showselect" :close-on-click-modal="false" :close-on-press-escape="false" title="查看"
width="1000px" top="10vh" class="dialog-h" @closed="diaClose">
<add v-if="showselect" :list="fmData" />
</el-dialog>
<el-dialog :visible.sync="HandlePointsshow" :close-on-click-modal="false" :close-on-press-escape="false"
title="打卡积分" width="1000px" top="10vh" class="dialog-h" @closed="diaClose">
<<<<<<< HEAD
<Points v-if="HandlePointsshow" :list="fmData" />
</el-dialog>
<el-dialog :visible.sync="ActivityCountshow" :close-on-click-modal="false" :close-on-press-escape="false"
title="报名管理" width="750" top="10vh" class="dialog-h" @closed="diaClose">
<ActivityCountshow v-if="ActivityCountshow" :list="fmData" />
=======
<Points :list="fmData" />
</el-dialog>
<el-dialog :visible.sync="ActivityCountshow" :close-on-click-modal="false" :close-on-press-escape="false"
title="报名管理" width="1000px" top="10vh" class="dialog-h" @closed="diaClose">
<ActivityCountshow :list="fmData" />
>>>>>>> 926ea0e06d536998682803c35c3ca75539b31a2a
</el-dialog>
</div>
@ -127,33 +118,27 @@
import add from "./add.vue"
import ActivityCountshow from "./Administration.vue"
import Points from "./Points.vue"
import select from "./select.vue"
export default {
components: {add,ActivityCountshow,Points },
components: {add,ActivityCountshow,Points,select },
data() {
return {
HandlePointsshow: false,
ActivityCountshow: false,
add: false,
showselect:false,
formData: {
content: "",
strTime: "",
endTime: "",
optionsStatus: [{
<<<<<<< HEAD
value: '0',
label: '下线'
}, {
value: '1',
label: '上线 '
=======
value: '已发布',
label: '已发布'
}, {
value: '未发布',
label: '未发布'
>>>>>>> 926ea0e06d536998682803c35c3ca75539b31a2a
},],
online:'',
title:""
@ -188,7 +173,6 @@
this.getTableData();
},
methods: {
<<<<<<< HEAD
//线
handleupOnline(row){
@ -212,8 +196,6 @@
})
},
=======
>>>>>>> 926ea0e06d536998682803c35c3ca75539b31a2a
//
handleSearch(){
console.log("this.long");
@ -232,10 +214,7 @@
pageSize:this.pageSize,
statusType:this.formData.statusType,
endTime:this.formData.endTime,
<<<<<<< HEAD
online:this.formData.online
=======
>>>>>>> 926ea0e06d536998682803c35c3ca75539b31a2a
}
requestGet(url, params).then((res) => {
if (res.code == 0) {
@ -324,7 +303,7 @@
},
handleDetail(row){
console.log(row,"row");
this.formShow=true
this.showselect=true
this.fmData=row
},

500
src/views/modules/volunteer/activityArchive/select.vue

@ -0,0 +1,500 @@
<template>
<div>
<div class="dialog-h-content scroll-h"
style="display: flex; flex-direction: row; justify-content:space-between; padding: 20px;">
<div style="width: 49%; ">
<el-form ref="ref_form" :inline="true" :model="formData" class="form">
<el-form-item label="主办方" prop="agencyId">
<el-cascader class="list_item_width_1" ref="myCascader" clearable size="small"
v-model.trim="formData.agencyId" :options="orgOptions" :props="orgOptionProps"
@change="handleChangeAgency"></el-cascader>
</el-form-item>
<el-form-item label="活动标题" prop="title">
<el-input type="textarea" 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">
<div class="item_width_1">
<Tinymce class="tinymce_view " v-model.trim="formData.content" :height="250" placeholder="请输入活动内容" />
</div>
</el-form-item>
<el-form-item label="照片" prop="activityImgs">
<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"></i> </el-upload>
</div>
</el-form-item>
<el-form-item label="活动时间" prop="activeTime">
<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">
</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">
</el-date-picker>
</el-form-item>
<el-form-item label="活动名额" prop="points">
<div style="display: flex; flex-direction: column;">
<el-input-number :disabled="formData.notQuota === '0'" v-model.trim="formData.quota" :max="10"
label="描述文字"></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>
<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="contacts">
<el-input v-model="formData.linkman" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label=" 联系电话" prop="phone">
<el-input v-model="formData.linkMobile" placeholder="请输入"></el-input>
</el-form-item>
</el-form>
</div>
<div style="width: 49%;">
<el-form ref="ref_form" :inline="true" :model="formData" class="form">
<div>
<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-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">
<div class="item_width_1">
<Tinymce class="tinymce_view " v-model.trim="formData.conditions" :height="250" placeholder="请输入活动内容" />
</div>
</el-form-item>
<el-form-item label="签到时间" prop="Checktime">
<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:280px">
</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:280px">
</el-date-picker>
</el-form-item>
<el-form-item label="报名截止时间" prop="deadline">
<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-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>
</div>
<el-form-item label="赞助单位" prop="sponsor">
<div class="flex flex-center1 flex-center2">
<el-input v-model="input" placeholder="请输入"></el-input>
<i class="el-icon-circle-plus"></i>
</div>
</el-form-item>
<el-form-item label=" 联系电话" prop="number">
<el-input v-model="input" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="活动地点" prop="address" style="display: block">
<div style="width: 500px">
<el-select v-model.trim="searchValue" filterable style="width: 400px" 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>
</el-form>
</div>
</div>
<div class="div_btn1">
<el-button size="small" @click="handleCancle"> </el-button>
<el-button size="small" v-if="formType != 'detail'" type="primary" :disabled="btnDisable"
@click="handleComfirm">确定</el-button>
</div>
</div>
</template>
<script>
import { Loading } from 'element-ui' // Loading
import { mapGetters } from 'vuex'
import { requestPost, requestGet } from '@/js/dai/request'
import fileList from '@/views/components/fileList'
import Tinymce from '@c/tinymce2/index.vue'
import UploadImage from '@/views/modules/plugins/rent/upload-image.vue'
import daiMap from "@/utils/dai-map";
var map
var search
var markers
var infoWindowList
var geocoder //
export default {
data () {
return {
loading: false,
searchOptions: [],
orgOptionProps: {
value: 'agencyId',
label: 'agencyName',
children: 'subAgencyList',
emitPath: false,
multiple: false,
checkStrictly: true
},
customerId: localStorage.getItem('customerId'),
uploadUrl: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
orgOptions:[],
resultList: [],
btnDisable: false,
searchValue:"",
formData: {
title:"",
agencyId:"",
projectId:"",
content:"",
points:10,
imgs:"",
deadline:"",
strTime:"",
endTime:"",
signInTime:"",
signOutTime:"",
quota:'',
conditions:"",
notQuota:'',
linkman:"",
linkMobile:"",
address:"",
longitude: this.$store.state.user.longitude, //
latitude: this.$store.state.user.latitude,//
type:"",
online:0,
sponsors:[
{
"name":"赞助1",
"phone":"13111111111"
},
{
"name":"赞助2",
"phone":"13122222222"
}
]
},
activityImgs:[],//
typeList:[
{
id:"1",
name:"线上活动"
},
{
id:"2",
name:"线下活动"
}
],
fileList: [],
uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadvariedfile',
}
},
watch: {
'formData.notQuota'(newValue) {
console.log(newValue,'newvalue');
// notQuota '0' quota
if (newValue === '0') {
this.formData.quota = '';
}
console.log( this.formData.quota);
}
},
components: { fileList,Tinymce,UploadImage},
async mounted () {
// this.startLoading()
// await this.loadInfo()
// this.endLoading()
this.getOrgTreeList()
},
methods: {
handleClickKey(index) {
let selPosition = this.resultList[index]
let lonlat = selPosition.lonlat.split(" ")
map.setCenter(lonlat[1], lonlat[0]);
map.setMarker(lonlat[1], lonlat[0]);
this.formData.latitude = lonlat[1];
this.formData.longitude = lonlat[0];
this.formData.address = selPosition.address + selPosition.name
},
async handleMoveCenter(e) {
//
// const { lat, lng } = map.getCenter();
const { lat, lng } = e.latLng;
this.formData.latitude = lat;
this.formData.longitude = lng;
map.setMarker(lat, lng);
let { msg, data } = await map.getAddress(lat, lng);
if (msg == "success") {
this.formData.address = data.address
this.searchValue = data.address
this.searchOptions = []
console.log('data,this.searchValue ', this.searchValue)
}
},
// init
initMap(latitude, longitude) {
console.log(latitude, longitude,"564564568");
map = new daiMap(
document.getElementById("app_activity"),
{ latitude, longitude },
{
zoom: 16.2, //
pitch: 43.5, //
rotation: 45, //
}
);
//
/* map.on("dragend", (e) => {
this.handleMoveCenter(e);
});*/
map.on("click", (e) => {
this.handleMoveCenter(e);
});
map.setCenter(latitude, longitude);
map.setMarker(latitude, longitude);
},
async remoteMethod(query) {
console.log(query, "sfsvsdv");
if (query !== '') {
this.loading = true;
const { msg, data } = await map.searchNearby(query);
this.loading = false;
this.resultList = []
if (msg == "success" && data.resultList && data.resultList.length > 0) {
if (data.resultList && data.resultList.length > 0) {
this.resultList = data.resultList
console.log(this.resultList, "this.resultList");
this.searchOptions = this.resultList.map(item => {
return { value: `${item.id}`, label: `${item.address + item.title}` };
});
console.log(this.searchOptions, "this.searchOptions");
}
} else {
this.searchOptions = [
{
value: '0',
label: '未检索到结果'
}
]
}
} else {
this.searchOptions = [];
}
},
//
beforeImgUpload(file) {
const isLt1M = file.size / 1024 / 1024 < 10;
const srcType = file.type;
const format = file.name.split('.').pop();
if (!isLt1M) {
this.$message.error('上传文件大小不能超过 10MB!');
return false;
}
if (srcType.indexOf('image') == -1) {
this.$message.error('仅限图片格式');
return false;
}
return true;
},
//
handleImgExceed() {
this.$message({
type: 'warning',
message: '文件数量最多不超过一个'
});
},
//
handleImgRemove(file) {
console.log('handleImgRemove', file);
if (file.response) {
let index = this.activityImgs.findIndex(item => item.url == file.response.data.url);
this.activityImgs.splice(index, 1);
} else if (file.url) {
let index = this.activityImgs.findIndex(item => item.url == file.url);
this.activityImgs.splice(index, 1);
}
},
//
handleImgSuccess(res, file, fileList) {
if (res.code === 0 && res.msg === 'success') {
let format = file.name.split('.').pop();
let srcType = file.raw.type;
let type = 'file';
if (srcType.indexOf('image') != -1) {
type = 'image';
} else if (srcType.indexOf('video') != -1) {
type = 'video';
}
this.activityImgs.push(res.data.url);
this.formData.imgs=this.activityImgs[0]
console.log( this.formData.imgs," this.formData.imgs");
} else {
this.$message.error(res.msg);
}
},
//
handleImgPreview(file) {
console.log(file);
window.open(file.url || file.response.data.url);
},
handleSwitchChange(value) {
// value
this.formData.online = Number(value);
},
handleOnlineRegistration(value) {
if (value) {
this.online = true;
this.formData.online = 1;
} else {
this.online = false;
this.formData.cutOffTime = ''
this.formData.online = 0;
}
},
handleChangeAgency(val) {
console.log(val);
this.formData.agencyId = val
},
//
handleComfirm() {
console.log(this.formData,"this,formD");
let url="/voluntary/activityInfo/saveInfo";
let parms={
...this.formData
}
console.log(parms,"parms");
requestPost(url,parms).then((res)=>{
console.log(res,"res");
})
},
//
removedImg() {
this.formData.imgs = ''
},
onChangeFileList(e) {
console.log(e, 'sssssb');
// this.formData.$slotsimgs = e.length > 0 ? e.map(item => ({
// fileType: '0',
// fileUrl: item.response.data.url
// })) : []; // efileList
if (e.length > 0) {
this.formData.imgs = e[0].response.data.url;
} else {
this.formData.imgs = '';
}
},
//
getOrgTreeList() {
this.$http
.post("/gov/org/customeragency/agencygridtree", {orgTypeFilter:this.orgTypeFilter})
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg);
} else {
this.orgOptions = [];
this.orgOptions.push(res.data);
console.log(this.orgOptions,"this.orgOptions");
}
})
.catch(() => {
return this.$message.error("网络错误");
});
this.$nextTick(() => {
console.log(map,"mao");
if (!map) {
this.initMap(this.formData.latitude, this.formData.longitude);
console.log("map", map,this.formData.latitude, this.formData.longitude)
} else {
map.setCenter(this.formData.latitude, this.formData.longitude);
map.setMarker(this.formData.latitude, this.formData.longitude);
console.log("mapmapmap", map)
}
})
},
handleCancle () {
this.$emit('diaDetailClose')
},
//
startLoading() {
loading = Loading.service({
lock: true, //
text: '正在加载……', //
background: 'rgba(0,0,0,.7)' //
})
},
//
endLoading() {
// clearTimeout(timer);
if (loading) {
loading.close()
}
}
},
computed: {
},
props: {
formType: { // addeditdetail
type: String,
required: ''
},
icPartyActId: {
type: String,
required: ''
},
defaultTime: {
type: String,
required: ''
},
}
}
</script>
<style lang="scss" scoped>
.div_map{
width: 400px;
}
</style>

2
src/views/modules/volunteer/pointsRedemption/Select.vue

@ -20,7 +20,7 @@
{{ tableData.redeemerOrgName}}
</el-form-item>
<el-form-item label="规则说明">
{{ tableData.sponsorName}}
{{ tableData.description}}
</el-form-item>
</el-form>
</div>

7
src/views/modules/volunteer/pointsRedemption/add.vue

@ -69,8 +69,7 @@
</el-form-item>
</el-form>
<div class="flex flex-center1 flex-center2">
<el-button v-if="list" type="primary" @click="updateForm()">提交</el-button>
<el-button v-if="!list" type="primary" @click="submitForm()">提交</el-button>
<el-button type="primary" @click="submitForm()">提交</el-button>
<el-button @click="handlecancel">取消</el-button>
</div>
</div>
@ -122,10 +121,6 @@ export default {
}
},
created() {
if (this.list) {
this.formData=this.list
}
this.getclasses()
this.getOrgTreeList()
},

12
src/views/modules/volunteer/pointsRedemption/index.vue

@ -91,6 +91,10 @@
width="1000px" top="10vh" class="dialog-h" @closed="closeDialog">
<add v-if="add" :list="fmData" @closeDialog="closeDialog"/>
</el-dialog>
<el-dialog :visible.sync="updateshow" :close-on-click-modal="false" :close-on-press-escape="false" title="修改"
width="1000px" top="10vh" class="dialog-h" @closed="closeDialog">
<update v-if="updateshow" :list="fmData" @closeDialog="closeDialog"/>
</el-dialog>
<el-dialog :visible.sync="recordshow" :close-on-click-modal="false" :close-on-press-escape="false" title="兑换记录"
width="1000px" top="10vh" class="dialog-h" @closed="diaClose">
<record v-if="recordshow" :list="fmData" />
@ -111,11 +115,13 @@
import { mapGetters } from "vuex";
import add from "./add";
import Select from "./Select.vue"
import update from "./update.vue"
export default {
components: {add,record,Select},
components: {add,record,Select,update},
data() {
return {
updateshow:false,
orgOptionProps: {
value: 'agencyId',
label: 'agencyName',
@ -144,7 +150,7 @@
formShow:false,
// pageType: "list", // list dispose info issue-info
pageNo: 1,
pageSize: window.localStorage.getItem("pageSize") || 20,
pageSize: 20,
total: 1,
tableData: [
],
@ -287,7 +293,7 @@
},
handleDetail(row){
console.log(row,"row");
this.add=true
this.updateshow=true
this.fmData=row
},
handleSizeChange(val) {

272
src/views/modules/volunteer/pointsRedemption/update.vue

@ -0,0 +1,272 @@
<template>
<div class="g-main">
<el-form :inline="true" :label-position="labelPosition" :model="tableData"
style="height: 500px; overflow: scroll;">
<el-form-item label="分类" required label-width="150px">
<el-select class="item_width_1" v-model="formData.classKey" placeholder="请选择">
<el-option v-for="item in TypeList" :key="item.classKey" :label="item.className" :value="item.classKey">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="标题" label-width="150px" required>
<el-input class="item_width_1" v-model="formData.awardName" placeholder="请输入内容"></el-input>
</el-form-item>
<el-form-item v-if="formData.classKey=='mjq' ||formData.classKey=='cxdjq'" required label="金额"
label-width="150px">
<div class="item_width_2" style="display: flex;">
<div></div>
<el-input v-model="formData.worthAmount" placeholder="请输入金额"></el-input>
</div>
</el-form-item>
<el-form-item :inline="true" required v-if="formData.classKey=='zkq'" label="折扣" label-width="150px">
<div class="item_width_2" style="display: flex;">
<el-input v-model="formData.worthAmount" placeholder="请输入折扣"></el-input>
<div> </div>
</div>
</el-form-item>
<el-form-item required v-if="formData.classKey=='hwjh'" label="原价" label-width="150px">
<div style="display: flex;">
<div></div>
<el-input v-model="formData.worthAmount" placeholder="请输入内容"></el-input>
</div>
</el-form-item>
<el-form-item required label="兑换积分" label-width="150px">
<el-input class="item_width_2" v-model="formData.points" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="有效期至" label-width="150px">
<el-date-picker style="width: 250px;" v-model="formData.expireTime" type="datetime" placeholder="请选择日期" format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss">
</el-date-picker>
</el-form-item>
<el-form-item label="规则说明" label-width="150px">
<Tinymce style="width: 560px;" class="tinymce_view" v-model="formData.description" :height="250"
placeholder="请输入活动内容" />
</el-form-item>
<el-form-item label="库存" label-width="150px">
<el-radio v-model="radio" label="1">不限数目</el-radio>
<div class="flex flex-x">
<el-radio v-model="radio" label="2">自定义</el-radio>
<el-input v-if="radio=='2'" v-model="formData.stockQty" placeholder="请输入数量"></el-input>
</div>
</el-form-item>
<el-form-item label="发布范围" label-width="150px">
<el-cascader class="list_item_width_1" ref="myCascader" clearable size="small"
v-model.trim="formData.redeemerOrgId" :options="orgOptions" :props="orgOptionProps"
@change="handleChangeAgency"></el-cascader>
</el-form-item>
<el-form-item label="赞助单位" label-width="150px">
<el-input v-model="formData.sponsorName" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="联系电话" label-width="150px">
<el-input style="width: 210px;" v-model="formData.sponsorMobile" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="上架" label-width="150px" inline="false">
<el-switch style="width: 500px;" v-model="formData.shelveStatus" active-color="#13ce66"
inactive-color="#ff4949" active-value="1" inactive-value="0">
</el-switch>
</el-form-item>
</el-form>
<div class="flex flex-center1 flex-center2">
<el-button type="primary" @click="updateForm()">提交</el-button>
<el-button @click="handlecancel">取消</el-button>
</div>
</div>
</template>
<script>
import { requestPost,requestGet } from "@/js/dai/request";
import Tinymce from '@c/tinymce2/index.vue'
export default {
components: {
Tinymce
},
name: "see",
data() {
return {
formData:{
classKey: "",
awardName: "",
worthAmount: "",
points: "",
redeemerOrgId: "",
expireTime: "",
description: "",
stockQty: '',
sponsorName: "",
sponsorMobile: "",
shelveStatus: ''
},
orgOptionProps: {
value: 'agencyId',
label: 'agencyName',
children: 'subAgencyList',
emitPath: false,
multiple: false,
checkStrictly: true
},
labelPosition: 'right',
TypeList:[
],
radio:'1',
orgOptions:[]
};
},
props:{
list:{
type: Object,
default: () => {}
}
},
created() {
this.getTableData()
this.getclasses()
this.getOrgTreeList()
},
methods: {
getTableData() {
const url = "/voluntary/pointsAward/admin/detail";
let params = {
id:this.list.id
}
requestGet(url, params).then((res) =>{
console.log(res,"res");
if(res.code===0){
console.log("列表请求成功!!!!!!!!!!!!!!");
console.log(res.data, "data");
this.formData = res.data
}
})
// const { data, code, msg } = requestGet(url, params)
// console.log(data,"data");
// if (code === 0) {
// console.log("");
// console.log(data,"data");
// this.tableData = data
// console.log(this.tableData,"this.tableData");
// } else {
// }
},
//
async updateForm(){
console.log(this.formData,"formData");
const url = "/voluntary/pointsAward/admin/update";
let params = {
...this.formData,
id:this.list.id
}
console.log(params,"formData");
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
console.log("列表请求成功!!!!!!!!!!!!!!");
this.TypeList=data
this.total = data.total || 0;
this.tableData = data.list
console.log(this.tableData,"this.tableData");
this.formData={}
this.$emit('closeDialog')
} else {
this.$message.error(msg || "列表请求失败");
}
},
//
getOrgTreeList() {
this.$http
.post("/gov/org/customeragency/agencygridtree", {})
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg);
} else {
this.orgOptions = [];
this.orgOptions.push(res.data);
console.log(this.orgOptions,"this.orgOptions");
}
})
.catch(() => {
return this.$message.error("网络错误");
});
},
handleChangeAgency(val){
console.log(val);
this.redeemerOrgId=val
},
//
async getclasses() {
// const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/project-list";
const url = "/voluntary/pointsAward/classes/list";
let params = {
}
const { data, code, msg } = await requestGet(url, params)
if (code === 0) {
console.log("列表请求成功!!!!!!!!!!!!!!");
this.TypeList=data
this.total = data.total || 0;
this.tableData = data.list
console.log(this.tableData,"this.tableData");
} else {
this.$message.error(msg || "列表请求失败");
}
},
handlecancel(){
this.formData={}
console.log(this.formData,"formData");
this.$emit('closeDialog')
},
//
async submitForm(){
console.log(this.formData,"formData");
const url = "/voluntary/pointsAward/admin/add";
let params = {
...this.formData
}
console.log(params,"formData");
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
console.log("列表请求成功!!!!!!!!!!!!!!");
this.TypeList=data
this.total = data.total || 0;
this.tableData = data.list
console.log(this.tableData,"this.tableData");
this.formData={}
this.$emit('closeDialog')
} else {
this.$message.error(msg || "列表请求失败");
}
}
},
}
</script>
<style lang="scss" scoped>
@import "@/assets/scss/modules/management/volunteet.scss";
.item_width_1 {
width: 560px;
/deep/.tox .tox-dialog {
z-index: 20000;
}
}
.item_width_2 {
width: 150px;
/deep/.tox .tox-dialog {
z-index: 20000;
}
}
</style>
Loading…
Cancel
Save