elink-star
/
esua-epdc-admin
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改获取党委

master
qushutong 6 years ago
parent
956fa02fe6
commit
cba8a8d4d8
22 changed files with 847 additions and 491 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. 1
      src/i18n/en-US.js
  2. 1
      src/i18n/zh-CN.js
  3. 167
      src/views/modules/events/issue-change.vue
  4. 167
      src/views/modules/events/issue-close.vue
  5. 176
      src/views/modules/events/issue-process.vue
  6. 142
      src/views/modules/events/issue-reject.vue
  7. 142
      src/views/modules/events/issue-review.vue
  8. 167
      src/views/modules/events/item-close.vue
  9. 172
      src/views/modules/events/item-deal.vue
  10. 157
      src/views/modules/events/item-end.vue
  11. 2
      src/views/modules/news/banner-add-or-update.vue
  12. 2
      src/views/modules/news/news-add-or-update.vue
  13. 2
      src/views/modules/news/news-publish.vue
  14. 2
      src/views/modules/news/news.vue
  15. 2
      src/views/modules/news/newsdraft.vue
  16. 2
      src/views/modules/news/notice-add-or-update.vue
  17. 7
      src/views/modules/sys/dept-add-or-update.vue
  18. 2
      src/views/modules/sys/deptmacode.vue
  19. 2
      src/views/modules/user/partymembers-add-or-update.vue
  20. 2
      src/views/modules/user/partymembers.vue
  21. 2
      src/views/modules/user/user.vue
  22. 19
      src/views/pages/login.vue

1
src/i18n/en-US.js
View File

@ -270,6 +270,7 @@ t.oss.localPathTips = 'eg: D:/upload'
t.dept = {} t.dept = {}
t.dept.name = 'Name' t.dept.name = 'Name'
t.dept.partyCode = 'partyCode'
t.dept.parentName = 'Superior' t.dept.parentName = 'Superior'
t.dept.sort = 'Sort' t.dept.sort = 'Sort'
t.dept.parentNameDefault = 'Top Department' t.dept.parentNameDefault = 'Top Department'

1
src/i18n/zh-CN.js
View File

@ -275,6 +275,7 @@ t.oss.localPathTips = '如：D:/upload'
t.dept = {} t.dept = {}
t.dept.name = '名称' t.dept.name = '名称'
t.dept.partyCode = '编码'
t.dept.parentName = '上级部门' t.dept.parentName = '上级部门'
t.dept.sort = '排序' t.dept.sort = '排序'
t.dept.parentNameDefault = '一级部门' t.dept.parentNameDefault = '一级部门'

167
src/views/modules/events/issue-change.vue
View File

@ -1,87 +1,132 @@
<template> <template>
<el-card shadow="never" class="aui-card--fill"> <el-card shadow="never"
class="aui-card--fill">
<div class="mod-demo__epdcevents}"> <div class="mod-demo__epdcevents}">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()"> <el-form :inline="true"
:model="dataForm"
@keyup.enter.native="getDataList()">
<el-form-item label="街道"> <el-form-item label="街道">
<el-select v-model="dataForm.streetId" placeholder="请选择" @change="getCommunityList"> <el-select v-model="dataForm.streetId"
<el-option placeholder="请选择"
v-for="item in streetOptions" @change="getCommunityList">
:key="item.id" <el-option v-for="item in streetOptions"
:label="item.name" :key="item.id"
:value="item.id"> :label="item.name"
:value="item.id">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="社区"> <el-form-item label="社区">
<el-select v-model="dataForm.communityId" placeholder="请选择" @change="getGridList"> <el-select v-model="dataForm.communityId"
<el-option placeholder="请选择"
v-for="item in communityOptions" @change="getGridList">
:key="item.id" <el-option v-for="item in communityOptions"
:label="item.name" :key="item.id"
:value="item.id"> :label="item.name"
:value="item.id">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="网格"> <el-form-item label="网格">
<el-select v-model="dataForm.gridId" placeholder="请选择"> <el-select v-model="dataForm.gridId"
<el-option placeholder="请选择">
v-for="item in gridOptions" <el-option v-for="item in gridOptions"
:key="item.id" :key="item.id"
:label="item.name" :label="item.name"
:value="item.id"> :value="item.id">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="时间" prop="startTime"> <el-form-item label="时间"
<el-date-picker prop="startTime">
v-model="dataForm.startTime" <el-date-picker v-model="dataForm.startTime"
type="date" type="date"
:picker-options="pickerBeginDateBefore" :picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
format="yyyy-MM-dd" format="yyyy-MM-dd"
placeholder="选择日期时间"> placeholder="选择日期时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="至" label-width = "25px" prop="endTime"> <el-form-item label="至"
<el-date-picker label-width="25px"
v-model="dataForm.endTime" prop="endTime">
type="date" <el-date-picker v-model="dataForm.endTime"
:picker-options="pickerBeginDateAfter" type="date"
value-format="yyyy-MM-dd" :picker-options="pickerBeginDateAfter"
format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="选择日期时间"> format="yyyy-MM-dd"
placeholder="选择日期时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button> <el-button @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;"> <el-table v-loading="dataListLoading"
<el-table-column label="序号" type="index" show-overflow-tooltip width="50" ></el-table-column> :data="dataList"
<el-table-column prop="issueContent" label="议题内容" header-align="center" align="center"></el-table-column> border
<el-table-column prop="createdTime" label="提交时间" header-align="center" align="center"></el-table-column> @selection-change="dataListSelectionChangeHandle"
<el-table-column prop="nickName" label="提交人" header-align="center" align="center"></el-table-column> style="width: 100%;">
<el-table-column prop="participateNum" label="参与人数" header-align="center" align="center"></el-table-column> <el-table-column label="序号"
<el-table-column prop="approveNum" label="支持人数" header-align="center" align="center"></el-table-column> type="index"
<el-table-column prop="opposeNum" label="反对人数" header-align="center" align="center"></el-table-column> show-overflow-tooltip
<el-table-column prop="commentNum" label="评论数" header-align="center" align="center"></el-table-column> width="50"></el-table-column>
<el-table-column prop="browseNum" label="浏览数" header-align="center" align="center"></el-table-column> <el-table-column prop="issueContent"
<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150"> label="议题内容"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="createdTime"
label="提交时间"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="nickName"
label="提交人"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="participateNum"
label="参与人数"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="approveNum"
label="支持人数"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="opposeNum"
label="反对人数"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="commentNum"
label="评论数"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="browseNum"
label="浏览数"
header-align="center"
align="center"></el-table-column>
<el-table-column :label="$t('handle')"
fixed="right"
header-align="center"
align="center"
width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="$hasPermission('events:change:look')" type="text" size="small" @click="detailAction(scope.row.id)">{{ $t('look') }}</el-button> <el-button v-if="$hasPermission('events:change:look')"
type="text"
size="small"
@click="detailAction(scope.row.id)">{{ $t('look') }}</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination <el-pagination :current-page="page"
:current-page="page" :page-sizes="[10, 20, 50, 100]"
:page-sizes="[10, 20, 50, 100]" :page-size="limit"
:page-size="limit" :total="total"
:total="total" layout="total, sizes, prev, pager, next, jumper"
layout="total, sizes, prev, pager, next, jumper" @size-change="pageSizeChangeHandle"
@size-change="pageSizeChangeHandle" @current-change="pageCurrentChangeHandle">
@current-change="pageCurrentChangeHandle">
</el-pagination> </el-pagination>
<detail v-if="detailVisible" ref="detail" @refreshDataList="getDataList"></detail> <detail v-if="detailVisible"
ref="detail"
@refreshDataList="getDataList"></detail>
</div> </div>
</el-card> </el-card>
</template> </template>
@ -142,12 +187,12 @@ export default {
}) })
}, },
getStreetList () { getStreetList () {
this.$http.get(`/sys/dept/sublist/1169154711480528897`).then(({ data: res }) => { this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
this.streetOptions = res.data this.streetOptions = res.data
}).catch(() => {}) }).catch(() => { })
}, },
getCommunityList () { getCommunityList () {
this.dataForm.communityId = '' this.dataForm.communityId = ''
@ -157,7 +202,7 @@ export default {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
this.communityOptions = res.data this.communityOptions = res.data
}).catch(() => {}) }).catch(() => { })
}, },
getGridList () { getGridList () {
this.dataForm.gridId = '' this.dataForm.gridId = ''
@ -166,7 +211,7 @@ export default {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
this.gridOptions = res.data this.gridOptions = res.data
}).catch(() => {}) }).catch(() => { })
} }
} }
} }

