Browse Source

人民建议征集进行更改,组织单位进行更改

chengyang
是小王呀\24601 9 months ago
parent
commit
d4ab362992
  1. 6
      src/views/modules/base/orgUnitManger/index.vue
  2. 31
      src/views/modules/peopleOpinons/cpts/eventDetail.vue
  3. 2
      src/views/modules/peopleOpinons/cpts/eventInfo.vue
  4. 2
      src/views/modules/peopleOpinons/opinionsDaily.vue
  5. 4
      src/views/modules/solicitationSpecial/cpts/suggestionList.vue
  6. 30
      src/views/modules/volunteer/VolunteerProjects/enclosure.vue
  7. 149
      src/views/modules/volunteer/activityArchive/Administration.vue
  8. 4
      src/views/modules/volunteer/activityArchive/index.vue

6
src/views/modules/base/orgUnitManger/index.vue

@ -317,9 +317,9 @@
// return user
// })
let arr1 =this.companyList.find(item1=>item1.value==item.property)
console.log(arr1,"sdlkjgflksdjg");
item.propertyName=arr1.label
// let arr1 = this.companyList.find(item1 => item1.value == item.property)
// console.log(arr1, "sdlkjgflksdjg");
// item.propertyName = arr1.label
})

31
src/views/modules/peopleOpinons/cpts/eventDetail.vue

