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

志愿组织

feature
是小王呀\24601 12 months ago
parent
6f79fc6b60
commit
5e48f2a596
7 changed files with 1664 additions and 1623 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. 4
      src/views/modules/shequzhili/event/eventList.vue
  2. 2
      src/views/modules/volunteer/Dynamicmanagement/index.vue
  3. 182
      src/views/modules/volunteer/VoluntaryOrganization/MemberManagement.vue
  4. 1680
      src/views/modules/volunteer/VoluntaryOrganization/add.vue
  5. 1368
      src/views/modules/volunteer/VoluntaryOrganization/edit.vue
  6. 38
      src/views/modules/volunteer/VoluntaryOrganization/index.vue
  7. 13
      src/views/modules/volunteer/VoluntaryOrganization/process.vue

4
src/views/modules/shequzhili/event/eventList.vue
View File

@ -545,12 +545,14 @@ export default {
let url = '/governance/icEvent/downloadTemplate';
let params = {};
await this.$http({
method: 'POST',
method: 'GET',
url,
responseType: 'blob',
data: params
})
.then(res => {
console.log(res,"res");
if (res.headers['content-disposition']) {
let fileName = window.decodeURI(res.headers['content-disposition'].split(';')[1].split('=')[1]);
let blob = new Blob([res.data], {

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

@ -3,7 +3,7 @@
<div class="m-search">
<el-form :inline="true" ref="ref_searchform" :label-width="'100px'">
<div>
<el-form-item label="标题" :label-width="'50px'">
<el-form-item label="标题" >
<el-input v-model.trim="formData.OrganizationName" size="small" class="item_width_1" clearable
placeholder="请输入">
</el-input>

182
src/views/modules/volunteer/VoluntaryOrganization/MemberManagement.vue
View File

@ -7,11 +7,11 @@
</el-input>
</el-form-item>
<el-form-item label="加入时间" label-width="100px">
<el-date-picker v-model="formData.createdTimeFrom" type="datetime" placeholder="开始时间"
<el-date-picker v-model="formData.startTime" type="datetime" placeholder="开始时间"
format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss">
</el-date-picker>
<span style="margin: 0 10px;">至</span>
<el-date-picker v-model="formData.createdTimeTo" type="datetime" placeholder="结束时间"
<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" @change="actcontrolTime">
</el-date-picker>
</el-form-item>
@ -23,19 +23,19 @@
<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 prop="createdTime" header-align="center" align="center" label="加入时间">
</el-table-column>
<el-table-column prop="createdTime" header-align="center" align="center" label="所属社区">
<el-table-column prop="agencyName" header-align="center" align="center" label="所属社区">
</el-table-column>
. <el-table-column prop="operationName" header-align="center" align="center" label="姓名">
. <el-table-column prop="name" header-align="center" align="center" label="姓名">
</el-table-column>
<el-table-column prop="pointsDelta" header-align="center" align="center" label="身份证号">
<el-table-column prop="idCard" header-align="center" align="center" label="身份证号">
</el-table-column>
<el-table-column prop="pointsDelta" header-align="center" align="center" label="手机号">
<el-table-column prop="mobile" header-align="center" align="center" label="手机号">
</el-table-column>
<el-table-column prop="pointsDelta" header-align="center" align="center" label="活动次数">
<el-table-column prop="actNum" header-align="center" align="center" label="活动次数">
</el-table-column>
<el-table-column prop="pointsDelta" header-align="center" align="center" label="服务时常">
<el-table-column prop="leftPoints" header-align="center" align="center" label="服务时长">
</el-table-column>
</el-table>
<div>
@ -60,35 +60,14 @@
name: "see",
data() {
return {
formData:{
createdTimeTo:"",
createdTimeTo:"",
pointsClass:"",
optionsStatus: [
{
code:1,
name:"活动积分"
},
{
code:2,
name:"平台积分"
},
{
code:3,
name:"操作积分"
},
],
},
labelPosition: 'right',
tableData: [],
integralnum: 1,
radio:3,
textarea: '',
options: [],
behaviorName: '',
description:"",
pointsDelta:"",
Positive:'',
formData: {
name: "",
mobile: "",
volunteerOrgId: "",
startTime: "",
endTime: "",
Positive: '',
},
pageSize: 10,
pageNo: 1,
total: 0,
@ -110,12 +89,46 @@
},
methods: {
//获取成员列表
async getlist() {
const url = "/voluntary/volunteerInfo/page";
let params={
id:this.list.id,
name:this.formData.name,
mobile:this.formData.mobile,
// description:this.description,
pointsClass:this.formData.pointsClass,
pageNo:this.pageNo,
pageSize:this.pageSize,
// pointsDelta:this.Positive+this.integralnum,
// primaryPoints:this.tableData.points
volunteerOrgId:this.formData.volunteerOrgId,
startTime:this.formData.startTime,
endTime:this.formData.endTime
}
console.log(params,"params");
const { data, code, msg } = await requestPost(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 {
}
},
//控制活动时间
actcontrolTime(){
console.log("dislfj");
if(this.formData.createdTimeFrom>this.formData.createdTimeTo){
if(this.formData.startTime>this.formData.endTime){
this.$message.error('活动结束时间不能在活动开始时间之前');
this.formData.createdTimeTo=''
this.formData.endTime=''
return
}
},
@ -143,81 +156,22 @@
},
//获取积分行为
async getpoint1s() {
const url = "/voluntary/points/adjustVolunteerPoints/reasonsList";
let params={
}
await requestGet(url,params).then((res)=>{
if (res.code === 0) {
console.log("列表请求成功！！！！！！！！！！！！！！");
this.optionsStatus = res.data
console.log(this.optionsStatus);
// //获取积分行为
// async getpoint1s() {
// const url = "/voluntary/points/adjustVolunteerPoints/reasonsList";
// let params={
// }
// await requestGet(url,params).then((res)=>{
// if (res.code === 0) {
// console.log("列表请求成功！！！！！！！！！！！！！！");
// this.optionsStatus = res.data
// console.log(this.optionsStatus);
} else {
}
})
},
//调整积分
// 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 {
// }
// },
async getlist() {
const url = "/voluntary/points/listPointsChangeRecord";
let params={
volunteerId:this.list.id,
createdTimeFrom:this.formData.createdTimeFrom,
createdTimeTo:this.formData.createdTimeTo,
// description:this.description,
pointsClass:this.formData.pointsClass,
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 {
}
},
// } else {
// }
// })
// },
handleSubmit(){
this.$emit('MemberManagementClose')
},

1680
src/views/modules/volunteer/VoluntaryOrganization/add.vue
View File

File diff suppressed because it is too large

1368
src/views/modules/volunteer/VoluntaryOrganization/edit.vue
View File

File diff suppressed because it is too large

38
src/views/modules/volunteer/VoluntaryOrganization/index.vue
View File

@ -78,7 +78,7 @@
@click="handleshowMember(scope.row)">成员管理</el-button>
<el-button type="text" style="color:#1C6AFD;" size="small"
@click="handleDel(scope.row)">删除</el-button>
<el-button type="text" style="color:#1C6AFD;" size="small"
<el-button v-if="scope.row.status == 'processing'" type="text" style="color:#1C6AFD;" size="small"
@click="handleprocessl(scope.row)">审核</el-button>
</template>
</el-table-column>
@ -153,6 +153,7 @@ export default {
tableData: [
],
importLoading:false,
showInfo:false,
};
@ -184,8 +185,11 @@ export default {
this.showprocess=false
},
//成员管理
handleshowMember(){
handleshowMember(row){
console.log (row,this.fmData,"row");
this.showMember=true
this.fmData=row
},
//关闭成员管理
MemberManagementClose(){
@ -210,6 +214,7 @@ export default {
console.log("sdlkfjklsdf1");
this.showAdd=false
this.getTableData()
},
//关闭查看
showInfoClose(){
@ -236,7 +241,10 @@ export default {
},
//模板
async uploadHttpRequest(file) {
log("file", file);
this.importLoading = true;
console.log(this.importLoading,"this.importLoading");
this.importBtnTitle = '正在上传中...';
this.$message({
showClose: true,
@ -245,20 +253,25 @@ export default {
duration: 3000
});
let than = this;
document.getElementById('clickA').addEventListener('click', function () {
than.$router.replace('/main/importRecord-index');
});
console.log(than,"than");
// document.getElementById('clickA').addEventListener('click', function () {
// than.$router.replace('/main/importRecord-index');
// });
const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
formData.append('file', file.file); //添加文件对象
formData.append('code', ''); //添加文件对象
let url = '/governance/icEvent/importEvent'
if (this.importType == 2) {
url = '/governance/icEvent/importAwo'
}
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 = [
@ -300,6 +313,7 @@ export default {
}
},
beforeExcelUpload(file) {
console.log(file,"file");
const isType = file.type === 'application/vnd.ms-excel';
const isTypeComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
const fileType = isType || isTypeComputer;
@ -354,15 +368,17 @@ export default {
this.getTableData()
},
async handleExportModule() {
let url = "/heart/iccommunityselforganization/import-template-download";
let url = "/voluntary/volunteerOrg/downloadImportTemplate";
let params = {};
await this.$http({
method: "POST",
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]

13
src/views/modules/volunteer/VoluntaryOrganization/process.vue
View File

@ -6,7 +6,7 @@
<div> {{ tableData.orgName }}</div>
</el-form-item>
<el-form-item label="服务类型">
{{ tableData.serviceTypeList }}
{{ tableData.serviceTypeName }}
</el-form-item>
<el-form-item label="组织类型">
{{ tableData.Organizationaltype}}
@ -37,7 +37,7 @@
{{ tableData.address}}
</el-form-item>
<el-form-item label="申请时间">
{{ tableData.redeemerOrgName}}
{{tableData.updatedTime}}
</el-form-item>
</el-form>
@ -86,7 +86,7 @@ export default {
console.log(this.VolunteerList,"list");
this.tableData=this.VolunteerList
// this.awardId=this.list.id
// this.getTableData()
this.getTableData()
},
methods: {
//取消审查
@ -125,15 +125,14 @@ export default {
},
getTableData() {
console.log(this.formData);
const url = "/voluntary/pointsAward/admin/detail";
const url = "/voluntary/volunteerOrg/editDetail";
let params = {
id:this.awardId
id:this.VolunteerList.id
}
requestGet(url, params).then((res) =>{
requestPost(url, params).then((res) =>{
console.log(res,"res");
if(res.code===0){
console.log("列表请求成功！！！！！！！！！！！！！！");
console.log(res.data, "data");
this.tableData = res.data
console.log(this.tableData, "this.tableData");
}

Write Preview
Loading…
Cancel
Save