Browse Source

Merge branch 'xiaowang-social' into feature

featrue-social
是小王呀\24601 1 year ago
parent
commit
bad6353a0c
  1. 3
      .gitignore
  2. 2
      package.json
  3. 633
      src/views/modules/volunteer/LifeCircleManagement/add.vue
  4. 147
      src/views/modules/volunteer/LifeCircleManagement/index.vue
  5. 492
      src/views/modules/volunteer/LifeCircleManagement/info.vue
  6. 526
      src/views/modules/volunteer/SiteManagement/add.vue
  7. 267
      src/views/modules/volunteer/SiteManagement/index.vue
  8. 482
      src/views/modules/volunteer/SiteManagement/info.vue
  9. 370
      src/views/modules/volunteer/Venuemanagement/add.vue
  10. 158
      src/views/modules/volunteer/Venuemanagement/index.vue
  11. 528
      src/views/modules/volunteer/Venuemanagement/info.vue
  12. 4
      src/views/modules/volunteer/VoluntaryOrganization/info.vue
  13. 88
      src/views/modules/volunteer/VolunteerProjects/add.vue
  14. 10
      src/views/modules/volunteer/VolunteerProjects/edit.vue
  15. 2
      src/views/modules/volunteer/VolunteerProjects/index.vue
  16. 8
      src/views/modules/volunteer/activityArchive/Points.vue
  17. 3
      src/views/modules/volunteer/activityArchive/index.vue
  18. 117
      src/views/modules/volunteer/activityArchive/realselect.vue
  19. 49
      src/views/modules/volunteer/pointsRedemption/add.vue
  20. 2
      src/views/modules/volunteer/pointsRedemption/index.vue
  21. 20
      src/views/modules/volunteer/pointsRedemption/update.vue

3
.gitignore

@ -19,4 +19,5 @@ dist
epmet-oper
epmet-work-pc
package-lock.json
.idea/
.idea/
report.20240923.092213.21116.0.001.json

2
package.json

@ -10,7 +10,7 @@
"build:uat": "vue-cli-service build --mode production.uat",
"build:preview": "vue-cli-service build --mode preview",
"build:prod": "vue-cli-service build --mode production",
"build:test": "vue-cli-service build --mode test",
"build:test": "set NODE_OPTIONS=--max_old_space_size=4096 && vue-cli-service build --mode test",
"build:shibei_prod": "vue-cli-service build --mode shibei_production",
"lint": "vue-cli-service lint",
"et": "node_modules/.bin/et",

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