167
src/views/modules/events/issue-close.vue
View File

@ -1,88 +1,133 @@
<template> <template>
<el-card shadow="never" class="aui-card--fill"> <el-card shadow="never"
class="aui-card--fill">
<div class="mod-demo__epdcevents}"> <div class="mod-demo__epdcevents}">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()"> <el-form :inline="true"
:model="dataForm"
@keyup.enter.native="getDataList()">
<el-form-item label="街道"> <el-form-item label="街道">
<el-select v-model="dataForm.streetId" placeholder="请选择" @change="getCommunityList"> <el-select v-model="dataForm.streetId"
<el-option placeholder="请选择"
v-for="item in streetOptions" @change="getCommunityList">
:key="item.id" <el-option v-for="item in streetOptions"
:label="item.name" :key="item.id"
:value="item.id"> :label="item.name"
:value="item.id">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="社区"> <el-form-item label="社区">
<el-select v-model="dataForm.communityId" placeholder="请选择" @change="getGridList"> <el-select v-model="dataForm.communityId"
<el-option placeholder="请选择"
v-for="item in communityOptions" @change="getGridList">
:key="item.id" <el-option v-for="item in communityOptions"
:label="item.name" :key="item.id"
:value="item.id"> :label="item.name"
:value="item.id">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="网格"> <el-form-item label="网格">
<el-select v-model="dataForm.gridId" placeholder="请选择"> <el-select v-model="dataForm.gridId"
<el-option placeholder="请选择">
v-for="item in gridOptions" <el-option v-for="item in gridOptions"
:key="item.id" :key="item.id"
:label="item.name" :label="item.name"
:value="item.id"> :value="item.id">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="时间" prop="startTime"> <el-form-item label="时间"
<el-date-picker prop="startTime">
v-model="dataForm.startTime" <el-date-picker v-model="dataForm.startTime"
type="date" type="date"
:picker-options="pickerBeginDateBefore" :picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
format="yyyy-MM-dd" format="yyyy-MM-dd"
placeholder="选择日期时间"> placeholder="选择日期时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="至" label-width = "25px" prop="endTime"> <el-form-item label="至"
<el-date-picker label-width="25px"
v-model="dataForm.endTime" prop="endTime">
type="date" <el-date-picker v-model="dataForm.endTime"
:picker-options="pickerBeginDateAfter" type="date"
value-format="yyyy-MM-dd" :picker-options="pickerBeginDateAfter"
format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="选择日期时间"> format="yyyy-MM-dd"
placeholder="选择日期时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button> <el-button @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;"> <el-table v-loading="dataListLoading"
<el-table-column label="序号" type="index" show-overflow-tooltip width="50" ></el-table-column> :data="dataList"
<el-table-column prop="issueContent" label="议题内容" header-align="center" align="center"></el-table-column> border
<el-table-column prop="createdTime" label="提交时间" header-align="center" align="center"></el-table-column> @selection-change="dataListSelectionChangeHandle"
<el-table-column prop="nickName" label="提交人" header-align="center" align="center"></el-table-column> style="width: 100%;">
<el-table-column prop="participateNum" label="参与人数" header-align="center" align="center"></el-table-column> <el-table-column label="序号"
<el-table-column prop="approveNum" label="支持人数" header-align="center" align="center"></el-table-column> type="index"
<el-table-column prop="opposeNum" label="反对人数" header-align="center" align="center"></el-table-column> show-overflow-tooltip
<el-table-column prop="commentNum" label="评论数" header-align="center" align="center"></el-table-column> width="50"></el-table-column>
<el-table-column prop="browseNum" label="浏览数" header-align="center" align="center"></el-table-column> <el-table-column prop="issueContent"
<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150"> label="议题内容"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="createdTime"
label="提交时间"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="nickName"
label="提交人"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="participateNum"
label="参与人数"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="approveNum"
label="支持人数"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="opposeNum"
label="反对人数"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="commentNum"
label="评论数"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="browseNum"
label="浏览数"
header-align="center"
align="center"></el-table-column>
<el-table-column :label="$t('handle')"
fixed="right"
header-align="center"
align="center"
width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="$hasPermission('events:close:look')" type="text" size="small" @click="detailAction(scope.row.id)">{{ $t('look') }}</el-button> <el-button v-if="$hasPermission('events:close:look')"
type="text"
size="small"
@click="detailAction(scope.row.id)">{{ $t('look') }}</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination <el-pagination :current-page="page"
:current-page="page" :page-sizes="[10, 20, 50, 100]"
:page-sizes="[10, 20, 50, 100]" :page-size="limit"
:page-size="limit" :total="total"
:total="total" layout="total, sizes, prev, pager, next, jumper"
layout="total, sizes, prev, pager, next, jumper" @size-change="pageSizeChangeHandle"
@size-change="pageSizeChangeHandle" @current-change="pageCurrentChangeHandle">
@current-change="pageCurrentChangeHandle">
</el-pagination> </el-pagination>
<!-- 弹窗 --> <!-- 弹窗 -->
<detail v-if="detailVisible" ref="detail" @refreshDataList="getDataList"></detail> <detail v-if="detailVisible"
ref="detail"
@refreshDataList="getDataList"></detail>
</div> </div>
</el-card> </el-card>
</template> </template>
@ -143,12 +188,12 @@ export default {
}) })
}, },
getStreetList () { getStreetList () {
this.$http.get(`/sys/dept/sublist/1169154711480528897`).then(({ data: res }) => { this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
this.streetOptions = res.data this.streetOptions = res.data
}).catch(() => {}) }).catch(() => { })
}, },
getCommunityList () { getCommunityList () {
this.dataForm.communityId = '' this.dataForm.communityId = ''
@ -158,7 +203,7 @@ export default {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
this.communityOptions = res.data this.communityOptions = res.data
}).catch(() => {}) }).catch(() => { })
}, },
getGridList () { getGridList () {
this.dataForm.gridId = '' this.dataForm.gridId = ''
@ -167,7 +212,7 @@ export default {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
this.gridOptions = res.data this.gridOptions = res.data
}).catch(() => {}) }).catch(() => { })
} }
} }
} }

