Browse Source

bug更改

dlt_lingshan_12345
是小王呀\24601 1 year ago
parent
commit
49302c2675
  1. 10
      src/views/modules/volunteer/activityArchive/Points.vue
  2. 17
      src/views/modules/volunteer/activityArchive/add.vue
  3. 8
      src/views/modules/volunteer/activityArchive/enclosure.vue
  4. 8
      src/views/modules/volunteer/activityArchive/realselect.vue
  5. 2
      src/views/modules/volunteer/activityArchive/select.vue

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

@ -67,12 +67,13 @@
</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>
<!-- <el-dialog :visible.sync="info" :close-on-click-modal="false" :close-on-press-escape="false" title="附件详情"
width="1000px" top="10vh" class="dialog-h" @closed="AddClose" >
width="1000px" top="10vh" class="dialog-h" @closed="AddClose" >
<enclosure v-if="info" :list="fmData" @AddClose="AddClose" />
</el-dialog> -->
</div>
@ -82,7 +83,7 @@
</template>
<script>
import { requestPost,requestGet } from "@/js/dai/request";
// import { enclosure } from "./enclosure.vue";
// import enclosure from "./enclosure.vue";
export default {
name: "see",
@ -114,6 +115,9 @@ export default {
default: () => {}
}
},
// components:{
// enclosure
// },
methods: {
handleDetail(row){
console.log(row,"row");

17
src/views/modules/volunteer/activityArchive/add.vue

@ -97,12 +97,18 @@
@change="handleSwitchChange"></el-switch>
</el-form-item>
</div>
<div style="display: flex;">
<div v-if="formData.sponsors" style="display: flex;">
<div style="">
<div v-for="(item, index) in formData.sponsors" :label="index" :key="item.name" :prop=index>
<<<<<<< Updated upstream
<el-form-item label="赞助单位" prop="sponsors" style="margin-bottom:20px" label-width="110px">
<el-input v-model="item.name" placeholder="请输入" style="width: 300px;"></el-input>
<i class="el-icon-remove-outline" @click.prevent="removeDomain(item)" style="font-size: 20px; margin-left: 20px;"></i>
=======
<el-form-item label="赞助单位" prop="sponsors" style="margin-bottom:20px" >
<el-input v-model="item.name" placeholder="请输入" style="width: 280px;"></el-input>
<i class="el-icon-remove-outline" @click="removeDomain(item)" style="font-size: 20px; margin-left: 20px;"></i>
>>>>>>> Stashed changes
</el-form-item>
<el-form-item label="活动地点" prop="searchValue" >
<div style="width: 300px">
@ -266,6 +272,7 @@ export default {
var index = this.formData.sponsors.indexOf(item)
if (index !== -1) {
this.formData.sponsors.splice(index, 1)
this.tableDate = {}
}
},
//
@ -313,10 +320,10 @@ export default {
this.$message.error('请输入活动详情');
return;
}
// if (this.formData.imgs == '') {
// this.$message.error('');
// return;
// }
if (this.formData.imgs == '') {
this.$message.error('请上传图片');
return;
}
if (this.formData.strTime == '') {
this.$message.error('请填写活动开始时间');
return;

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

@ -59,17 +59,17 @@
</el-table-column>
<el-table-column prop="points" header-align="center" align="center" label="积分">
</el-table-column>
<el-table-column label="附件" fixed="right" header-align="center" align="center" class="operate">
<!-- <el-table-column label="附件" fixed="right" 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>
</template>
</el-table-column>
</el-table-column> -->
</el-table>
<div>
<el-dialog :visible.sync="info" :close-on-click-modal="false" :close-on-press-escape="false" title="附件详情"
<!-- <el-dialog :visible.sync="info" :close-on-click-modal="false" :close-on-press-escape="false" title="附件详情"
width="1000px" top="10vh" class="dialog-h" @closed="AddClose" v-if="add">
<add :list="fmData" @AddClose="AddClose" />
</el-dialog>
</el-dialog> -->
<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>

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

@ -245,7 +245,7 @@
this.formData=res.data;
this.tableDate=res.data.sponsors[0],
this.searchValue=res.data.address
this.formData.activityImgs=res.data.imgs
this.formData.activityImgs=[{url:res.data.imgs}]
} else {
this.$message.error(res.msg);
@ -608,8 +608,12 @@
}
}
},
destroyed () {
map = null
}
}
</script>
<style lang="scss" scoped>
.div_map{

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

@ -108,7 +108,7 @@
</div>
<div id="app_activity" class="div_map"></div>
</el-form-item>
<div style="display: flex;">
<div v-if="formData.sponsors" style="display: flex;">
<div style="">
<div v-for="(item, index) in formData.sponsors" :label="index" :key="item.name" :prop=index>
<el-form-item label="赞助单位" prop="sponsors" style="margin-bottom:20px" label-width="110px">

Loading…
Cancel
Save