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

Merge branch 'xiaowang-social' into test

xiaowang-social
是小王呀\24601 1 year ago
parent
df5627df81 02b71659bb
commit
e6591a619e
3 changed files with 94 additions and 102 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 168
      src/views/modules/volunteer/SiteManagement/index.vue
  2. 8
      src/views/modules/volunteer/Venuemanagement/index.vue
  3. 20
      src/views/modules/volunteer/Venuemanagement/info.vue

168
src/views/modules/volunteer/SiteManagement/index.vue
View File

@ -1,99 +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.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 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="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="办公时间"
<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 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>
<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>

8
src/views/modules/volunteer/Venuemanagement/index.vue
View File

@ -80,6 +80,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="formTitle"
width="850px" top="10vh" class="dialog-h" @closed="showAddClose">
<info ref="ref_form" v-if="showInfo" @showAddClose="showAddClose" />
</el-dialog>
</div>
@ -105,6 +110,7 @@ export default {
data() {
return {
showInfo:false,
formTitle:"",
formData: {
agencyId:"",
@ -198,7 +204,7 @@ 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.id);

20
src/views/modules/volunteer/Venuemanagement/info.vue
View File

@ -10,36 +10,34 @@
:disabled="true" class="u-item-width-normal"></el-input>
</el-form-item>
-->
<el-form-item label="类型" prop="type" label-width="100px">
<el-form-item label="挂靠阵地" prop="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">
: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="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">
<!-- <el-form-item label="办公时间" prop="workTime" label-width="100px">
<div>{{ formData.workTime }}</div>
</el-form-item>
</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">
<!-- <el-form-item label="阵地简介" prop="content" label-width="100px" style="display: block">
<div>{{ formData.content }}</div>
</el-form-item>
</el-form-item> -->
<el-form-item label="位置" prop="address" label-width="100px" style="display: block">
<div style="width: 300px">
<div>{{ formData.address }}</div>
@ -132,7 +130,7 @@
//获取详情
getTableDetail(id) {
console.log(id,"dskljfksdljf");
let url = `/voluntary/position/edit/${id}`;
let url = `/voluntary/positionVenues/edit/${id}`;
console.log(url,"url");
requestGet(url).then((res) => {
console.log(res);

Write Preview
Loading…
Cancel
Save