Browse Source

Merge branch 'feature' of http://120.46.222.128:10021/elink-star/epmet-work-pc into feature

feature
mk 11 months ago
parent
commit
368898f334
  1. 264
      src/views/modules/volunteer/LifeCircleManagement/add.vue
  2. 234
      src/views/modules/volunteer/LifeCircleManagement/index.vue
  3. 196
      src/views/modules/volunteer/LifeCircleManagement/info.vue
  4. 8
      src/views/modules/volunteer/SiteManagement/add.vue
  5. 20
      src/views/modules/volunteer/SiteManagement/info.vue
  6. 4
      src/views/modules/volunteer/Venuemanagement/add.vue
  7. 14
      src/views/modules/volunteer/Venuemanagement/info.vue
  8. 14
      src/views/modules/volunteer/VoluntaryOrganization/add.vue
  9. 895
      src/views/modules/volunteer/VoluntaryOrganization/edit.vue
  10. 966
      src/views/modules/volunteer/VoluntaryOrganization/index.vue
  11. 23
      src/views/modules/volunteer/VoluntaryOrganization/process.vue
  12. 2
      src/views/modules/volunteer/activityArchive/index.vue

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

@ -1,33 +1,34 @@
<template>
<div>
<div>
<div class="dialog-h-content scroll-h">
<div class="dialog-h-content scroll-h">
<el-form ref="ref_form" :inline="true" :model="formData" :rules="dataRule" class="form">
<el-row>
<!-- <el-col :span="12">
<el-form ref="ref_form" :inline="true" :model="formData" :rules="dataRule" class="form">
<el-row>
<!-- <el-col :span="12">
<el-form-item label="所属组织" prop="agencyName" label-width="100px">
<el-input v-model.trim="formData.agencyName" size="small" clearable placeholder="请输入活动名称" :disabled="true"
class="u-item-width-normal"></el-input>
</el-form-item>
</el-col> -->
<el-col :span="12">
<el-form-item label="类型" prop="type" label-width="100px">
<!-- <el-cascader @change="handleChangeAgency" :options="options" :disabled="showdisabled" :props="{ checkStrictly: true }"></el-cascader>
<el-col :span="12">
<el-form-item label="类型" prop="type" label-width="100px">
<!-- <el-cascader @change="handleChangeAgency" :options="options" :disabled="showdisabled" :props="{ checkStrictly: true }"></el-cascader>
<el-form-item label="类型" prop="type" label-width="100px"> -->
<el-cascader v-model="this.formData.type" @change="handleChangeAgency" :options="options" :disabled="showdisabled" :props="{emitPath: false,
<el-cascader v-model="this.formData.type" @change="handleChangeAgency" :options="options"
:disabled="showdisabled" :props="{emitPath: false,
multiple: false, }"></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="请输入活动名称" :disabled="showdisabled"
class="u-item-width-normal"></el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="12">
</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="请输入活动名称"
: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="orgType">
<el-select class="u-item-width-normal" v-model.trim="formData.orgType" placeholder="请选择"
clearable>
@ -37,79 +38,98 @@
</el-select>
</el-form-item>
</el-col> -->
<el-col :span="24">
<el-form-item label="位置" prop="searchValue" label-width="100px" style="display: block">
<div style="width: 634px">
<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>
</el-select>
<div id="app_activity" class="div_map"></div>
</div>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="联系人" prop="linkman" label-width="100px">
<el-input v-model.trim="formData.linkman" 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="linkPhone" label-width="100px">
<el-input v-model.trim="formData.linkPhone" size="small" clearable placeholder="请输入手机号" :disabled="showdisabled"
class="u-item-width-normal"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<!-- <div v-if="formData.tags" style="display: flex; "> -->
<el-col :span="24">
<el-form-item label="位置" prop="searchValue" label-width="100px" style="display: block">
<div style="width: 634px">
<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>
</el-select>
<div id="app_activity" class="div_map"></div>
</div>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="联系人" prop="linkman" label-width="100px">
<el-input v-model.trim="formData.linkman" 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="linkPhone" label-width="100px">
<el-input v-model.trim="formData.linkPhone" size="small" clearable placeholder="请输入手机号"
:disabled="showdisabled" class="u-item-width-normal"></el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="12">
<div style="display: flex; ">
<div >
<!-- <div v-for="(item, index) in formData.tags" :label="index" :key="item.name" :prop=index style="display: flex;">
-->
<div v-for="(item, index) in formData.tags" :label="index" :key="item.name" :prop=index style="display: flex;">
<el-form-item label="标签" prop="tags" label-width="100px" >
<el-input :disabled="showdisabled" v-model="formData.tags" 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> -->
<!-- </div> -->
<!-- </div> -->
<!-- <div @click="addDomain" style="color: blue; font-size: 12px; margin-top: 15px">添加
</div> -->
<!-- <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="展示图片" label-width="100px" prop="attrs">
<template>
<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 v-if="index > 0" @click="removeDomain(item)" style="color: blue; font-size: 12px; margin-top: 15px">删除
</div>
</div>
</template>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="营业时间" label-width="100px" prop="workTime">
<el-input v-model.trim="formData.workTime" 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="beiremarkzhu">
<el-input v-model.trim="formData.remark" size="small" clearable placeholder="请输入备注" :disabled="showdisabled"
class="u-item-width-normal"></el-input>
</el-form-item>
</el-col>
<!-- <el-form-item label="组织介绍" prop="introduction" label-width="100px" style="display: block">
</div>
<div @click="addDomain" style="color: blue; font-size: 12px; margin-top: 15px">添加
</div>
<i class="el-icon-circle-plus" @click="addDomain" style="font-size: 20px; margin-top:7px;"></i>
</div>
</el-col> -->
<el-col :span="12">
<div v-if="formData.tags1" style="display: flex;">
<div>
<div v-for="(item, index) in formData.tags1" :key="item.name + index"
style="display: flex;">
<el-form-item label="标签" prop="tags1" label-width="100px">
<el-input :disabled="showdisabled" v-model="item.tab" placeholder="请输入(最多添加四个)"
class="u-item-width-normal"></el-input>
</el-form-item>
<div v-if="index > 0" @click="removeDomain(index)"
style="color: blue; font-size: 12px; margin-top: 15px">
删除
</div>
</div>
</div>
<div @click="addDomain" style="color: blue; font-size: 12px; margin-top: 15px">添加</div>
</div>
</el-col>
<el-col :span="12">
<el-form-item label="展示图片" label-width="100px" prop="attrs">
<template>
<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="workTime">
<el-input v-model.trim="formData.workTime" 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="beiremarkzhu">
<el-input v-model.trim="formData.remark" size="small" clearable placeholder="请输入备注"
:disabled="showdisabled" class="u-item-width-normal"></el-input>
</el-form-item>
</el-col>
<!-- <el-form-item label="组织介绍" prop="introduction" label-width="100px" style="display: block">
<div class="item_width_1">
<el-input type="textarea" autosize placeholder="请填写组织介绍"
v-model.trim="formData.introduction" :autosize="{ minRows:4., maxRows: 10}">
</el-input>
</div>
</el-form-item> -->
<!--
<!--
<el-form-item label="志愿品牌" prop="brand" label-width="100px" style="display: block">
<div class="item_width_1">
<el-input type="textarea" autosize placeholder="请输入内容" v-model.trim="formData.brand"
@ -123,15 +143,15 @@
@file-removed="removedImg"></upload-image>
</template>
</el-form-item> -->
</el-row></el-form>
</div>
<div class="div_btn">
<el-button size="small" @click="handleCancle"> </el-button>
<el-button size="small" type="primary" @click="handleComfirm">
</el-button>
</el-row></el-form>
</div>
<div class="div_btn">
<el-button size="small" @click="handleCancle"> </el-button>
<el-button size="small" type="primary" @click="handleComfirm">
</el-button>
</div>
</div>
</div>
</template>
<script>
@ -336,13 +356,6 @@
"label": "文化体育"
},
{
// "children": [
// {
// "pv":"5",
// "value": "51",
// "label": ""
// },
// ],
"value": "5",
"label": "其它"
}
@ -364,7 +377,10 @@
linkPhone: "",
workTime: "",
type: "",
tags: "",//
tags1: [
{}
],
tags:"",//
agencyId: this.$store.state.user.agencyId,
address: "",//
longitude: this.$store.state.user.longitude, //
@ -435,12 +451,11 @@
let url = `/voluntary/sphereLife/detail/${id}`;
console.log(url,"url");
requestGet(url).then((res) => {
console.log(res);
if (res.code == 0) {
this.formData = res.data
this.fileList=[{fileUrl:res.data.attrs[0].url}]
this.searchValue=res.data.address
console.log(this.formData,"this.formData");
this.formData.tags1=res.data.tags.split(',').map(item => ({ tab: item.trim() }));
} else {
this.$message.error(res.msg)
}
@ -450,8 +465,11 @@
},
//
addDomain() {
if (this.formData.tags.length < 4) {
this.formData.tags.push(this.tableDate);
if (this.formData.tags1.length < 4) {
this.formData.tags1.push({tab: '' });
}else{
this.$message.error("最多添加4个标签");
}
@ -460,11 +478,12 @@
//
removeDomain(item) {
console.log(item);
var index = this.formData.sponsors.indexOf(item)
if (index !== -1) {
this.formData.sponsors.splice(index, 1)
this.tableDate = {}
}
this.formData.tags1.splice(item, 1);
// var index = this.formData.sponsors.indexOf(item)
// if (index !== -1) {
// this.formData.sponsors.splice(index, 1)
// this.tableDate = {}
// }
},
validateContent() {
// 使HTML
@ -528,18 +547,7 @@
removedImg() {
this.formData.coverPic = ''
},
// onChangeFileList(e) {
// console.log(e, 'sssssb');
// this.fileList = e.length > 0 ? e.map(item => ({
// fileType: '0',
// fileUrl: item.response.data.url
// })) : []; // efileList
// if (e.length > 0) {
// this.formData.qualification = e[0].response.data.url;
// } else {
// this.formData.qualification = '';
// }
// },
onChangeImgs(e, rowIndex = 0) {
console.log('onChangeFileList', e)
@ -576,7 +584,14 @@
async handleComfirm() {
console.log(this.formData," this.formData");
if (this.formData.tags1) {
let one=this.formData.tags1.map(item => item.tab).join(', ')
this.formData.tags=one;
console.log(this.formData,"this.formData");
}
// console.log(this.formData.tags.map(item => item.tab).join(', ')," this.formData");
// if (!this.formData.type) {
// this.$message.error('');
// return;
@ -615,6 +630,7 @@
},
//
async addActivity() {
let url = '/voluntary/sphereLife/saveOrUpdate'
const { data, code, msg } = await requestPost(url, this.formData)
if (code === 0) {
@ -692,12 +708,12 @@
async remoteMethod(query) {
console.log(query, "sfsvsdv");
if (query !== '') {
const { msg, data } = await map.searchNearby(query);
console.log(data,"sdl;kjfklsjfkld");
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");
@ -705,6 +721,7 @@
return { value: `${item.id}`, label: `${item.address + item.title}` };
});
console.log(this.searchOptions, "this.searchOptions");
}
} else {
@ -727,7 +744,10 @@
map.setMarker(lonlat[1], lonlat[0]);
this.formData.latitude = lonlat[1];
this.formData.longitude = lonlat[0];
this.formData.address = selPosition.address + selPosition.name
this.searchValue = selPosition.address + selPosition.name
console.log(this.formData.latitude, this.formData.longitude, "this.formData.latitude, this.formData.longitude");
},
@ -753,7 +773,7 @@
linkman: [
{ required: true, message: '请填写联系人', trigger: 'blur' }
],
tags: [
tags1: [
{ required: true, message: '请填写标签信息', trigger: 'blur' },
],
attrs: [

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

@ -54,7 +54,7 @@
<el-table-column prop="agencyName" header-align="center" align="center" label="所属组织"
:show-overflow-tooltip="true">
</el-table-column>
<el-table-column prop="type" header-align="center" align="center" label="类型"
<el-table-column prop="typeName" header-align="center" align="center" label="类型"
:show-overflow-tooltip="true">
<!-- <template slot-scope="scope">
<span>{{ scope.row.enabled === 1 ? '关闭' : '显示' }}</span>
@ -127,6 +127,182 @@ export default {
data() {
return {
options:[
{
"children": [
{
"pv":"1",
"value": "11",
"label": "托儿所"
},
{
"pv":"1",
"value": "12",
"label": "幼儿园"
},
{
"pv":"1",
"value": "13",
"label": "小学"
},
{
"pv":"1",
"value": "14",
"label": "中学"
},
{
"pv":"1",
"value": "15",
"label": "培训机构"
},
{
"pv":"1",
"value": "16",
"label": "其它"
}
],
"value": "1",
"label": "教育培训"
},
{
"children": [
{
"pv":"2",
"value": "21",
"label": "门诊"
},
{
"pv":"2",
"value": "22",
"label": "社区医院"
},
{
"pv":"2",
"value": "23",
"label": "医院"
},
{
"pv":"2",
"value": "24",
"label": "其它"
}
],
"value": "2",
"label": "医疗卫生"
},
{
"children": [
{
"pv":"3",
"value": "31",
"label": "餐饮"
},
{
"pv":"3",
"value": "32",
"label": "超市"
},
{
"pv":"3",
"value": "33",
"label": "理发"
},
{
"pv":"3",
"value": "34",
"label": "书店"
},
{
"pv":"3",
"value": "35",
"label": "便利店"
},
{
"pv":"3",
"value": "36",
"label": "市场"
},
{
"pv":"3",
"value": "37",
"label": "五金"
},
{
"pv":"3",
"value": "38",
"label": "照相"
},
{
"pv":"3",
"value": "39",
"label": "综合修理"
},
{
"pv":"3",
"value": "30",
"label": "服务站"
},
{
"pv":"3",
"value": "330",
"label": "农贸市场"
},
{
"pv":"3",
"value": "331",
"label": "其它"
}
],
"value": "3",
"label": "商业服务"
},
{
"children": [
{
"pv":"4",
"value": "41",
"label": "电影院"
},
{
"pv":"4",
"value": "42",
"label": "歌剧院"
},
{
"pv":"4",
"value": "43",
"label": "图书馆"
},
{
"pv":"4",
"value": "44",
"label": "游泳馆"
},
{
"pv":"4",
"value": "45",
"label": "活动中心"
},
{
"pv":"4",
"value": "46",
"label": "体育馆"
},
{
"pv":"4",
"value": "47",
"label": "其它"
}
],
"value": "4",
"label": "文化体育"
},
{
"value": "5",
"label": "其它"
}
],
formTitle:"",
formData: {
name:"",
@ -183,7 +359,6 @@ export default {
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.OrganizationaltypeList = data;
console.log(this.OrganizationaltypeList,"his.Organizationaltype");
} else {
this.$message.error(msg)
@ -193,7 +368,7 @@ export default {
handleprocessl(row){
this.showprocess=true
this.EditList=row
console.log(row,this.fmData,"row");
},
//
@ -203,7 +378,7 @@ export default {
},
//
handleshowMember(row){
console.log (row,this.fmData,"row");
this.showMember=true
this.fmData=row
@ -216,8 +391,8 @@ export default {
//
handleEdit(row){
this.showAdd=true
this.formTitle="新增"
console.log(row,"row");
this.formTitle="修改"
this.$nextTick(() => {
this.$refs.ref_form.initForm("edit", row.id);
});
@ -268,13 +443,30 @@ export default {
pageNo:this.pageNo,
pageSize: this.pageSize
}
const { data, code, msg } = await requestGet(url,params);
if (code === 0) {
console.log("列表请求成功!!!!!!!!!!!!!!");
this.total = data.total || 0;
this.tableData = data.list
} else {
}
const { data, code, msg } = await requestGet(url, params);
if (code === 0) {
console.log("列表请求成功!!!!!!!!!!!!!!");
this.total = data.total || 0;
this.tableData = data.list;
this.tableData.forEach(item => {
this.options.forEach(item1 => {
if (Array.isArray(item1.children)) {
item1.children.forEach(item2 => {
if (item2.value.toString() == item.type) {
item.typeName = item2.label;
}
});
} else {
}
});
});
} else {
//
}
},
//
async uploadHttpRequest(file) {
@ -373,7 +565,14 @@ export default {
return fileType && isLt1M;
},
handleDel(row) {
console.log(row, "row");
this.$confirm('此操作将永久删除该记录, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
console.log(row, "row");
let url = "/voluntary/sphereLife/delete";
let params = [String(row.id)];
axios.delete(this.processUrl(url), { data: params })
@ -389,6 +588,13 @@ export default {
console.error("删除失败", error);
this.$message.error("删除失败,请稍后重试");
});
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
});
})
},
diaClose(){
this.formShow=false

196
src/views/modules/volunteer/LifeCircleManagement/info.vue

@ -17,7 +17,7 @@
<div>{{ formData.typeName }}</div>
</el-option>
</el-select> -->
<div>{{ formData.positionName }}</div>
<div>{{ formData.typeName }}</div>
</el-form-item>
<el-form-item label="名称" label-width="100px" prop="name">
<!-- <el-input v-model.trim="formData.name" size="small" clearable placeholder="请输入名称"
@ -39,7 +39,9 @@
</el-form-item> -->
<el-form-item label="图片" label-width="100px" prop="attrs">
<template>
<img v-for="(item, index) in this.formData.attrs" :key="index" :src="item.url" style="width: 100px; height: 100px;">
<el-image :preview-src-list="[item.url]" v-for="(item, index) in this.formData.attrs" :key="index" :src="item.url" style="width: 100px; height: 100px;">
</el-image>
</template>
</el-form-item>
<!-- <el-form-item label="阵地简介" prop="content" label-width="100px" style="display: block">
@ -89,6 +91,182 @@
export default {
data() {
return {
options:[
{
"children": [
{
"pv":"1",
"value": "11",
"label": "托儿所"
},
{
"pv":"1",
"value": "12",
"label": "幼儿园"
},
{
"pv":"1",
"value": "13",
"label": "小学"
},
{
"pv":"1",
"value": "14",
"label": "中学"
},
{
"pv":"1",
"value": "15",
"label": "培训机构"
},
{
"pv":"1",
"value": "16",
"label": "其它"
}
],
"value": "1",
"label": "教育培训"
},
{
"children": [
{
"pv":"2",
"value": "21",
"label": "门诊"
},
{
"pv":"2",
"value": "22",
"label": "社区医院"
},
{
"pv":"2",
"value": "23",
"label": "医院"
},
{
"pv":"2",
"value": "24",
"label": "其它"
}
],
"value": "2",
"label": "医疗卫生"
},
{
"children": [
{
"pv":"3",
"value": "31",
"label": "餐饮"
},
{
"pv":"3",
"value": "32",
"label": "超市"
},
{
"pv":"3",
"value": "33",
"label": "理发"
},
{
"pv":"3",
"value": "34",
"label": "书店"
},
{
"pv":"3",
"value": "35",
"label": "便利店"
},
{
"pv":"3",
"value": "36",
"label": "市场"
},
{
"pv":"3",
"value": "37",
"label": "五金"
},
{
"pv":"3",
"value": "38",
"label": "照相"
},
{
"pv":"3",
"value": "39",
"label": "综合修理"
},
{
"pv":"3",
"value": "30",
"label": "服务站"
},
{
"pv":"3",
"value": "330",
"label": "农贸市场"
},
{
"pv":"3",
"value": "331",
"label": "其它"
}
],
"value": "3",
"label": "商业服务"
},
{
"children": [
{
"pv":"4",
"value": "41",
"label": "电影院"
},
{
"pv":"4",
"value": "42",
"label": "歌剧院"
},
{
"pv":"4",
"value": "43",
"label": "图书馆"
},
{
"pv":"4",
"value": "44",
"label": "游泳馆"
},
{
"pv":"4",
"value": "45",
"label": "活动中心"
},
{
"pv":"4",
"value": "46",
"label": "体育馆"
},
{
"pv":"4",
"value": "47",
"label": "其它"
}
],
"value": "4",
"label": "文化体育"
},
{
"value": "5",
"label": "其它"
}
],
formData:
{
agencyName:"",
@ -149,6 +327,20 @@
console.log(res);
if (res.code == 0) {
this.formData = res.data
// this.formData.forEach(item => {
this.options.forEach(item1 => {
console.log(item1, "item1");
console.log(item1.children, "item1.children");
if (Array.isArray(item1.children)) {
item1.children.forEach(item2 => {
if (item2.value.toString() == this.formData.type) {
this.formData.typeName = item2.label;
}
});
} else {
}
});
// });
this.fileList=[{fileUrl:res.data.attrs[0].url}]
this.searchValue=res.data.address
console.log(this.formData,"this.formData");

8
src/views/modules/volunteer/SiteManagement/add.vue

@ -5,12 +5,6 @@
<el-form ref="ref_form" :inline="true" :model="formData" :rules="dataRule" class="form">
<el-row>
<!-- <el-col :span="12">
<el-form-item label="所属组织" prop="agencyName" label-width="100px">
<el-input v-model.trim="formData.agencyName" size="small" clearable placeholder="请输入组织名称"
:disabled="true" class="u-item-width-normal"></el-input>
</el-form-item>
</el-col> -->
<el-col :span="12">
<el-form-item label="类型" prop="type" label-width="100px">
<el-select :disabled="showdisabled" v-model="formData.type" placeholder="请选择" clearable class="u-item-width-normal">
@ -119,7 +113,7 @@
{ value: 1, label: "实践点" },
{ value: 2, label: "其它" },
],
],
formData:
{
agencyName:"",

20
src/views/modules/volunteer/SiteManagement/info.vue

@ -10,12 +10,13 @@
:disabled="true" class="u-item-width-normal"></el-input>
</el-form-item>
-->
<el-form-item label="类型" prop="type" label-width="100px">
<el-form-item label="类型" prop="typeName" label-width="100px">
<!-- <el-select :disabled="showdisabled" v-model="formData.type" placeholder="请选择" clearable class="u-item-width-normal">
<el-option :disabled="showdisabled" class="u-item-width-normal" v-for="item in formData.optionstype" :key="item.value" :label="item.label"
:value="item.value">
</el-option>
</el-select> -->
<div>{{ formData.typeName }}</div>
</el-form-item>
<el-form-item label="名称" label-width="100px" prop="name">
<!-- <el-input v-model.trim="formData.name" size="small" clearable placeholder="请输入名称"
@ -34,7 +35,7 @@
</el-form-item>
<el-form-item label="图片" label-width="100px" prop="attrs">
<template>
<img v-for="(item, index) in this.formData.attrs" :key="index" :src="item.url" style="width: 100px; height: 100px;">
<el-image :preview-src-list="[item.url]" v-for="(item, index) in this.formData.attrs" :key="index" :src="item.url" style="width: 100px; height: 100px;"></el-image>
</template>
</el-form-item>
<el-form-item label="阵地简介" prop="content" label-width="100px" style="display: block">
@ -78,6 +79,12 @@
export default {
data() {
return {
optionstype: [
{ value: 0, label: "实践站" },
{ value: 1, label: "实践点" },
{ value: 2, label: "其它" },
],
formData:
{
agencyName:"",
@ -137,10 +144,19 @@
requestGet(url).then((res) => {
console.log(res);
if (res.code == 0) {
this.optionstype.forEach((item) => {
if (item.value == res.data.type) {
res.data.typeName = item.label;
console.log(res.data,"res.data.typeName");
}
});
this.formData = res.data
this.fileList=[{fileUrl:res.data.attrs[0].url}]
console.log(this.formData,"this.formData");
} else {
this.$message.error(res.msg)
}

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

@ -460,7 +460,6 @@
async remoteMethod(query) {
console.log(query, "sfsvsdv");
if (query !== '') {
const { msg, data } = await map.searchNearby(query);
this.resultList = []
@ -495,7 +494,10 @@
map.setMarker(lonlat[1], lonlat[0]);
this.formData.latitude = lonlat[1];
this.formData.longitude = lonlat[0];
this.formData.address=selPosition.address + selPosition.nam
this.searchValue = selPosition.address + selPosition.name
console.log(this.formData.address," this.formData.address ");
},

14
src/views/modules/volunteer/Venuemanagement/info.vue

@ -53,7 +53,7 @@
<el-table-column prop="time" header-align="center" align="center" label="日期"
:show-overflow-tooltip="true">
</el-table-column>
<el-table-column prop="name" header-align="center" align="center" label="预约人"
<el-table-column prop="userName" header-align="center" align="center" label="预约人"
:show-overflow-tooltip="true">
</el-table-column>
<el-table-column prop="available" header-align="center" align="center" label="预约时间"
@ -100,7 +100,7 @@
return {
formData:
{
agencyName:"",
agencyName: "",
agencyId: "",
linkman: "",
linkPhone: "",
@ -118,9 +118,9 @@
address: "",//
longitude: this.$store.state.user.longitude, //
latitude: this.$store.state.user.latitude,//
},
tableData1:[],
showdisabled:false,
},
tableData1: [],
showdisabled: false,
uploadUrl: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
customerId: localStorage.getItem('customerId'),
@ -184,8 +184,8 @@
requestGet(url,params).then((res) => {
console.log(res);
if (res.code == 0) {
this.tableData1 = res.data
this.tableData1 = res.data.list
l
} else {
this.$message.error(res.msg)

14
src/views/modules/volunteer/VoluntaryOrganization/add.vue

@ -72,10 +72,14 @@
</el-col>
<el-col :span="12">
<el-form-item label="组织封面图" label-width="150px" prop="fileList" >
<template>
<upload-image :defaultFileList="fileList" :limit="1" @change="onChangeFileList"
<template >
<upload-image v-if="!disabled" :defaultFileList="fileList" :limit="1" @change="onChangeFileList"
@file-removed="removedImg"></upload-image>
<img v-else v-if="formData.orgImage" style="width: 100px; height: 100px" :src="formData.orgImage"
:preview-src-list="srcList">
</img>
</template>
</el-form-item>
</el-col>
<el-form-item label="组织介绍" prop="introduction" label-width="150px" style="display: block">
@ -95,8 +99,11 @@
</el-form-item>
<el-form-item label="品牌展示图" label-width="150px" prop="brandImg">
<template>
<upload-image :defaultFileList="fileList1" :limit="1" @change="onChangeFileList1"
<upload-image v-if="!disabled" :defaultFileList="fileList1" :limit="1" @change="onChangeFileList1"
@file-removed="removedImg"></upload-image>
<img v-else v-if="formData.brandImg" style="width: 100px; height: 100px" :src="formData.brandImg"
:preview-src-list="srcList">
</img>
</template>
</el-form-item>
</el-row></el-form>
@ -176,7 +183,6 @@
components: { Tinymce, UploadImage },
mounted() {
this.volunteerservicetype()
this.volunteertype()
this.formData.agencyId=this.$store.state.user.agencyId

895
src/views/modules/volunteer/VoluntaryOrganization/edit.vue

@ -1,895 +0,0 @@
<template>
<div>
<div class="dialog-h-content scroll-h">
<el-form ref="ref_form" :inline="true" :model="formData" :rules="dataRule"
class="form">
<el-row>
<el-col :span="12">
<el-form-item label="所属组织" prop="agencyName" label-width="150px">
<el-input v-model.trim="formData.agencyName" size="small" clearable placeholder="请输入活动名称"
class="u-item-width-normal"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="组织名称" prop="orgName" label-width="150px">
<el-input v-model.trim="formData.orgName" 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="150px" prop="serviceTypeList" >
<el-select multiple-limit='4' class="u-item-width-normal" v-model.trim="formData.serviceTypeList" placeholder="请选择" clearable multiple>
<el-option v-for="item in ServicetypeListName" :key="item.value" :label="item.label" :value="item.value" >
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="组织类型" label-width="150px" prop="orgType" >
<el-select class="u-item-width-normal" v-model.trim="formData.orgType" placeholder="请选择" clearable >
<el-option v-for="item in OrganizationaltypeList" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="活动地点" prop="address" label-width="150px" 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-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-col>
<el-col :span="12">
<el-form-item label="管理员姓名" prop="operator" label-width="150px">
<el-input v-model.trim="formData.operator" size="small" clearable placeholder="请输入管理员姓名"
class="u-item-width-normal"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="手机号" prop="mobile" label-width="150px">
<el-input v-model.trim="formData.mobile" size="small" clearable placeholder="请输入手机号"
class="u-item-width-normal"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="身份证号" prop="idCard" label-width="150px">
<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="150px" prop="orgImage">
<template>
<upload-image :defaultFileList="fileList" :limit="1" @change="onChangeFileList" :file-list="fileList"
@file-removed="removedImg"></upload-image>
</template>
</el-form-item>
</el-col>
<el-form-item label="组织介绍" prop="introduction" label-width="150px" style="display: block">
<div class="item_width_1">
<el-input type="textarea" autosize placeholder="请填写组织介绍" v-model.trim="formData.introduction" :autosize="{ minRows:4., maxRows: 10}" >
</el-input>
</div>
</el-form-item>
<el-form-item label="志愿品牌" prop="brand" label-width="150px" style="display: block">
<div class="item_width_1">
<el-input type="textarea" autosize placeholder="请输入内容" v-model.trim="formData.brand" :autosize="{ minRows:4., maxRows: 10}" >
</el-input>
</div>
</el-form-item>
<el-form-item label="品牌展示图" label-width="150px" prop="VolunteerPic">
<template>
<upload-image :defaultFileList="fileList1" :limit="1" @change="onChangeFileList1"
@file-removed="removedImg"></upload-image>
</template>
</el-form-item>
</el-row></el-form>
</div>
<div class="div_btn">
<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 { mapGetters } from 'vuex'
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";
import util from '@js/util.js';
// import UploadImage from './upload-image.vue'
import UploadImage from '@/views/modules/plugins/rent/upload-image.vue'
var map
var search
var markers
var infoWindowList
var geocoder //
let loading //
export default {
data() {
return {
fileList:[],
fileList1:[],
searchValue:"",
OrganizationaltypeList:[],
ServicetypeListName:[],
Organizationaltype:[
{ label: "社区", value: 1 },
{ label: "企业", value: 2 },
{ label: "学校", value: 3 },
],
formData:
{
status:"pass",//
numberNum:"",//
userId:"",//id
agencyId:"",//id
orgType:"",
brandImg:"",//
brand:"",//
introduction:"",//
qualification: "",//
idCard:"",//
mobile:"",//
operator:"",//
Organizationaltype:"",//
// serviceTypeList:"",//
orgName:"",//
agencyName:"",//
serviceTypeList:[],//
address: "",//
longitude: this.$store.state.user.longitude, //
latitude: this.$store.state.user.latitude,//
},
corganizerList: [],
uploadUrl: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
customerId: localStorage.getItem('customerId'),
}
},
components: { Tinymce, UploadImage },
mounted() {
console.log(this.VolunteerList,"this.VolunteerLis");
let { latitude, longitude } = this.$store.state.user;
if (!latitude || latitude == "" || latitude == "0") {
latitude = 39.9088810666821;
longitude = 116.39743841556731;
}
this.formData.latitude = latitude;
this.formData.longitude = longitude;
this.volunteerDetail()
this.volunteerservicetype()
this.volunteertype()
this.formData.agencyId=this.$store.state.user.agencyId
this.formData.agencyName=this.$store.state.user.agencyName
this.activityType()
this.listServerOrg()
},
methods: {
validateContent() {
// 使HTML
const textContent = this.stripHtml(this.formData.sumUp);
if (textContent.trim() === '') {
this.formData.sumUp = null;
}
},
stripHtml(html) {
const div = document.createElement('div');
div.innerHTML = html;
return div.textContent || div.innerText || '';
},
// //
// 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.formData.activityImgs.push({
// // format,
// // name: file.name,
// // size: file.size,
// // type,
// // url: res.data.url
// // });
// // console.log('this.formData.activityImgs',res.data.url)
// this.formData.activityImgs.push(res.data.url);
// } else {
// this.$message.error(res.msg);
// }
// },
// //
// handleImgRemove(file) {
// console.log('handleImgRemove', file);
// if (file.response) {
// let index = this.formData.activityImgs.findIndex(item => item.url == file.response.data.url);
// this.formData.activityImgs.splice(index, 1);
// } else if (file.url) {
// let index = this.formData.activityImgs.findIndex(item => item.url == file.url);
// this.formData.activityImgs.splice(index, 1);
// }
// },
//
// handleImgPreview(file) {
// console.log(file);
// window.open(file.url || file.response.data.url);
// },
// //
// handleImgExceed() {
// this.$message({
// type: 'warning',
// message: ''
// });
// },
//
// 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;
// },
async activityType() {
const url = "/actual/base/activityType/page"
let params = {
// agencyId: this.agencyId
pageSize: 20,
pageNo: 1,
typeName: "",
enabled: 1
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.typeList = data.list
} else {
this.$message.error(msg)
}
this.$nextTick(() => {
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)
}
})
},
handleOnlineRegistration(value) {
//
if (value) {
this.online = true;
this.formData.online = 1;
} else {
this.online = false;
this.formData.cutOffTime = ''
this.formData.online = 0;
}
},
// onChangeFileList(e) {
// if (e.length > 0) {
// let item = e[0];
// let ob = {
// fileType: '0',
// fileUrl: item.response.data.url
// };
// this.fileList = [ob];
// this.formData.coverPic = ob.fileUrl;
// }
// },
removedImg() {
this.formData.coverPic = ''
},
onChangeFileList(e) {
console.log(e, 'sssssb');
this.fileList = e.length > 0 ? e.map(item => ({
fileType: '0',
fileUrl: item.response.data.url
})) : []; // efileList
// if (e.length > 0) {
// this.formData.qualification = e[0].response.data.url;
// } else {
// this.formData.qualification = '';
// }
},
onChangeFileList1(e) {
console.log(e, 'sssssb');
this.fileList1 = e.length > 0 ? e.map(item => ({
fileType: '0',
fileUrl: item.response.data.url
})) : []; // efileList
if (e.length > 0) {
this.formData.brandImg = e[0].response.data.url;
} else {
this.formData.brandImg = '';
}
},
onChangeImgs(e, rowIndex = 0) {
console.log('onChangeFileList', e)
if (e.length > 0) {
this.activityImgs = []
e.forEach(item => {
let ob = {
fileType: '0',
fileUrl: item.response.data.url
}
this.activityImgs.push(ob)
})
}
},
// onChangeImgs(e) {
// this.activityImgs = [];
// if (e.length > 0) {
// e.forEach(item => {
// let ob = {
// fileType: '0',
// fileUrl: item.response.data.url
// };
// this.activityImgs.push(ob);
// });
// console.log('this.activityImgs',this.activityImgs)
// }
// },
handleChange(value) {},
handleTimeChange(time) {
if (time) {
const startTimeArray = util.dateFormatter(time[0], 'time').split('-')
console.log(startTimeArray);
const endTimeArray = util.dateFormatter(time[1], 'time').split('-')
console.log(endTimeArray);
this.formData.startTime = startTimeArray[0] + '-' + startTimeArray[1] + '-' + startTimeArray[2]
this.formData.endTime = endTimeArray[0] + '-' + endTimeArray[1] + '-' + endTimeArray[2]
// this.startTimeShow = startTimeArray[0] + '' + startTimeArray[1] + '' + startTimeArray[2] + ''
// this.endTimeShow = endTimeArray[0] + '' + endTimeArray[1] + '' + endTimeArray[2] + ''
} else {
this.formData.startTime = ''
this.formData.endTime = ''
}
},
// async initForm(type, activityId) {
// this.startLoading()
// this.formType = type
// if (type === 'edit') {
// if (activityId.activityImgs || activityId.sumUp) {
// this.records = true
// } else {
// this.records = false
// }
// this.formData = activityId
// this.timeRange = [this.formData.startTime, this.formData.endTime]
// console.log(activityId,"activityId");
// if (activityId.coverPic) {
// let ob = {
// fileType: '0',
// fileUrl: activityId.coverPic
// };
// this.fileList = [ob];
// this.formData.coverPic = ob.fileUrl;
// if (this.formData.online == 1) {
// this.online = true
// }
// }
// } else if (type === 'records') {
// this.records = true
// } else if (type === 'summary') {
// this.formData = activityId
// this.formData.activityImgs = []
// console.log("this.formData", this.formData)
// this.records = true
// this.summary = false
// } else {
// this.records = false
// }
// this.endLoading()
// },
async getDemandOptions() {
this.$http
.post("/actual/base/serviceitem/listAllCategory")
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg);
} else {
console.log(res.data);
this.demandOptions = this.getFlagData(
this.getTreeData(res.data),
"usableFlag"
);
}
})
.catch(() => {
return this.$message.error("网络错误");
});
},
getFlagData(data, flag) {
if (!Array.isArray(data)) return [];
let arr1 = data.filter((item) => item[flag]);
let arr2 = arr1.map((item) => {
if (item.childCateList)
return { ...item, childCateList: this.getFlagData(item.childCateList, flag) };
else return item;
});
return arr2;
},
getTreeData(data) {
if (!Array.isArray(data)) return [];
let arr = data.map((item) => {
let _item = {};
if (item.childCateList) {
if (item.childCateList.length === 0)
_item = { ...item, childCateList: undefined };
else _item = { ...item, childCateList: this.getTreeData(item.childCateList) };
} else {
_item = { ...item };
}
return _item;
});
return arr;
},
async loadGrid() {
const url = "/gov/org/customergrid/gridoption"
let params = {
agencyId: this.agencyId
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.gridList = data
} else {
this.$message.error(msg)
}
},
//
async volunteerDetail () {
const url = "/voluntary/volunteerOrg/getDetail"
let params = {
id: this.VolunteerList.id
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0&&data) {
this.formData = data[0];
this.searchValue= this.formData.address
this.fileList=[]
this.fileList.push({fileUrl:data[0].orgImage})
this.fileList1.push({fileUrl:data[0].brandImg})
console.log(this.formData,"this.formData");
console.log(this.fileList,"this.fileList");
} else {
this.$message.error(msg)
}
},
//
async volunteertype () {
const url = "/sys/dict/data/dictlist"
let params = {
dictType: 'volunteer_org_type'
}
console.log("vol123234");
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.OrganizationaltypeList = data;
} else {
this.$message.error(msg)
}
},
//
async volunteerservicetype () {
const url = "/sys/dict/data/dictlist"
let params = {
dictType: 'voluntary_project_service_class'
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.ServicetypeListName = data;
} else {
this.$message.error(msg)
}
},
//
async loadFormData() {
const url = '/actual/base/icpartyactivity/detail'
// const url = 'http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/detail'
let params = {
id: this.activityId
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.formData = data
let style_img = "style='width:50px;height:40px;' "
if (this.formData.content) {
// this.formData.content = this.formData.content.replace(/<img/g, "<img style='width:200px;height:120px;'")
// let array=this.formData.content.split('<img')
}
} else {
this.$message.error(msg)
}
},
async handleComfirm() {
console.log(this.formData," this.formData");
if (!this.formData.agencyName) {
this.$message.error('请选择所属组织');
return;
}
if (!this.formData.introduction) {
this.$message.error('请输入组织介绍');
return;
}
if (this.fileList.length === 0) {
this.$message.error('请上传封面图片');
return;
}
if (!this.formData.idCard) {
this.$message.error('请输入身份证信息');
return;
}
if (!this.formData.mobile) {
this.$message.error('请输入管理员电话');
return;
}
if (!this.formData.operator) {
this.$message.error('请输入管理员姓名');
return;
}
if (!this.formData.orgType) {
this.$message.error('请输入组织类型');
return;
}
if (!this.formData.serviceTypeList) {
this.$message.error('请输入服务类型');
return;
}
if (!this.formData.orgName) {
this.$message.error('请输入组织名称');
return;
}
console.log(this.formData,"this.formData");
this.addActivity()
},
async addActivity() {
let url = '/voluntary/volunteerOrg/saveOrUpdate'
const { data, code, msg } = await requestPost(url, this.formData)
if (code === 0) {
this.$message({
type: 'success',
message: '操作成功'
})
// this.resetData()
this.$emit('showEditClose')
this.btnDisable = false
} else {
this.btnDisable = false
this.$message.error(msg)
}
},
handleCancle() {
console.log("sdlkfjklsdf ");
this.$emit('showEditClose')
},
// 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 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
console.log(this.formData.address," this.formData.address ");
this.searchValue = data.address
this.searchOptions = []
// console.log('data,this.searchValue ', this.searchValue)
}
},
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 = [];
}
},
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.searchValue = selPosition.address + selPosition.name
},
resetData() {
this.timeRange = []
this.fileList = []
this.searchValue = ''
this.searchOptions = []
this.resultList = []
this.activityId = ''
this.keyWords = ''
this.online = false
this.formType = ''
this.summary = true
this.formData = {
id: "",
typeId: "",
activityName: "",//
status: 0,//
assistingParty: "",//
startTime: "",//
endTime: "",//
coverPic: "",//
content: "",//
address: "",//
online: 0,//
cutOffTime: "",//
points: 0,//
participants: 0,//
sendMessage: 0,//
sumUp: "",//
activityImgs: [],//
longitude: this.$store.state.user.longitude, //
latitude: this.$store.state.user.latitude//
// longitude: null, //
// latitude: null//
}
map=""
},
//
startLoading() {
loading = Loading.service({
lock: true, //
text: '正在加载……', //
background: 'rgba(0,0,0,.7)' //
})
},
//
endLoading() {
// clearTimeout(timer);
if (loading) {
loading.close()
}
}
},
computed: {
dataRule() {
return {
orgName: [
{ required: true, message: '组织名称不能为空', trigger: 'blur' }
],
serviceTypeList: [
{ required: true, message: '请选择服务类型', trigger: 'blur' }
],
Organizationaltype: [
{ required: true, message: '请选择组织类型', trigger: 'blur' }
],
operator: [
{ required: true, message: '请输入管理员姓名', trigger: 'blur' }
],
idCard: [
{ required: true, message: '身份证号不能为空不能为空', trigger: 'blur' },
{ pattern: /^(?:[1-9]\d{5}(18|19|20)?\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\d{3}(\d|X)|[1-9]\d{5}\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\d{3})$/, message: '请输入正确的身份证号', trigger: 'blur' }
],
mobile: [
{ required: true, message: '管理员电话不能为空不能为空', trigger: 'blur' },
{ pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号码', trigger: 'blur' }
],
fileList: [
{ required: true, message: '请上传组织封面图', trigger: 'blur' }
],
introduction: [
{ required: true, message: '请填写组织介绍', trigger: 'blur' },
{ min:50, message: '请输入50字以上的介绍', trigger: 'blur'}
],
points: [
{ required: true, message: '请选择活动积分', trigger: 'blur' }
],
sumUp: [
{ required: true, message: '请输入活动总结', trigger: 'blur' }
],
activityImgs: [
{ required: true, message: '请选择活动照片', trigger: 'blur' }
]
}
},
},
props: {
VolunteerList: {
type: Array,
default: []
},
},
destroyed () {
map = null
}
}
</script>
<style lang="scss" scoped>
@import "@/assets/scss/modules/visual/communityManageForm.scss";
</style>
<style lang="scss" scoped>
.item_width_1 {
width: 634px;
/deep/.tox .tox-dialog {
z-index: 20000;
}
}
.u-item-width-normal{
width: 222px;
}
.tinymce_view {
::v-deep .tox .tox-dialog {
z-index: 2000000000;
}
}
.div_map {
position: relative;
}
.div_searchmap {
z-index: 5000;
position: absolute;
top: 5px;
left: 5px;
}
.tinymce_view {
height: 400px;
overflow: auto;
}
.text_p {
margin: 0;
padding: 0 10px;
border: 1px solid #d9d9d9;
border-radius: 5px;
>p {
margin: 0;
}
}
</style>

966
src/views/modules/volunteer/VoluntaryOrganization/index.vue

@ -1,116 +1,116 @@
<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-input v-model.trim="formData.orgName" size="small" class="item_width_1" clearable
placeholder="请输入">
</el-input>
</el-form-item>
<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>
</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 prop="mobile" header-align="center" align="center" label="联系电话"
:show-overflow-tooltip="true">
</el-table-column>
<!-- <el-table-column prop="createdTime" header-align="center" align="center" label="注册时间" :show-overflow-tooltip="true">
</el-table-column>
<el-table-column prop="points" header-align="center" align="center" label="积分":show-overflow-tooltip="true">
</el-table-column>
<el-table-column prop="actNum" 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" v-if="scope.row.editNum !=0"
@click="handleDetail(scope.row)">查看</el-button>
<el-button type="text" style="color:#1C6AFD;" size="small" v-if="scope.row.editNum !=0"
@click="handleEdit(scope.row)">修改</el-button>
<el-button type="text" style="color:#1C6AFD;" size="small" v-if="scope.row.editNum !=0"
@click="handleshowMember(scope.row)">成员管理</el-button>
<el-button type="text" style="color:#1C6AFD;" size="small" v-if="scope.row.editNum !=0"
@click="handleDel(scope.row)">删除</el-button>
<el-button v-if="scope.row.status == 'processing'&&scope.row.isCheck == '1'" type="text" style="color:#1C6AFD;" size="small"
@click="handleprocessl(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="新增"
width="950px" 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>
<el-dialog :visible.sync="showMember" :close-on-click-modal="false" :close-on-press-escape="false"
title="成员管理" width="1000px" top="10vh" class="dialog-h" @closed="MemberManagementClose">
<MemberManagement v-if="showMember" :list="fmData" @MemberManagementClose="MemberManagementClose" />
</el-dialog>
<el-dialog :visible.sync="showprocess" :close-on-click-modal="false" :close-on-press-escape="false" title="审核"
width="850px" top="10vh" class="dialog-h" @closed="handleprocesslClose">
<process v-if="showprocess" @handleprocesslClose="handleprocesslClose" :VolunteerList="EditList"/>
</el-dialog>
</div>
</div>
<div class="g-main">
<div class="m-search">
<el-form :inline="true" ref="ref_searchform" :label-width="'100px'">
<div>
<el-form-item label="组织名称">
<el-input v-model.trim="formData.orgName" size="small" class="item_width_1" clearable
placeholder="请输入">
</el-input>
</el-form-item>
<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>
</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 prop="mobile" header-align="center" align="center" label="联系电话"
:show-overflow-tooltip="true">
</el-table-column>
<!-- <el-table-column prop="createdTime" header-align="center" align="center" label="注册时间" :show-overflow-tooltip="true">
</el-table-column>
<el-table-column prop="points" header-align="center" align="center" label="积分":show-overflow-tooltip="true">
</el-table-column>
<el-table-column prop="actNum" 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" v-if="scope.row.editNum !=0||scope.row.status == 'pass'"
@click="handleDetail(scope.row)">查看</el-button>
<el-button type="text" style="color:#1C6AFD;" size="small" v-if="scope.row.editNum !=0||scope.row.status == 'pass'"
@click="handleEdit(scope.row)">修改</el-button>
<el-button type="text" style="color:#1C6AFD;" size="small" v-if="scope.row.editNum !=0||scope.row.status == 'pass'"
@click="handleshowMember(scope.row)">成员管理</el-button>
<el-button type="text" style="color:#1C6AFD;" size="small" v-if="scope.row.editNum !=0||scope.row.status == 'pass'"
@click="handleDel(scope.row)">删除</el-button>
<el-button v-if="scope.row.status == 'processing'&&scope.row.isCheck == '1'" type="text" style="color:#1C6AFD;" size="small"
@click="handleprocessl(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="titleName"
width="950px" 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>
<el-dialog :visible.sync="showMember" :close-on-click-modal="false" :close-on-press-escape="false"
title="成员管理" width="1000px" top="10vh" class="dialog-h" @closed="MemberManagementClose">
<MemberManagement v-if="showMember" :list="fmData" @MemberManagementClose="MemberManagementClose" />
</el-dialog>
<el-dialog :visible.sync="showprocess" :close-on-click-modal="false" :close-on-press-escape="false" title="审核"
width="850px" top="10vh" class="dialog-h" @closed="handleprocesslClose">
<process v-if="showprocess" @handleprocesslClose="handleprocesslClose" :VolunteerList="EditList"/>
</el-dialog>
</div>
</div>
</template>
<script>
@ -119,7 +119,6 @@ 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"
@ -128,392 +127,395 @@ import process from "./process.vue"
import axios from "axios";
export default {
components: { add, info,edit,MemberManagement,process},
components: { add, info,MemberManagement,process},
data() {
return {
ids:"",
formData: {
orgName: "",
serviceType: "",
optionstype: [
{ value: 1, label: "志愿者服务组织" },
{ value: 2, label: "志愿者服务团队" },
]
},
showprocess:false,
EditList:{},
data() {
return {
titleName:"",
ids:"",
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,
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;
},
computed: {
maxTableHeight() {
return this.$store.state.inIframe
? this.clientHeight - 400 + this.iframeHeigh
: this.clientHeight - 400;
},
...mapGetters(["clientHeight", "iframeHeight"]),
...mapGetters(["clientHeight", "iframeHeight"]),
},
watch: {
},
mounted() {
this.ids=this.$store.state.user.agencyId
console.log(this.ids,"this.ids");
this.getTableData();
},
methods: {
//
handleprocessl(row){
this.showprocess=true
this.EditList=row
console.log(row,this.fmData,"row");
},
watch: {
//
handleprocesslClose(){
this.showprocess=false
this.getTableData()
},
mounted() {
this.ids=this.$store.state.user.agencyId
console.log(this.ids,"this.ids");
this.getTableData();
//
handleshowMember(row){
console.log (row,this.fmData,"row");
this.showMember=true
this.fmData=row
},
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.$nextTick(() => {
this.$refs.ref_form.initForm("edit", row.id);
});
console.log(row,this.EditList,"row");
},
//
showEditClose(){
this.showEdit=false
this.getTableData()
},
//
handleAdd(){
this.showAdd=true
this.$nextTick(() => {
this.$refs.ref_form.initForm("add", null);
});
},
//
showAddClose(){
console.log("sdlkfjklsdf1");
//
MemberManagementClose(){
this.showMember=false
this.getTableData()
},
//
handleEdit(row) {
this.titleName = "修改"
this.showAdd = true,
this.$nextTick(() => {
this.$refs.ref_form.initForm("edit", row.id);
});
console.log(row, this.EditList, "row");
},
//
showEditClose() {
this.showEdit = false
this.getTableData()
},
//
handleAdd() {
this.titleName = "新增"
this.showAdd = true
this.$nextTick(() => {
this.$refs.ref_form.initForm("add", null);
});
},
//
showAddClose(){
console.log("sdlkfjklsdf1");
this.showAdd=false
this.getTableData()
},
//
showInfoClose(){
this.showEdit=false
},
//
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");
this.showAdd=false
this.getTableData()
},
//
showInfoClose(){
this.showEdit=false
},
//
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 {
}
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();
},
//
async uploadHttpRequest(file) {
debugger
// this.importLoading = true;
console.log(this.importLoading,"this.importLoading");
handleExcelSuccess(res, file) {
if (!res.code === 0 && !res.msg === 'success') {
this.$message.error(res.msg);
}
},
beforeExcelUpload(file) {
console.log(file,"file1");
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);
}
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;
},
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) {
this.$confirm('此操作将永久删除该记录, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
console.log(row,"row");
let url="/voluntary/volunteerOrg/delete";
let params={
id:row.id
handleDel(row) {
this.$confirm('此操作将永久删除该记录, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
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)
}
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)
}
})
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
});
})
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
});
})
},
diaClose(){
this.formShow=false
},
resetSearch(){
this.formData=[]
this.getTableData()
},
handleDetail(row){
console.log(row,"row");
this.showInfo=true
this.fmData=row
},
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,
},
diaClose(){
this.formShow=false
},
resetSearch(){
this.formData=[]
this.getTableData()
},
handleDetail(row){
console.log(row,"row");
this.showInfo=true
this.fmData=row
},
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("下载失败");
})
.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();
},
.catch((err) => {
console.log("err", err);
return this.$message.error("网络错误");
});
},
};
</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;
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;
}
</style>
}
.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>

23
src/views/modules/volunteer/VoluntaryOrganization/process.vue

@ -1,5 +1,5 @@
<template>
<div style="height: 600px; overflow-y: scroll;">
<div class="dialog-h-content scroll-h">
<div style="display: flex;white-space: nowrap; padding: 30px;">
<el-form style="padding-left: 150px;">
<el-form-item label="组织名称">
@ -33,7 +33,7 @@
<el-form-item label="组织介绍">
{{ tableData.introduction}}
</el-form-item>
<el-form-item label="附件">
<el-form-item label="附件" v-if="tableData.qualification">
<div class="demo-image__preview" v-if="tableData.qualification" >
<el-image style="width: 100px; height: 100px" :src="tableData.qualification" :preview-src-list="tableData.qualificationList">
</el-image>
@ -50,7 +50,7 @@
</div>
<!-- {{ tableData.address}} -->
</el-form-item>
<el-form-item label="申请时间">
<el-form-item v-if="editNum" label="申请时间">
{{tableData.updatedTime}}
</el-form-item>
<el-form-item label="志愿品牌" v-if="tableData.brand">
@ -61,34 +61,21 @@
<img v-if="tableData.brandImg" style="width: 100px; height: 100px" :src="tableData.brandImg">
</img>
</div>
<!-- {{ tableData.address}} -->
</el-form-item>
<el-form-item label="审核结果">
<!-- <div style="display: flex; justify-items:center; align-items: center;">
<el-radio v-model="status1" label="pass" style="margin-right:20px">通过</el-radio>
<div class="flex flex-x flex-center2">
<el-radio v-model="status1" label="notPass" style="margin-right: 10px;">不通过</el-radio>
<el-input aria-hidden="true" v-if="status1 == 'notPass'" type="number" v-model="reason" style="width: 200px;"
placeholder="请说明原因"></el-input>
</div>
</div> -->
<template>
<el-select v-model="findingsofaudit" placeholder="请选择">
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"
:disabled="item.disabled">
</el-option>
</el-select>
</template>
</el-form-item>
<el-form-item label="原因" v-if="findingsofaudit == 'notPass'">
<el-input v-if="findingsofaudit == 'notPass'" v-model="reason" style="width: 200px;"
placeholder="请说明原因"></el-input>
</el-form-item>
</el-form>
</div>
<div class="div_btn">
<!-- <div style="display: flex; margin-bottom: 20px; margin-left: 75px;">
@ -124,6 +111,7 @@ export default {
name: "see",
data() {
return {
editNum:false,
options:[
{
value: 'pass',
@ -150,6 +138,9 @@ export default {
},
created() {
console.log(this.VolunteerList,"list");
if(this.VolunteerList.editNum==0){
this.editNum=true
}
// this.tableData=this.VolunteerList
// this.awardId=this.list.id
this.getTableData()

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

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

Loading…
Cancel
Save