176
src/views/modules/events/issue-process.vue
View File

@ -1,90 +1,140 @@
<template> <template>
<el-card shadow="never" class="aui-card--fill"> <el-card shadow="never"
class="aui-card--fill">
<div class="mod-demo__epdcevents}"> <div class="mod-demo__epdcevents}">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()"> <el-form :inline="true"
:model="dataForm"
@keyup.enter.native="getDataList()">
<el-form-item label="街道"> <el-form-item label="街道">
<el-select v-model="dataForm.streetId" placeholder="请选择" @change="getCommunityList"> <el-select v-model="dataForm.streetId"
<el-option placeholder="请选择"
v-for="item in streetOptions" @change="getCommunityList">
:key="item.id" <el-option v-for="item in streetOptions"
:label="item.name" :key="item.id"
:value="item.id"> :label="item.name"
:value="item.id">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="社区"> <el-form-item label="社区">
<el-select v-model="dataForm.communityId" placeholder="请选择" @change="getGridList"> <el-select v-model="dataForm.communityId"
<el-option placeholder="请选择"
v-for="item in communityOptions" @change="getGridList">
:key="item.id" <el-option v-for="item in communityOptions"
:label="item.name" :key="item.id"
:value="item.id"> :label="item.name"
:value="item.id">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="网格"> <el-form-item label="网格">
<el-select v-model="dataForm.gridId" placeholder="请选择"> <el-select v-model="dataForm.gridId"
<el-option placeholder="请选择">
v-for="item in gridOptions" <el-option v-for="item in gridOptions"
:key="item.id" :key="item.id"
:label="item.name" :label="item.name"
:value="item.id"> :value="item.id">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="时间" prop="startTime"> <el-form-item label="时间"
<el-date-picker prop="startTime">
v-model="dataForm.startTime" <el-date-picker v-model="dataForm.startTime"
type="date" type="date"
:picker-options="pickerBeginDateBefore" :picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
format="yyyy-MM-dd" format="yyyy-MM-dd"
placeholder="选择日期时间"> placeholder="选择日期时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="至" label-width = "25px" prop="endTime"> <el-form-item label="至"
<el-date-picker label-width="25px"
v-model="dataForm.endTime" prop="endTime">
type="date" <el-date-picker v-model="dataForm.endTime"
:picker-options="pickerBeginDateAfter" type="date"
value-format="yyyy-MM-dd" :picker-options="pickerBeginDateAfter"
format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="选择日期时间"> format="yyyy-MM-dd"
placeholder="选择日期时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button> <el-button @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;"> <el-table v-loading="dataListLoading"
<el-table-column label="序号" type="index" show-overflow-tooltip width="50" ></el-table-column> :data="dataList"
<el-table-column prop="issueContent" label="议题内容" header-align="center" align="center"></el-table-column> border
<el-table-column prop="createdTime" label="提交时间" header-align="center" align="center"></el-table-column> @selection-change="dataListSelectionChangeHandle"
<el-table-column prop="nickName" label="提交人" header-align="center" align="center"></el-table-column> style="width: 100%;">
<el-table-column prop="participateNum" label="参与人数" header-align="center" align="center"></el-table-column> <el-table-column label="序号"
<el-table-column prop="approveNum" label="支持人数" header-align="center" align="center"></el-table-column> type="index"
<el-table-column prop="opposeNum" label="反对人数" header-align="center" align="center"></el-table-column> show-overflow-tooltip
<el-table-column prop="commentNum" label="评论数" header-align="center" align="center"></el-table-column> width="50"></el-table-column>
<el-table-column prop="browseNum" label="浏览数" header-align="center" align="center"></el-table-column> <el-table-column prop="issueContent"
<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150"> label="议题内容"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="createdTime"
label="提交时间"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="nickName"
label="提交人"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="participateNum"
label="参与人数"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="approveNum"
label="支持人数"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="opposeNum"
label="反对人数"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="commentNum"
label="评论数"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="browseNum"
label="浏览数"
header-align="center"
align="center"></el-table-column>
<el-table-column :label="$t('handle')"
fixed="right"
header-align="center"
align="center"
width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="$hasPermission('events:issue:look')" type="text" size="small" @click="detailAction(scope.row.id)">{{ $t('look') }}</el-button> <el-button v-if="$hasPermission('events:issue:look')"
<el-button v-if="$hasPermission('events:issue:deal')" type="text" size="small" @click="dealAction(scope.row.id)">{{ $t('deal') }}</el-button> type="text"
size="small"
@click="detailAction(scope.row.id)">{{ $t('look') }}</el-button>
<el-button v-if="$hasPermission('events:issue:deal')"
type="text"
size="small"
@click="dealAction(scope.row.id)">{{ $t('deal') }}</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination <el-pagination :current-page="page"
:current-page="page" :page-sizes="[10, 20, 50, 100]"
:page-sizes="[10, 20, 50, 100]" :page-size="limit"
:page-size="limit" :total="total"
:total="total" layout="total, sizes, prev, pager, next, jumper"
layout="total, sizes, prev, pager, next, jumper" @size-change="pageSizeChangeHandle"
@size-change="pageSizeChangeHandle" @current-change="pageCurrentChangeHandle">
@current-change="pageCurrentChangeHandle">
</el-pagination> </el-pagination>
<!-- 弹窗, 新增 / 修改 --> <!-- 弹窗, 新增 / 修改 -->
<process-deal v-if="processDealVisible" ref="processDeal" @refreshDataList="getDataList"></process-deal> <process-deal v-if="processDealVisible"
<detail v-if="detailVisible" ref="detail" @refreshDataList="getDataList"></detail> ref="processDeal"
@refreshDataList="getDataList"></process-deal>
<detail v-if="detailVisible"
ref="detail"
@refreshDataList="getDataList"></detail>
</div> </div>
</el-card> </el-card>
</template> </template>
@ -155,12 +205,12 @@ export default {
}) })
}, },
getStreetList () { getStreetList () {
this.$http.get(`/sys/dept/sublist/1169154711480528897`).then(({ data: res }) => { this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
this.streetOptions = res.data this.streetOptions = res.data
}).catch(() => {}) }).catch(() => { })
}, },
getCommunityList () { getCommunityList () {
this.dataForm.communityId = '' this.dataForm.communityId = ''
@ -170,7 +220,7 @@ export default {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
this.communityOptions = res.data this.communityOptions = res.data
}).catch(() => {}) }).catch(() => { })
}, },
getGridList () { getGridList () {
this.dataForm.gridId = '' this.dataForm.gridId = ''
@ -179,7 +229,7 @@ export default {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
this.gridOptions = res.data this.gridOptions = res.data
}).catch(() => {}) }).catch(() => { })
} }
} }
} }

