Browse Source

增加积分接口,返回积分总数

feature
是小王呀\24601 11 months ago
parent
commit
198a1cb02a
  1. 71
      src/views/modules/volunteer/LifeCircleManagement/add.vue
  2. 19
      src/views/modules/volunteer/LifeCircleManagement/index.vue
  3. 1017
      src/views/modules/volunteer/Venuemanagement/add.vue
  4. 491
      src/views/modules/volunteer/Venuemanagement/index.vue
  5. 32
      src/views/modules/volunteer/activityArchive/add.vue
  6. 4
      src/views/modules/volunteer/activityArchive/index.vue

71
src/views/modules/volunteer/LifeCircleManagement/add.vue

@ -13,12 +13,12 @@
</el-col>
<el-col :span="12">
<el-form-item label="组织类型" prop="typeName" label-width="100px">
<el-cascader v-model="typeName" :options="options" @change="handleChange"></el-cascader>
<el-cascader v-model="formData.typeName" :options="options" @change="handleChange" :disabled="showdisabled"></el-cascader>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="名称" label-width="100px" prop="Name">
<el-input v-model.trim="formData.Name" size="small" clearable placeholder="请输入活动名称"
<el-input v-model.trim="formData.Name" size="small" clearable placeholder="请输入活动名称" :disabled="showdisabled"
class="u-item-width-normal"></el-input>
</el-form-item>
</el-col>
@ -35,8 +35,8 @@
<el-col :span="24">
<el-form-item label="位置" prop="address" label-width="100px" style="display: block">
<div style="width: 634px">
<el-select v-model.trim="searchValue" filterable style="width: 634px" remote :reserve-keyword="true"
placeholder="请输入关键词" :remote-method="remoteMethod" :loading="loading">
<el-select v-model.trim="searchValue" filterable style="width: 634px" remote :reserve-keyword="true" :disabled="showdisabled"
placeholder="请输入关键词" :remote-method="remoteMethod" >
<el-option v-for="(item, index) in searchOptions" @click.native="handleClickKey(index)"
:key="item.value || index" :label="item.label" :value="item.value">
</el-option>
@ -47,13 +47,13 @@
</el-col>
<el-col :span="12">
<el-form-item label="联系人" prop="operator" label-width="100px">
<el-input v-model.trim="formData.operator" size="small" clearable placeholder="请输入管理员姓名"
<el-input v-model.trim="formData.operator" size="small" clearable placeholder="请输入管理员姓名" :disabled="showdisabled"
class="u-item-width-normal"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="联系电话" prop="mobile" label-width="100px">
<el-input v-model.trim="formData.mobile" size="small" clearable placeholder="请输入手机号"
<el-input v-model.trim="formData.mobile" size="small" clearable placeholder="请输入手机号" :disabled="showdisabled"
class="u-item-width-normal"></el-input>
</el-form-item>
</el-col>
@ -62,9 +62,9 @@
<div >
<div v-for="(item, index) in formData.sponsors" :label="index" :key="item.name" :prop=index style="display: flex;">
<el-form-item label="标签" prop="sponsors" label-width="100px" >
<el-input v-model="item.name" placeholder="请输入(最多添加四个)" lass="u-item-width-normal"></el-input>
<el-input :disabled="showdisabled" v-model="item.name" placeholder="请输入(最多添加四个)" lass="u-item-width-normal"></el-input>
</el-form-item>
<div v-if="index > 0" @click="removeDomain(item)" style="color: blue; font-size: 12px; margin-top: 15px">删除
<div v-if="index > 0" @click="removeDomain(item)" style="color: blue; font-size: 12px; margin-top: 15px">删除
</div>
</div>
</div>
@ -73,29 +73,26 @@
<!-- <i class="el-icon-circle-plus" @click="addDomain" style="font-size: 20px; margin-top:7px;"></i> -->
</div>
</el-col>
<!-- <el-col :span="12">
<el-form-item label="身份证号" prop="idCard" label-width="100px">
<el-input v-model.trim="formData.idCard" size="small" clearable placeholder="请输入身份证号"
class="u-item-width-normal"></el-input>
</el-form-item>
</el-col> -->
<el-col :span="12">
<el-form-item label="展示图片" label-width="100px" prop="coverImg">
<template>
<upload-image :defaultFileList="fileList" :limit="1" @change="onChangeFileList"
<upload-image :defaultFileList="fileList" :limit="1" @change="onChangeFileList" v-if="!showdisabled"
@file-removed="removedImg"></upload-image>
<div v-else>
<img :src="formData.coverImg" alt="" style="width: 100px; height: 100px;">
</div>
</template>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="营业时间" label-width="100px" prop="datatime">
<el-input v-model.trim="formData.datatime" size="small" clearable placeholder="请输入营业时间"
<el-input v-model.trim="formData.datatime" size="small" clearable placeholder="请输入营业时间" :disabled="showdisabled"
class="u-item-width-normal"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="备注" label-width="100px" prop="beizhu">
<el-input v-model.trim="formData.beizhu" size="small" clearable placeholder="请输入备注"
<el-input v-model.trim="formData.beizhu" size="small" clearable placeholder="请输入备注" :disabled="showdisabled"
class="u-item-width-normal"></el-input>
</el-form-item>
</el-col>
@ -133,7 +130,7 @@
<script>
import { mapGetters } from 'vuex'
import { Loading } from 'element-ui' // Loading
// import { Loading } from 'element-ui' // Loading
import { requestPost } from '@/js/dai/request'
import Tinymce from '@c/tinymce2/index.vue'
import daiMap from "@/utils/dai-map";
@ -147,10 +144,12 @@
var infoWindowList
var geocoder //
let loading //
export default {
data() {
return {
showdisabled:false,
searchOptions:[],
options: [{
value: 'zhinan',
label: '指南',
@ -358,9 +357,7 @@
tableDate:{},
formData:
{
sponsors: [{ name: ""}],//
sponsors: [{ name: ""}],//
typeName:"",//
status:"pass",//
numberNum:"",//
@ -411,7 +408,9 @@
//
async initForm(type, unitId) {
console.log(type, unitId,"i就理解哦i");
if(type=="info"){
this.showdisabled=true
}
// await this.getDemandOptions()
// console.log(this.demandOptions);
// let { latitude, longitude } = this.$store.state.user;
@ -536,7 +535,6 @@
// agencyId: this.agencyId
pageSize: 20,
pageNo: 1,
typeName: "",
enabled: 1
}
const { data, code, msg } = await requestPost(url, params)
@ -884,9 +882,8 @@
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) {
@ -924,31 +921,11 @@
},
//
startLoading() {
loading = Loading.service({
lock: true, //
text: '正在加载……', //
background: 'rgba(0,0,0,.7)' //
})
},
//
endLoading() {
// clearTimeout(timer);
if (loading) {
loading.close()
}
}
},
computed: {
dataRule() {
return {
// typeName: [
// { required: true, message: '', trigger: 'blur' }
// ],
// serviceTypeList: [
// { required: true, message: '', trigger: 'blur' }
// ],
typeName: [
{ required: true, message: '请选择组织类型', trigger: 'blur' }
],

19
src/views/modules/volunteer/LifeCircleManagement/index.vue

@ -229,6 +229,18 @@ export default {
//
showInfoClose(){
this.showEdit=false
},
//
handleDetail(row){
// console.log(row,"row");
// this.showInfo=true
this.showAdd=true
this.formTitle="查看"
this.$nextTick(() => {
this.$refs.ref_form.initForm("info", row);
});
},
//
async getTableData() {
@ -376,12 +388,7 @@ export default {
this.formData=[]
this.getTableData()
},
handleDetail(row){
console.log(row,"row");
this.showInfo=true
this.fmData=row
},
summDetailClose(){
this.showAdd=false
this.getTableData()

1017
src/views/modules/volunteer/Venuemanagement/add.vue

File diff suppressed because it is too large

491
src/views/modules/volunteer/Venuemanagement/index.vue

@ -0,0 +1,491 @@
<template>
<div class="g-main">
<div class="m-search">
<el-form :inline="true" ref="ref_searchform" :label-width="'100px'">
<div>
<el-form-item label="挂靠阵地">
<el-select v-model="formData.serviceType" placeholder="请选择" clearable>
<el-option v-for="item in formData.optionstype" :key="item.value" :label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="名称">
<el-input v-model.trim="formData.orgName" size="small" class="item_width_1" clearable
placeholder="请输入">
</el-input>
</el-form-item>
</div>
<div class="block">
<div style="display: flex; justify-content: flex-end;">
<el-button style="margin-left:10px" class="diy-button--blue" size="small"
@click="handleSearch">查询</el-button>
<el-button style="margin-left:10px" class="diy-button--white" size="small"
@click="resetSearch">重置</el-button>
</div>
</div>
</el-form>
</div>
<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="handleExportModule()">下载模板</el-button>
<el-button class="diy-button--white" size="small">
<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" :on-progress="handleProgress" :on-success="handleExcelSuccess"
:before-upload="beforeExcelUpload" :http-request="uploadHttpRequest">
导入
</el-upload>
</el-button>
<el-table class="table" :data="tableData" border style="width: 100%">
<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="挂靠阵地"
:show-overflow-tooltip="true">
</el-table-column>
<el-table-column prop="orgName" header-align="center" align="center" label="名称"
:show-overflow-tooltip="true">
<!-- <template slot-scope="scope">
<span>{{ scope.row.enabled === 1 ? '关闭' : '显示' }}</span>
</template> -->
</el-table-column>
<el-table-column prop="serviceTypeName" header-align="center" align="center" label="咨询电话"
:show-overflow-tooltip="true">
</el-table-column>
<el-table-column prop="numberNum" header-align="center" align="center" label="地址"
:show-overflow-tooltip="true">
</el-table-column>
<el-table-column prop="operator" header-align="center" align="center" label="预约时间"
:show-overflow-tooltip="true">
</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="handleDel(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>
<el-dialog :visible.sync="showAdd" :close-on-click-modal="false" :close-on-press-escape="false" :title="formTitle"
width="850px" top="10vh" class="dialog-h" @closed="showAddClose">
<add ref="ref_form" v-if="showAdd" @showAddClose="showAddClose" />
</el-dialog>
<el-dialog :visible.sync="showInfo" :close-on-click-modal="false" :close-on-press-escape="false" title="查看"
width="850px" top="10vh" class="dialog-h" @closed="showInfoClose">
<info v-if="showInfo" :VolunteerList="fmData" @showInfoClose="showInfoClose" />
</el-dialog>
<el-dialog :visible.sync="showEdit" :close-on-click-modal="false" :close-on-press-escape="false" title="修改"
width="850px" top="10vh" class="dialog-h" @closed="showEditClose">
<edit v-if="showEdit" :VolunteerList="EditList" @showEditClose="showEditClose" />
</el-dialog>
</div>
</div>
</template>
<script>
import { requestPost, requestGet } from "@/js/dai/request";
import nextTick from "dai-js/tools/nextTick";
import { mapGetters } from "vuex";
import add from "./add.vue"
// import info from "./info.vue"
// import edit from "./edit.vue"
// import MemberManagement from "./MemberManagement.vue"
// import process from "./process.vue"
// import Record from "./activeRecord"
// import integral from "./integral"
// // import projectInfo from "./cpts/project-info";
import axios from "axios";
export default {
components: { add},
data() {
return {
formTitle:"",
formData: {
orgName: "",
serviceType: "",
optionstype: [
{ value: 1, label: "志愿者服务组织" },
{ value: 2, label: "志愿者服务团队" },
]
},
showprocess:false,
EditList:{},
showAdd: false,
showMember: false,
showEdit: false,
// pageType: "list", // list dispose info issue-info
pageNo: 1,
pageSize: 20,
total: 0,
tableData: [
],
importLoading:false,
showInfo:false,
};
},
computed: {
maxTableHeight() {
return this.$store.state.inIframe
? this.clientHeight - 400 + this.iframeHeigh
: this.clientHeight - 400;
},
...mapGetters(["clientHeight", "iframeHeight"]),
},
watch: {
},
mounted() {
this.getTableData();
},
methods: {
//
handleprocessl(row){
this.showprocess=true
this.EditList=row
console.log(row,this.fmData,"row");
},
//
handleprocesslClose(){
this.showprocess=false
this.getTableData()
},
//
handleshowMember(row){
console.log (row,this.fmData,"row");
this.showMember=true
this.fmData=row
},
//
MemberManagementClose(){
this.showMember=false
this.getTableData()
},
//
handleEdit(row){
this.showAdd=true
this.formTitle="新增"
console.log(row,"row");
this.$nextTick(() => {
this.$refs.ref_form.initForm("edit", row);
});
},
//
showEditClose(){
this.showEdit=false
this.getTableData()
},
//
handleAdd(){
this.showAdd=true
this.formTitle="新增"
this.$nextTick(() => {
this.$refs.ref_form.initForm("add", null);
});
// this.$refs.ref_form.initForm("add", null);
},
//
showAddClose(){
console.log("sdlkfjklsdf1");
this.showAdd=false
this.getTableData()
},
//
showInfoClose(){
this.showEdit=false
},
//
handleDetail(row){
// console.log(row,"row");
// this.showInfo=true
this.showAdd=true
this.formTitle="查看"
this.$nextTick(() => {
this.$refs.ref_form.initForm("info", row);
});
},
//
async getTableData() {
// const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/project-list";
const url = "/voluntary/volunteerOrg/page";
let params={
orgName: this.formData.orgName,
serviceType: this.formData.serviceType,
pageNo:this.pageNo,
pageSize: this.pageSize
}
const { data, code, msg } = await requestPost(url,params);
if (code === 0) {
console.log("列表请求成功!!!!!!!!!!!!!!");
this.total = data.total || 0;
this.tableData = data.list
} else {
}
},
//
async uploadHttpRequest(file) {
debugger
// this.importLoading = true;
console.log(this.importLoading,"this.importLoading");
debugger
// this.importBtnTitle = '...';
this.$message({
showClose: true,
dangerouslyUseHTMLString: true,
message: "导入中,请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
duration: 3000
});debugger
let than = this;
console.log(than,"than");
debugger
// document.getElementById('clickA').addEventListener('click', function () {
// than.$router.replace('/main/importRecord-index');
// });
const formData = new FormData(); //FormDataappend('key', value)
formData.append('file', file.file); //
formData.append('code', ''); //
debugger
console.log(formData,"formData");
let url = '/voluntary/volunteerOrg/import'
// if (this.importType == 2) {
// url = '/governance/icEvent/importAwo'
// }
console.log(url)
await this.$http
.post(url, formData)
.then(res => {
log("res", res);
if (res.data.code == 0 && res.data.msg == 'success') {
const data = res.data.data;
this.dataList = [
...Object.keys(data.option.exist).map(k => {
return {
index: k,
srcField: data.option.exist[k],
exist: true,
field: data.option.exist[k]
};
}),
...Object.keys(data.option.notExist).map(k => {
return {
index: k,
srcField: data.option.notExist[k],
exist: false,
field: ''
};
})
];
this.importOption = data.option;
this.importCode = data.code;
this.fileData = file;
} else this.$message.error(res.data.msg);
})
.catch(err => {
console.log('失败', err);
file.onError(); //
});
this.importLoading = false;
this.importBtnTitle = '导入';
this.$refs.upload.clearFiles();
this.getTableData();
},
handleExcelSuccess(res, file) {
if (!res.code === 0 && !res.msg === 'success') {
this.$message.error(res.msg);
}
},
beforeExcelUpload(file) {
console.log(file,"file1");
debugger
const isType = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
debugger
const isTypeComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
const fileType = isType || isTypeComputer;
debugger
const isLt1M = file.size / 1024 / 1024 < 10;
debugger
if (!fileType) {
this.$message.error('上传文件只能是xls/xlsx格式!');
}
debugger
if (!isLt1M) {
this.$message.error('上传文件大小不能超过 10MB!');
}
console.log(isLt1M,"isLt1M");
debugger
return fileType && isLt1M;
},
handleDel(row){
console.log(row,"row");
let url="/voluntary/volunteerOrg/delete";
let params={
id:row.id
}
requestPost(
url,params
).then(({data}) => {
if (data && data.code === 0) {
this.$message({
message: '删除成功',
type: 'success',
duration: 1500,
onClose: () => {
}
})
this.getTableData()
} else {
this.$message.error(data.msg)
}
})
},
diaClose(){
this.formShow=false
},
resetSearch(){
this.formData=[]
this.getTableData()
},
summDetailClose(){
this.showAdd=false
this.getTableData()
},
async handleExportModule() {
let url = "/voluntary/volunteerOrg/downloadImportTemplate";
let params = {};
await this.$http({
method: "GET",
url,
responseType: "blob",
data: params,
})
.then((res) => {
console.log(res,"resskfk");
if (res.headers["content-disposition"]) {
let fileName = window.decodeURI(
res.headers["content-disposition"].split(";")[1].split("=")[1]
);
console.log("filename", fileName);
let blob = new Blob([res.data], {
type: "application/vnd.ms-excel",
});
var url = window.URL.createObjectURL(blob);
var aLink = document.createElement("a");
aLink.style.display = "none";
aLink.href = url;
aLink.setAttribute("download", fileName);
document.body.appendChild(aLink);
aLink.click();
document.body.removeChild(aLink); //
window.URL.revokeObjectURL(url); //blob
} else this.$message.error("下载失败");
})
.catch((err) => {
console.log("err", err);
return this.$message.error("网络错误");
});
},
handleProgress(event, file, fileList) {
console.log("percentage", file.percentage);
},
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();
},
//
handleSearch(val) {
console.log(this.fmData);
this.pageNo = 1;
this.getTableData();
},
handleClose() {
this.pageType = "list";
this.currentProject = {
projectId: "",
};
},
handleEditSuccess() {
this.handleClose();
this.getTableData();
},
},
};
</script>
<style lang="scss" scoped>
@import "@/assets/scss/modules/management/list-main.scss";
.g-main {
width: 100%;
}
.m-search {
background: #ffffff;
border-radius: 4px;
padding: 30px 20px 5px;
box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
}
.item_width_1 {
width: 260px;
}
.item_width_2 {
width: 495px;
}
.m-table {
background: #ffffff;
box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
border-radius: 4px;
margin-top: 15px;
padding: 23px 30px 10px;
.table {
margin-top: 20px;
}
}
.div_btn {
display: flex;
justify-content: space-between;
}
.el-row {
/* margin-bottom: 20px; */
display: flex;
flex-wrap: wrap;
margin-top: 10px;
margin-right: 50px;
}
</style>

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

@ -36,7 +36,7 @@
</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 v-for="item in serviceLevelList" :key="item.id" :label="item.name" :value="item.id" @click.native="handeleserviceLevel()">
</el-option>
</el-select>
</el-form-item>
@ -60,13 +60,13 @@
<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>
label="描述文字" type="number" @change="handeleserviceTime()"></el-input-number>
</div>
</el-form-item>
</el-col>
<el-col :span="12">
<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-input-number :disabled="true" v-model="formData.points" :min="0" label="描述文字" :step="0.1" :precision="1" ></el-input-number>
</el-form-item>
</el-col>
<el-col :span="12">
@ -402,7 +402,31 @@ export default {
this.getTableData()
},
methods: {
methods: {
//
handeleserviceLevel(){
console.log(this.formData.serviceLevel,"this.formData.serviceLevel");
this.getintegralComputation()
},
//
handeleserviceTime(){
console.log(this.formData.serviceTime,"this.formData.serviceLevel");
this.getintegralComputation()
},
//
async getintegralComputation() {
const url = "/voluntary/activityInfo/integralComputation";
let params={
level:this.formData.serviceLevel,
serviceTime:this.formData.serviceTime,
}
requestGet(url,params).then(res=>{
console.log(res,"res");
this.formData.points=res.data
})
},
//
async getTableData() {
const url = "/voluntary/project/admin/list";

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

@ -85,9 +85,9 @@
@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"v-if="scope.row.auditStatus === 0" style="color:#1C6AFD;" size="small" @click="handleprocessl(scope.row)">审核</el-button>
<el-button v-if="scope.row.online === 1 &&scope.row.statusType!='进行中'"
<el-button v-if="scope.row.online === 1 &&scope.row.statusType!='进行中'&&scope.row.client !== 1"
type="text" style="color:#1C6AFD;" size="small" @click="handleupOnline(scope.row)">下线</el-button>
<el-button v-if="scope.row.online === 0 &&scope.row.statusType!='进行中'" type="text" style="color:#1C6AFD;"
<el-button v-if="scope.row.online === 0 &&scope.row.statusType!='进行中'&&scope.row.client !== 1" 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> -->
<el-dropdown trigger="click" style="margin-left: 10px" v-if="scope.row.client !== 1||scope.row.auditStatus==1"

Loading…
Cancel
Save