@ -5,20 +5,20 @@
<el-form ref="ref_form" :inline="true" :model="formData" :rules="dataRule" class="form">
<el-row>
<el-col :span="12">
<!-- <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> -->
<el-col :span="12">
<el-form-item label="组织类型" prop="typeName" label-width="100px">
<el-cascader v-model="formData.typeName" :options="options" @change="handleChange" :disabled="showdisabled"></el-cascader>
<el-form-item label="类型" prop="type" label-width="100px">
<el-cascader v-model="formData.type" :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="请输入活动名称" :disabled="showdisabled"
<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>
@ -33,7 +33,7 @@
</el-form-item>
</el-col> -->
<el-col :span="24">
<el-form-item label="位置" prop="address" label-width="100px" style="display: block">
<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" >
@ -46,35 +46,36 @@
</el-form-item>
</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="请输入管理员姓名" :disabled="showdisabled"
<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="mobile" label-width="100px">
<el-input v-model.trim="formData.mobile" size="small" clearable placeholder="请输入手机号" :disabled="showdisabled"
<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.sponsors" style="display: flex; ">
<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 :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>
</div>
</div>
<div @click="addDomain" style="color: blue; font-size: 12px; margin-top: 15px">添加
</div>
<!-- <div v-if="formData.tags" style="display: flex; "> -->
<div >
<!-- <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="coverImg">
<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>
@ -85,14 +86,14 @@
</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="请输入营业时间" :disabled="showdisabled"
<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="beizhu">
<el-input v-model.trim="formData.beizhu" size="small" clearable placeholder="请输入备注" :disabled="showdisabled"
<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>
@ -121,7 +122,7 @@
</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 size="small" type="primary" @click="handleComfirm">
</el-button>
</div>
@ -131,7 +132,7 @@
<script>
import { mapGetters } from 'vuex'
// import { Loading } from 'element-ui' // Loading
import { requestPost } from '@/js/dai/request'
import { requestPost,requestGet } from '@/js/dai/request'
import Tinymce from '@c/tinymce2/index.vue'
import daiMap from "@/utils/dai-map";
import util from '@js/util.js';
@ -150,201 +151,8 @@
return {
showdisabled:false,
searchOptions:[],
options: [{
value: 'zhinan',
label: '指南',
children: [{
value: 'shejiyuanze',
label: '设计原则',
children: [{
value: 'yizhi',
label: '一致'
}, {
value: 'fankui',
label: '反馈'
}, {
value: 'xiaolv',
label: '效率'
}, {
value: 'kekong',
label: '可控'
}]
}, {
value: 'daohang',
label: '导航',
children: [{
value: 'cexiangdaohang',
label: '侧向导航'
}, {
value: 'dingbudaohang',
label: '顶部导航'
}]
}]
}, {
value: 'zujian',
label: '组件',
children: [{
value: 'basic',
label: 'Basic',
children: [{
value: 'layout',
label: 'Layout 布局'
}, {
value: 'color',
label: 'Color 色彩'
}, {
value: 'typography',
label: 'Typography 字体'
}, {
value: 'icon',
label: 'Icon 图标'
}, {
value: 'button',
label: 'Button 按钮'
}]
}, {
value: 'form',
label: 'Form',
children: [{
value: 'radio',
label: 'Radio 单选框'
}, {
value: 'checkbox',
label: 'Checkbox 多选框'
}, {
value: 'input',
label: 'Input 输入框'
}, {
value: 'input-number',
label: 'InputNumber 计数器'
}, {
value: 'select',
label: 'Select 选择器'
}, {
value: 'cascader',
label: 'Cascader 级联选择器'
}, {
value: 'switch',
label: 'Switch 开关'
}, {
value: 'slider',
label: 'Slider 滑块'
}, {
value: 'time-picker',
label: 'TimePicker 时间选择器'
}, {
value: 'date-picker',
label: 'DatePicker 日期选择器'
}, {
value: 'datetime-picker',
label: 'DateTimePicker 日期时间选择器'
}, {
value: 'upload',
label: 'Upload 上传'
}, {
value: 'rate',
label: 'Rate 评分'
}, {
value: 'form',
label: 'Form 表单'
}]
}, {
value: 'data',
label: 'Data',
children: [{
value: 'table',
label: 'Table 表格'
}, {
value: 'tag',
label: 'Tag 标签'
}, {
value: 'progress',
label: 'Progress 进度条'
}, {
value: 'tree',
label: 'Tree 树形控件'
}, {
value: 'pagination',
label: 'Pagination 分页'
}, {
value: 'badge',
label: 'Badge 标记'
}]
}, {
value: 'notice',
label: 'Notice',
children: [{
value: 'alert',
label: 'Alert 警告'
}, {
value: 'loading',
label: 'Loading 加载'
}, {
value: 'message',
label: 'Message 消息提示'
}, {
value: 'message-box',
label: 'MessageBox 弹框'
}, {
value: 'notification',
label: 'Notification 通知'
}]
}, {
value: 'navigation',
label: 'Navigation',
children: [{
value: 'menu',
label: 'NavMenu 导航菜单'
}, {
value: 'tabs',
label: 'Tabs 标签页'
}, {
value: 'breadcrumb',
label: 'Breadcrumb 面包屑'
}, {
value: 'dropdown',
label: 'Dropdown 下拉菜单'
}, {
value: 'steps',
label: 'Steps 步骤条'
}]
}, {
value: 'others',
label: 'Others',
children: [{
value: 'dialog',
label: 'Dialog 对话框'
}, {
value: 'tooltip',
label: 'Tooltip 文字提示'
}, {
value: 'popover',
label: 'Popover 弹出框'
}, {
value: 'card',
label: 'Card 卡片'
}, {
value: 'carousel',
label: 'Carousel 走马灯'
}, {
value: 'collapse',
label: 'Collapse 折叠面板'
}]
}]
}, {
value: 'ziyuan',
label: '资源',
children: [{
value: 'axure',
label: 'Axure Components'
}, {
value: 'sketch',
label: 'Sketch Templates'
}, {
value: 'jiaohu',
label: '组件交互文档'
}]
}],
options: [{
}],
fileList:[],
searchValue:"",
OrganizationaltypeList:[],
@ -357,28 +165,16 @@
tableDate:{},
formData:
{
sponsors: [{ name: ""}],//
typeName:"",//
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,//
agencyName:"",
linkman: "",
linkPhone: "",
workTime: "",
type: "1",
tags: "",//
agencyId: this.$store.state.user.agencyId,
address: "",//
longitude: this.$store.state.user.longitude, //
latitude: this.$store.state.user.latitude,//
},
corganizerList: [],
uploadUrl: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
@ -390,7 +186,7 @@
components: { Tinymce, UploadImage },
mounted() {
this.formData.agencyId=this.$store.state.user.agencyId
this.formData.agencyId=this.$store.state.user.agencyId
this.formData.agencyName=this.$store.state.user.agencyName
let { latitude, longitude } = this.$store.state.user;
if (!latitude || latitude == "" || latitude == "0") {
@ -411,6 +207,9 @@
if(type=="info"){
this.showdisabled=true
}
if (type=="edit") {
this.getTableDetail(unitId)
}
// await this.getDemandOptions()
// console.log(this.demandOptions);
// let { latitude, longitude } = this.$store.state.user;
@ -431,13 +230,29 @@
// this.endLoading();
},
//
getTableDetail(id) {
console.log(id,"dskljfksdljf");
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");
} else {
this.$message.error(res.msg)
}
})
},
//
addDomain() {
if (this.formData.sponsors.length < 4) {
console.log("jshdfdsjdfkl");
console.log(this.formData.sponsors,this.tableDate,);
this.formData.sponsors.push(this.tableDate);
console.log(this.formData.sponsors,this.tableDate,);
if (this.formData.tags.length < 4) {
this.formData.tags.push(this.tableDate);
}else{
this.$message.error("最多添加4个标签");
}
@ -465,84 +280,9 @@
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,
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);
@ -567,18 +307,25 @@
}
},
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.coverPic = e[0].response.data.url;
} else {
this.formData.coverPic = '';
}
},
console.log(e, 'sssssb');
this.fileList = e.length > 0 ? e.map(item => ({
fileType: '0',
type:'image',
fileType: '0',
name:item.response.data.fileName,
fileUrl: item.response.data.url,
format: item.response.data.fileName.split('.').pop(),
url: item.response.data.url
})) : []; // efileList
if (e.length > 0) {
console.log(this.fileList,"this.fileList");
this.formData.attrs=this.fileList;
console.log(this.formData.attrs,"this.fileList");
} else {
this.formData.coverPic = '';
}
},
removedImg() {
this.formData.coverPic = ''
},
@ -594,19 +341,7 @@
// 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) {
@ -621,21 +356,8 @@
}
},
// 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('-')
@ -652,160 +374,49 @@
}
},
// 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 handleComfirm() {
console.log(this.formData," this.formData");
if (!this.formData.agencyName) {
this.$message.error('请选择所属组织');
return;
}
if (!this.formData.introduction) {
// if (!this.formData.type) {
// this.$message.error('');
// return;
// }
if (!this.formData.name) {
this.$message.error('请输入组织介绍');
return;
}
if (this.fileList.length === 0) {
if (this.formData.attrs.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('请输入管理员姓名');
if (!this.formData.linkPhone) {
this.$message.error('请输入联系电话');
return;
}
if (!this.formData.orgType) {
this.$message.error('请输入组织类型');
if (!this.formData.linkman) {
this.$message.error('请输入联系人');
return;
}
if (!this.formData.serviceTypeList) {
this.$message.error('请输入服务类型');
return;
}
// if (this.formData.tabs.length === 0) {
// this.$message.error('');
// return;
// }
if (!this.formData.orgName) {
this.$message.error('请输入组织名称');
return;
}
// if (!this.formData.serviceTypeList) {
// this.$message.error('');
// return;
// }
console.log(this.formData,"this.formData");
this.addActivity()
},
//
async addActivity() {
let url = '/voluntary/volunteerOrg/saveOrUpdate'
let url = '/voluntary/sphereLife/saveOrUpdate'
const { data, code, msg } = await requestPost(url, this.formData)
if (code === 0) {
this.$message({
@ -929,30 +540,24 @@
typeName: [
{ required: true, message: '请选择组织类型', trigger: 'blur' }
],
Name: [
name: [
{ required: true, message: '请填写名称', trigger: 'blur' }
],
searchValue: [
{ required: true, message: '请选择地址', trigger: 'blur' },
],
mobile: [
{ required: true, message: '管理员电话不能为空不能为空', trigger: 'blur' },
linkPhone: [
{ required: true, message: '联系电话不能为空', trigger: 'blur' },
{ pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号码', trigger: 'blur' }
],
operator: [
linkman: [
{ required: true, message: '请填写联系人', trigger: 'blur' }
],
sponsors: [
tags: [
{ required: true, message: '请填写标签信息', trigger: 'blur' },
],
fileList: [
{ required: true, message: '请选择封面图片', trigger: 'blur' }
],
sumUp: [
{ required: true, message: '请输入活动总结', trigger: 'blur' }
],
activityImgs: [
attrs: [
{ required: true, message: '请选择活动照片', trigger: 'blur' }
]
}

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

@ -4,24 +4,24 @@
<el-form :inline="true" ref="ref_searchform" :label-width="'100px'">
<div>
<el-form-item label="类型">
<el-select v-model="formData.serviceType" placeholder="请选择" clearable>
<el-select v-model="formData.tyep" 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
<el-input v-model.trim="formData.name" size="small" class="item_width_1" clearable
placeholder="请输入">
</el-input>
</el-form-item>
<el-form-item label="位置">
<el-input v-model.trim="formData.orgName" size="small" class="item_width_1" clearable
<el-input v-model.trim="formData.address" size="small" class="item_width_1" clearable
placeholder="请输入">
</el-input>
</el-form-item>
<el-form-item label="标签">
<el-input v-model.trim="formData.orgName" size="small" class="item_width_1" clearable
<el-input v-model.trim="formData.tags" size="small" class="item_width_1" clearable
placeholder="请输入">
</el-input>
</el-form-item>
@ -54,27 +54,27 @@
<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="类型"
<el-table-column prop="type" 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="名称"
<el-table-column prop="name" header-align="center" align="center" label="名称"
:show-overflow-tooltip="true">
</el-table-column>
<el-table-column prop="numberNum" header-align="center" align="center" label="位置"
<el-table-column prop="address" header-align="center" align="center" label="位置"
:show-overflow-tooltip="true">
</el-table-column>
<el-table-column prop="operator" header-align="center" align="center" label="联系人"
<el-table-column prop="linkman" header-align="center" align="center" label="联系人"
:show-overflow-tooltip="true">
</el-table-column>
<el-table-column prop="mobile" header-align="center" align="center" label="联系电话"
<el-table-column prop="linkPhone" 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 prop="tags" 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 prop="remark" 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">
@ -98,14 +98,11 @@
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>
<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 ref="ref_form" v-if="showInfo" :VolunteerList="fmData" @showInfoClose="showInfoClose" />
</el-dialog>
</div>
</div>
@ -116,7 +113,7 @@ 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 info from "./info.vue"
// import edit from "./edit.vue"
// import MemberManagement from "./MemberManagement.vue"
// import process from "./process.vue"
@ -126,19 +123,23 @@ import add from "./add.vue"
import axios from "axios";
export default {
components: { add},
components: { add,info},
data() {
return {
formTitle:"",
formData: {
orgName: "",
serviceType: "",
optionstype: [
name:"",
tyep:"",
tags:"",
address:"",
},
optionstype: [
{ value: 1, label: "志愿者服务组织" },
{ value: 2, label: "志愿者服务团队" },
]
},
],
showprocess:false,
EditList:{},
@ -169,9 +170,23 @@ export default {
},
mounted() {
this.getLifeType()
this.getTableData();
},
methods: {
//
async getLifeType () {
const url = "/sys/dict/data/dictlist"
let params = {
dictType: 'voluntary_sphereLife_type'
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.OrganizationaltypeList = data;
} else {
this.$message.error(msg)
}
},
//
handleprocessl(row){
this.showprocess=true
@ -202,7 +217,7 @@ export default {
this.formTitle="新增"
console.log(row,"row");
this.$nextTick(() => {
this.$refs.ref_form.initForm("edit", row);
this.$refs.ref_form.initForm("edit", row.id);
});
},
@ -234,10 +249,10 @@ export default {
handleDetail(row){
// console.log(row,"row");
// this.showInfo=true
this.showAdd=true
this.showInfo=true
this.formTitle="查看"
this.$nextTick(() => {
this.$refs.ref_form.initForm("info", row);
this.$refs.ref_form.initForm("info", row.id);
});
@ -245,15 +260,13 @@ export default {
//
async getTableData() {
// const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/project-list";
const url = "/voluntary/volunteerOrg/page";
const url = "/voluntary/sphereLife/list";
let params={
orgName: this.formData.orgName,
serviceType: this.formData.serviceType,
...this.formData,
pageNo:this.pageNo,
pageSize: this.pageSize
}
const { data, code, msg } = await requestPost(url,params);
const { data, code, msg } = await requestGet(url,params);
if (code === 0) {
console.log("列表请求成功!!!!!!!!!!!!!!");
this.total = data.total || 0;
@ -263,28 +276,28 @@ export default {
},
//
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'
@ -338,48 +351,42 @@ export default {
},
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: () => {
handleDel(row) {
console.log(row, "row");
let url = "/voluntary/sphereLife/delete";
let params = [String(row.id)];
axios.delete(this.processUrl(url), { data: params })
.then((res) => {
if (res.data.code === 0) {
this.$message.success("删除成功");
this.getTableData();
} else {
this.$message.error(res.data.msg);
}
})
this.getTableData()
} else {
this.$message.error(data.msg)
}
})
.catch((error) => {
console.error("删除失败", error);
this.$message.error("删除失败,请稍后重试");
});
},
diaClose(){
this.formShow=false
@ -460,7 +467,13 @@ export default {
this.handleClose();
this.getTableData();
},
// URL
processUrl(url) {
if (url.indexOf("http://") > -1 || url.indexOf("https://") > -1) {
return url;
}
return process.env.VUE_APP_API_SERVER + url;
}
},
};
</script>

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

@ -0,0 +1,492 @@
<template>
<div>
<div class="dialog-h-content scroll-h">
<el-form ref="ref_form" :model="formData" :rules="dataRule" class="form">
<!-- <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-form-item label="类型" prop="type" 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">typeName
<div>{{ formData.typeName }}</div>
</el-option>
</el-select> -->
<div>{{ formData.positionName }}</div>
</el-form-item>
<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> -->
<div>{{ formData.name }}</div>
</el-form-item>
<el-form-item label="联系人" prop="linkPhone" label-width="100px">
<div>{{ formData.linkPhone }}</div>
</el-form-item>
<el-form-item label="联系电话" prop="linkPhone" label-width="100px">
<div>{{ formData.linkPhone }}</div>
</el-form-item>
<el-form-item label="标签" prop="linkPhone" label-width="100px">
<div>{{ formData.tags }}</div>
</el-form-item>
<!-- <el-form-item label="办公时间" prop="workTime" label-width="100px">
<div>{{ formData.workTime }}</div>
</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;">
</template>
</el-form-item>
<!-- <el-form-item label="阵地简介" prop="content" label-width="100px" style="display: block">
<div>{{ formData.content }}</div>
</el-form-item> -->
<el-form-item label="营业时间" prop="workTime" label-width="100px">
<div>{{ formData.workTime }}</div>
</el-form-item>
<el-form-item label="备注" prop="workTime" label-width="100px">
<div>{{ formData.remark }}</div>
</el-form-item>
<el-form-item label="位置" prop="address" label-width="100px" style="display: block">
<div style="width: 300px">
<div>{{ formData.address }}</div>
<div id="app_activity" class="div_map"></div>
</div>
</el-form-item>
</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"
@click="handleComfirm">
</el-button>
</div> -->
</div>
</template>
<script>
import { mapGetters } from 'vuex'
// import { Loading } from 'element-ui' // Loading
import { requestPost,requestGet } 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 //
export default {
data() {
return {
formData:
{
agencyName:"",
agencyId: "",
linkman: "",
linkPhone: "",
content: "",
workTime: "",
attrs: [],
type: "",
name: "",
optionstype: [
{ value: 0, label: "实践站" },
{ value: 1, label: "实践点" },
{ value: 2, label: "其它" },
],
address: "",//
longitude: this.$store.state.user.longitude, //
latitude: this.$store.state.user.latitude,//
},
showdisabled:false,
uploadUrl: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
customerId: localStorage.getItem('customerId'),
}
},
components: { Tinymce, UploadImage },
mounted() {
this.formData.agencyId=this.$store.state.user.agencyId
this.formData.agencyName=this.$store.state.user.agencyName
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.activityType()
this.listServerOrg()
},
methods: {
//
async initForm(type, unitId) {
this.getTableDetail(unitId)
},
//
getTableDetail(id) {
console.log(id,"dskljfksdljf");
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");
} else {
this.$message.error(res.msg)
}
})
},
//
addDomain() {
if (this.formData.sponsors.length < 4) {
console.log("jshdfdsjdfkl");
console.log(this.formData.sponsors,this.tableDate,);
this.formData.sponsors.push(this.tableDate);
console.log(this.formData.sponsors,this.tableDate,);
}else{
this.$message.error("最多添加4个标签");
}
},
//
removeDomain(item) {
console.log(item);
var index = this.formData.sponsors.indexOf(item)
if (index !== -1) {
this.formData.sponsors.splice(index, 1)
this.tableDate = {}
}
},
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 || '';
},
async activityType() {
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)
}
})
},
onChangeFileList(e) {
console.log(e, 'sssssb');
this.fileList = e.length > 0 ? e.map(item => ({
fileType: '0',
type:'image',
fileType: '0',
name:item.response.data.fileName,
fileUrl: item.response.data.url,
format: item.response.data.fileName.split('.').pop(),
url: item.response.data.url
})) : []; // efileList
if (e.length > 0) {
console.log(this.fileList,"this.fileList");
this.formData.attrs=this.fileList;
console.log(this.formData.attrs,"this.fileList");
} else {
this.formData.coverPic = '';
}
},
removedImg() {
this.formData.coverPic = ''
},
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)
})
}
},
async handleComfirm() {
console.log(this.formData," this.formData");
// if (this.formData.type!==1&&!this.formData.type!=2&&!this.formData.type!=0) {
// this.$message.error('');
// return;
// }
if (!this.formData.linkPhone) {
this.$message.error('请输入电话');
return;
}
if (!this.formData.linkman) {
this.$message.error('请输入姓名');
return;
}
if (!this.formData.address) {
this.$message.error('请选择位置');
return;
}
if (!this.formData.workTime) {
this.$message.error('请输入办公时间');
return;
}
console.log(this.formData,"this.formData");
this.addActivity()
},
//
async addActivity() {
let url = '/voluntary/position/saveOrUpdate'
console.log();
const { data, code, msg } = await requestPost(url, this.formData)
if (code === 0) {
this.$message({
type: 'success',
message: '操作成功'
})
// this.resetData()
this.$emit('showAddClose')
} else {
this.$message.error(msg)
}
},
handleCancle() {
console.log("sdlkfjklsdf ");
this.$emit('showAddClose')
},
// 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 !== '') {
const { msg, data } = await map.searchNearby(query);
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
},
},
computed: {
dataRule() {
return {
type: [
{ required: true, message: '请选择类型', trigger: 'blur' }
],
name: [
{ required: true, message: '请选择名称', trigger: 'blur' }
],
linkman: [
{ required: true, message: '请输入联系人', trigger: 'blur' },
],
linkPhone: [
{ required: true, message: '请填写电话', trigger: 'blur' },
{ pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号码', trigger: 'blur' }
],
content: [
{ required: true, message: '请输入阵地介绍', trigger: 'blur' }
],
attrs: [
{ required: true, message: '请选择封面图片', trigger: 'blur' }
],
address: [
{ required: true, message: '请选择位置', trigger: 'blur' }
],
workTime: [
{ required: true, message: '请输入办公时间', trigger: 'blur' }
]
}
},
},
props: {
},
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>

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

@ -5,62 +5,62 @@
<el-form ref="ref_form" :inline="true" :model="formData" :rules="dataRule" class="form">
<el-row>
<el-col :span="12">
<!-- <el-col :span="12">
<el-form-item label="所属组织" prop="agencyName" label-width="100px">
<el-input v-model.trim="formData.agencyName" size="small" clearable placeholder="请输入活动名称"
<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">
<el-option :disabled="showdisabled" class="u-item-width-normal" v-for="item in optionstype" :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="类型" prop="typeName" label-width="100px">
<el-cascader class="u-item-width-normal" v-model="formData.typeName" :options="options"
@change="handleChange" :disabled="showdisabled"></el-cascader>
<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="Name">
<el-input v-model.trim="formData.Name" size="small" clearable placeholder="请输入活动名称"
<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="operator" label-width="100px">
<el-input v-model.trim="formData.operator" size="small" clearable placeholder="请输入管理员姓名"
<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">
<el-form-item label="联系电话" prop="mobile" label-width="100px">
<el-input v-model.trim="formData.mobile" size="small" clearable placeholder="请输入手机号"
<el-form-item label="办公时间" prop="workTime" label-width="100px">
<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="coverImg">
<el-form-item label="图片" label-width="100px" prop="attrs">
<template>
<upload-image :defaultFileList="fileList" :limit="1" @change="onChangeFileList"
<upload-image :defaultFileList="fileList" :limit="3" @change="onChangeFileList"
v-if="!showdisabled" @file-removed="removedImg"></upload-image>
<div v-else>
<img :src="formData.coverImg" alt="" style="width: 100px; height: 100px;">
<img v-for="(item, index) in this.formData.attrs" :key="index" :src="item.url" style="width: 100px; height: 100px;">
</div>
</template>
</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>
<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="description" label-width="100px" style="display: block">
<el-form-item label="阵地简介" prop="content" label-width="100px" style="display: block">
<div class="item_width_1">
<el-input :disabled="showdisabled" type="textarea" autosize placeholder="请填写组织介绍"
v-model.trim="formData.description" :autosize="{ minRows:4., maxRows: 10}">
<el-input :disabled="showdisabled" type="textarea" autosize placeholder="请填写阵地介绍"
v-model.trim="formData.content" :autosize="{ minRows:4., maxRows: 10}">
</el-input>
</div>
</el-form-item>
@ -68,7 +68,7 @@
<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
<el-select v-model.trim="this.formData.address" filterable style="width: 634px" remote
:reserve-keyword="true" :disabled="showdisabled" placeholder="请输入关键词"
:remote-method="remoteMethod">
<el-option v-for="(item, index) in searchOptions"
@ -82,32 +82,11 @@
</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"
:autosize="{ minRows:4., maxRows: 10}">
</el-input>
</div>
</el-form-item>
<el-form-item label="品牌展示图" label-width="100px" prop="brandImg">
<template>
<upload-image :defaultFileList="formData.brandImg" :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"
<el-button size="small" v-if="formType != 'detail'" type="primary"
@click="handleComfirm">
</el-button>
@ -118,7 +97,7 @@
<script>
import { mapGetters } from 'vuex'
// import { Loading } from 'element-ui' // Loading
import { requestPost } from '@/js/dai/request'
import { requestPost,requestGet } from '@/js/dai/request'
import Tinymce from '@c/tinymce2/index.vue'
import daiMap from "@/utils/dai-map";
import util from '@js/util.js';
@ -135,41 +114,29 @@
export default {
data() {
return {
showdisabled:false,
searchOptions:[],
fileList:[],
searchValue:"",
Organizationaltype:[
{ label: "社区", value: 1 },
{ label: "企业", value: 2 },
{ label: "学校", value: 3 },
],
tableDate:{},
formData:
{
sponsors: [{ name: ""}],//
typeName:"",//
status:"pass",//
numberNum:"",//
userId:"",//id
agencyId:"",//id
orgType:"",
brandImg:"",//
brand:"",//
introduction:"",//
qualification: "",//
idCard:"",//
mobile:"",//
operator:"",//
Organizationaltype:"",//
// serviceTypeList:"",//
orgName:"",//
agencyName:"",//
serviceTypeList:[],//
optionstype: [
{ value: 0, label: "实践站" },
{ value: 1, label: "实践点" },
{ value: 2, label: "其它" },
],
formData:
{
agencyName:"",
agencyId: "",
linkman: "",
linkPhone: "",
content: "",
workTime: "",
attrs: [],
type: "",
name: "",
address: "",//
longitude: this.$store.state.user.longitude, //
latitude: this.$store.state.user.latitude,//
},
showdisabled:false,
uploadUrl: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
customerId: localStorage.getItem('customerId'),
@ -199,26 +166,32 @@
console.log(type, unitId,"i就理解哦i");
if(type=="info"){
this.showdisabled=true
this.getTableDetail(unitId)
}
// await this.getDemandOptions()
// console.log(this.demandOptions);
// let { latitude, longitude } = this.$store.state.user;
// this.formType = type;
// if (unitId) {
// this.unitId = unitId;
// this.formData.id = unitId;
// await this.loadFormData();
// } else {
// this.formData.latitude = latitude;
// this.formData.longitude = longitude;
// }
// // if (!map) {
// this.initMap(this.formData.latitude, this.formData.longitude);
// // }
// this.endLoading();
if (type=="edit") {
this.getTableDetail(unitId)
}
},
//
getTableDetail(id) {
console.log(id,"dskljfksdljf");
let url = `/voluntary/position/edit/${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}]
console.log(this.formData,"this.formData");
} else {
this.$message.error(res.msg)
}
})
},
//
addDomain() {
@ -253,85 +226,7 @@
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,
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);
@ -343,26 +238,23 @@
}
})
},
handleOnlineRegistration(value) {
//
if (value) {
this.online = true;
this.formData.online = 1;
} else {
this.online = false;
this.formData.cutOffTime = ''
this.formData.online = 0;
}
},
onChangeFileList(e) {
console.log(e, 'sssssb');
this.fileList = e.length > 0 ? e.map(item => ({
fileType: '0',
fileUrl: item.response.data.url
type:'image',
fileType: '0',
name:item.response.data.fileName,
fileUrl: item.response.data.url,
format: item.response.data.fileName.split('.').pop(),
url: item.response.data.url
})) : []; // efileList
if (e.length > 0) {
this.formData.coverPic = e[0].response.data.url;
console.log(this.fileList,"this.fileList");
this.formData.attrs=this.fileList;
console.log(this.formData.attrs,"this.fileList");
} else {
this.formData.coverPic = '';
}
@ -371,30 +263,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 = '';
// }
// },
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)
@ -409,184 +278,32 @@
})
}
},
// 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 handleComfirm() {
console.log(this.formData," this.formData");
if (!this.formData.agencyName) {
this.$message.error('请选择所属组织');
return;
}
if (!this.formData.introduction) {
this.$message.error('请输入组织介绍');
// if (this.formData.type!==1&&!this.formData.type!=2&&!this.formData.type!=0) {
// this.$message.error('');
// return;
// }
if (!this.formData.linkPhone) {
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('请输入管理员电话');
if (!this.formData.linkman) {
this.$message.error('请输入姓名');
return;
}
if (!this.formData.operator) {
this.$message.error('请输入管理员姓名');
if (!this.formData.address) {
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('请输入组织名称');
if (!this.formData.workTime) {
this.$message.error('请输入办公时间');
return;
}
console.log(this.formData,"this.formData");
@ -594,7 +311,9 @@
},
//
async addActivity() {
let url = '/voluntary/volunteerOrg/saveOrUpdate'
let url = '/voluntary/position/saveOrUpdate'
console.log();
const { data, code, msg } = await requestPost(url, this.formData)
if (code === 0) {
this.$message({
@ -603,9 +322,8 @@
})
// this.resetData()
this.$emit('showAddClose')
this.btnDisable = false
} else {
this.btnDisable = false
this.$message.error(msg)
}
@ -658,7 +376,7 @@
let { msg, data } = await map.getAddress(lat, lng);
if (msg == "success") {
this.formData.address = data.address;
this.searchValue=data.address
// this.searchValue=data.address
console.log(this.formData.address," this.formData.address ");
this.searchValue = data.address
@ -715,34 +433,32 @@
computed: {
dataRule() {
return {
typeName: [
{ required: true, message: '请选择组织类型', trigger: 'blur' }
type: [
{ required: true, message: '请选择类型', trigger: 'blur' }
],
Name: [
{ required: true, message: '请填写名称', trigger: 'blur' }
name: [
{ required: true, message: '请选择名称', trigger: 'blur' }
],
searchValue: [
{ required: true, message: '请选择地址', trigger: 'blur' },
linkman: [
{ required: true, message: '请输入联系人', trigger: 'blur' },
],
mobile: [
{ required: true, message: '管理员电话不能为空不能为空', trigger: 'blur' },
linkPhone: [
{ required: true, message: '请填写电话', trigger: 'blur' },
{ pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号码', trigger: 'blur' }
],
operator: [
{ required: true, message: '请填写联系人', trigger: 'blur' }
content: [
{ required: true, message: '请输入阵地介绍', trigger: 'blur' }
],
description: [
{ required: true, message: '请填写阵地介绍', trigger: 'blur' },
],
fileList: [
attrs: [
{ required: true, message: '请选择封面图片', trigger: 'blur' }
],
address: [
{ required: true, message: '请选择位置', trigger: 'blur' }
],
coverImg: [
{ required: true, message: '请选择照片', trigger: 'blur' }
workTime: [
{ required: true, message: '请输入办公时间', trigger: 'blur' }
]
}
},

267
src/views/modules/volunteer/SiteManagement/index.vue

@ -1,103 +1,87 @@
<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 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.name" size="small" class="item_width_1" clearable placeholder="请输入">
</el-input>
</el-form-item>
<el-form-item label="类型">
<el-select v-model="formData.type" 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="operator" header-align="center" align="center" label="联系电话"
:show-overflow-tooltip="true">
</el-table-column>
<!-- <el-table-column prop="operator" header-align="center" align="center" label="办公时间"
<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="type" header-align="center" align="center" label="类型" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.type === 0 ? '实践站' : scope.row.type === 1 ? '实践点' : '其他' }}</span>
</template>
</el-table-column>
<el-table-column prop="name" header-align="center" align="center" label="名称" :show-overflow-tooltip="true">
</el-table-column>
<el-table-column prop="address" header-align="center" align="center" label="地址" :show-overflow-tooltip="true">
</el-table-column>
<el-table-column prop="linkman" header-align="center" align="center" label="联系人" :show-overflow-tooltip="true">
</el-table-column>
<el-table-column prop="linkPhone" 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>
<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 x :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" ref="ref_form" @showInfoClose="showInfoClose" />
</el-dialog>
</div>
</div>
</template>
<script>
@ -105,7 +89,7 @@ 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 info from "./info.vue"
// import edit from "./edit.vue"
// import MemberManagement from "./MemberManagement.vue"
// import process from "./process.vue"
@ -115,19 +99,21 @@ import add from "./add.vue"
import axios from "axios";
export default {
components: { add},
components: { add,info},
data() {
return {
formTitle:"",
formData: {
orgName: "",
serviceType: "",
optionstype: [
{ value: 1, label: "志愿者服务组织" },
{ value: 2, label: "志愿者服务团队" },
]
},
formData: {
type: "",
name: "",
optionstype: [
{ value: 0, label: "实践站" },
{ value: 1, label: "实践点" },
{ value: 2, label: "其它" },
]
},
showprocess:false,
EditList:{},
@ -188,10 +174,10 @@ export default {
//
handleEdit(row){
this.showAdd=true
this.formTitle="新增"
this.formTitle="修改"
console.log(row,"row");
this.$nextTick(() => {
this.$refs.ref_form.initForm("edit", row);
this.$refs.ref_form.initForm("edit", row.id);
});
},
@ -221,12 +207,10 @@ export default {
},
//
handleDetail(row){
// console.log(row,"row");
// this.showInfo=true
this.showAdd=true
this.showInfo=true
this.formTitle="查看"
this.$nextTick(() => {
this.$refs.ref_form.initForm("info", row);
this.$refs.ref_form.initForm("info", row.id);
});
@ -234,15 +218,15 @@ export default {
//
async getTableData() {
// const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/project-list";
const url = "/voluntary/volunteerOrg/page";
const url = "/voluntary/position/list";
let params={
orgName: this.formData.orgName,
serviceType: this.formData.serviceType,
name: this.formData.name,
type: this.formData.type,
pageNo:this.pageNo,
pageSize: this.pageSize
}
const { data, code, msg } = await requestPost(url,params);
const { data, code, msg } = await requestGet(url,params);
if (code === 0) {
console.log("列表请求成功!!!!!!!!!!!!!!");
this.total = data.total || 0;
@ -346,29 +330,26 @@ export default {
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)
}
})
handleDel(row) {
console.log(row, "row");
let url = "/voluntary/position/delete";
// let params = {
// ids: [String(row.id)] // row.id
// };
let params = [String(row.id)];
axios.delete(this.processUrl(url), { data: params })
.then((res) => {
if (res.data.code === 0) {
this.$message.success("删除成功");
this.getTableData();
} else {
this.$message.error(res.data.msg);
}
})
.catch((error) => {
console.error("删除失败", error);
this.$message.error("删除失败,请稍后重试");
});
},
diaClose(){
this.formShow=false
@ -449,8 +430,18 @@ export default {
this.handleClose();
this.getTableData();
},
// URL
processUrl(url) {
if (url.indexOf("http://") > -1 || url.indexOf("https://") > -1) {
return url;
}
return process.env.VUE_APP_API_SERVER + url;
}
},
};
</script>

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

@ -0,0 +1,482 @@
<template>
<div>
<div class="dialog-h-content scroll-h">
<el-form ref="ref_form" :model="formData" :rules="dataRule" class="form">
<!-- <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-form-item label="类型" prop="type" 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> -->
</el-form-item>
<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> -->
<div>{{ formData.name }}</div>
</el-form-item>
<el-form-item label="联系人" prop="linkman" label-width="100px">
<div>{{ formData.linkman }}</div>
</el-form-item>
<el-form-item label="联系电话" prop="linkPhone" label-width="100px">
<div>{{ formData.linkPhone }}</div>
</el-form-item>
<el-form-item label="办公时间" prop="workTime" label-width="100px">
<div>{{ formData.workTime }}</div>
</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;">
</template>
</el-form-item>
<el-form-item label="阵地简介" prop="content" label-width="100px" style="display: block">
<div>{{ formData.content }}</div>
</el-form-item>
<el-form-item label="位置" prop="address" label-width="100px" style="display: block">
<div style="width: 300px">
<div>{{ formData.address }}</div>
<div id="app_activity" class="div_map"></div>
</div>
</el-form-item>
</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"
@click="handleComfirm">
</el-button>
</div> -->
</div>
</template>
<script>
import { mapGetters } from 'vuex'
// import { Loading } from 'element-ui' // Loading
import { requestPost,requestGet } 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 //
export default {
data() {
return {
formData:
{
agencyName:"",
agencyId: "",
linkman: "",
linkPhone: "",
content: "",
workTime: "",
attrs: [],
type: "",
name: "",
optionstype: [
{ value: 0, label: "实践站" },
{ value: 1, label: "实践点" },
{ value: 2, label: "其它" },
],
address: "",//
longitude: this.$store.state.user.longitude, //
latitude: this.$store.state.user.latitude,//
},
showdisabled:false,
uploadUrl: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
customerId: localStorage.getItem('customerId'),
}
},
components: { Tinymce, UploadImage },
mounted() {
this.formData.agencyId=this.$store.state.user.agencyId
this.formData.agencyName=this.$store.state.user.agencyName
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.activityType()
this.listServerOrg()
},
methods: {
//
async initForm(type, unitId) {
this.getTableDetail(unitId)
},
//
getTableDetail(id) {
console.log(id,"dskljfksdljf");
let url = `/voluntary/position/edit/${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}]
console.log(this.formData,"this.formData");
} else {
this.$message.error(res.msg)
}
})
},
//
addDomain() {
if (this.formData.sponsors.length < 4) {
console.log("jshdfdsjdfkl");
console.log(this.formData.sponsors,this.tableDate,);
this.formData.sponsors.push(this.tableDate);
console.log(this.formData.sponsors,this.tableDate,);
}else{
this.$message.error("最多添加4个标签");
}
},
//
removeDomain(item) {
console.log(item);
var index = this.formData.sponsors.indexOf(item)
if (index !== -1) {
this.formData.sponsors.splice(index, 1)
this.tableDate = {}
}
},
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 || '';
},
async activityType() {
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)
}
})
},
onChangeFileList(e) {
console.log(e, 'sssssb');
this.fileList = e.length > 0 ? e.map(item => ({
fileType: '0',
type:'image',
fileType: '0',
name:item.response.data.fileName,
fileUrl: item.response.data.url,
format: item.response.data.fileName.split('.').pop(),
url: item.response.data.url
})) : []; // efileList
if (e.length > 0) {
console.log(this.fileList,"this.fileList");
this.formData.attrs=this.fileList;
console.log(this.formData.attrs,"this.fileList");
} else {
this.formData.coverPic = '';
}
},
removedImg() {
this.formData.coverPic = ''
},
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)
})
}
},
async handleComfirm() {
console.log(this.formData," this.formData");
// if (this.formData.type!==1&&!this.formData.type!=2&&!this.formData.type!=0) {
// this.$message.error('');
// return;
// }
if (!this.formData.linkPhone) {
this.$message.error('请输入电话');
return;
}
if (!this.formData.linkman) {
this.$message.error('请输入姓名');
return;
}
if (!this.formData.address) {
this.$message.error('请选择位置');
return;
}
if (!this.formData.workTime) {
this.$message.error('请输入办公时间');
return;
}
console.log(this.formData,"this.formData");
this.addActivity()
},
//
async addActivity() {
let url = '/voluntary/position/saveOrUpdate'
console.log();
const { data, code, msg } = await requestPost(url, this.formData)
if (code === 0) {
this.$message({
type: 'success',
message: '操作成功'
})
// this.resetData()
this.$emit('showAddClose')
} else {
this.$message.error(msg)
}
},
handleCancle() {
console.log("sdlkfjklsdf ");
this.$emit('showAddClose')
},
// 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 !== '') {
const { msg, data } = await map.searchNearby(query);
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
},
},
computed: {
dataRule() {
return {
type: [
{ required: true, message: '请选择类型', trigger: 'blur' }
],
name: [
{ required: true, message: '请选择名称', trigger: 'blur' }
],
linkman: [
{ required: true, message: '请输入联系人', trigger: 'blur' },
],
linkPhone: [
{ required: true, message: '请填写电话', trigger: 'blur' },
{ pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号码', trigger: 'blur' }
],
content: [
{ required: true, message: '请输入阵地介绍', trigger: 'blur' }
],
attrs: [
{ required: true, message: '请选择封面图片', trigger: 'blur' }
],
address: [
{ required: true, message: '请选择位置', trigger: 'blur' }
],
workTime: [
{ required: true, message: '请输入办公时间', trigger: 'blur' }
]
}
},
},
props: {
},
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>

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

@ -8,18 +8,22 @@
<el-col :span="12">
<el-form-item label="挂靠阵地" prop="typeName" label-width="100px">
<el-cascader class="u-item-width-normal" v-model="formData.typeName" :options="options" @change="handleChange" :disabled="showdisabled"></el-cascader>
<el-select v-model="formData.positionId" placeholder="请选择" clearable>
<el-option v-for="item in SiteData" :key="item.id" :label="item.name"
:value="item.id">
</el-option>
</el-select>
</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"
<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="联系电话" prop="mobile" label-width="100px">
<el-input v-model.trim="formData.mobile" size="small" clearable placeholder="请输入手机号" :disabled="showdisabled"
<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>
@ -29,21 +33,11 @@
<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;">
<img :src="formData.attrs[0].url" 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="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="100px" style="display: block">
<div style="width: 634px">
@ -57,34 +51,11 @@
</div>
</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"
:autosize="{ minRows:4., maxRows: 10}">
</el-input>
</div>
</el-form-item>
<el-form-item label="品牌展示图" label-width="100px" prop="brandImg">
<template>
<upload-image :defaultFileList="formData.brandImg" :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 size="small" type="primary" @click="handleComfirm">
</el-button>
</div>
@ -94,7 +65,7 @@
<script>
import { mapGetters } from 'vuex'
// import { Loading } from 'element-ui' // Loading
import { requestPost } from '@/js/dai/request'
import { requestPost,requestGet } from '@/js/dai/request'
import Tinymce from '@c/tinymce2/index.vue'
import daiMap from "@/utils/dai-map";
import util from '@js/util.js';
@ -111,6 +82,7 @@
export default {
data() {
return {
showdisabled:false,
searchOptions:[],
fileList:[],
@ -120,28 +92,12 @@
{ label: "企业", value: 2 },
{ label: "学校", value: 3 },
],
SiteData:[],
tableDate:{},
formData:
{
sponsors: [{ name: ""}],//
typeName:"",//
status:"pass",//
numberNum:"",//
userId:"",//id
agencyId:"",//id
orgType:"",
brandImg:"",//
brand:"",//
introduction:"",//
qualification: "",//
idCard:"",//
mobile:"",//
operator:"",//
Organizationaltype:"",//
// serviceTypeList:"",//
orgName:"",//
agencyName:"",//
serviceTypeList:[],//
attrs:[],
positionId:"",//
address: "",//
longitude: this.$store.state.user.longitude, //
latitude: this.$store.state.user.latitude,//
@ -155,7 +111,8 @@
components: { Tinymce, UploadImage },
mounted() {
this.formData.agencyId=this.$store.state.user.agencyId
this.getSiteTableData()
this.formData.agencyId=this.$store.state.user.agencyId
this.formData.agencyName=this.$store.state.user.agencyName
let { latitude, longitude } = this.$store.state.user;
if (!latitude || latitude == "" || latitude == "0") {
@ -165,149 +122,61 @@
this.formData.latitude = latitude;
this.formData.longitude = longitude;
this.activityType()
this.listServerOrg()
},
methods: {
//
async getSiteTableData() {
// const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/project-list";
const url = "/voluntary/position/list";
let params = {
name: "",
type: "",
pageNo: "",
pageSize: ""
}
const { data, code, msg } = await requestGet(url, params);
if (code === 0) {
console.log("列表请求成功!!!!!!!!!!!!!!");
// this.total = data.total || 0;
this.SiteData = data.list
} else {
}
},
//
async initForm(type, unitId) {
console.log(type, unitId,"i就理解哦i");
if(type=="info"){
this.showdisabled=true
this.getTableDetail(unitId)
}
// await this.getDemandOptions()
// console.log(this.demandOptions);
// let { latitude, longitude } = this.$store.state.user;
// this.formType = type;
// if (unitId) {
// this.unitId = unitId;
// this.formData.id = unitId;
// await this.loadFormData();
// } else {
// this.formData.latitude = latitude;
// this.formData.longitude = longitude;
// }
// // if (!map) {
// this.initMap(this.formData.latitude, this.formData.longitude);
// // }
// this.endLoading();
},
//
addDomain() {
if (this.formData.sponsors.length < 4) {
console.log("jshdfdsjdfkl");
console.log(this.formData.sponsors,this.tableDate,);
this.formData.sponsors.push(this.tableDate);
console.log(this.formData.sponsors,this.tableDate,);
}else{
this.$message.error("最多添加4个标签");
}
},
//
removeDomain(item) {
console.log(item);
var index = this.formData.sponsors.indexOf(item)
if (index !== -1) {
this.formData.sponsors.splice(index, 1)
this.tableDate = {}
if (type == "edit") {
this.getTableDetail(unitId)
}
},
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 || '';
//
getTableDetail(id) {
console.log(id,"dskljfksdljf");
let url = `/voluntary/positionVenues/edit/${id}`;
requestGet(url).then((res) => {
console.log(res);
if (res.code == 0) {
this.formData = res.data
this.searchValue= res.data.address
this.fileList=[{fileUrl:res.data.attrs[0].url}]
} else {
this.$message.error(res.msg)
}
})
},
// //
// 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,
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);
@ -334,11 +203,18 @@
onChangeFileList(e) {
console.log(e, 'sssssb');
this.fileList = e.length > 0 ? e.map(item => ({
fileType: '0',
type:'image',
fileType: '0',
fileUrl: item.response.data.url
name:item.response.data.fileName,
fileUrl: item.response.data.url,
format: item.response.data.fileName.split('.').pop(),
url: item.response.data.url
})) : []; // efileList
if (e.length > 0) {
this.formData.coverPic = e[0].response.data.url;
console.log(this.fileList,"this.fileList");
this.formData.attrs=this.fileList;
console.log(this.formData.attrs,"this.fileList");
} else {
this.formData.coverPic = '';
}
@ -417,44 +293,7 @@
}
},
// 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
@ -519,58 +358,34 @@
async handleComfirm() {
console.log(this.formData," this.formData");
if (!this.formData.agencyName) {
this.$message.error('请选择所属组织');
if (!this.formData.address) {
this.$message.error('请输入具体位置');
return;
}
if (!this.formData.introduction) {
this.$message.error('请输入组织介绍');
if (!this.formData.attrs ) {
this.$message.error('请上传图片');
return;
}
if (this.fileList.length === 0) {
this.$message.error('请上传封面图片');
if (!this.formData.linkPhone) {
this.$message.error('请填写联系电话');
return;
}
if (!this.formData.idCard) {
this.$message.error('请输入身份证信息');
if (!this.formData.positionId) {
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'
let url = '/voluntary/positionVenues/saveOrUpdate'
const { data, code, msg } = await requestPost(url, this.formData)
if (code === 0) {
this.$message({
@ -579,9 +394,7 @@
})
// this.resetData()
this.$emit('showAddClose')
this.btnDisable = false
} else {
this.btnDisable = false
this.$message.error(msg)
}
@ -691,35 +504,24 @@
computed: {
dataRule() {
return {
typeName: [
{ required: true, message: '请选择组织类型', trigger: 'blur' }
positionId: [
{ required: true, message: '请选择挂靠组织', trigger: 'blur' }
],
Name: [
name: [
{ required: true, message: '请填写名称', trigger: 'blur' }
],
searchValue: [
{ required: true, message: '请选择地址', trigger: 'blur' },
],
mobile: [
{ required: true, message: '管理员电话不能为空不能为空', trigger: 'blur' },
linkPhone: [
{ required: true, message: '电话不能为空不能为空', trigger: 'blur' },
{ pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号码', trigger: 'blur' }
],
operator: [
{ required: true, message: '请填写联系人', trigger: 'blur' }
],
sponsors: [
{ required: true, message: '请填写标签信息', trigger: 'blur' },
],
fileList: [
{ required: true, message: '请选择封面图片', trigger: 'blur' }
],
address: [
{ required: true, message: '请选择位置', trigger: 'blur' }
],
coverImg: [
{ required: true, message: '请选择照片', trigger: 'blur' }
]
}
},

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

@ -4,14 +4,14 @@
<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-select v-model="formData.positionId" placeholder="请选择" clearable>
<el-option v-for="item in SiteData" :key="item.id" :label="item.name"
:value="item.id">
</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
<el-input v-model.trim="formData.name" size="small" class="item_width_1" clearable
placeholder="请输入">
</el-input>
</el-form-item>
@ -40,24 +40,24 @@
<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="挂靠阵地"
<el-table-column prop="positionName" header-align="center" align="center" label="挂靠阵地"
:show-overflow-tooltip="true">
</el-table-column>
<el-table-column prop="orgName" header-align="center" align="center" label="名称"
<el-table-column prop="name" 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="咨询电话"
<el-table-column prop="linkPhone" 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="预约时间"
<el-table-column prop="address" 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">
@ -80,14 +80,12 @@
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 :visible.sync="showInfo" :close-on-click-modal="false" :close-on-press-escape="false" :title="formTitle"
width="850px" top="10vh" class="dialog-h" @closed="showAddClose">
<info ref="ref_form" v-if="showInfo" @showAddClose="showAddClose" />
</el-dialog>
</div>
</div>
@ -98,7 +96,7 @@ 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 info from "./info.vue"
// import edit from "./edit.vue"
// import MemberManagement from "./MemberManagement.vue"
// import process from "./process.vue"
@ -108,14 +106,16 @@ import add from "./add.vue"
import axios from "axios";
export default {
components: { add},
components: { add,info},
data() {
return {
showInfo:false,
formTitle:"",
formData: {
orgName: "",
serviceType: "",
agencyId:"",
name: "",
positionId: "",
optionstype: [
{ value: 1, label: "志愿者服务组织" },
{ value: 2, label: "志愿者服务团队" },
@ -134,6 +134,7 @@ export default {
tableData: [
],
SiteData:[],
importLoading:false,
showInfo:false,
@ -151,48 +152,38 @@ export default {
},
mounted() {
this.getSiteTableData()
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()
//
async getSiteTableData() {
// const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/project-list";
const url = "/voluntary/position/list";
let params={
name:"",
type: "",
pageNo:"",
pageSize: ""
}
const { data, code, msg } = await requestGet(url,params);
if (code === 0) {
console.log("列表请求成功!!!!!!!!!!!!!!");
// this.total = data.total || 0;
this.SiteData = data.list
} else {
}
},
//
handleEdit(row){
this.showAdd=true
this.formTitle="新增"
this.formTitle="修改"
console.log(row,"row");
this.$nextTick(() => {
this.$refs.ref_form.initForm("edit", row);
this.$refs.ref_form.initForm("edit", row.id);
});
},
//
showEditClose(){
this.showEdit=false
this.getTableData()
},
//
handleAdd(){
this.showAdd=true
@ -208,34 +199,30 @@ export default {
this.showAdd=false
this.getTableData()
},
//
showInfoClose(){
this.showEdit=false
},
//
handleDetail(row){
// console.log(row,"row");
// this.showInfo=true
this.showAdd=true
this.showInfo=true
this.formTitle="查看"
this.$nextTick(() => {
this.$refs.ref_form.initForm("info", row);
this.$refs.ref_form.initForm("info", row.id);
});
},
//
async getTableData() {
// const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/project-list";
const url = "/voluntary/volunteerOrg/page";
const url = "/voluntary/positionVenues/list";
let params={
orgName: this.formData.orgName,
serviceType: this.formData.serviceType,
name: this.formData.name,
positionId : this.formData.positionId ,
agencyId : this.formData.agencyId,
pageNo:this.pageNo,
pageSize: this.pageSize
}
const { data, code, msg } = await requestPost(url,params);
const { data, code, msg } = await requestGet(url,params);
if (code === 0) {
console.log("列表请求成功!!!!!!!!!!!!!!");
this.total = data.total || 0;
@ -339,28 +326,23 @@ export default {
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: () => {
handleDel(row) {
console.log(row, "row");
let url = "/voluntary/positionVenues/delete";
let params = [String(row.id)];
axios.delete(this.processUrl(url), { data: params })
.then((res) => {
if (res.data.code === 0) {
this.$message.success("删除成功");
this.getTableData();
} else {
this.$message.error(res.data.msg);
}
})
this.getTableData()
} else {
this.$message.error(data.msg)
}
})
.catch((error) => {
console.error("删除失败", error);
this.$message.error("删除失败,请稍后重试");
});
},
diaClose(){
@ -442,7 +424,13 @@ export default {
this.handleClose();
this.getTableData();
},
// URL
processUrl(url) {
if (url.indexOf("http://") > -1 || url.indexOf("https://") > -1) {
return url;
}
return process.env.VUE_APP_API_SERVER + url;
}
},
};
</script>

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

@ -0,0 +1,528 @@
<template>
<div>
<div class="dialog-h-content scroll-h">
<el-form ref="ref_form" :model="formData" :rules="dataRule" class="form">
<!-- <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-form-item label="挂靠阵地" prop="type" 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">typeName
<div>{{ formData.typeName }}</div>
</el-option>
</el-select> -->
<div>{{ formData.positionName }}</div>
</el-form-item>
<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> -->
<div>{{ formData.name }}</div>
</el-form-item>
<el-form-item label="联系电话" prop="linkPhone" label-width="100px">
<div>{{ formData.linkPhone }}</div>
</el-form-item>
<!-- <el-form-item label="办公时间" prop="workTime" label-width="100px">
<div>{{ formData.workTime }}</div>
</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;">
</template>
</el-form-item>
<!-- <el-form-item label="阵地简介" prop="content" label-width="100px" style="display: block">
<div>{{ formData.content }}</div>
</el-form-item> -->
<el-form-item label="位置" prop="address" label-width="100px" style="display: block">
<div style="width: 300px">
<div>{{ formData.address }}</div>
<div id="app_activity" class="div_map"></div>
</div>
</el-form-item>
</el-form>
<h3>预约记录</h3>
<div class="m-table">
<el-table class="table" :data="tableData1" border style="width: 100%" label-position="left" height="250">
<el-table-column label="序号" header-align="center" align="center" type="index"
width="80"></el-table-column>
<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="预约人"
:show-overflow-tooltip="true">
</el-table-column>
<el-table-column prop="available" header-align="center" align="center" label="预约时间"
:show-overflow-tooltip="true">
</el-table-column>
<el-table-column prop="status" header-align="center" align="center" label="状态"
:show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.status === 1 ? '已取消' : '已预约' }}</span>
</template>
</el-table-column>
</el-table>
</div>
</div>
<!-- <div class="div_btn">
<el-button size="small" @click="handleCancle"> </el-button>
<el-button size="small" v-if="formType != 'detail'" type="primary"
@click="handleComfirm">
</el-button>
</div> -->
</div>
</template>
<script>
import { mapGetters } from 'vuex'
// import { Loading } from 'element-ui' // Loading
import { requestPost,requestGet } 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 //
export default {
data() {
return {
formData:
{
agencyName:"",
agencyId: "",
linkman: "",
linkPhone: "",
content: "",
workTime: "",
attrs: [],
type: "",
name: "",
optionstype: [
{ value: 0, label: "实践站" },
{ value: 1, label: "实践点" },
{ value: 2, label: "其它" },
],
address: "",//
longitude: this.$store.state.user.longitude, //
latitude: this.$store.state.user.latitude,//
},
tableData1:[],
showdisabled:false,
uploadUrl: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
customerId: localStorage.getItem('customerId'),
}
},
components: { Tinymce, UploadImage },
mounted() {
this.formData.agencyId=this.$store.state.user.agencyId
this.formData.agencyName=this.$store.state.user.agencyName
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.activityType()
this.listServerOrg()
},
methods: {
//
async initForm(type, unitId) {
this.getTableDetail(unitId)
this.gethistory(unitId)
},
//
getTableDetail(id) {
console.log(id,"dskljfksdljf");
let url = `/voluntary/positionVenues/edit/${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}]
console.log(this.formData,"this.formData");
} else {
this.$message.error(res.msg)
}
})
},
//
gethistory(id) {
console.log(id, "dskljfksdljf");
let url = `/voluntary/positionVenues/history`;
let params = {
positionId:"",
pageNo:"",
pageSize:"",
venueId:id,
}
requestGet(url,params).then((res) => {
console.log(res);
if (res.code == 0) {
this.tableData1 = res.data
} else {
this.$message.error(res.msg)
}
})
},
//
addDomain() {
if (this.formData.sponsors.length < 4) {
console.log("jshdfdsjdfkl");
console.log(this.formData.sponsors,this.tableDate,);
this.formData.sponsors.push(this.tableDate);
console.log(this.formData.sponsors,this.tableDate,);
}else{
this.$message.error("最多添加4个标签");
}
},
//
removeDomain(item) {
console.log(item);
var index = this.formData.sponsors.indexOf(item)
if (index !== -1) {
this.formData.sponsors.splice(index, 1)
this.tableDate = {}
}
},
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 || '';
},
async activityType() {
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)
}
})
},
onChangeFileList(e) {
console.log(e, 'sssssb');
this.fileList = e.length > 0 ? e.map(item => ({
fileType: '0',
type:'image',
fileType: '0',
name:item.response.data.fileName,
fileUrl: item.response.data.url,
format: item.response.data.fileName.split('.').pop(),
url: item.response.data.url
})) : []; // efileList
if (e.length > 0) {
console.log(this.fileList,"this.fileList");
this.formData.attrs=this.fileList;
console.log(this.formData.attrs,"this.fileList");
} else {
this.formData.coverPic = '';
}
},
removedImg() {
this.formData.coverPic = ''
},
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)
})
}
},
async handleComfirm() {
console.log(this.formData," this.formData");
// if (this.formData.type!==1&&!this.formData.type!=2&&!this.formData.type!=0) {
// this.$message.error('');
// return;
// }
if (!this.formData.linkPhone) {
this.$message.error('请输入电话');
return;
}
if (!this.formData.linkman) {
this.$message.error('请输入姓名');
return;
}
if (!this.formData.address) {
this.$message.error('请选择位置');
return;
}
if (!this.formData.workTime) {
this.$message.error('请输入办公时间');
return;
}
console.log(this.formData,"this.formData");
this.addActivity()
},
//
async addActivity() {
let url = '/voluntary/position/saveOrUpdate'
console.log();
const { data, code, msg } = await requestPost(url, this.formData)
if (code === 0) {
this.$message({
type: 'success',
message: '操作成功'
})
// this.resetData()
this.$emit('showAddClose')
} else {
this.$message.error(msg)
}
},
handleCancle() {
console.log("sdlkfjklsdf ");
this.$emit('showAddClose')
},
// 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 !== '') {
const { msg, data } = await map.searchNearby(query);
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
},
},
computed: {
dataRule() {
return {
type: [
{ required: true, message: '请选择类型', trigger: 'blur' }
],
name: [
{ required: true, message: '请选择名称', trigger: 'blur' }
],
linkman: [
{ required: true, message: '请输入联系人', trigger: 'blur' },
],
linkPhone: [
{ required: true, message: '请填写电话', trigger: 'blur' },
{ pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号码', trigger: 'blur' }
],
content: [
{ required: true, message: '请输入阵地介绍', trigger: 'blur' }
],
attrs: [
{ required: true, message: '请选择封面图片', trigger: 'blur' }
],
address: [
{ required: true, message: '请选择位置', trigger: 'blur' }
],
workTime: [
{ required: true, message: '请输入办公时间', trigger: 'blur' }
]
}
},
},
props: {
},
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>

4
src/views/modules/volunteer/VoluntaryOrganization/info.vue

@ -70,8 +70,8 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="组织封面图" label-width="150px" prop="fileList">
<template>
<el-form-item label="组织封面图" label-width="150px" prop="fileList" >
<template v-if="formData.orgImage">
<!-- <upload-image :defaultFileList="fileList" :limit="1" @change="onChangeFileList" :file-list="formData.fileList"
@file-removed="removedImg"></upload-image> -->
<div class="demo-image__preview">

88
src/views/modules/volunteer/VolunteerProjects/add.vue

@ -21,13 +21,13 @@
</el-col>
<el-col :span="12">
<el-form-item label="发布单位" prop="publishUnitName" label-width="150px">
<el-input v-model.trim="formData.publishUnitName" size="small" clearable placeholder="请输入活动名称"
<el-input v-model.trim="formData.publishUnitName" 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="projectTitle" label-width="150px">
<el-input v-model.trim="formData.projectTitle" size="small" clearable placeholder="请输入活动名称"
<el-input v-model.trim="formData.projectTitle" size="small" clearable placeholder="请输入名称"
class="u-item-width-normal"></el-input>
</el-form-item>
</el-col>
@ -40,7 +40,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="项目展示图" label-width="150px" prop="">
<el-form-item label="项目展示图" label-width="150px" prop="activityImgs">
<template>
<upload-image :defaultFileList="fileList" :limit="1" @change="onChangeFileList"
@file-removed="removedImg"></upload-image>
@ -49,7 +49,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="服务类型" label-width="150px" prop="serviceClasses">
<el-select multiple-limit=4 class="u-item-width-normal" v-model.trim="formData.serviceClasses" placeholder="请选择" clearable multiple>
<el-select multiple-limit=1 class="u-item-width-normal" placeholder="请选择" clearable @click="getServiceTypeList" v-model="formData.serviceClasses" >
<el-option v-for="item in ServicetypeListName" :key="item.value" :label="item.label" :value="item.value" >
</el-option>
</el-select>
@ -186,6 +186,10 @@
},
methods: {
//
getServiceTypeList(){
},
//
actcontrolTime() {
console.log("dislfj");
@ -569,52 +573,39 @@
},
async handleComfirm() {
// if (!this.formData.agencyName) {
// this.$message.error('');
// return;
// }
if (!this.formData.projectTitle) {
this.$message.error('请填写名称');
return;
}
// if (!this.formData.Organizational) {
// this.$message.error('');
// return;
// }
// if (this.fileList.length === 0) {
// this.$message.error('');
// return;
// }
// if (!this.formData.AdministratorIDCard) {
// this.$message.error('');
// return;
// }
// if (!this.formData.Administratorphone) {
// this.$message.error('');
// return;
// }
// if (!this.formData.AdministratorName) {
// this.$message.error('');
// return;
// }
// if (!this.formData.Organizationaltype) {
// this.$message.error('');
// return;
// }
// if (!this.formData.Servicetype) {
// this.$message.error('');
// return;
// }
// if (!this.formData.OrganizationName) {
// this.$message.error('');
// return;
// }
if (!this.formData.description) {
this.$message.error('请填写项目介绍');
return;
}
if (!this.formData.serviceClasses) {
this.$message.error('请选择服务类型');
return;
}
if (!this.formData.recruitDeadline) {
this.$message.error('请选择服务截止时间');
return;
}
if (!this.formData.recruitRequirement) {
this.$message.error('请填写招募要求');
return;
}
if (!this.formData.serviceTimeFrom&&!this.formData.serviceTimeTo) {
this.$message.error('请选择服务期限');
return;
}
console.log(this.formData,"this.formData");
this.addActivity()
},
@ -628,11 +619,8 @@
type: 'success',
message: '操作成功'
})
this.resetData()
this.$emit('showAddClose')
this.btnDisable = false
} else {
this.btnDisable = false
this.$message.error(msg)
}

10
src/views/modules/volunteer/VolunteerProjects/edit.vue

@ -40,7 +40,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="项目展示图" label-width="150px" prop="fileList">
<el-form-item label="项目展示图" label-width="150px" prop="activityImgs">
<template>
<upload-image :defaultFileList="fileList1" :limit="1" @change="onChangeFileList"
@file-removed="removedImg"></upload-image>
@ -49,11 +49,13 @@
</el-col>
<el-col :span="12">
<el-form-item label="服务类型" label-width="150px" prop="serviceClasses">
<el-select multiple-limit=4 class="u-item-width-normal" v-model.trim="formData.serviceClasses" placeholder="请选择" clearable multiple>
<el-form-item label="服务类型" label-width="150px" prop="serviceClasses">
<el-select multiple-limit=1 class="u-item-width-normal" v-model.trim="formData.serviceClasses" 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-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="招募截止时间" label-width="150px" prop="recruitDeadline">
@ -509,11 +511,8 @@
type: 'success',
message: '操作成功'
})
this.resetData()
this.$emit('showEditClose')
this.btnDisable = false
} else {
this.btnDisable = false
this.$message.error(msg)
}
@ -635,7 +634,6 @@
computed: {
dataRule() {
return {
projectTitle: [
{ required: true, message: '名称不能为空', trigger: 'blur' }
],

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

@ -91,7 +91,7 @@
style="color:#1C6AFD;" size="small" @click="handleupOnline(scope.row)">上线</el-button>
<el-button type="text" style="color:#1C6AFD;" size="small" v-if="scope.row.onlineStatus==0&&scope.row.projectStatus==10"
@click="handledelete(scope.row)">删除</el-button>
<el-button type="text" style="color:#1C6AFD;" size="small"
<el-button type="text" style="color:#1C6AFD;" size="small" v-if="scope.row.source==1"
@click="handlerecruit(scope.row)">招募</el-button>
<!-- <el-button type="text" style="color:#1C6AFD;" size="small"
@click="handleprocessl(scope.row)">审核</el-button> -->

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

@ -30,13 +30,15 @@
</el-table-column>
<el-table-column prop="mobile" header-align="center" align="center" label="手机号">
</el-table-column>
. <el-table-column prop="idCard" header-align="center" align="center" label="证件号">
<el-table-column prop="idCard" header-align="center" align="center" label="证件号">
</el-table-column>
. <el-table-column prop="applyTime" header-align="center" align="center" label="打卡时间">
<el-table-column prop="applyTime" header-align="center" align="center" label="打卡时间">
</el-table-column>
<!-- <el-table-column prop="ActivityCount" header-align="center" align="center" label="打卡次数">
</el-table-column> -->
. <el-table-column prop="address" header-align="center" align="center" label="打开地点">
<el-table-column prop="address" header-align="center" align="center" label="打卡地点">
</el-table-column>
<el-table-column prop="content" header-align="center" align="center" label="打卡信息">
</el-table-column>
<el-table-column prop="whether" header-align="center" align="center" label="是否发放积分">
</el-table-column>

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

@ -4,7 +4,7 @@
<el-form :inline="true" ref="ref_searchform" :label-width="'100px'">
<div>
<el-form-item label="活动标题">
<el-input v-model.trim="formData.content" class="item_width_1" clearable placeholder="请输入">
<el-input v-model.trim="formData.title" class="item_width_1" clearable placeholder="请输入">
</el-input>
</el-form-item>
<el-form-item label="活动时间">
@ -269,6 +269,7 @@
statusType:this.formData.statusType,
endTime:this.formData.endTime,
online:this.formData.online,
title:this.formData.title,
// district: this.$store.state.user.agencyId,
}
requestPost(url, params).then((res) => {

117
src/views/modules/volunteer/activityArchive/realselect.vue

@ -31,11 +31,6 @@
</el-form-item>
<el-form-item label="活动时间" prop="strTime" required>
<!-- <el-date-picker v-model="formData.strTime" type="datetime" placeholder="开始时间" format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss" style="width: 150px;">
</el-date-picker> <el-date-picker v-model="formData.endTime" type="datetime" placeholder=""
format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"style="width: 150px;"@change="actcontrolTime">
</el-date-picker> -->
{{ formData.strTime }} <span style="margin: 0 10px"></span>{{ formData.endTime }}
</el-form-item>
<el-form-item label="活动范围" prop="strTime" required>
@ -43,7 +38,7 @@
</el-form-item>
<el-form-item label="活动名额" prop="points" required>
<div style="display: flex; flex-direction: column;">
<el-input-number disabled="false" v-model.trim="formData.quota" label="描述文字" v-if="formData.notQuota!=0"
<el-input-number disabled=fasle v-model.trim="formData.quota" label="描述文字" v-if="formData.notQuota!=0"
type="number"></el-input-number>
<span v-if="formData.notQuota==0">不限名额</span>
</div>
@ -55,10 +50,10 @@
<el-form-item label="活动地址" prop="address" required>
{{ formData.address }}
</el-form-item>
<el-form-item label="活动对象" prop="activityObject" required>
<!-- <el-form-item label="活动对象" prop="activityObject" required>
<template slot-scope="scope">{{ scope.row.strTime }}{{ scope.row.endTime}}
</template>
</el-form-item>
</el-form-item> -->
<el-form-item label=" 联系人" prop="linkman" required>
{{ formData.linkman }}
</el-form-item>
@ -72,12 +67,12 @@
<el-form ref="ref_form" :inline="true" :model="formData" class="form" label-width="115px">
<div>
<el-form-item label="活动积分" prop="integral">
<el-input-number disabled="false" v-model="formData.points" :min="1" :max="10"
<el-input-number disabled=fasle v-model="formData.points" :min="1" :max="10"
label="描述文字"></el-input-number>
</el-form-item>
<el-form-item label="服务时长" prop="serviceTime" required>
<div style="display: flex; justify-items:center; align-items: center;">
<el-input-number disabled="false" v-model.trim="formData.serviceTime" :min="1" label="描述文字"
<el-input-number disabled=fasle v-model.trim="formData.serviceTime" :min="1" label="描述文字"
type="number"></el-input-number>
</div>
</el-form-item>
@ -98,7 +93,7 @@
</el-form-item>
<el-form-item v-if="formType!=='records'" label="上线" style="display: block" prop="peopleCount">
<el-switch disabled="false" v-model="formData.online" :active-value='1' :inactive-value='0'
<el-switch disabled=fasle v-model="formData.online" :active-value='1' :inactive-value='0'
@change="handleSwitchChange"></el-switch>
</el-form-item>
</div>
@ -145,6 +140,7 @@
export default {
data () {
return {
disabled:false,
loading: false,
searchOptions: [],
orgOptionProps: {
@ -233,15 +229,16 @@
},
components: { fileList,Tinymce,UploadImage},
async mounted () {
this.volunteerservicetype()
this.getTableData1()
this.getTableData()
await this.volunteerservicetype()
await this.getTableData1()
await this.getOrgTreeList()
await this.getTableData()
// this.startLoading()
// await this.loadInfo()
// this.endLoading()
console.log(this.list,"dsfslfjl");
this.getOrgTreeList()
},
@ -299,9 +296,11 @@
}
requestGet(url, params).then((res) => {
if (res.code == 0) {
this.formData=res.data;
this.tableDate=res.data.sponsors[0],
this.tableDate=res.data.sponsors?res.data.sponsors:{},
this.searchValue=res.data.address
console.log(this.typeList,"this.sfaafsd");
this.formData.activityImgs=[{url:res.data.imgs}]
console.log(this.typeList,"this.sfaafsd");
this.typeList.list.forEach(item => {
@ -318,6 +317,7 @@
if (item.value == this.formData.type.toString()) {
console.log(item.projectTitle,"item.label");
this.formData.typeName=item.label
return
}
});
@ -338,15 +338,7 @@
// } else {
// }
},
//
actcontrolTime(){
console.log("dislfj");
if(this.formData.strTime>this.formData.endTime){
this.$message.error('活动结束时间不能在活动开始时间之前');
this.formData.endTime=''
return
}
},
//
controlTime(){
console.log("dislfj");
@ -357,80 +349,7 @@
}
},
//
async handleComfirm() {
console.log(this.tableDate);
this.formData.sponsors.push(this.tableDate);
console.log(this.formData,"this,formD");
if (this.formData.address == '') {
this.$message.error('请输入活动地点');
return;
}
if (this.formData.agencyId == '') {
this.$message.error('请选择主办方');
return;
}
if (this.formData.title == '') {
this.$message.error('请输入活动标题');
return;
}
if (this.formData.content == '') {
this.$message.error('请输入活动详情');
return;
}
// if (this.formData.imgs == '') {
// this.$message.error('');
// return;
// }
if (this.formData.strTime == '') {
this.$message.error('请填写活动开始时间');
return;
}
if (this.formData.endTime == '') {
this.$message.error('请填写活动结束时间');
return;
}
if (this.formData.type=='') {
this.$message.error('请填写活动和类型');
return;
}
if (this.formData.linkman=='') {
this.$message.error('请填写联系人');
return;
}
if (this.formData.linkMobile=='') {
this.$message.error('请填写联系电话');
return;
}
if (this.formData.signInTime=='') {
this.$message.error('请填写签到开始时间');
return;
}
if (this.formData.signOutTime=='') {
this.$message.error('请填写签到结束时间');
return;
}
if (this.formData.deadline=='') {
this.$message.error('请填写报名截止时间');
return;
}
let url="/voluntary/activityInfo/updateInfo";
let parms={
...this.formData
}
console.log(parms,"parms");
await requestPost(url,parms).then((res)=>{
console.log(res,"res");
if (res.code==0) {
this.$message.success('添加成功');
this.$emit('updateClose')
// this.$router.push({path:'/volunteer/activityArchive'})
}else{
this.$message.error(res.msg);
}
})
},
addDomain() {
console.log(this.formData.sponsors,this.tableDate,);
this.formData.sponsors.push(this.tableDate);

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

@ -85,6 +85,7 @@
</el-select>
</el-form-item>
</el-col>
<el-form-item :inline="true" required v-if="formData.classKey == 'zkq'" label="折扣" label-width="150px">
<div class="item_width_2" style="display: flex;">
@ -105,8 +106,17 @@
<el-input v-model="formData.worthAmount" placeholder="请输入内容"></el-input>
</div>
</el-form-item>
<el-col :span="12" v-if="formData.classKey == 'hwjh'">
<el-form-item label="展示图" required label-width="150px" >
<template>
<upload-image :defaultFileList="fileList" :limit="3" @change="onChangeFileList"
v-if="!showdisabled" @file-removed="removedImg"></upload-image>
<div v-else>
<img v-for="(item, index) in this.formData.attrs" :key="index" :src="item.url" style="width: 100px; height: 100px;">
</div>
</template>
</el-form-item>
</el-col>
<el-form-item label="规则说明" label-width="150px">
<Tinymce style="width: 763px;" class="tinymce_view" v-model="formData.description" :height="250"
placeholder="请输入活动内容" />
@ -129,12 +139,10 @@
<script>
import { requestPost, requestGet } from "@/js/dai/request";
import Tinymce from '@c/tinymce2/index.vue'
import UploadImage from '@/views/modules/plugins/rent/upload-image.vue'
export default {
components: {
Tinymce
},
components: { Tinymce, UploadImage },
name: "see",
data() {
return {
checked:false,
@ -181,8 +189,9 @@ export default {
}
],
fileList:[],
formData: {
imgAttachments:[],
Servicelevel:"",
starLevel:"",
redeemTimesEveryone:'',
@ -248,6 +257,32 @@ export default {
this.getOrgTreeList()
},
methods: {
//
removedImg() {
this.formData.coverPic = ''
},
//
onChangeFileList(e) {
console.log(e, 'sssssb');
this.fileList = e.length > 0 ? e.map(item => ({
fileType: '0',
type:'image',
fileType: '0',
name:item.response.data.fileName,
fileUrl: item.response.data.url,
format: item.response.data.fileName.split('.').pop(),
url: item.response.data.url
})) : []; // efileList
if (e.length > 0) {
console.log(this.fileList,"this.fileList");
this.formData.imgAttachments=this.fileList;
console.log(this.formData.imgAttachments,"this.fileList");
} else {
this.formData.coverPic = '';
}
},
//
getOrgTreeList() {
this.$http

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

@ -97,7 +97,7 @@
<add v-if="add" :list="fmData" @closeDialog="closeDialog" />
</el-dialog>
<el-dialog :visible.sync="updateshow" :close-on-click-modal="false" :close-on-press-escape="false" title="修改"
width="1000px" top="10vh" class="dialog-h" @closed="closeupdate">
width="1200px" top="10vh" class="dialog-h" @closed="closeupdate">
<update v-if="updateshow" :list="fmData" @closeupdate="closeupdate" />
</el-dialog>
<el-dialog :visible.sync="recordshow" :close-on-click-modal="false" :close-on-press-escape="false" title="兑换记录"

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

@ -99,7 +99,17 @@
</div>
</el-form-item>
<el-col :span="12" v-if="formData.classKey == 'hwjh'">
<el-form-item label="展示图" required label-width="150px" >
<template>
<upload-image :defaultFileList="fileList" :limit="3" @change="onChangeFileList"
v-if="!showdisabled" @file-removed="removedImg"></upload-image>
<div v-else>
<img v-for="(item, index) in this.formData.attrs" :key="index" :src="item.url" style="width: 100px; height: 100px;">
</div>
</template>
</el-form-item>
</el-col>
<el-form-item label="规则说明" label-width="150px">
<Tinymce style="width: 763px;" class="tinymce_view" v-model="formData.description" :height="250"
placeholder="请输入活动内容" />
@ -121,11 +131,10 @@
</template>
<script>
import { requestPost,requestGet } from "@/js/dai/request";
import Tinymce from '@c/tinymce2/index.vue'
import Tinymce from '@c/tinymce2/index.vue';
import UploadImage from '@/views/modules/plugins/rent/upload-image.vue'
export default {
components: {
Tinymce
},
components: { Tinymce, UploadImage },
name: "see",
data() {
@ -254,6 +263,7 @@
}else{
this.radio='2'
}
this.fileList=[{fileUrl:this.formData.imgAttachments[0].url}]

Loading…
Cancel
Save