142
src/views/modules/events/issue-reject.vue
View File

@ -1,83 +1,113 @@
<template> <template>
<el-card shadow="never" class="aui-card--fill"> <el-card shadow="never"
class="aui-card--fill">
<div class="mod-demo__epdcevents}"> <div class="mod-demo__epdcevents}">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()"> <el-form :inline="true"
:model="dataForm"
@keyup.enter.native="getDataList()">
<el-form-item label="街道"> <el-form-item label="街道">
<el-select v-model="dataForm.streetId" placeholder="请选择" @change="getCommunityList"> <el-select v-model="dataForm.streetId"
<el-option placeholder="请选择"
v-for="item in streetOptions" @change="getCommunityList">
:key="item.id" <el-option v-for="item in streetOptions"
:label="item.name" :key="item.id"
:value="item.id"> :label="item.name"
:value="item.id">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="社区"> <el-form-item label="社区">
<el-select v-model="dataForm.communityId" placeholder="请选择" @change="getGridList"> <el-select v-model="dataForm.communityId"
<el-option placeholder="请选择"
v-for="item in communityOptions" @change="getGridList">
:key="item.id" <el-option v-for="item in communityOptions"
:label="item.name" :key="item.id"
:value="item.id"> :label="item.name"
:value="item.id">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="网格"> <el-form-item label="网格">
<el-select v-model="dataForm.gridId" placeholder="请选择"> <el-select v-model="dataForm.gridId"
<el-option placeholder="请选择">
v-for="item in gridOptions" <el-option v-for="item in gridOptions"
:key="item.id" :key="item.id"
:label="item.name" :label="item.name"
:value="item.id"> :value="item.id">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="时间" prop="startTime"> <el-form-item label="时间"
<el-date-picker prop="startTime">
v-model="dataForm.startTime" <el-date-picker v-model="dataForm.startTime"
type="date" type="date"
:picker-options="pickerBeginDateBefore" :picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
format="yyyy-MM-dd" format="yyyy-MM-dd"
placeholder="选择日期时间"> placeholder="选择日期时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="至" label-width = "25px" prop="endTime"> <el-form-item label="至"
<el-date-picker label-width="25px"
v-model="dataForm.endTime" prop="endTime">
type="date" <el-date-picker v-model="dataForm.endTime"
:picker-options="pickerBeginDateAfter" type="date"
value-format="yyyy-MM-dd" :picker-options="pickerBeginDateAfter"
format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="选择日期时间"> format="yyyy-MM-dd"
placeholder="选择日期时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button> <el-button @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;"> <el-table v-loading="dataListLoading"
<el-table-column label="序号" type="index" show-overflow-tooltip width="50" ></el-table-column> :data="dataList"
<el-table-column prop="eventContent" label="议题内容" header-align="center" align="center"></el-table-column> border
<el-table-column prop="createdTime" label="提交时间" header-align="center" align="center"></el-table-column> @selection-change="dataListSelectionChangeHandle"
<el-table-column prop="nickName" label="提交人" header-align="center" align="center"></el-table-column> style="width: 100%;">
<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150"> <el-table-column label="序号"
type="index"
show-overflow-tooltip
width="50"></el-table-column>
<el-table-column prop="eventContent"
label="议题内容"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="createdTime"
label="提交时间"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="nickName"
label="提交人"
header-align="center"
align="center"></el-table-column>
<el-table-column :label="$t('handle')"
fixed="right"
header-align="center"
align="center"
width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="$hasPermission('events:reject:look')" type="text" size="small" @click="detailAction(scope.row.id)">{{ $t('look') }}</el-button> <el-button v-if="$hasPermission('events:reject:look')"
type="text"
size="small"
@click="detailAction(scope.row.id)">{{ $t('look') }}</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination <el-pagination :current-page="page"
:current-page="page" :page-sizes="[10, 20, 50, 100]"
:page-sizes="[10, 20, 50, 100]" :page-size="limit"
:page-size="limit" :total="total"
:total="total" layout="total, sizes, prev, pager, next, jumper"
layout="total, sizes, prev, pager, next, jumper" @size-change="pageSizeChangeHandle"
@size-change="pageSizeChangeHandle" @current-change="pageCurrentChangeHandle">
@current-change="pageCurrentChangeHandle">
</el-pagination> </el-pagination>
<!-- 弹窗, 新增 / 修改 --> <!-- 弹窗, 新增 / 修改 -->
<reject-detail v-if="rejectDetailVisible" ref="rejectDetail" @refreshDataList="getDataList"></reject-detail> <reject-detail v-if="rejectDetailVisible"
ref="rejectDetail"
@refreshDataList="getDataList"></reject-detail>
</div> </div>
</el-card> </el-card>
</template> </template>
@ -139,12 +169,12 @@ export default {
}) })
}, },
getStreetList () { getStreetList () {
this.$http.get(`/sys/dept/sublist/1169154711480528897`).then(({ data: res }) => { this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
this.streetOptions = res.data this.streetOptions = res.data
}).catch(() => {}) }).catch(() => { })
}, },
getCommunityList () { getCommunityList () {
this.dataForm.communityId = '' this.dataForm.communityId = ''
@ -154,7 +184,7 @@ export default {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
this.communityOptions = res.data this.communityOptions = res.data
}).catch(() => {}) }).catch(() => { })
}, },
getGridList () { getGridList () {
this.dataForm.gridId = '' this.dataForm.gridId = ''
@ -163,7 +193,7 @@ export default {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
this.gridOptions = res.data this.gridOptions = res.data
}).catch(() => {}) }).catch(() => { })
} }
} }
} }

142
src/views/modules/events/issue-review.vue
View File