@ -3,11 +3,11 @@
<el-card :style="containerStyle" :class="{ 'box-card': source === 'visiual' }" v-if="showType == ''">
<h3 v-if="source === 'manage'" class="h3-title">
<!-- <img src="../../../../../assets/images/index/title-icon-sqzl.png" width="30px" height="30px" alt="" /> -->
事件详情
建议详情
</h3>
<div class="m-detail-main">
<div class="m-info">
<div :class="['m-info-prop', { 'm-info-prop-vis': source === 'visiual' }]">
<!-- <div :class="['m-info-prop', { 'm-info-prop-vis': source === 'visiual' }]">
<span class="u-info-title-2">所属网格</span>
<template v-if="!info.gridName">
<el-select v-model.trim="info.gridId" placeholder="请选择" clearable class="cell-width-1">
@ -19,12 +19,12 @@
<template v-else>
<span>{{ info.gridName|| info.agencyName }}</span>
</template>
</div>
</div> -->
<div :class="[
'm-info-prop',
{ 'm-info-prop-vis': source === 'visiual' },
]">
<span class="u-info-title-2">上报时间</span>
<span class="u-info-title-2">建议上报时间</span>
<span>{{ info.submitTime }}</span>
</div>
<div :class="[
@ -63,7 +63,7 @@
'm-info-prop',
{ 'm-info-prop-vis': source === 'visiual' },
]">
<span class="u-info-title-2">上报</span>
<span class="u-info-title-2">建议</span>
<span>{{ info.name }}</span>
</div>
<div :class="[
@ -84,14 +84,14 @@
'm-info-prop',
{ 'm-info-prop-vis': source === 'visiual' },
]" v-if="info.responsibleUnit==='yes' && info.demandType==='chengguan'">
<span class="u-info-title-2">上报</span>
<span class="u-info-title-2">建议</span>
<span>{{ info.responsibleName }}</span>
</div>
<div :class="[
'm-info-prop',
{ 'm-info-prop-vis': source === 'visiual' },
]" v-if="info.responsibleUnit==='yes' && info.demandType==='chengguan'">
<span class="u-info-title-2">上报人电话</span>
<span class="u-info-title-2">建议人电话</span>
<span>{{ info.responsibleMobile }}</span>
</div>
<div :class="[
@ -275,8 +275,21 @@ export default {
this.$message.error(msg);
}
},
sendValue(){
this.$emit('update-value', this.info); //
sendValue() {
let url="/governance/icEventOld/update"
const params = {
goldenIdeaFlag: this.info.goldenIdeaFlag,
icEventId: this.info.icEventId
}
requestPost(url, params).then(res=>{
if (res.code === 0) {
this.$message.success("设置成功");
} else {
this.$message.error(msg);
}
});
// this.$emit('update-value', this.info); //
},
watchImg(src) {
window.open(src);

2
src/views/modules/peopleOpinons/cpts/eventInfo.vue

@ -450,7 +450,7 @@ export default {
...params,
});
if (code === 0) {
await this.icEventOldupdate('/governance/icEventOld/update')
// await this.icEventOldupdate('/governance/icEventOld/update')
this.$message.success("操作成功!");
this.$emit("handleOk");

2
src/views/modules/peopleOpinons/opinionsDaily.vue

@ -128,7 +128,7 @@
<el-table-column fixed="right" label="操作" align="center" width="200px" prop="status">
<template slot-scope="scope">
<el-button @click="handleDispose(scope.row,'dispose')" type="text"
size="small">办理</el-button>
size="small">修改</el-button>
<el-button @click="handleDel(scope.row,'info')" type="text" size="small">删除</el-button>
</template>
</el-table-column>

4
src/views/modules/solicitationSpecial/cpts/suggestionList.vue

@ -27,7 +27,7 @@
placeholder="请输入">
</el-input>
</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
placeholder="请输入">
</el-input>
@ -94,7 +94,7 @@
</el-table-column>
<el-table-column prop="eventContent" label="意见内容" align="center" :show-overflow-tooltip="true">
</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 prop="mobile" align="center" width="110" label="提交人电话">
<!-- <template slot-scope="scope">

30
src/views/modules/volunteer/VolunteerProjects/enclosure.vue

@ -5,35 +5,7 @@
<el-table-column label="序号" width="80" header-align="center" align="center" type="index"></el-table-column>
<el-table-column prop="name" header-align="center" align="center" label="名称">
</el-table-column>
<!-- <el-table-column prop="url" align="center" width="80" label="图片">
<template slot-scope="scope">
<el-image v-if="scope.row.url && scope.row.type == 'image'" style="width: 40px; height: 40px"
:src="scope.row.url" :preview-src-list="[scope.row.url]">
</el-image>
<span v-else></span>
</template>
</el-table-column>
<el-table-column prop="url" align="center" width="80" label="视频">
<template slot-scope="scope"> -->
<!-- <el-image v-if="scope.row.url && scope.row.type == 'voice'" style="width: 40px; height: 40px"
:src="scope.row.url" :preview-src-list="[scope.row.url]">
</el-image> -->
<!-- <img class="img-voice"
v-if="scope.row.url && scope.row.type == 'video'"
src="../../../../assets/img/icon-voice.png" />
<span v-else></span> -->
<!-- <i v-if="scope.row.url && scope.row.type == 'video'" @click="handleShowVoice(scope.row.url)" class="el-icon-video-play" style="font-size: 40px;"></i>
</template> -->
<!-- </el-table-column> -->
<!-- <el-table-column prop="type" header-align="center" align="center" label="类型">
<template slot-scope="scope">
<span v-if="scope.row.type=='image'">图片</span>
<span v-if="scope.row.type=='voice'">语音</span>
<span v-if="scope.row.type=='video'">视频</span>
</template>
</el-table-column> -->
</el-table>

149
src/views/modules/volunteer/activityArchive/Administration.vue

@ -1,58 +1,69 @@
<template>
<div class="g-main" style="padding: 30px;">
<div class="flex" >
<!-- <div class="flex flex-center1 flex-center2" style="align-items: center;">
<div>姓名</div>
<el-input placeholder="请输入内容" v-model="name" style="width: 200px" clearable>
</el-input>
</div>
<div class="flex" style="align-items: center;">
<div>手机号</div>
<el-input placeholder="请输入内容" v-model="mobile" style="width: 200px" clearable>
</el-input>
</div>
<div>
<el-button type="primary" @click="handleSearch">查询</el-button>
</div> -->
<el-form :inline="true" :model="formData" class="demo-form-inline" style="" >
<el-form-item label="姓名">
<el-input placeholder="请输入姓名" v-model="name" style="width: 200px" clearable>
</el-input>
</el-form-item>
<el-form-item label="手机号" label-width="120px">
<el-input placeholder="请输入手机号" v-model="mobile" style="width: 150px" clearable>
</el-input>
</el-form-item>
</el-form>
<div style="margin:0 0 10px 30px;">
<el-button type="primary" @click="handleSearch" style="margin: 20rpx;">查询</el-button>
</div>
</div>
<div >
<div class="g-main" style="padding: 30px;">
<div class="flex">
<el-form :inline="true" class="demo-form-inline" style="">
<el-form-item label="姓名">
<el-input placeholder="请输入姓名" v-model="name" style="width: 200px" clearable>
</el-input>
</el-form-item>
<el-form-item label="手机号" label-width="120px">
<el-input placeholder="请输入手机号" v-model="mobile" style="width: 150px" clearable>
</el-input>
</el-form-item>
</el-form>
<div style="margin:0 0 10px 30px;">
<el-button type="primary" @click="handleSearch" style="margin: 20rpx;">查询</el-button>
</div>
</div>
<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="姓名" >
<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="姓名">
</el-table-column>
<el-table-column prop="nickName" header-align="center" align="center" label="昵称" >
<el-table-column prop="nickName" header-align="center" align="center" label="昵称">
</el-table-column>
<el-table-column prop="mobile" header-align="center" align="center" label="手机号" >
<el-table-column prop="mobile" header-align="center" align="center" label="手机号">
</el-table-column>
. <el-table-column prop="idCard" header-align="center" align="center" label="证件号" >
. <el-table-column prop="idCard" header-align="center" align="center" label="证件号">
</el-table-column>
<el-table-column prop="applyTime" header-align="center" align="center" label="报名时间" >
<el-table-column prop="applyTime" header-align="center" align="center" label="报名时间">
</el-table-column>
<!-- <el-table-column label="操作" fixed="right" width="250" header-align="center" align="center" class="operate">
<el-table-column v-if="list.auditVolunteerFlag" 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="handleDelete(scope.row)">积分调整</el-button>
<el-button v-if="scope.row.attendFlag==1&&auditVolunteerReason==null" type="text" style="color:#1C6AFD;" size="small" @click="handleDetail(scope.row)">审核</el-button>
<span v-if="scope.row.attendFlag==1">审核通过</span>
<span v-if="scope.row.attendFlag==2">审核不通过</span>
</template>
</el-table-column> -->
</el-table-column>
</el-table>
<el-dialog :modal="false" :visible.sync="showprocess" :close-on-click-modal="false" :close-on-press-escape="false"
title="报名审核" width="750px" top="10vh" class="dialog-h" @closed="handleprocesslClose">
<div class="g-main" style="padding: 30px;">
<el-form :inline="true" class="demo-form-inline" style="">
<el-form-item label="审核通过">
<!-- <el-input placeholder="" v-model="name" style="width: 200px" clearable>
</el-input> -->
<el-select v-model="processTable.attendFlag" placeholder="请选择" style="width: 200px">
<el-option v-for="item in processList" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
<br>
<el-form-item label="不通过原因">
<el-input type="textarea" autosize placeholder="请输入内容" v-model="processTable.auditVolunteerReason" :autosize="6">
</el-input>
</el-form-item>
</el-form>
<div class="flex flex-center1 flex-center2">
<el-button type="info" @click="handleComfirm"> </el-button>
</div>
</div>
</el-dialog>
<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">
@ -60,7 +71,7 @@
</div>
</div>
</div>
</div>
</template>
<script>
import { requestPost,requestGet } from "@/js/dai/request";
@ -69,6 +80,21 @@ export default {
name: "see",
data() {
return {
processTable:{
id:"",
attendFlag :"",
auditVolunteerReason:""
},
processList:[{
label:"通过",
value:1
},
{
label:"不通过",
value:2
}
],
showprocess:false,
name:"",
mobile:"",
total:0,
@ -77,6 +103,7 @@ export default {
formData:[],
pageNo: 1,
pageSize:20,
reviewData:{}
};
},
props:{
@ -86,6 +113,36 @@ export default {
}
},
methods: {
///
handleComfirm(){
const url = "/voluntary/activityApply/updateApplyStatus";
let params = {
id:this.reviewData.id,
attendFlag:this.processTable.attendFlag,
auditVolunteerReason:this.processTable.auditVolunteerReason
}
requestPost(url, params).then((res) => {
if (res.code == 0) {
this.showprocess = false
} else {
this.$message.error(res.msg);
}
});
},
//
handleprocesslClose() {
this.showprocess = false
this.getTableData()
},
handleDetail(row){
this.reviewData={}
this.reviewData=row
this.showprocess=true
console.log(row,"sd;lgj");
},
//
handleSearch(){
console.log("this.long");

4
src/views/modules/volunteer/activityArchive/index.vue

@ -127,10 +127,10 @@
<Points v-if="HandlePointsshow" :list="fmData" />
</el-dialog>
<el-dialog :visible.sync="ActivityCountshow" :close-on-click-modal="false" :close-on-press-escape="false"
title="报名管理" width="750" top="10vh" class="dialog-h" @closed="diaClose">
title="报名管理" width="1000" top="10vh" class="dialog-h" @closed="diaClose">
<ActivityCountshow v-if="ActivityCountshow" :list="fmData" />
</el-dialog>
<el-dialog :visible.sync="showprocess" :close-on-click-modal="false" :close-on-press-escape="false" title="审核"
<el-dialog :modal="false" :visible.sync="showprocess" :close-on-click-modal="false" :close-on-press-escape="false" title="审核"
width="750px" top="10vh" class="dialog-h" @closed="handleprocesslClose">
<process v-if="showprocess" @handleprocesslClose="handleprocesslClose" :VolunteerList="EditList"/>
</el-dialog>

Loading…
Cancel
Save