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

生活圈更改标签变为4个，活动小程序端可以在pc上下线

feature
是小王呀\24601 11 months ago
parent
56c5011a86
commit
0f81aa1cf9
2 changed files with 130 additions and 100 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 228
      src/views/modules/volunteer/LifeCircleManagement/add.vue
  2. 2
      src/views/modules/volunteer/activityArchive/index.vue

228
src/views/modules/volunteer/LifeCircleManagement/add.vue
View File

@ -1,33 +1,34 @@
<template> <template>
<div> <div>
<div class="dialog-h-content scroll-h"> <div class="dialog-h-content scroll-h">
<el-form ref="ref_form" :inline="true" :model="formData" :rules="dataRule" class="form"> <el-form ref="ref_form" :inline="true" :model="formData" :rules="dataRule" class="form">
<el-row> <el-row>
<!-- <el-col :span="12"> <!-- <el-col :span="12">
<el-form-item label="所属组织" prop="agencyName" label-width="100px"> <el-form-item label="所属组织" prop="agencyName" label-width="100px">
<el-input v-model.trim="formData.agencyName" size="small" clearable placeholder="请输入活动名称" :disabled="true" <el-input v-model.trim="formData.agencyName" size="small" clearable placeholder="请输入活动名称" :disabled="true"
class="u-item-width-normal"></el-input> class="u-item-width-normal"></el-input>
</el-form-item> </el-form-item>
</el-col> --> </el-col> -->
<el-col :span="12"> <el-col :span="12">
<el-form-item label="类型" prop="type" label-width="100px"> <el-form-item label="类型" prop="type" label-width="100px">
<!-- <el-cascader @change="handleChangeAgency" :options="options" :disabled="showdisabled" :props="{ checkStrictly: true }"></el-cascader> <!-- <el-cascader @change="handleChangeAgency" :options="options" :disabled="showdisabled" :props="{ checkStrictly: true }"></el-cascader>
<el-form-item label="类型" prop="type" label-width="100px"> --> <el-form-item label="类型" prop="type" label-width="100px"> -->
<el-cascader v-model="this.formData.type" @change="handleChangeAgency" :options="options" :disabled="showdisabled" :props="{emitPath: false, <el-cascader v-model="this.formData.type" @change="handleChangeAgency" :options="options"
:disabled="showdisabled" :props="{emitPath: false,
multiple: false, }"></el-cascader> multiple: false, }"></el-cascader>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="名称" label-width="100px" prop="name"> <el-form-item label="名称" label-width="100px" prop="name">
<el-input v-model.trim="formData.name" size="small" clearable placeholder="请输入活动名称" :disabled="showdisabled" <el-input v-model.trim="formData.name" size="small" clearable placeholder="请输入活动名称"
class="u-item-width-normal"></el-input> :disabled="showdisabled" class="u-item-width-normal"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="12"> <!-- <el-col :span="12">
<el-form-item label="组织类型" label-width="100px" prop="orgType"> <el-form-item label="组织类型" label-width="100px" prop="orgType">
<el-select class="u-item-width-normal" v-model.trim="formData.orgType" placeholder="请选择" <el-select class="u-item-width-normal" v-model.trim="formData.orgType" placeholder="请选择"
clearable> clearable>
@ -37,79 +38,98 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> --> </el-col> -->
<el-col :span="24"> <el-col :span="24">
<el-form-item label="位置" prop="searchValue" label-width="100px" style="display: block"> <el-form-item label="位置" prop="searchValue" label-width="100px" style="display: block">
<div style="width: 634px"> <div style="width: 634px">
<el-select v-model.trim="searchValue" filterable style="width: 634px" remote :reserve-keyword="true" :disabled="showdisabled" <el-select v-model.trim="searchValue" filterable style="width: 634px" remote
placeholder="请输入关键词" :remote-method="remoteMethod" > :reserve-keyword="true" :disabled="showdisabled" placeholder="请输入关键词"
<el-option v-for="(item, index) in searchOptions" @click.native="handleClickKey(index)" :remote-method="remoteMethod">
:key="item.value || index" :label="item.label" :value="item.value"> <el-option v-for="(item, index) in searchOptions"
</el-option> @click.native="handleClickKey(index)" :key="item.value || index"
</el-select> :label="item.label" :value="item.value">
<div id="app_activity" class="div_map"></div> </el-option>
</div> </el-select>
</el-form-item> <div id="app_activity" class="div_map"></div>
</el-col> </div>
<el-col :span="12"> </el-form-item>
<el-form-item label="联系人" prop="linkman" label-width="100px"> </el-col>
<el-input v-model.trim="formData.linkman" size="small" clearable placeholder="请输入联系人" :disabled="showdisabled" <el-col :span="12">
class="u-item-width-normal"></el-input> <el-form-item label="联系人" prop="linkman" label-width="100px">
</el-form-item> <el-input v-model.trim="formData.linkman" size="small" clearable placeholder="请输入联系人"
</el-col> :disabled="showdisabled" class="u-item-width-normal"></el-input>
<el-col :span="12"> </el-form-item>
<el-form-item label="联系电话" prop="linkPhone" label-width="100px"> </el-col>
<el-input v-model.trim="formData.linkPhone" size="small" clearable placeholder="请输入手机号" :disabled="showdisabled" <el-col :span="12">
class="u-item-width-normal"></el-input> <el-form-item label="联系电话" prop="linkPhone" label-width="100px">
</el-form-item> <el-input v-model.trim="formData.linkPhone" size="small" clearable placeholder="请输入手机号"
</el-col> :disabled="showdisabled" class="u-item-width-normal"></el-input>
<el-col :span="12"> </el-form-item>
<!-- <div v-if="formData.tags" style="display: flex; "> --> </el-col>
<!-- <el-col :span="12">
<div style="display: flex; ">
<div > <div >
<!-- <div v-for="(item, index) in formData.tags" :label="index" :key="item.name" :prop=index style="display: flex;"> <div v-for="(item, index) in formData.tags" :label="index" :key="item.name" :prop=index style="display: flex;">
-->
<el-form-item label="标签" prop="tags" label-width="100px" > <el-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-input :disabled="showdisabled" v-model="formData.tags" placeholder="请输入(最多添加四个)" lass="u-item-width-normal"></el-input>
</el-form-item> </el-form-item>
<!-- <div v-if="index > 0" @click="removeDomain(item)" style="color: blue; font-size: 12px; margin-top: 15px">删除 <div v-if="index > 0" @click="removeDomain(item)" style="color: blue; font-size: 12px; margin-top: 15px">删除
</div> --> </div>
<!-- </div> -->
<!-- </div> -->
<!-- <div @click="addDomain" style="color: blue; font-size: 12px; margin-top: 15px">添加
</div> -->
<!-- <i class="el-icon-circle-plus" @click="addDomain" style="font-size: 20px; margin-top:7px;"></i> -->
</div>
</el-col>
<el-col :span="12">
<el-form-item label="展示图片" label-width="100px" prop="attrs">
<template>
<upload-image :defaultFileList="fileList" :limit="1" @change="onChangeFileList" v-if="!showdisabled"
@file-removed="removedImg"></upload-image>
<div v-else>
<img :src="formData.coverImg" alt="" style="width: 100px; height: 100px;">
</div> </div>
</template> </div>
</el-form-item> <div @click="addDomain" style="color: blue; font-size: 12px; margin-top: 15px">添加
</el-col> </div>
<el-col :span="12"> <i class="el-icon-circle-plus" @click="addDomain" style="font-size: 20px; margin-top:7px;"></i>
<el-form-item label="营业时间" label-width="100px" prop="workTime"> </div>
<el-input v-model.trim="formData.workTime" size="small" clearable placeholder="请输入营业时间" :disabled="showdisabled" </el-col> -->
class="u-item-width-normal"></el-input> <el-col :span="12">
</el-form-item> <div v-if="formData.tags1" style="display: flex;">
</el-col> <div>
<el-col :span="12"> <div v-for="(item, index) in formData.tags1" :key="item.name + index"
<el-form-item label="备注" label-width="100px" prop="beiremarkzhu"> style="display: flex;">
<el-input v-model.trim="formData.remark" size="small" clearable placeholder="请输入备注" :disabled="showdisabled" <el-form-item label="标签" prop="tags1" label-width="100px">
class="u-item-width-normal"></el-input> <el-input :disabled="showdisabled" v-model="item.tab" placeholder="请输入(最多添加四个)"
</el-form-item> class="u-item-width-normal"></el-input>
</el-col> </el-form-item>
<!-- <el-form-item label="组织介绍" prop="introduction" label-width="100px" style="display: block"> <div v-if="index > 0" @click="removeDomain(index)"
style="color: blue; font-size: 12px; margin-top: 15px">
删除
</div>
</div>
</div>
<div @click="addDomain" style="color: blue; font-size: 12px; margin-top: 15px">添加</div>
</div>
</el-col>
<el-col :span="12">
<el-form-item label="展示图片" label-width="100px" prop="attrs">
<template>
<upload-image :defaultFileList="fileList" :limit="1" @change="onChangeFileList"
v-if="!showdisabled" @file-removed="removedImg"></upload-image>
<div v-else>
<img :src="formData.coverImg" alt="" style="width: 100px; height: 100px;">
</div>
</template>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="营业时间" label-width="100px" prop="workTime">
<el-input v-model.trim="formData.workTime" size="small" clearable placeholder="请输入营业时间"
:disabled="showdisabled" class="u-item-width-normal"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="备注" label-width="100px" prop="beiremarkzhu">
<el-input v-model.trim="formData.remark" size="small" clearable placeholder="请输入备注"
:disabled="showdisabled" class="u-item-width-normal"></el-input>
</el-form-item>
</el-col>
<!-- <el-form-item label="组织介绍" prop="introduction" label-width="100px" style="display: block">
<div class="item_width_1"> <div class="item_width_1">
<el-input type="textarea" autosize placeholder="请填写组织介绍" <el-input type="textarea" autosize placeholder="请填写组织介绍"
v-model.trim="formData.introduction" :autosize="{ minRows:4., maxRows: 10}"> v-model.trim="formData.introduction" :autosize="{ minRows:4., maxRows: 10}">
</el-input> </el-input>
</div> </div>
</el-form-item> --> </el-form-item> -->
<!-- <!--
<el-form-item label="志愿品牌" prop="brand" label-width="100px" style="display: block"> <el-form-item label="志愿品牌" prop="brand" label-width="100px" style="display: block">
<div class="item_width_1"> <div class="item_width_1">
<el-input type="textarea" autosize placeholder="请输入内容" v-model.trim="formData.brand" <el-input type="textarea" autosize placeholder="请输入内容" v-model.trim="formData.brand"
@ -123,15 +143,15 @@
@file-removed="removedImg"></upload-image> @file-removed="removedImg"></upload-image>
</template> </template>
</el-form-item> --> </el-form-item> -->
</el-row></el-form> </el-row></el-form>
</div> </div>
<div class="div_btn"> <div class="div_btn">
<el-button size="small" @click="handleCancle">取 消</el-button> <el-button size="small" @click="handleCancle">取 消</el-button>
<el-button size="small" type="primary" @click="handleComfirm">确 <el-button size="small" type="primary" @click="handleComfirm">确
定</el-button> 定</el-button>
</div>
</div> </div>
</div>
</template> </template>
<script> <script>
@ -357,7 +377,10 @@
linkPhone: "", linkPhone: "",
workTime: "", workTime: "",
type: "", type: "",
tags: "",//标签 tags1: [
{}
],
tags:"",//标签
agencyId: this.$store.state.user.agencyId, agencyId: this.$store.state.user.agencyId,
address: "",//地址 address: "",//地址
longitude: this.$store.state.user.longitude, //经度 longitude: this.$store.state.user.longitude, //经度
@ -443,8 +466,9 @@
}, },
//添加标签 //添加标签
addDomain() { addDomain() {
if (this.formData.tags.length < 4) { if (this.formData.tags1.length < 4) {
this.formData.tags.push(this.tableDate); this.formData.tags1.push({ name: '', tab: '' });
}else{ }else{
this.$message.error("最多添加4个标签"); this.$message.error("最多添加4个标签");
} }
@ -453,11 +477,12 @@
//删除动态 //删除动态
removeDomain(item) { removeDomain(item) {
console.log(item); console.log(item);
var index = this.formData.sponsors.indexOf(item) this.formData.tags1.splice(item, 1);
if (index !== -1) { // var index = this.formData.sponsors.indexOf(item)
this.formData.sponsors.splice(index, 1) // if (index !== -1) {
this.tableDate = {} // this.formData.sponsors.splice(index, 1)
} // this.tableDate = {}
// }
}, },
validateContent() { validateContent() {
// 使用正则表达式去除HTML标签后检查内容 // 使用正则表达式去除HTML标签后检查内容
@ -569,7 +594,11 @@
async handleComfirm() { async handleComfirm() {
console.log(this.formData," this.formData"); let one=this.formData.tags1.map(item => item.tab).join(', ')
this.formData.tags=one;
console.log(this.formData,"this.formData");
// console.log(this.formData.tags.map(item => item.tab).join(', ')," this.formData");
// if (!this.formData.type) { // if (!this.formData.type) {
// this.$message.error('请选择类型'); // this.$message.error('请选择类型');
// return; // return;
@ -608,6 +637,7 @@
}, },
//增加 //增加
async addActivity() { async addActivity() {
let url = '/voluntary/sphereLife/saveOrUpdate' let url = '/voluntary/sphereLife/saveOrUpdate'
const { data, code, msg } = await requestPost(url, this.formData) const { data, code, msg } = await requestPost(url, this.formData)
if (code === 0) { if (code === 0) {
@ -750,7 +780,7 @@
linkman: [ linkman: [
{ required: true, message: '请填写联系人', trigger: 'blur' } { required: true, message: '请填写联系人', trigger: 'blur' }
], ],
tags: [ tags1: [
{ required: true, message: '请填写标签信息', trigger: 'blur' }, { required: true, message: '请填写标签信息', trigger: 'blur' },
], ],
attrs: [ attrs: [

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

@ -85,7 +85,7 @@
@click="handleDetail(scope.row)">修改</el-button> @click="handleDetail(scope.row)">修改</el-button>
<el-button type="text" style="color:#1C6AFD;" size="small" @click="handleselect(scope.row)">查看</el-button> <el-button type="text" style="color:#1C6AFD;" size="small" @click="handleselect(scope.row)">查看</el-button>
<el-button type="text"v-if="scope.row.auditStatus === 0" style="color:#1C6AFD;" size="small" @click="handleprocessl(scope.row)">审核</el-button> <el-button type="text"v-if="scope.row.auditStatus === 0" style="color:#1C6AFD;" size="small" @click="handleprocessl(scope.row)">审核</el-button>
<el-button v-if="scope.row.online === 1 &&scope.row.statusType!='进行中'&&scope.row.client !== 1" <el-button v-if="scope.row.online === 1 &&scope.row.statusType!='进行中'"
type="text" style="color:#1C6AFD;" size="small" @click="handleupOnline(scope.row)">下线</el-button> type="text" style="color:#1C6AFD;" size="small" @click="handleupOnline(scope.row)">下线</el-button>
<el-button v-if="scope.row.online === 0 &&scope.row.statusType!='进行中'&&scope.row.client !== 1" type="text" style="color:#1C6AFD;" <el-button v-if="scope.row.online === 0 &&scope.row.statusType!='进行中'&&scope.row.client !== 1" type="text" style="color:#1C6AFD;"
size="small" @click="handleupOnline(scope.row)">上线</el-button> size="small" @click="handleupOnline(scope.row)">上线</el-button>

Write Preview
Loading…
Cancel
Save