@ -1,83 +1,113 @@
<template> <template>
<el-card shadow="never" class="aui-card--fill"> <el-card shadow="never"
class="aui-card--fill">
<div class="mod-demo__epdcevents}"> <div class="mod-demo__epdcevents}">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()"> <el-form :inline="true"
:model="dataForm"
@keyup.enter.native="getDataList()">
<el-form-item label="街道"> <el-form-item label="街道">
<el-select v-model="dataForm.streetId" placeholder="请选择" @change="getCommunityList"> <el-select v-model="dataForm.streetId"
<el-option placeholder="请选择"
v-for="item in streetOptions" @change="getCommunityList">
:key="item.id" <el-option v-for="item in streetOptions"
:label="item.name" :key="item.id"
:value="item.id"> :label="item.name"
:value="item.id">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="社区"> <el-form-item label="社区">
<el-select v-model="dataForm.communityId" placeholder="请选择" @change="getGridList"> <el-select v-model="dataForm.communityId"
<el-option placeholder="请选择"
v-for="item in communityOptions" @change="getGridList">
:key="item.id" <el-option v-for="item in communityOptions"
:label="item.name" :key="item.id"
:value="item.id"> :label="item.name"
:value="item.id">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="网格"> <el-form-item label="网格">
<el-select v-model="dataForm.gridId" placeholder="请选择"> <el-select v-model="dataForm.gridId"
<el-option placeholder="请选择">
v-for="item in gridOptions" <el-option v-for="item in gridOptions"
:key="item.id" :key="item.id"
:label="item.name" :label="item.name"
:value="item.id"> :value="item.id">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="时间" prop="startTime"> <el-form-item label="时间"
<el-date-picker prop="startTime">
v-model="dataForm.startTime" <el-date-picker v-model="dataForm.startTime"
type="date" type="date"
:picker-options="pickerBeginDateBefore" :picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
format="yyyy-MM-dd" format="yyyy-MM-dd"
placeholder="选择日期时间"> placeholder="选择日期时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="至" label-width = "25px" prop="endTime"> <el-form-item label="至"
<el-date-picker label-width="25px"
v-model="dataForm.endTime" prop="endTime">
type="date" <el-date-picker v-model="dataForm.endTime"
:picker-options="pickerBeginDateAfter" type="date"
value-format="yyyy-MM-dd" :picker-options="pickerBeginDateAfter"
format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="选择日期时间"> format="yyyy-MM-dd"
placeholder="选择日期时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button> <el-button @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;"> <el-table v-loading="dataListLoading"
<el-table-column label="序号" type="index" show-overflow-tooltip width="50" ></el-table-column> :data="dataList"
<el-table-column prop="eventContent" label="议题内容" header-align="center" align="center"></el-table-column> border
<el-table-column prop="createdTime" label="提交时间" header-align="center" align="center"></el-table-column> @selection-change="dataListSelectionChangeHandle"
<el-table-column prop="nickName" label="提交人" header-align="center" align="center"></el-table-column> style="width: 100%;">
<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150"> <el-table-column label="序号"
type="index"
show-overflow-tooltip
width="50"></el-table-column>
<el-table-column prop="eventContent"
label="议题内容"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="createdTime"
label="提交时间"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="nickName"
label="提交人"
header-align="center"
align="center"></el-table-column>
<el-table-column :label="$t('handle')"
fixed="right"
header-align="center"
align="center"
width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="$hasPermission('events:epdcevents:verify')" type="text" size="small" @click="detailAction(scope.row.id)">{{ $t('verify') }}</el-button> <el-button v-if="$hasPermission('events:epdcevents:verify')"
type="text"
size="small"
@click="detailAction(scope.row.id)">{{ $t('verify') }}</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination <el-pagination :current-page="page"
:current-page="page" :page-sizes="[10, 20, 50, 100]"
:page-sizes="[10, 20, 50, 100]" :page-size="limit"
:page-size="limit" :total="total"
:total="total" layout="total, sizes, prev, pager, next, jumper"
layout="total, sizes, prev, pager, next, jumper" @size-change="pageSizeChangeHandle"
@size-change="pageSizeChangeHandle" @current-change="pageCurrentChangeHandle">
@current-change="pageCurrentChangeHandle">
</el-pagination> </el-pagination>
<!-- 弹窗, 新增 / 修改 --> <!-- 弹窗, 新增 / 修改 -->
<review-detail v-if="reviewDetailVisible" ref="reviewDetail" @refreshDataList="getDataList"></review-detail> <review-detail v-if="reviewDetailVisible"
ref="reviewDetail"
@refreshDataList="getDataList"></review-detail>
</div> </div>
</el-card> </el-card>
</template> </template>
@ -139,12 +169,12 @@ export default {
}) })
}, },
getStreetList () { getStreetList () {
this.$http.get(`/sys/dept/sublist/1169154711480528897`).then(({ data: res }) => { this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
this.streetOptions = res.data this.streetOptions = res.data
}).catch(() => {}) }).catch(() => { })
}, },
getCommunityList () { getCommunityList () {
this.dataForm.communityId = '' this.dataForm.communityId = ''
@ -154,7 +184,7 @@ export default {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
this.communityOptions = res.data this.communityOptions = res.data
}).catch(() => {}) }).catch(() => { })
}, },
getGridList () { getGridList () {
this.dataForm.gridId = '' this.dataForm.gridId = ''
@ -163,7 +193,7 @@ export default {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
this.gridOptions = res.data this.gridOptions = res.data
}).catch(() => {}) }).catch(() => { })
} }
} }
} }

167
src/views/modules/events/item-close.vue
View File

