Browse Source

Merge branch 'feature' of http://120.46.222.128:10021/elink-star/epmet-work-pc into feature

feature-bug
duanliangtao 8 months ago
parent
commit
4989554e40
  1. 1
      src/utils/index.js
  2. 3
      src/views/modules/portrayal/jumin/index.vue
  3. 6
      src/views/modules/shequzhili/event/cpts/event-detail.vue
  4. 59
      src/views/modules/shequzhili/peopleOpinons/cpts/eventDetail.vue
  5. 22
      src/views/modules/shequzhili/peopleOpinons/opinionsDaily.vue
  6. 14
      src/views/modules/shequzhili/solicitationSpecial/cpts/suggestionList.vue
  7. 12
      src/views/modules/shequzhili/solicitationSpecial/index.vue
  8. 116
      src/views/modules/volunteer/Dynamicmanagement/comment.vue
  9. 23
      src/views/modules/volunteer/Dynamicmanagement/index.vue
  10. 11
      src/views/modules/volunteer/activityArchive/add.vue
  11. 46
      src/views/modules/volunteer/activityArchive/select.vue
  12. 7
      src/views/pages/login.vue

1
src/utils/index.js

@ -46,7 +46,6 @@ export function clearLoginInfo() {
console.log('==========clearLoginInfo') console.log('==========clearLoginInfo')
store.commit("resetStore"); store.commit("resetStore");
localStorage.removeItem("token"); localStorage.removeItem("token");
localStorage.setItem('thePageAtExit', location.href);
window.SITE_CONFIG["dynamicMenuRoutesHasAdded"] = false; window.SITE_CONFIG["dynamicMenuRoutesHasAdded"] = false;
} }

3
src/views/modules/portrayal/jumin/index.vue

