Browse Source

阵营合场所的联调

xiaowang-social
是小王呀\24601 11 months ago
parent
commit
88493f318f
  1. 3
      .gitignore
  2. 523
      src/views/modules/volunteer/SiteManagement/add.vue
  3. 102
      src/views/modules/volunteer/SiteManagement/index.vue
  4. 370
      src/views/modules/volunteer/Venuemanagement/add.vue
  5. 105
      src/views/modules/volunteer/Venuemanagement/index.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

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

@ -7,60 +7,60 @@
<el-row>
<el-col :span="12">
<el-form-item label="所属组织" prop="agencyName" label-width="100px">
<el-input v-model.trim="formData.agencyName" size="small" clearable placeholder="请输入活动名称"
<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="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="类型" 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-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="名称" 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="operator" label-width="100px">
<el-input v-model.trim="formData.operator" 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="mobile" label-width="100px">
<el-input v-model.trim="formData.mobile" 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="图片" label-width="100px" prop="coverImg">
<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="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,28 @@
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:[],//
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'),
@ -199,26 +165,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 +225,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 +237,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 +262,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 +277,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('请选择所属组织');
// 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.introduction) {
this.$message.error('请输入组织介绍');
return;
}
if (this.fileList.length === 0) {
this.$message.error('请上传封面图片');
return;
}
if (!this.formData.idCard) {
this.$message.error('请输入身份证信息');
return;
}
if (!this.formData.mobile) {
this.$message.error('请输入管理员电话');
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 +310,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 +321,8 @@
})
// this.resetData()
this.$emit('showAddClose')
this.btnDisable = false
} else {
this.btnDisable = false
this.$message.error(msg)
}
@ -658,7 +375,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 +432,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' }
]
}
},

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

@ -4,12 +4,12 @@
<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
<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.serviceType" placeholder="请选择" clearable>
<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>
@ -44,22 +44,22 @@
<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> -->
<template slot-scope="scope">
<span>{{ scope.row.type === 0 ? '实践站' : scope.row.type === 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="operator" 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="operator" header-align="center" align="center" label="办公时间"
@ -120,14 +120,16 @@ export default {
data() {
return {
formTitle:"",
formData: {
orgName: "",
serviceType: "",
optionstype: [
{ value: 1, label: "志愿者服务组织" },
{ value: 2, label: "志愿者服务团队" },
]
},
formData: {
type: "",
name: "",
optionstype: [
{ value: 0, label: "实践站" },
{ value: 1, label: "实践点" },
{ value: 1, label: "其它" },
]
},
showprocess:false,
EditList:{},
@ -188,10 +190,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);
});
},
@ -226,7 +228,7 @@ export default {
this.showAdd=true
this.formTitle="查看"
this.$nextTick(() => {
this.$refs.ref_form.initForm("info", row);
this.$refs.ref_form.initForm("info", row.id);
});
@ -234,15 +236,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 +348,35 @@ 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: [row.id]
}
})
console.log(row,"删除活动");
axios.delete(url, [row.id]).then((res) => {
if (res.code == 0) {
this.$message.success("删除成功")
this.getTableData()
} else {
this.$message.error(res.msg)
}
})
// axios({
// url: window.SITE_CONFIG["apiURL"] + url,
// method: "DELETE",
// params
// })
// .then((res) => {
// if(res.code==0){
// this.$message.success("")
// this.getTableData()
// }else{
// this.$message.error(res.msg)
// }
// })
},
diaClose(){
this.formShow=false

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' }
]
}
},

105
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,7 @@
width="850px" top="10vh" class="dialog-h" @closed="showAddClose">
<add ref="ref_form" v-if="showAdd" @showAddClose="showAddClose" />
</el-dialog>
<el-dialog :visible.sync="showInfo" :close-on-click-modal="false" :close-on-press-escape="false" title="查看"
width="850px" top="10vh" class="dialog-h" @closed="showInfoClose">
<info v-if="showInfo" :VolunteerList="fmData" @showInfoClose="showInfoClose" />
</el-dialog>
<el-dialog :visible.sync="showEdit" :close-on-click-modal="false" :close-on-press-escape="false" title="修改"
width="850px" top="10vh" class="dialog-h" @closed="showEditClose">
<edit v-if="showEdit" :VolunteerList="EditList" @showEditClose="showEditClose" />
</el-dialog>
</div>
</div>
@ -114,8 +107,9 @@ export default {
return {
formTitle:"",
formData: {
orgName: "",
serviceType: "",
agencyId:"",
name: "",
positionId: "",
optionstype: [
{ value: 1, label: "志愿者服务组织" },
{ value: 2, label: "志愿者服务团队" },
@ -134,6 +128,7 @@ export default {
tableData: [
],
SiteData:[],
importLoading:false,
showInfo:false,
@ -151,48 +146,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,10 +193,7 @@ export default {
this.showAdd=false
this.getTableData()
},
//
showInfoClose(){
this.showEdit=false
},
//
handleDetail(row){
// console.log(row,"row");
@ -219,23 +201,22 @@ export default {
this.showAdd=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;

Loading…
Cancel
Save