@ -1,87 +1,132 @@
<template> <template>
<el-card shadow="never" class="aui-card--fill"> <el-card shadow="never"
class="aui-card--fill">
<div class="mod-item__item}"> <div class="mod-item__item}">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()"> <el-form :inline="true"
:model="dataForm"
@keyup.enter.native="getDataList()">
<el-form-item label="街道"> <el-form-item label="街道">
<el-select v-model="dataForm.streetId" placeholder="请选择" @change="getCommunityList"> <el-select v-model="dataForm.streetId"
<el-option placeholder="请选择"
v-for="item in streetOptions" @change="getCommunityList">
:key="item.id" <el-option v-for="item in streetOptions"
:label="item.name" :key="item.id"
:value="item.id"> :label="item.name"
:value="item.id">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="社区"> <el-form-item label="社区">
<el-select v-model="dataForm.communityId" placeholder="请选择" @change="getGridList"> <el-select v-model="dataForm.communityId"
<el-option placeholder="请选择"
v-for="item in communityOptions" @change="getGridList">
:key="item.id" <el-option v-for="item in communityOptions"
:label="item.name" :key="item.id"
:value="item.id"> :label="item.name"
:value="item.id">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="网格"> <el-form-item label="网格">
<el-select v-model="dataForm.gridId" placeholder="请选择"> <el-select v-model="dataForm.gridId"
<el-option placeholder="请选择">
v-for="item in gridOptions" <el-option v-for="item in gridOptions"
:key="item.id" :key="item.id"
:label="item.name" :label="item.name"
:value="item.id"> :value="item.id">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="时间" prop="startTime"> <el-form-item label="时间"
<el-date-picker prop="startTime">
v-model="dataForm.startTime" <el-date-picker v-model="dataForm.startTime"
type="date" type="date"
:picker-options="pickerBeginDateBefore" :picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
format="yyyy-MM-dd" format="yyyy-MM-dd"
placeholder="选择日期时间"> placeholder="选择日期时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="至" label-width = "25px" prop="endTime"> <el-form-item label="至"
<el-date-picker label-width="25px"
v-model="dataForm.endTime" prop="endTime">
type="date" <el-date-picker v-model="dataForm.endTime"
:picker-options="pickerBeginDateAfter" type="date"
value-format="yyyy-MM-dd" :picker-options="pickerBeginDateAfter"
format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="选择日期时间"> format="yyyy-MM-dd"
placeholder="选择日期时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button> <el-button @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;"> <el-table v-loading="dataListLoading"
<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column> :data="dataList"
<el-table-column prop="itemContent" label="项目内容" header-align="center" align="center"></el-table-column> border
<el-table-column prop="createdTime" label="转成项目时间" header-align="center" align="center"></el-table-column> @selection-change="dataListSelectionChangeHandle"
<el-table-column prop="nickName" label="提交人" header-align="center" align="center"></el-table-column> style="width: 100%;">
<el-table-column prop="participantsNum" label="参与人数" header-align="center" align="center"></el-table-column> <el-table-column type="selection"
<el-table-column prop="approveNum" label="支持" header-align="center" align="center"></el-table-column> header-align="center"
<el-table-column prop="opposeNum" label="反对" header-align="center" align="center"></el-table-column> align="center"
<el-table-column prop="commentNum" label="评论数" header-align="center" align="center"></el-table-column> width="50"></el-table-column>
<el-table-column prop="browseNum" label="浏览数" header-align="center" align="center"></el-table-column> <el-table-column prop="itemContent"
<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150"> label="项目内容"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="createdTime"
label="转成项目时间"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="nickName"
label="提交人"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="participantsNum"
label="参与人数"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="approveNum"
label="支持"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="opposeNum"
label="反对"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="commentNum"
label="评论数"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="browseNum"
label="浏览数"
header-align="center"
align="center"></el-table-column>
<el-table-column :label="$t('handle')"
fixed="right"
header-align="center"
align="center"
width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="$hasPermission('events:item:look')" type="text" size="small" @click="detailAction(scope.row.id)">{{ $t('look') }}</el-button> <el-button v-if="$hasPermission('events:item:look')"
type="text"
size="small"
@click="detailAction(scope.row.id)">{{ $t('look') }}</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination <el-pagination :current-page="page"
:current-page="page" :page-sizes="[10, 20, 50, 100]"
:page-sizes="[10, 20, 50, 100]" :page-size="limit"
:page-size="limit" :total="total"
:total="total" layout="total, sizes, prev, pager, next, jumper"
layout="total, sizes, prev, pager, next, jumper" @size-change="pageSizeChangeHandle"
@size-change="pageSizeChangeHandle" @current-change="pageCurrentChangeHandle">
@current-change="pageCurrentChangeHandle">
</el-pagination> </el-pagination>
<detail v-if="detailVisible" ref="detailRef" @refreshDataList="getDataList"></detail> <detail v-if="detailVisible"
ref="detailRef"
@refreshDataList="getDataList"></detail>
</div> </div>
</el-card> </el-card>
</template> </template>
@ -143,12 +188,12 @@ export default {
}) })
}, },
getStreetList () { getStreetList () {
this.$http.get(`/sys/dept/sublist/1169154711480528897`).then(({ data: res }) => { this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
this.streetOptions = res.data this.streetOptions = res.data
}).catch(() => {}) }).catch(() => { })
}, },
getCommunityList () { getCommunityList () {
this.dataForm.communityId = '' this.dataForm.communityId = ''
@ -158,7 +203,7 @@ export default {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
this.communityOptions = res.data this.communityOptions = res.data
}).catch(() => {}) }).catch(() => { })
}, },
getGridList () { getGridList () {
this.dataForm.gridId = '' this.dataForm.gridId = ''
@ -167,7 +212,7 @@ export default {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
this.gridOptions = res.data this.gridOptions = res.data
}).catch(() => {}) }).catch(() => { })
} }
} }
} }

172
src/views/modules/events/item-deal.vue
View File

@ -1,89 +1,137 @@
<template> <template>
<el-card shadow="never" class="aui-card--fill"> <el-card shadow="never"
class="aui-card--fill">
<div class="mod-item__item}"> <div class="mod-item__item}">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()"> <el-form :inline="true"
:model="dataForm"
@keyup.enter.native="getDataList()">
<el-form-item label="街道"> <el-form-item label="街道">
<el-select v-model="dataForm.streetId" placeholder="请选择" @change="getCommunityList"> <el-select v-model="dataForm.streetId"
<el-option placeholder="请选择"
v-for="item in streetOptions" @change="getCommunityList">
:key="item.id" <el-option v-for="item in streetOptions"
:label="item.name" :key="item.id"
:value="item.id"> :label="item.name"
:value="item.id">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="社区"> <el-form-item label="社区">
<el-select v-model="dataForm.communityId" placeholder="请选择" @change="getGridList"> <el-select v-model="dataForm.communityId"
<el-option placeholder="请选择"
v-for="item in communityOptions" @change="getGridList">
:key="item.id" <el-option v-for="item in communityOptions"
:label="item.name" :key="item.id"
:value="item.id"> :label="item.name"
:value="item.id">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="网格"> <el-form-item label="网格">
<el-select v-model="dataForm.gridId" placeholder="请选择"> <el-select v-model="dataForm.gridId"
<el-option placeholder="请选择">
v-for="item in gridOptions" <el-option v-for="item in gridOptions"
:key="item.id" :key="item.id"
:label="item.name" :label="item.name"
:value="item.id"> :value="item.id">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="时间" prop="startTime"> <el-form-item label="时间"
<el-date-picker prop="startTime">
v-model="dataForm.startTime" <el-date-picker v-model="dataForm.startTime"
type="date" type="date"
:picker-options="pickerBeginDateBefore" :picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
format="yyyy-MM-dd" format="yyyy-MM-dd"
placeholder="选择日期时间"> placeholder="选择日期时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="至" label-width = "25px" prop="endTime"> <el-form-item label="至"
<el-date-picker label-width="25px"
v-model="dataForm.endTime" prop="endTime">
type="date" <el-date-picker v-model="dataForm.endTime"
:picker-options="pickerBeginDateAfter" type="date"
value-format="yyyy-MM-dd" :picker-options="pickerBeginDateAfter"
format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="选择日期时间"> format="yyyy-MM-dd"
placeholder="选择日期时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button> <el-button @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;"> <el-table v-loading="dataListLoading"
<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column> :data="dataList"
<el-table-column label="序号" type="index" show-overflow-tooltip width="50" ></el-table-column> border
<el-table-column prop="itemContent" label="项目内容" header-align="center" align="center"></el-table-column> @selection-change="dataListSelectionChangeHandle"
<el-table-column prop="createdTime" label="转成项目时间" header-align="center" align="center"></el-table-column> style="width: 100%;">
<el-table-column prop="nickName" label="提交人" header-align="center" align="center"></el-table-column> <el-table-column type="selection"
<el-table-column prop="participantsNum" label="参与人数" header-align="center" align="center"></el-table-column> header-align="center"
<el-table-column prop="approveNum" label="支持" header-align="center" align="center"></el-table-column> align="center"
<el-table-column prop="opposeNum" label="反对" header-align="center" align="center"></el-table-column> width="50"></el-table-column>
<el-table-column prop="commentNum" label="评论数" header-align="center" align="center"></el-table-column> <el-table-column label="序号"
<el-table-column prop="browseNum" label="浏览数" header-align="center" align="center"></el-table-column> type="index"
<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150"> show-overflow-tooltip
width="50"></el-table-column>
<el-table-column prop="itemContent"
label="项目内容"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="createdTime"
label="转成项目时间"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="nickName"
label="提交人"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="participantsNum"
label="参与人数"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="approveNum"
label="支持"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="opposeNum"
label="反对"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="commentNum"
label="评论数"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="browseNum"
label="浏览数"
header-align="center"
align="center"></el-table-column>
<el-table-column :label="$t('handle')"
fixed="right"
header-align="center"
align="center"
width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="$hasPermission('events:item:deal')" type="text" size="small" @click="dealAction(scope.row.id)">{{ $t('deal') }}</el-button> <el-button v-if="$hasPermission('events:item:deal')"
type="text"
size="small"
@click="dealAction(scope.row.id)">{{ $t('deal') }}</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination <el-pagination :current-page="page"
:current-page="page" :page-sizes="[10, 20, 50, 100]"
:page-sizes="[10, 20, 50, 100]" :page-size="limit"
:page-size="limit" :total="total"
:total="total" layout="total, sizes, prev, pager, next, jumper"
layout="total, sizes, prev, pager, next, jumper" @size-change="pageSizeChangeHandle"
@size-change="pageSizeChangeHandle" @current-change="pageCurrentChangeHandle">
@current-change="pageCurrentChangeHandle">
</el-pagination> </el-pagination>
<!-- 弹窗, 新增 / 修改 --> <!-- 弹窗, 新增 / 修改 -->
<detail v-if="detailVisible" ref="detail" @refreshDataList="getDataList"></detail> <detail v-if="detailVisible"
ref="detail"
@refreshDataList="getDataList"></detail>
</div> </div>
</el-card> </el-card>
</template> </template>
@ -145,12 +193,12 @@ export default {
}) })
}, },
getStreetList () { getStreetList () {
this.$http.get(`/sys/dept/sublist/1169154711480528897`).then(({ data: res }) => { this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
this.streetOptions = res.data this.streetOptions = res.data
}).catch(() => {}) }).catch(() => { })
}, },
getCommunityList () { getCommunityList () {
this.dataForm.communityId = '' this.dataForm.communityId = ''
@ -160,7 +208,7 @@ export default {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
this.communityOptions = res.data this.communityOptions = res.data
}).catch(() => {}) }).catch(() => { })
}, },
getGridList () { getGridList () {
this.dataForm.gridId = '' this.dataForm.gridId = ''
@ -169,7 +217,7 @@ export default {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
this.gridOptions = res.data this.gridOptions = res.data
}).catch(() => {}) }).catch(() => { })
} }
} }
} }

