Browse Source

部分bug

feature
是小王呀\24601 1 year ago
parent
commit
6c96787f52
  1. 72
      src/views/modules/volunteer/VolManage/integral.vue
  2. 2
      src/views/modules/volunteer/activityArchive/Administration.vue
  3. 15
      src/views/modules/volunteer/activityArchive/Points.vue
  4. 10
      src/views/modules/volunteer/activityArchive/add.vue
  5. 10
      src/views/modules/volunteer/activityArchive/index.vue
  6. 68
      src/views/modules/volunteer/activityArchive/select.vue
  7. 5
      src/views/modules/volunteer/pointsRedemption/Select.vue
  8. 12
      src/views/modules/volunteer/pointsRedemption/index.vue
  9. 44
      src/views/modules/volunteer/pointsRedemption/record.vue
  10. 8
      src/views/modules/volunteer/pointsRedemption/update.vue

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

@ -33,7 +33,7 @@
<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-select v-model="formData.classKey" placeholder="请选择" clearable>
<el-option v-for="item in formData.optionsStatus" :key="item.code" :label="item.name"
:value="item.code">
</el-option>
@ -104,7 +104,7 @@
</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="danger" @click="getTableData">确定</el-button> -->
</div>
<div>
</div>
@ -121,7 +121,20 @@ export default {
createdTimeTo:"",
createdTimeTo:"",
classKey:"",
optionsStatus: [],
optionsStatus: [
{
code:1,
name:"活动积分"
},
{
code:2,
name:"平台积分"
},
{
code:3,
name:"操作积分"
},
],
},
labelPosition: 'right',
tableData: [],
@ -194,31 +207,31 @@ await requestGet(url,params).then((res)=>{
})
},
//
async getTableData() {
const url = "/voluntary/points/adjustVolunteerPoints/commit";
let params={
volunteerId:this.tableData.id,
reason:this.behaviorName,
description:this.description,
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");
// async getTableData() {
// const url = "/voluntary/points/adjustVolunteerPoints/commit";
// let params={
// volunteerId:this.list.id,
// reason:this.behaviorName,
// description:this.description,
// 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 requestPost(url,params);
if (code === 0) {
console.log("列表请求成功!!!!!!!!!!!!!!");
this.$message({
message: "调整成功",
type: "success",
});
this.$emit('summDetailClose')
} else {
}
},
// const { data, code, msg } = await requestPost(url,params);
// if (code === 0) {
// console.log("");
// this.$message({
// message: "",
// type: "success",
// });
// this.$emit('summDetailClose')
// } else {
// }
// },
async getlist() {
const url = "/voluntary/points/listPointsChangeRecord";
@ -226,11 +239,12 @@ await requestGet(url,params).then((res)=>{
volunteerId:this.list.id,
createdTimeFrom:this.formData.createdTimeFrom,
createdTimeTo:this.formData.createdTimeTo,
description:this.description,
// description:this.description,
pointsClass:this.formData.classKey,
pageNo:this.pageNo,
pageSize:this.pageSize,
// pointsDelta:this.Positive+this.integralnum,
primaryPoints:this.tableData.points
// primaryPoints:this.tableData.points
// volunteerId:this.list.id,
// mobile:this.formData.phone,
// name:this.formData.name

2
src/views/modules/volunteer/activityArchive/Administration.vue

@ -60,7 +60,7 @@ export default {
labelPosition: 'right',
tableData: [],
pageNo: 1,
pageSize: window.localStorage.getItem("pageSize") || 20,
pageSize:20,
};
},
props:{

15
src/views/modules/volunteer/activityArchive/Points.vue

@ -3,7 +3,7 @@
<div class="f-flex" style="justify-content: space-around; margin-bottom: 20px;">
<div class="f-flex" style="align-items: center;">
<div>是否发放积分</div>
<el-select v-model="formData.whether" placeholder="请选择" >
<el-select v-model="formData.whether" placeholder="请选择" clearable >
<el-option v-for="item in formData.options" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
@ -76,7 +76,7 @@ export default {
mobile:"",
options:[
{value:1,label:"已发放"},
{value:"",label:"未发放"},
{value:'',label:"未发放"},
]
}
@ -90,6 +90,17 @@ export default {
}
},
methods: {
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();
},
//
handleSearch(){
console.log("this.long");

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

@ -74,7 +74,9 @@
</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="请输入活动内容" />
<el-input type="textarea" placeholder="请输入活动标题,不超过50子" v-model="formData.conditions" maxlength="200"
show-word-limit>
</el-input>
</div>
</el-form-item>
<el-form-item label="签到时间" prop="Checktime">
@ -96,7 +98,7 @@
@change="handleSwitchChange"></el-switch>
</el-form-item>
</div>
<el-form-item label="赞助单位" prop="sponsor">
<!-- <el-form-item label="赞助单位" prop="sponsor">
<div style="display: flex; align-items: center">
<el-input v-model="input" placeholder="请输入"></el-input>
@ -105,7 +107,7 @@
</el-form-item>
<el-form-item label=" 联系电话" prop="number">
<el-input v-model="input" placeholder="请输入"></el-input>
</el-form-item>
</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
@ -397,7 +399,7 @@ export default {
//
handleComfirm() {
console.log(this.formData,"this,formD");
let url="/voluntary/activityInfo/saveInfo";
let url="/voluntary/activityInfo/ ";
let parms={
...this.formData
}

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

@ -64,7 +64,7 @@
</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="handleDetail(scope.row)">修改</el-button>
<el-button v-if="scope.row.online === 1" type="text" style="color:#1C6AFD;" size="small" @click="handleupOnline(scope.row)">下线</el-button>
<el-button v-if="scope.row.online === 0" type="text" style="color:#1C6AFD;" size="small" @click="handleupOnline(scope.row)">上线</el-button>
<!-- <el-button type="text" style="color:#1C6AFD;" size="small" @click="handleintegral(scope.row)">更多</el-button> -->
@ -91,9 +91,9 @@
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="查看"
<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" />
<selecthande 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">
@ -118,10 +118,10 @@
import add from "./add.vue"
import ActivityCountshow from "./Administration.vue"
import Points from "./Points.vue"
import select from "./select.vue"
import selecthande from "./select.vue"
export default {
components: {add,ActivityCountshow,Points,select },
components: {add,ActivityCountshow,Points,selecthande },
data() {
return {

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

@ -74,7 +74,9 @@
</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="请输入活动内容" />
<el-input type="textarea" placeholder="请输入活动标题,不超过50子" v-model="formData.conditions" maxlength="200"
show-word-limit>
</el-input>
</div>
</el-form-item>
<el-form-item label="签到时间" prop="Checktime">
@ -107,7 +109,7 @@
</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
<el-select v-model.trim="formData.address" 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;"
@ -130,6 +132,7 @@
</div>
</template>
<script>
import { Loading } from 'element-ui' // Loading
import { mapGetters } from 'vuex'
import { requestPost, requestGet } from '@/js/dai/request'
@ -212,6 +215,12 @@
}
},
props:{
list:{
type: Object,
default: () => {}
}
},
watch: {
'formData.notQuota'(newValue) {
console.log(newValue,'newvalue');
@ -225,14 +234,44 @@
},
components: { fileList,Tinymce,UploadImage},
async mounted () {
console.log(this.list,"list");
// this.formData=this.list
// this.startLoading()
// await this.loadInfo()
// this.endLoading()
this.getOrgTreeList()
this.getTableData()
},
methods: {
//
async getTableData() {
// const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/project-list";
const url = `/voluntary/activityInfo/detail/${this.list.id}`;
let params = {
}
requestGet(url, params).then((res) => {
if (res.code == 0) {
// this.total = res.data.total || 0;
this.formData = res.data;
console.log(res, "this.tableData");
} else {
this.$message.error(res.msg);
}
});
// const { data, code, msg } = await requestGet(url, params)
// if (code === 0) {
// console.log("");
// this.total = data.total || 0;
// this.tableData = data.list
// console.log(this.tableData,"this.tableData");
// } else {
// }
},
handleClickKey(index) {
let selPosition = this.resultList[index]
let lonlat = selPosition.lonlat.split(" ")
@ -254,9 +293,9 @@
let { msg, data } = await map.getAddress(lat, lng);
if (msg == "success") {
this.formData.address = data.address
this.searchValue = data.address
this.formData.address = data.address
this.searchOptions = []
console.log('data,this.searchValue ', this.searchValue)
}
},
@ -433,7 +472,7 @@
} else {
this.orgOptions = [];
this.orgOptions.push(res.data);
console.log(this.orgOptions,"this.orgOptions");
console.log(this.orgOptions,this.list,"this.orgOptions");
}
})
@ -475,22 +514,7 @@
},
computed: {
},
props: {
formType: { // addeditdetail
type: String,
required: ''
},
icPartyActId: {
type: String,
required: ''
},
defaultTime: {
type: String,
required: ''
},
}
}
</script>
<style lang="scss" scoped>

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

@ -19,8 +19,9 @@
<el-form-item label="兑换地点">
{{ tableData.redeemerOrgName}}
</el-form-item>
<el-form-item label="规则说明">
{{ tableData.description}}
<el-form-item label="规则说明" style=" display: flex;
align-items: center;">
<div v-html="tableData.description"></div>
</el-form-item>
</el-form>
</div>

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

@ -9,7 +9,7 @@
@change="handleChangeAgency"></el-cascader>
</el-form-item>
<el-form-item label="分类">
<el-select v-model="formData.classKey" placeholder="请选择">
<el-select v-model="formData.classKey" placeholder="请选择" clearable>
<el-option v-for="item in formData.optionsStatus" :key="item.classKey" :label="item.className"
:value="item.classKey">
</el-option>
@ -92,8 +92,8 @@
<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"/>
width="1000px" top="10vh" class="dialog-h" @closed="closeupdate">
<update v-if="updateshow" :list="fmData" @closeupdate="closeupdate"/>
</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">
@ -136,7 +136,7 @@
HandlePointsshow:false,
ActivityCountshow:false,
add:false,
orgTypeFilter:[],
orgTypeFilter:["street"],
formData:{
shelveOnTimeTo:"",
classKey:"",
@ -280,6 +280,10 @@
this.add=false,
this.getTableData()
},
closeupdate(){
this.updateshow=false,
this.getTableData()
},
handleSelect(row){
this.showSelect=true
this.fmData=row

44
src/views/modules/volunteer/pointsRedemption/record.vue

@ -11,9 +11,9 @@
<el-input placeholder="请输入内容" v-model="searchData.redeemerMobile" style="width: 200px" clearable>
</el-input>
</div>
<!-- <div class="flex flex-center1 flex-center2 m-bottom10" style="">
<div class="flex flex-center1 flex-center2 m-bottom10" style="">
<div>状态</div>
<el-select v-model="StatusName" placeholder="请选择">
<el-select v-model="searchData.StatusName" placeholder="请选择">
<el-option v-for="item in Status" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
@ -21,9 +21,13 @@
</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 v-model="searchData.redeemTimeFrom" 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="searchData.redeemTimeTo" type="datetime" placeholder=""
format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss">
</el-date-picker>
</div> -->
</div>
<div>
<el-button type="primary" class="m-bottom10" @click="handleSeach">查询</el-button>
</div>
@ -62,7 +66,7 @@
layout="sizes, prev, pager, next, total" :total="total">
</el-pagination>
</div>
</div>
</div>
</template>
@ -86,9 +90,13 @@ export default {
tableData: [],
searchData:{
redeemerMobile:"",
redeemerName:""
redeemerName:"",
redeemTimeTo:"",
redeemTimeFrom:"",
},
pageNo:1,
pageSize:10,
total:0,
awardId:"",
};
},
@ -99,6 +107,17 @@ export default {
}
},
methods: {
handleSizeChange(val) {
console.log(`每页 ${val}`);
this.pageSize = val;
window.localStorage.setItem("pageSize", val);
this.getTableData();
},
handleCurrentChange(val) {
console.log(`当前页: ${val}`);
this.pageNo = val;
this.getTableData();
},
handleSeach(){
console.log(this.SearchName);
this.getTableData()
@ -109,8 +128,13 @@ export default {
const url = "/voluntary/points/admin/listRedeemRecords";
let params = {
awardId:this.awardId,
redeemerMobile:this.searchData.redeemerMobile,
redeemerName:this.searchData.redeemerName
mobile:this.searchData.redeemerMobile,
name:this.searchData.redeemerName,
redeemTimeFrom:this.searchData.redeemTimeFrom,
redeemTimeTo:this.searchData.redeemTimeTo,
pageSize:this.pageSize,
pageNo:this.pageNo
}
console.log(params,"params");
console.log(this.awardId,"awardId"
@ -123,8 +147,6 @@ export default {
this.total = data.total || 0;
this.tableData = data.list
console.log(this.tableData,"this.tableData");
} else {
}
},

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

@ -127,6 +127,7 @@
},
methods: {
//
getTableData() {
const url = "/voluntary/pointsAward/admin/detail";
let params = {
@ -138,6 +139,9 @@
console.log("列表请求成功!!!!!!!!!!!!!!");
console.log(res.data, "data");
this.formData = res.data
if ( this.formData.stockQty) {
this.radio='2'
}
}
})
@ -222,7 +226,7 @@
this.formData={}
console.log(this.formData,"formData");
this.$emit('closeDialog')
this.$emit('closeupdate')
},
//
async submitForm(){
@ -240,7 +244,7 @@
this.tableData = data.list
console.log(this.tableData,"this.tableData");
this.formData={}
this.$emit('closeDialog')
this.$emit('closeupdate')
} else {
this.$message.error(msg || "列表请求失败");

Loading…
Cancel
Save