@ -990,6 +990,7 @@ export default {
{ {
id: "volunteerDto", id: "volunteerDto",
title: "志愿者信息", title: "志愿者信息",
scrollId: "volunteer",
children: [ children: [
{ {
label: "志愿者类别", label: "志愿者类别",
@ -1280,6 +1281,7 @@ export default {
chronic_disease: "慢病信息", chronic_disease: "慢病信息",
base: "基本信息", base: "基本信息",
business_record:'业务记录', business_record:'业务记录',
volunteer:'志愿者信息',
update_record:'更新记录' update_record:'更新记录'
}; };
const keysWithValueOne = []; const keysWithValueOne = [];
@ -1340,7 +1342,6 @@ export default {
sortedData.push(item); sortedData.push(item);
} }
}); });
console.log(sortedData);
// data sortedData // data sortedData
this.menuList.forEach(item => { this.menuList.forEach(item => {
if (!orderIds.includes(item.id)) { if (!orderIds.includes(item.id)) {

6
src/views/modules/shequzhili/event/cpts/event-detail.vue

@ -13,14 +13,14 @@
<div class="m-info"> <div class="m-info">
<div class="flex"> <div class="flex">
<div class="item"> <div class="item">
<div class="label">受理员编号</div> <div class="label">工单编号</div>
<div class="value">{{ info.clerkNumber }}</div> <div class="value">{{ info.clerkNumber }}</div>
<div class="label">办结时限</div> <div class="label">办结时限</div>
<div class="value border-right">{{ info.timeLimit }}</div> <div class="value border-right">{{ info.timeLimit }}</div>
</div> </div>
<div class="item"> <div class="item">
<div class="label">工单编号</div> <div class="label">接收时间</div>
<div class="value">{{ info.workOrderNum }}</div> <div class="value">{{ info.happenTime }}</div>
<div class="label">紧急程度</div> <div class="label">紧急程度</div>
<div class="value border-right">{{ info.exigency }}</div> <div class="value border-right">{{ info.exigency }}</div>
</div> </div>

59
src/views/modules/shequzhili/peopleOpinons/cpts/eventDetail.vue

@ -49,33 +49,35 @@
'm-info-prop', 'm-info-prop',
{ 'm-info-prop-vis': source === 'visiual' }, { 'm-info-prop-vis': source === 'visiual' },
]"> ]">
<span class="u-info-title-2">意见标</span> <span class="u-info-title-2">建议主</span>
<span>{{ info.subjectTitle }}</span> <span>{{ info.subjectTitle }}</span>
</div> </div>
<div :class="[ <div :class="[
'm-info-prop', 'm-info-prop',
{ 'm-info-prop-vis': source === 'visiual' }, { 'm-info-prop-vis': source === 'visiual' },
]"> ]">
<span class="u-info-title-2">意见内容:</span> <span class="u-info-title-2">建议内容:</span>
<span>{{ info.eventContent }}</span> <span>{{ info.eventContent }}</span>
</div> </div>
<div :class="[ <div v-if="info.attachmentList" :class="[
'm-info-prop', 'm-info-prop',
{ 'm-info-prop-vis': source === 'visiual' }, { 'm-info-prop-vis': source === 'visiual' },
]" > ]">
<span class="u-info-title-2">意见文档:</span> <span class="u-info-title-2">建议附件:</span>
<el-button v-if="info.fileList.length!=0" size="small" type="primary" @click="onClickDown(info.fileList)">下载文件</el-button> <section class="uploadList1">
<!-- <span>{{ info.eventContent }}</span> --> <div v-for="(file,index) in info.attachmentList" :key="index" :file="file"
<!-- <div v-for="(item1,index) in info.fileList"> >
<div>{{item1[index]}}111111</div> <img style="width: 40px; height: 40px;" :src="file.image">
<div>111111</div> <span>{{ file.name }}</span>
</div> --> <span :style="{ cursor: pageType === 'check' ? 'no-drop' : 'pointer' }" style="color: #2d7ad6;margin-left: 20px;" type="text" @click="onClickDown(file)">下载</span>
</div>
</section>
</div> </div>
<div :class="[ <div :class="[
'm-info-prop', 'm-info-prop',
{ 'm-info-prop-vis': source === 'visiual' }, { 'm-info-prop-vis': source === 'visiual' },
]"> ]">
<span class="u-info-title-2">建议人</span> <span class="u-info-title-2">建议人姓名</span>
<span>{{ info.name }}</span> <span>{{ info.name }}</span>
</div> </div>
<div :class="[ <div :class="[
@ -109,14 +111,14 @@
<div :class="[ <div :class="[
'm-info-prop', 'm-info-prop',
{ 'm-info-prop-vis': source === 'visiual' }, { 'm-info-prop-vis': source === 'visiual' },
]" > ]">
<span class="u-info-title-2">建议人年龄</span> <span class="u-info-title-2">建议人年龄</span>
<span>{{ info.age }}</span> <span>{{ info.age }}</span>
</div> </div>
<div :class="[ <div :class="[
'm-info-prop', 'm-info-prop',
{ 'm-info-prop-vis': source === 'visiual' }, { 'm-info-prop-vis': source === 'visiual' },
]" > ]">
<span class="u-info-title-2">建议人身份</span> <span class="u-info-title-2">建议人身份</span>
<span>{{ ideaIdentityName }}</span> <span>{{ ideaIdentityName }}</span>
</div> </div>
@ -143,7 +145,7 @@
{ 'm-info-prop-vis': source === 'visiual' }, { 'm-info-prop-vis': source === 'visiual' },
]"> ]">
<span class="u-info-title-2">办理前</span> <span class="u-info-title-2">办理前</span>
<img :src="src" :key="src" style="width: 60px; height: 60px; padding-right: 10px" <img :src="src" :key="src" style="width: 60px; height: 60px; padding-right: 10px;cursor: pointer;"
v-for="src in info.dealBeforeImageList" @click="watchImg(src)" /> v-for="src in info.dealBeforeImageList" @click="watchImg(src)" />
</div> </div>
<div :class="[ <div :class="[
@ -278,6 +280,11 @@ export default {
this.user = this.$store.state.user; this.user = this.$store.state.user;
if (this.eventId) { if (this.eventId) {
this.info = JSON.parse(JSON.stringify(this.eventDetailData)); this.info = JSON.parse(JSON.stringify(this.eventDetailData));
this.info.attachmentList = this.eventDetailData.attachmentList.filter(item => item.type == 'doc')
this.info.attachmentList.map(item=>{
item.image=item.name.split('.').pop()=='pdf'?"https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet-saas/prod/20241224/3859c08cd2e64e73924d768acd3f7dee.png":"https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet-saas/prod/20241224/35ef6aa0a06548c1a5811e28ba53562b.png"
})
this.agencyId = this.info.agencyId this.agencyId = this.info.agencyId
} }
@ -312,10 +319,7 @@ export default {
} }
}, },
onClickDown(data){ onClickDown(data){
data.forEach((item) => { window.open(data.url, '_blank');
console.log(item,"奥特玛");
window.open(item, '_blank');
});
}, },
async loadGrid() { async loadGrid() {
const url = "/gov/org/customergrid/gridoption"; const url = "/gov/org/customergrid/gridoption";
@ -440,4 +444,21 @@ export default {
margin-right: 10px; margin-right: 10px;
} }
} }
.uploadList1{
// width: 99%;
display: flex;
// justify-content: space-between;
align-items: center;
flex-wrap: wrap;
>div{
display: flex;
color: #606266;
align-items: center;
justify-content: space-between;
width: 100%;
&:hover{
background-color: #f5f7fa;
}
}
}
</style> </style>

22
src/views/modules/shequzhili/peopleOpinons/opinionsDaily.vue

@ -4,7 +4,7 @@
<div class="m-search"> <div class="m-search">
<el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'120px'"> <el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'120px'">
<div> <div>
<el-form-item label="所属组织1" prop="agencyId"> <el-form-item label="所属组织" prop="agencyId">
<el-cascader class="u-item-width-normal" size="small" ref="myCascader" <el-cascader class="u-item-width-normal" size="small" ref="myCascader"
v-model.trim="formData.agencyId" :options="orgOptions" :props="orgOptionProps" v-model.trim="formData.agencyId" :options="orgOptions" :props="orgOptionProps"
:show-all-levels="false" @change="handleChangeAgency" clearable></el-cascader> :show-all-levels="false" @change="handleChangeAgency" clearable></el-cascader>
@ -17,17 +17,17 @@
</el-select> </el-select>
</el-form-item> --> </el-form-item> -->
<el-form-item label="意见标题" prop="subjectTitle"> <el-form-item label="建议主题" prop="subjectTitle">
<el-input v-model.trim="formData.subjectTitle" class="u-item-width-normal" size="small" <el-input v-model.trim="formData.subjectTitle" class="u-item-width-normal" size="small"
clearable placeholder="请输入"> clearable placeholder="请输入">
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="提交人姓名" prop="name"> <el-form-item label="建议人姓名" prop="name">
<el-input v-model.trim="formData.name" class="u-item-width-normal" size="small" clearable <el-input v-model.trim="formData.name" class="u-item-width-normal" size="small" clearable
placeholder="请输入"> placeholder="请输入">
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="报件人电话" prop="mobile"> <el-form-item label="建议人电话" prop="mobile">
<el-input v-model.trim="formData.mobile" class="u-item-width-normal" size="small" clearable <el-input v-model.trim="formData.mobile" class="u-item-width-normal" size="small" clearable
placeholder="请输入"> placeholder="请输入">
</el-input> </el-input>
@ -48,7 +48,7 @@
</el-form-item> </el-form-item>
<el-form-item label="提交时间" prop="startSubmitTime"> <el-form-item label="建议时间" prop="startSubmitTime">
<el-date-picker v-model.trim="formData.startSubmitTime" class="u-item-width-daterange" <el-date-picker v-model.trim="formData.startSubmitTime" class="u-item-width-daterange"
size="small" type="date" value-format="yyyy-MM-dd HH:mm:ss" value="yyyy-MM-dd" size="small" type="date" value-format="yyyy-MM-dd HH:mm:ss" value="yyyy-MM-dd"
placeholder="开始时间"> placeholder="开始时间">
@ -87,13 +87,13 @@
<!-- <el-table-column prop="typeCode" label="征集领域" min-width="140" align="center" <!-- <el-table-column prop="typeCode" label="征集领域" min-width="140" align="center"
:show-overflow-tooltip="true" /> --> :show-overflow-tooltip="true" /> -->
<el-table-column prop="subjectTitle" label="意见标题" align="center" :show-overflow-tooltip="true"> <el-table-column prop="subjectTitle" label="建议主题" align="center" :show-overflow-tooltip="true">
</el-table-column> </el-table-column>
<el-table-column prop="eventContent" label="意见内容" align="center" :show-overflow-tooltip="true"> <el-table-column prop="eventContent" label="建议内容" align="center" :show-overflow-tooltip="true">
</el-table-column> </el-table-column>
<el-table-column prop="name" label="提交人" align="center" :show-overflow-tooltip="true"> <el-table-column prop="name" label="建议人姓名" align="center" :show-overflow-tooltip="true">
</el-table-column> </el-table-column>
<el-table-column prop="mobile" align="center" width="110" label="提交人电话"> <el-table-column prop="mobile" align="center" width="110" label="建议人电话">
<!-- <template slot-scope="scope"> <!-- <template slot-scope="scope">
<el-button <el-button
v-if="scope.row.reportUserId !== null && scope.row.reportUserId !== ''" v-if="scope.row.reportUserId !== null && scope.row.reportUserId !== ''"
@ -122,7 +122,7 @@
<span v-else-if="scope.row.goldenIdeaFlag ===1"></span> <span v-else-if="scope.row.goldenIdeaFlag ===1"></span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="submitTime" align="center" width="110" label="提交时间" <el-table-column prop="submitTime" align="center" width="110" label="建议时间"
:show-overflow-tooltip="true"> :show-overflow-tooltip="true">
</el-table-column> </el-table-column>
<el-table-column fixed="right" label="操作" align="center" width="200px" prop="status"> <el-table-column fixed="right" label="操作" align="center" width="200px" prop="status">
@ -230,7 +230,7 @@ export default {
subjectTitle: "", subjectTitle: "",
goldenIdeaFlag: "", goldenIdeaFlag: "",
agencyId: "", agencyId: "",
clientType: "other", clientType: "web",
startSubmitTime:"", startSubmitTime:"",
endSubmitTime:"" endSubmitTime:""
}, },

14
src/views/modules/shequzhili/solicitationSpecial/cpts/suggestionList.vue

@ -17,12 +17,12 @@
</el-select> </el-select>
</el-form-item> --> </el-form-item> -->
<el-form-item label="意见标题" prop="subjectTitle"> <el-form-item label="建议标题" prop="subjectTitle">
<el-input v-model.trim="formData.subjectTitle" class="u-item-width-normal" size="small" <el-input v-model.trim="formData.subjectTitle" class="u-item-width-normal" size="small"
clearable placeholder="请输入"> clearable placeholder="请输入">
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="提交人姓名" prop="name"> <el-form-item label="建议人姓名" prop="name">
<el-input v-model.trim="formData.name" class="u-item-width-normal" size="small" clearable <el-input v-model.trim="formData.name" class="u-item-width-normal" size="small" clearable
placeholder="请输入"> placeholder="请输入">
</el-input> </el-input>
@ -48,7 +48,7 @@
</el-form-item> </el-form-item>
<el-form-item label="提交时间" prop="startSubmitTime"> <el-form-item label="建议时间" prop="startSubmitTime">
<el-date-picker v-model.trim="formData.startSubmitTime" class="u-item-width-daterange" <el-date-picker v-model.trim="formData.startSubmitTime" class="u-item-width-daterange"
size="small" type="date" value-format="yyyy-MM-dd HH:mm:ss" value="yyyy-MM-dd" size="small" type="date" value-format="yyyy-MM-dd HH:mm:ss" value="yyyy-MM-dd"
placeholder="开始时间"> placeholder="开始时间">
@ -92,11 +92,11 @@
</el-table-column> --> </el-table-column> -->
<el-table-column prop="subjectTitle" label="所属专题" align="center" :show-overflow-tooltip="true"> <el-table-column prop="subjectTitle" label="所属专题" align="center" :show-overflow-tooltip="true">
</el-table-column> </el-table-column>
<el-table-column prop="eventContent" label="意见内容" align="center" :show-overflow-tooltip="true"> <el-table-column prop="eventContent" label="建议内容" align="center" :show-overflow-tooltip="true">
</el-table-column> </el-table-column>
<el-table-column prop="name" label="建议人" align="center" :show-overflow-tooltip="true"> <el-table-column prop="name" label="建议人姓名" align="center" :show-overflow-tooltip="true">
</el-table-column> </el-table-column>
<el-table-column prop="mobile" align="center" width="110" label="提交人电话"> <el-table-column prop="mobile" align="center" width="110" label="建议人电话">
<!-- <template slot-scope="scope"> <!-- <template slot-scope="scope">
<el-button <el-button
v-if="scope.row.reportUserId !== null && scope.row.reportUserId !== ''" v-if="scope.row.reportUserId !== null && scope.row.reportUserId !== ''"
@ -125,7 +125,7 @@
<span v-else-if="scope.row.goldenIdeaFlag ===1"></span> <span v-else-if="scope.row.goldenIdeaFlag ===1"></span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="submitTime" align="center" width="110" label="提交时间" <el-table-column prop="submitTime" align="center" width="110" label="建议时间"
:show-overflow-tooltip="true"> :show-overflow-tooltip="true">
</el-table-column> </el-table-column>
<el-table-column fixed="right" label="操作" align="center" width="200px" prop="status"> <el-table-column fixed="right" label="操作" align="center" width="200px" prop="status">

12
src/views/modules/shequzhili/solicitationSpecial/index.vue

@ -27,12 +27,12 @@
placeholder="请输入"> placeholder="请输入">
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="发布人" prop="publicationPeople"> <el-form-item label="建议人" prop="publicationPeople">
<el-input v-model.trim="formData.publicationPeople" class="u-item-width-normal" size="small" clearable <el-input v-model.trim="formData.publicationPeople" class="u-item-width-normal" size="small" clearable
placeholder="请输入"> placeholder="请输入">
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="发布时间" prop="startTime"> <el-form-item label="建议时间" prop="startTime">
<el-date-picker v-model.trim="formData.publicationTimeStart" <el-date-picker v-model.trim="formData.publicationTimeStart"
class="u-item-width-daterange" size="small" type="date" class="u-item-width-daterange" size="small" type="date"
value-format="yyyy-MM-dd HH:mm:ss" value="yyyy-MM-dd" placeholder="开始时间"> value-format="yyyy-MM-dd HH:mm:ss" value="yyyy-MM-dd" placeholder="开始时间">
@ -59,7 +59,7 @@
<div class="m-table"> <div class="m-table">
<div class="div_btn"> <div class="div_btn">
<el-button size="small" type="primary " @click="handleAdd">发布专题</el-button> <el-button size="small" type="primary " @click="handleAdd">建议专题</el-button>
<el-button @click="handleExport" class="diy-button--white" size="small">导出</el-button> <el-button @click="handleExport" class="diy-button--white" size="small">导出</el-button>
<el-button @click="handleSuperviseEvent" class="diy-button--white" size="small">批量删除</el-button> <el-button @click="handleSuperviseEvent" class="diy-button--white" size="small">批量删除</el-button>
</div> </div>
@ -69,7 +69,7 @@
<el-table-column label="" fixed="left" type="selection" align="center" width="50" /> <el-table-column label="" fixed="left" type="selection" align="center" width="50" />
<el-table-column label="序号" fixed="left" type="index" align="center" width="50" /> <el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
<el-table-column prop="publicationDept" align="center" label="发布部门" :show-overflow-tooltip="true"> <el-table-column prop="publicationDept" align="center" label="建议部门" :show-overflow-tooltip="true">
</el-table-column> </el-table-column>
<el-table-column prop="typeName" align="center" width="110" label="征集领域" <el-table-column prop="typeName" align="center" width="110" label="征集领域"
:show-overflow-tooltip="true"> :show-overflow-tooltip="true">
@ -89,10 +89,10 @@
<el-button type="text" @click="onClickOpinion(scope.row,'optionList')">{{ scope.row.eventNum }}</el-button> <el-button type="text" @click="onClickOpinion(scope.row,'optionList')">{{ scope.row.eventNum }}</el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="publicationPeopleName" align="center" label="专题发布人" <el-table-column prop="publicationPeopleName" align="center" label="专题建议人"
:show-overflow-tooltip="true"> :show-overflow-tooltip="true">
</el-table-column> </el-table-column>
<el-table-column prop="publicationTime" align="center" label="专题发布时间" <el-table-column prop="publicationTime" align="center" label="专题建议时间"
:show-overflow-tooltip="true"> :show-overflow-tooltip="true">
</el-table-column> </el-table-column>

116
src/views/modules/volunteer/Dynamicmanagement/comment.vue

@ -0,0 +1,116 @@
<template>
<div class="g-main" style="padding: 30px;">
<div>
<el-table :data="tableData" border>
<el-table-column label="序号" width="80" header-align="center" align="center"
type="index"></el-table-column>
<el-table-column prop="realName" header-align="center" align="center" label="姓名" label-width="100">
</el-table-column>
<el-table-column prop="content" header-align="center" align="center" label="评论内容" :show-overflow-tooltip="true">
</el-table-column>
. <el-table-column prop="commentTime" header-align="center" align="center" label="评论时间" label-width="100">
</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="handleDelete(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
<div>
<el-pagination @current-change="handleCurrentChange"
:current-page.sync="pageNo" :page-sizes="[10, 20, 50]" :page-size="pageSize"
layout=" prev, pager, next, total" :total="total">
</el-pagination>
</div>
</div>
</div>
</template>
<script>
import { requestPost, requestGet } from "@/js/dai/request";
export default {
name: "see",
data() {
return {
total: 0,
tableData: [],
pageNo: 1,
pageSize: 10,
};
},
props: {
id: {
type: String,
default: ''
}
},
methods: {
handleCurrentChange(val) {
console.log(`当前页: ${val}`);
this.pageNo = val;
this.getTableData();
},
//
getTableData() {
// const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/project-list";
const url = "/voluntary/newsTrendsComment/page";
let params = {
pageNo: this.pageNo,
trendsId: this.id,
pageSize: this.pageSize,
}
requestGet(url, params).then((res) => {
if (res.code == 0) {
this.total = res.data.total || 0;
this.tableData = res.data.list;
console.log(this.tableData, "this.tableData");
} else {
this.$message.error(res.msg);
}
});
},
handleDelete(row){
if(!row.id){
this.$message.error('缺少重要参数')
return false
}
this.$confirm('此操作将永久删除该记录, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then( () =>{
const formData = new FormData();
formData.append("ids", [row.id]);
this.$http
.post(
"/voluntary/newsTrendsComment/delete",
formData
)
.then((res) => {
this.$message.success('删除成功')
this.getTableData()
})
.catch((err) => {
this.$message.error(err)
});
})
}
},
created() {
console.log(this.id, "id");
this.getTableData()
},
}
</script>
<style lang="scss" scoped>
@import "@/assets/scss/modules/management/volunteet.scss";
</style>

23
src/views/modules/volunteer/Dynamicmanagement/index.vue

@ -83,12 +83,9 @@
@click="handleupOnline(scope.row)" v-if="scope.row.online === 1">上线</el-button> @click="handleupOnline(scope.row)" v-if="scope.row.online === 1">上线</el-button>
<el-button type="text" style="color:#1C6AFD;" size="small" <el-button type="text" style="color:#1C6AFD;" size="small"
@click="handledelete(scope.row)">删除</el-button> @click="handledelete(scope.row)">删除</el-button>
<!-- <el-button type="text" style="color:#1C6AFD;" size="small"
@click="handlerecruit(scope.row)">招募</el-button>
<el-button type="text" style="color:#1C6AFD;" size="small" <el-button type="text" style="color:#1C6AFD;" size="small"
@click="handleprocessl(scope.row)">审核</el-button> @click="handlComment(scope.row)">评论管理</el-button>
<el-button type="text" style="color:#1C6AFD;" size="small"
@click="handlerecord(scope.row)">记录</el-button> -->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -110,6 +107,10 @@
width="850px" top="10vh" class="dialog-h" @closed="showEditClose"> width="850px" top="10vh" class="dialog-h" @closed="showEditClose">
<edit v-if="showEdit" :EditList="EditList" @showEditClose="showEditClose" /> <edit v-if="showEdit" :EditList="EditList" @showEditClose="showEditClose" />
</el-dialog> </el-dialog>
<el-dialog :visible.sync="showComment" :close-on-click-modal="false" :close-on-press-escape="false" title="评论管理"
width="850px" top="10vh" class="dialog-h" @closed="showCommentClose">
<comment v-if="showComment" :id="infoId" @showEditClose="showCommentClose" />
</el-dialog>
<!-- <el-dialog :visible.sync="showrecruit" :close-on-click-modal="false" :close-on-press-escape="false" <!-- <el-dialog :visible.sync="showrecruit" :close-on-click-modal="false" :close-on-press-escape="false"
title="招募" width="1000px" top="10vh" class="dialog-h" @closed="handlerecruitClose"> title="招募" width="1000px" top="10vh" class="dialog-h" @closed="handlerecruitClose">
<recruit v-if="showrecruit" :list="fmData" @handlerecruitClose="handlerecruitClose" /> <recruit v-if="showrecruit" :list="fmData" @handlerecruitClose="handlerecruitClose" />
@ -133,6 +134,7 @@ import { mapGetters } from "vuex";
import add from "./add.vue" import add from "./add.vue"
import info from "./info.vue" import info from "./info.vue"
import edit from "./edit.vue" import edit from "./edit.vue"
import comment from "./comment.vue"
import axios from "axios"; import axios from "axios";
// import recruit from "./recruit" // import recruit from "./recruit"
@ -143,7 +145,7 @@ import axios from "axios";
export default { export default {
components: { components: {
add,edit,info add,edit,info,comment
}, },
data() { data() {
@ -173,6 +175,7 @@ export default {
showAdd: false, showAdd: false,
showMember: false, showMember: false,
showEdit: false, showEdit: false,
showComment:false,
// pageType: "list", // list dispose info issue-info // pageType: "list", // list dispose info issue-info
pageNo: 1, pageNo: 1,
pageSize: 20, pageSize: 20,
@ -272,6 +275,14 @@ export default {
showEditClose(){ showEditClose(){
this.showEdit=false this.showEdit=false
}, },
handlComment(row){
this.infoId = row.id
this.showComment = true
},
showCommentClose(){
this.showComment = false
},
// //
handleAdd(){ handleAdd(){
this.showAdd=true this.showAdd=true

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

@ -44,7 +44,7 @@
<el-col :span="12"> <el-form-item label="活动区域" prop="district" required> <el-col :span="12"> <el-form-item label="活动区域" prop="district" required>
<el-cascader class="list_item_width_1" ref="myCascader" clearable style="width: 280px;" <el-cascader class="list_item_width_1" ref="myCascader" clearable style="width: 280px;"
v-model.trim="formData.district" :options="orgOptions" :props="orgOptionProps" v-model.trim="formData.district" :options="orgOptions" :props="orgOptionProps"
@change="handleChangeAgency1"></el-cascader> ></el-cascader>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@ -52,7 +52,9 @@
<div style="display: flex; justify-items:center; align-items: center;"> <div style="display: flex; justify-items:center; align-items: center;">
<el-input-number :disabled="formData.notQuota == '0'" v-model.trim="formData.quota" :min="0" <el-input-number :disabled="formData.notQuota == '0'" v-model.trim="formData.quota" :min="0"
label="描述文字" type="number"></el-input-number> label="描述文字" type="number"></el-input-number>
<el-checkbox style="margin-left: 20px;" v-model="checked">不限名额</el-checkbox> <el-checkbox-group v-model="formData.notQuota" >
<el-checkbox style="margin-left: 20px;" :true-label="0" :false-label="1">不限名额</el-checkbox>
</el-checkbox-group>
</div> </div>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -524,7 +526,10 @@ export default {
}, },
// //
async handleComfirm() { async handleComfirm() {
console.log(this.formData,"this,formD"); if (this.formData.notQuota == '1' && this.formData.quota === 0) {
this.$message.error('活动人数不能为0');
return false;
}
if (this.formData.address == '') { if (this.formData.address == '') {
this.$message.error('请输入活动地点'); this.$message.error('请输入活动地点');
return; return;

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

@ -14,7 +14,7 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="所属项目" prop="typeId" > <el-form-item label="所属项目" prop="typeId" >
<el-select v-model.trim="formData.projectTitle" filterable style="width: 280px" remote :reserve-keyword="true" <el-select v-model.trim="formData.projectTitle" filterable style="width: 280px" remote :reserve-keyword="true"
placeholder="请输入关键词" :remote-method="remoteMethod1" :loading="loading"> placeholder="请输入关键词" :loading="loading">
<el-option v-for="(item, index) in typeList1" @click.native="handleClickKey1(item.id)" <el-option v-for="(item, index) in typeList1" @click.native="handleClickKey1(item.id)"
style="width: 280px;" :key="item.id" :label="item.projectTitle" :value="item.id"> style="width: 280px;" :key="item.id" :label="item.projectTitle" :value="item.id">
</el-option> </el-option>
@ -44,15 +44,17 @@
<el-col :span="12"> <el-form-item label="活动区域" prop="district" required> <el-col :span="12"> <el-form-item label="活动区域" prop="district" required>
<el-cascader class="list_item_width_1" ref="myCascader" clearable style="width: 280px;" <el-cascader class="list_item_width_1" ref="myCascader" clearable style="width: 280px;"
v-model.trim="formData.district" :options="orgOptions" :props="orgOptionProps" v-model.trim="formData.district" :options="orgOptions" :props="orgOptionProps"
@change="handleChangeAgency1"></el-cascader> ></el-cascader>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="活动名额" prop="points" required> <el-form-item label="活动名额" prop="notQuota" required>
<div style="display: flex; justify-items:center; align-items: center;"> <div style="display: flex; justify-items:center; align-items: center;">
<el-input-number :disabled="formData.notQuota == '0'" v-model.trim="formData.quota" :min="0" <el-input-number :disabled="formData.notQuota == '0'" v-model.trim="formData.quota" :min="0"
label="描述文字" type="number"></el-input-number> label="描述文字" type="number"></el-input-number>
<el-checkbox style="margin-left: 20px;" v-model="checked">不限名额</el-checkbox> <el-checkbox-group v-model="formData.notQuota" >
<el-checkbox style="margin-left: 20px;" :true-label="0" :false-label="1">不限名额</el-checkbox>
</el-checkbox-group>
</div> </div>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -93,14 +95,6 @@
<el-col :span="24"> <el-col :span="24">
<el-form-item label="活动时间" prop="strTime" required> <el-form-item label="活动时间" prop="strTime" required>
<!-- <el-date-picker
v-model="value1"
type="datetimerange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
</div> -->
<el-date-picker v-model="formData.strTime" type="datetime" placeholder="开始时间" format="yyyy-MM-dd HH:mm:ss" <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:195px"> value-format="yyyy-MM-dd HH:mm:ss" style="width:195px">
</el-date-picker> <span style="margin: 0 10px"></span> <el-date-picker v-model="formData.endTime" </el-date-picker> <span style="margin: 0 10px"></span> <el-date-picker v-model="formData.endTime"
@ -120,20 +114,6 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="12">
<el-form-item label="活动名额" prop="points" required>
<div style="display: flex; justify-items:center; align-items: center;">
<el-input-number :disabled="formData.notQuota == '0'" v-model.trim="formData.quota" :min="0"
label="描述文字" type="number"></el-input-number>
<el-checkbox style="margin-left: 20px;" v-model="checked">不限名额</el-checkbox>
</div>
</el-form-item>
</el-col> -->
<!-- <el-col :span="12">
<el-form-item label="活动积分" prop="integral" >
<el-input-number v-model="formData.points" :min="1" :max="10" label="描述文字"></el-input-number>
</el-form-item>
</el-col> -->
<el-col :span="24"> <el-col :span="24">
<el-form-item label="活动详情" prop="content" style="display: block" required> <el-form-item label="活动详情" prop="content" style="display: block" required>
<div style="width: 756px;"> <div style="width: 756px;">
@ -364,12 +344,10 @@ export default {
}, },
watch: { watch: {
'formData.notQuota'(newValue) { 'formData.notQuota'(newValue) {
console.log(newValue,'newvalue');
// notQuota '0' quota // notQuota '0' quota
if (newValue === '0') { if (newValue === '0') {
this.formData.quota = ''; this.formData.quota = '';
} }
console.log( this.formData.quota);
} }
}, },
@ -378,12 +356,7 @@ export default {
this.getTableData2() this.getTableData2()
this.volunteerservicetype() this.volunteerservicetype()
this.getTableData() this.getTableData()
// this.startLoading()
// await this.loadInfo()
// this.endLoading()
this.getOrgTreeList() this.getOrgTreeList()
}, },
methods: { methods: {
@ -468,7 +441,7 @@ export default {
} }
}, },
// //
async getTableData() { getTableData() {
// const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/project-list"; // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/project-list";
const url = `/voluntary/activityInfo/detail/${this.list.id}`; const url = `/voluntary/activityInfo/detail/${this.list.id}`;
requestGet(url).then((res) => { requestGet(url).then((res) => {
@ -529,7 +502,10 @@ export default {
}, },
// //
async handleComfirm() { async handleComfirm() {
if (this.formData.notQuota == '1' && this.formData.quota === 0) {
this.$message.error('活动人数不能为');
return false;
}
if (this.formData.address == '') { if (this.formData.address == '') {
this.$message.error('请输入活动地点'); this.$message.error('请输入活动地点');
return; return;

7
src/views/pages/login.vue

@ -161,15 +161,8 @@ export default {
methods: { methods: {
// //
skipAfterLogin() { skipAfterLogin() {
let href = localStorage.getItem("thePageAtExit");
if (href && href.indexOf("login") == -1) {
localStorage.removeItem("thePageAtExit");
location.href = href;
} else {
localStorage.removeItem("thePageAtExit");
const redirect = this.$route.query.redirect || '/' const redirect = this.$route.query.redirect || '/'
this.$router.replace(redirect); this.$router.replace(redirect);
}
}, },
// //
getPubKey() { getPubKey() {

Loading…
Cancel
Save