157
src/views/modules/events/item-end.vue
View File

@ -1,81 +1,120 @@
<template> <template>
<el-card shadow="never" class="aui-card--fill"> <el-card shadow="never"
class="aui-card--fill">
<div class="mod-item__item}"> <div class="mod-item__item}">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()"> <el-form :inline="true"
:model="dataForm"
@keyup.enter.native="getDataList()">
<el-form-item label="街道"> <el-form-item label="街道">
<el-select v-model="dataForm.streetId" placeholder="请选择" @change="getCommunityList"> <el-select v-model="dataForm.streetId"
<el-option placeholder="请选择"
v-for="item in streetOptions" @change="getCommunityList">
:key="item.id" <el-option v-for="item in streetOptions"
:label="item.name" :key="item.id"
:value="item.id"> :label="item.name"
:value="item.id">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="社区"> <el-form-item label="社区">
<el-select v-model="dataForm.communityId" placeholder="请选择" @change="getGridList"> <el-select v-model="dataForm.communityId"
<el-option placeholder="请选择"
v-for="item in communityOptions" @change="getGridList">
:key="item.id" <el-option v-for="item in communityOptions"
:label="item.name" :key="item.id"
:value="item.id"> :label="item.name"
:value="item.id">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="网格"> <el-form-item label="网格">
<el-select v-model="dataForm.gridId" placeholder="请选择"> <el-select v-model="dataForm.gridId"
<el-option placeholder="请选择">
v-for="item in gridOptions" <el-option v-for="item in gridOptions"
:key="item.id" :key="item.id"
:label="item.name" :label="item.name"
:value="item.id"> :value="item.id">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="时间" prop="startTime"> <el-form-item label="时间"
<el-date-picker prop="startTime">
v-model="dataForm.startTime" <el-date-picker v-model="dataForm.startTime"
type="date" type="date"
:picker-options="pickerBeginDateBefore" :picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
format="yyyy-MM-dd" format="yyyy-MM-dd"
placeholder="选择日期时间"> placeholder="选择日期时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="至" label-width = "25px" prop="endTime"> <el-form-item label="至"
<el-date-picker label-width="25px"
v-model="dataForm.endTime" prop="endTime">
type="date" <el-date-picker v-model="dataForm.endTime"
:picker-options="pickerBeginDateAfter" type="date"
value-format="yyyy-MM-dd" :picker-options="pickerBeginDateAfter"
format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="选择日期时间"> format="yyyy-MM-dd"
placeholder="选择日期时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button> <el-button @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;"> <el-table v-loading="dataListLoading"
<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column> :data="dataList"
<el-table-column prop="itemContent" label="项目内容" header-align="center" align="center"></el-table-column> border
<el-table-column prop="createdTime" label="转成项目时间" header-align="center" align="center"></el-table-column> @selection-change="dataListSelectionChangeHandle"
<el-table-column prop="nickName" label="提交人" header-align="center" align="center"></el-table-column> style="width: 100%;">
<el-table-column prop="participantsNum" label="参与人数" header-align="center" align="center"></el-table-column> <el-table-column type="selection"
<el-table-column prop="approveNum" label="支持" header-align="center" align="center"></el-table-column> header-align="center"
<el-table-column prop="opposeNum" label="反对" header-align="center" align="center"></el-table-column> align="center"
<el-table-column prop="commentNum" label="评论数" header-align="center" align="center"></el-table-column> width="50"></el-table-column>
<el-table-column prop="browseNum" label="浏览数" header-align="center" align="center"></el-table-column> <el-table-column prop="itemContent"
<el-table-column prop="evaluationScore" label="评价" header-align="center" align="center"></el-table-column> label="项目内容"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="createdTime"
label="转成项目时间"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="nickName"
label="提交人"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="participantsNum"
label="参与人数"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="approveNum"
label="支持"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="opposeNum"
label="反对"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="commentNum"
label="评论数"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="browseNum"
label="浏览数"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="evaluationScore"
label="评价"
header-align="center"
align="center"></el-table-column>
</el-table> </el-table>
<el-pagination <el-pagination :current-page="page"
:current-page="page" :page-sizes="[10, 20, 50, 100]"
:page-sizes="[10, 20, 50, 100]" :page-size="limit"
:page-size="limit" :total="total"
:total="total" layout="total, sizes, prev, pager, next, jumper"
layout="total, sizes, prev, pager, next, jumper" @size-change="pageSizeChangeHandle"
@size-change="pageSizeChangeHandle" @current-change="pageCurrentChangeHandle">
@current-change="pageCurrentChangeHandle">
</el-pagination> </el-pagination>
</div> </div>
</el-card> </el-card>
@ -128,12 +167,12 @@ export default {
}, },
methods: { methods: {
getStreetList () { getStreetList () {
this.$http.get(`/sys/dept/sublist/1169154711480528897`).then(({ data: res }) => { this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
this.streetOptions = res.data this.streetOptions = res.data
}).catch(() => {}) }).catch(() => { })
}, },
getCommunityList () { getCommunityList () {
this.dataForm.communityId = '' this.dataForm.communityId = ''
@ -143,7 +182,7 @@ export default {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
this.communityOptions = res.data this.communityOptions = res.data
}).catch(() => {}) }).catch(() => { })
}, },
getGridList () { getGridList () {
this.dataForm.gridId = '' this.dataForm.gridId = ''
@ -152,7 +191,7 @@ export default {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
this.gridOptions = res.data this.gridOptions = res.data
}).catch(() => {}) }).catch(() => { })
} }
} }
} }

2
src/views/modules/news/banner-add-or-update.vue
View File

@ -151,7 +151,7 @@ export default {
}, },
created () { created () {
// 1169154711480528897 为市北区部门ID // 1169154711480528897 为市北区部门ID
this.getDeptInfoList('street', '1169154711480528897') this.getDeptInfoList('street', localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))
this.getListFromDict('bannerType') this.getListFromDict('bannerType')
this.getListFromDict('bannerPosition') this.getListFromDict('bannerPosition')
}, },

2
src/views/modules/news/news-add-or-update.vue
View File

@ -176,7 +176,7 @@ export default {
} }
}, },
created () { created () {
this.getDeptInfoList('street', '1169154711480528897') this.getDeptInfoList('street', localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))
this.getListCategory() this.getListCategory()
this.visible = true this.visible = true
this.$nextTick(() => { this.$nextTick(() => {

2
src/views/modules/news/news-publish.vue
View File

@ -182,7 +182,7 @@ export default {
} }
}, },
created () { created () {
this.getDeptInfoList('street', '1169154711480528897') this.getDeptInfoList('street', localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))
this.getListCategory() this.getListCategory()
this.visible = true this.visible = true
this.$nextTick(() => { this.$nextTick(() => {

2
src/views/modules/news/news.vue
View File

@ -208,7 +208,7 @@ export default {
} }
}, },
created () { created () {
this.getDeptInfoList('street', '1169154711480528897') this.getDeptInfoList('street', localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))
this.getListCategory() this.getListCategory()
}, },
methods: { methods: {

2
src/views/modules/news/newsdraft.vue
View File

@ -187,7 +187,7 @@ export default {
} }
}, },
created () { created () {
this.getDeptInfoList('street', '1169154711480528897') this.getDeptInfoList('street', localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))
this.getListCategory() this.getListCategory()
}, },
methods: { methods: {

2
src/views/modules/news/notice-add-or-update.vue
View File

@ -136,7 +136,7 @@ export default {
}, },
created () { created () {
// 1169154711480528897 为市北区部门ID // 1169154711480528897 为市北区部门ID
this.getDeptInfoList('street', '1169154711480528897') this.getDeptInfoList('street', localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))
}, },
methods: { methods: {
// 富文本编辑器 // 富文本编辑器

7
src/views/modules/sys/dept-add-or-update.vue
View File

@ -13,6 +13,10 @@
<el-input v-model="dataForm.name" <el-input v-model="dataForm.name"
:placeholder="$t('dept.name')"></el-input> :placeholder="$t('dept.name')"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="$t('dept.partyCode')">
<el-input v-model="dataForm.partyCode"
:placeholder="$t('dept.partyCode')"></el-input>
</el-form-item>
<el-form-item prop="parentName" <el-form-item prop="parentName"
:label="$t('dept.parentName')" :label="$t('dept.parentName')"
class="dept-list"> class="dept-list">
@ -84,7 +88,8 @@ export default {
parentName: '', parentName: '',
sort: 0, sort: 0,
typeKey: '', typeKey: '',
typeName: '' typeName: '',
partyCode: ''
}, },
secondOrgDictList: [] secondOrgDictList: []
} }

2
src/views/modules/sys/deptmacode.vue
View File

@ -142,7 +142,7 @@ export default {
components: { components: {
}, },
created () { created () {
this.getDeptInfoList('street', '1169154711480528897') this.getDeptInfoList('street', localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))
}, },
methods: { methods: {
createDeptMaCodeHandle (id) { createDeptMaCodeHandle (id) {

2
src/views/modules/user/partymembers-add-or-update.vue
View File

@ -165,7 +165,7 @@ export default {
}).catch(() => { }) }).catch(() => { })
}, },
getStreetList () { getStreetList () {
this.$http.get(`/sys/dept/sublist/1169154711480528897`).then(({ data: res }) => { this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }

2
src/views/modules/user/partymembers.vue
View File

@ -240,7 +240,7 @@ export default {
this.dataForm.endTime = this.timeRange[1] this.dataForm.endTime = this.timeRange[1]
}, },
getStreetList () { getStreetList () {
this.$http.get(`/sys/dept/sublist/1169154711480528897`).then(({ data: res }) => { this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }

2
src/views/modules/user/user.vue
View File

@ -418,7 +418,7 @@ export default {
}, },
methods: { methods: {
getStreetList () { getStreetList () {
this.$http.get(`/sys/dept/sublist/1169154711480528897`).then(({ data: res }) => { this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }

19
src/views/pages/login.vue
View File

@ -135,9 +135,26 @@ export default {
} }
Cookies.set('token', res.data.token) Cookies.set('token', res.data.token)
this.$router.replace({ name: 'home' }) this.$router.replace({ name: 'home' })
// 登陆之后从localStorage获取党委为空则从网络上拉取
this.checkLocakStorage()
}).catch(() => { }) }).catch(() => { })
}) })
}, 1000, { 'leading': true, 'trailing': false }) }, 1000, { 'leading': true, 'trailing': false }),
checkLocakStorage () {
var street = localStorage.getItem('street')
if (street === null) {
this.getIdByCode('shibei')
}
},
// 获取党委
getIdByCode (partyCode) {
this.$http.get(`/sys/dept/getIdByCode/` + partyCode).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
localStorage.setItem('street', res.data.id)
}).catch(() => { })
}
} }
} }
</script> </script>

Write Preview
Loading…
Cancel
Save