Browse Source

解决冲突

master
尹作梅 6 years ago
parent
commit
283c10d0a4
  1. 2
      public/index.html
  2. 8
      src/App.vue
  3. 12
      src/views/modules/api/scanswitch.vue
  4. 2
      src/views/modules/events/category.vue
  5. 247
      src/views/modules/events/issue-change-list.vue
  6. 247
      src/views/modules/events/issue-close-list.vue
  7. 509
      src/views/modules/events/issue-process-detail-view.vue
  8. 266
      src/views/modules/events/issue-process-list.vue
  9. 285
      src/views/modules/events/item-close-list.vue
  10. 281
      src/views/modules/events/item-deal-detail-view.vue
  11. 247
      src/views/modules/events/item-deal-list.vue
  12. 255
      src/views/modules/events/item-end-list.vue
  13. 2
      src/views/modules/group/group-approve.vue
  14. 11
      src/views/modules/group/group-detail.vue
  15. 3
      src/views/modules/group/topic-list.vue
  16. 2
      src/views/modules/news/news.vue
  17. 2
      src/views/modules/news/newsdraft.vue
  18. 13
      src/views/modules/news/notice-add-or-update.vue
  19. 306
      src/views/modules/oss/oss-config.vue
  20. 2
      src/views/modules/user/fail-authentication.vue
  21. 7
      src/views/modules/user/partymembers-add-or-update.vue
  22. 8
      src/views/modules/user/partymembers.vue
  23. 203
      src/views/modules/user/pass-authentication.vue
  24. 2
      src/views/modules/user/unauthorized.vue
  25. 2
      src/views/modules/user/wait-authentication.vue

2
public/index.html

@ -51,7 +51,7 @@
<!-- 生产环境 -->
<% if (process.env.VUE_APP_NODE_ENV === 'prod') { %>
<script>
window.SITE_CONFIG['apiURL'] = 'https://epdc-api.elinkchina.com.cn/epdc-api'
window.SITE_CONFIG['apiURL'] = 'https://epdc-shibei.elinkservice.cn/epdc-api'
</script>
<% } %>
</head>

8
src/App.vue

@ -5,9 +5,9 @@
</template>
<style>
body .el-table th.gutter{
display: table-cell!important;
}
body .el-table th.gutter {
display: table-cell !important;
}
</style>
<script>
@ -17,8 +17,6 @@ export default {
watch: {
'$i18n.locale': 'i18nHandle'
},
created () {
this.i18nHandle(this.$i18n.locale)
},

12
src/views/modules/api/scanswitch.vue

@ -31,10 +31,6 @@
header-align="center"
align="center"
width="50"></el-table-column>
<el-table-column prop="id"
label="id"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="versionNum"
label="版本号"
header-align="center"
@ -53,18 +49,10 @@
label="维护信息"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="createdBy"
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="updatedBy"
label="更新者"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="updatedTime"
label="更新时间"
header-align="center"

2
src/views/modules/events/category.vue

@ -15,7 +15,7 @@
:limit="1"
:on-success='uploadSuccess'
:on-error='errorExceed'>
<el-button type="primary">点击上传</el-button>
<el-button type="primary">导入</el-button>
</el-upload>
</el-form-item>
</el-form>

247
src/views/modules/events/issue-change-list.vue

@ -1,108 +1,157 @@
<template>
<el-card shadow="never"
class="aui-card--fill">
<el-card shadow="never" class="aui-card--fill">
<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-cascader v-model="ids" :options="options" :props="{ checkStrictly: true }" clearable>
<el-cascader
v-model="ids"
:options="options"
:props="{ checkStrictly: true }"
clearable
>
</el-cascader>
</el-form-item>
<el-form-item label="时间"
prop="startTime">
<el-date-picker v-model="dataForm.startTime"
type="date"
:picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期时间">
<el-form-item label="议题编号" prop="issueCode">
<el-input
v-model="dataForm.issueCode"
placeholder="请输入议题编号"
></el-input>
</el-form-item>
<el-form-item label="时间" prop="startTime">
<el-date-picker
v-model="dataForm.startTime"
type="date"
:picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期时间"
>
</el-date-picker>
</el-form-item>
<el-form-item label="至"
label-width="25px"
prop="endTime">
<el-date-picker v-model="dataForm.endTime"
type="date"
:picker-options="pickerBeginDateAfter"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期时间">
<el-form-item label="至" label-width="25px" prop="endTime">
<el-date-picker
v-model="dataForm.endTime"
type="date"
:picker-options="pickerBeginDateAfter"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期时间"
>
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item>
</el-form>
<el-table v-loading="dataListLoading"
:data="dataList"
border
@selection-change="dataListSelectionChangeHandle"
style="width: 100%;">
<el-table-column label="序号"
type="index"
show-overflow-tooltip
align="center"
width="50"></el-table-column>
<el-table-column prop="issueContent"
label="议题内容"
header-align="center"
width="330"
align="left"></el-table-column>
<el-table-column prop="createdTime"
label="提交时间"
header-align="center"
width="160"
align="center"></el-table-column>
<el-table-column prop="nickName"
label="提交人"
header-align="center"
width="120"
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">
<el-table
v-loading="dataListLoading"
:data="dataList"
border
@selection-change="dataListSelectionChangeHandle"
style="width: 100%;"
>
<el-table-column
label="序号"
type="index"
show-overflow-tooltip
align="center"
width="50"
></el-table-column>
<el-table-column
prop="issueContent"
label="议题内容"
header-align="center"
width="198"
align="center"
></el-table-column>
<el-table-column
prop="issueCode"
label="议题编号"
header-align="center"
width="142"
align="center"
></el-table-column>
<el-table-column
prop="createdTime"
label="提交时间"
header-align="center"
width="152"
align="center"
></el-table-column>
<el-table-column
prop="nickName"
label="提交人"
header-align="center"
width="120"
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">
<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>
</el-table-column>
</el-table>
<el-pagination :current-page="page"
:page-sizes="[10, 20, 50, 100]"
:page-size="limit"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="pageSizeChangeHandle"
@current-change="pageCurrentChangeHandle">
<el-pagination
:current-page="page"
:page-sizes="[10, 20, 50, 100]"
:page-size="limit"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="pageSizeChangeHandle"
@current-change="pageCurrentChangeHandle"
>
</el-pagination>
<detail v-if="detailVisible"
ref="detail"
@refreshDataList="getDataList"></detail>
<detail
v-if="detailVisible"
ref="detail"
@refreshDataList="getDataList"
></detail>
</div>
</el-card>
</template>
@ -126,12 +175,13 @@ export default {
streetId: '',
communityId: '',
gridId: '',
state: '4'
state: '4',
issueCode: ''
},
ids: [],
options: [],
pickerBeginDateBefore: {
disabledDate: (time) => {
disabledDate: time => {
let beginDateVal = this.dataForm.startTime
if (beginDateVal) {
return time.getTime() > new Date(beginDateVal).getTime()
@ -139,7 +189,7 @@ export default {
}
},
pickerBeginDateAfter: {
disabledDate: (time) => {
disabledDate: time => {
let EndDateVal = this.dataForm.endTime
if (EndDateVal) {
return time.getTime() < new Date(EndDateVal).getTime()
@ -155,7 +205,7 @@ export default {
this.getOptions()
},
watch: {
'ids': function (val) {
ids: function (val) {
if (val.length === 0) {
this.dataForm.streetId = ''
this.dataForm.communityId = ''
@ -184,12 +234,15 @@ export default {
this.$router.push({ path: '/events-issue-change', query: { id: id } })
},
getOptions () {
this.$http.get(`/sys/user/deptOptions/getByLoginUser`).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.options = res.data.options
}).catch(() => {})
this.$http
.get(`/sys/user/deptOptions/getByLoginUser`)
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.options = res.data.options
})
.catch(() => {})
}
}
}

247
src/views/modules/events/issue-close-list.vue

@ -1,109 +1,158 @@
<template>
<el-card shadow="never"
class="aui-card--fill">
<el-card shadow="never" class="aui-card--fill">
<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-cascader v-model="ids" :options="options" :props="{ checkStrictly: true }" clearable>
<el-cascader
v-model="ids"
:options="options"
:props="{ checkStrictly: true }"
clearable
>
</el-cascader>
</el-form-item>
<el-form-item label="时间"
prop="startTime">
<el-date-picker v-model="dataForm.startTime"
type="date"
:picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期时间">
<el-form-item label="议题编号" prop="issueCode">
<el-input
v-model="dataForm.issueCode"
placeholder="请输入议题编号"
></el-input>
</el-form-item>
<el-form-item label="时间" prop="startTime">
<el-date-picker
v-model="dataForm.startTime"
type="date"
:picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期时间"
>
</el-date-picker>
</el-form-item>
<el-form-item label="至"
label-width="25px"
prop="endTime">
<el-date-picker v-model="dataForm.endTime"
type="date"
:picker-options="pickerBeginDateAfter"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期时间">
<el-form-item label="至" label-width="25px" prop="endTime">
<el-date-picker
v-model="dataForm.endTime"
type="date"
:picker-options="pickerBeginDateAfter"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期时间"
>
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item>
</el-form>
<el-table v-loading="dataListLoading"
:data="dataList"
border
@selection-change="dataListSelectionChangeHandle"
style="width: 100%;">
<el-table-column label="序号"
type="index"
show-overflow-tooltip
align="center"
width="50"></el-table-column>
<el-table-column prop="issueContent"
label="议题内容"
header-align="center"
width="330"
align="left"></el-table-column>
<el-table-column prop="createdTime"
label="提交时间"
header-align="center"
width="160"
align="center"></el-table-column>
<el-table-column prop="nickName"
label="提交人"
header-align="center"
width="120"
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">
<el-table
v-loading="dataListLoading"
:data="dataList"
border
@selection-change="dataListSelectionChangeHandle"
style="width: 100%;"
>
<el-table-column
label="序号"
type="index"
show-overflow-tooltip
align="center"
width="50"
></el-table-column>
<el-table-column
prop="issueContent"
label="议题内容"
header-align="center"
width="198"
align="center"
></el-table-column>
<el-table-column
prop="issueCode"
label="议题编号"
header-align="center"
width="142"
align="center"
></el-table-column>
<el-table-column
prop="createdTime"
label="提交时间"
header-align="center"
width="152"
align="center"
></el-table-column>
<el-table-column
prop="nickName"
label="提交人"
header-align="center"
width="120"
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">
<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>
</el-table-column>
</el-table>
<el-pagination :current-page="page"
:page-sizes="[10, 20, 50, 100]"
:page-size="limit"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="pageSizeChangeHandle"
@current-change="pageCurrentChangeHandle">
<el-pagination
:current-page="page"
:page-sizes="[10, 20, 50, 100]"
:page-size="limit"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="pageSizeChangeHandle"
@current-change="pageCurrentChangeHandle"
>
</el-pagination>
<!-- 弹窗 -->
<detail v-if="detailVisible"
ref="detail"
@refreshDataList="getDataList"></detail>
<detail
v-if="detailVisible"
ref="detail"
@refreshDataList="getDataList"
></detail>
</div>
</el-card>
</template>
@ -127,12 +176,13 @@ export default {
streetId: '',
communityId: '',
gridId: '',
state: '2'
state: '2',
issueCode: ''
},
ids: [],
options: [],
pickerBeginDateBefore: {
disabledDate: (time) => {
disabledDate: time => {
let beginDateVal = this.dataForm.startTime
if (beginDateVal) {
return time.getTime() > new Date(beginDateVal).getTime()
@ -140,7 +190,7 @@ export default {
}
},
pickerBeginDateAfter: {
disabledDate: (time) => {
disabledDate: time => {
let EndDateVal = this.dataForm.endTime
if (EndDateVal) {
return time.getTime() < new Date(EndDateVal).getTime()
@ -156,7 +206,7 @@ export default {
this.getOptions()
},
watch: {
'ids': function (val) {
ids: function (val) {
if (val.length === 0) {
this.dataForm.streetId = ''
this.dataForm.communityId = ''
@ -185,12 +235,15 @@ export default {
this.$router.push({ path: '/events-issue-close', query: { id: id } })
},
getOptions () {
this.$http.get(`/sys/user/deptOptions/getByLoginUser`).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.options = res.data.options
}).catch(() => {})
this.$http
.get(`/sys/user/deptOptions/getByLoginUser`)
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.options = res.data.options
})
.catch(() => {})
}
}
}

509
src/views/modules/events/issue-process-detail-view.vue

@ -1,105 +1,128 @@
<template>
<div class="project-handle">
<div class="project-detail">
<div class="project-detail-tip">议题详情</div>
<el-form label-position="right" label-width="120px">
<el-form-item label="议题内容:" prop="eventContent">
<div>{{dataForm.issueContent}}</div>
<el-image v-for="url in dataForm.images"
style="width: 100px; height: 100px; margin-right: 10px"
:key="url"
:src="url"
:preview-src-list="previewImgList"
@click="clickImg(url)">
</el-image>
</el-form-item>
<el-form-item label="所属网格:" prop="ownGrid">
<div>{{dataForm.allDeptNames}}</div>
</el-form-item>
<el-form-item v-if="dataForm.groupName && dataForm.groupName.length > 0" label="议题来源:" prop="ownGrid">
<div>{{dataForm.groupName}}</div>
</el-form-item>
<el-form-item label="上报时间:" prop="distributeTime">
<div>
{{dataForm.distributeTime}}
</div>
</el-form-item>
<el-form-item label="上报人:" prop="nickName">
<div>{{dataForm.nickName}}</div>
</el-form-item>
<el-form-item label="电话:" prop="mobile">
<div>{{dataForm.mobile}}</div>
</el-form-item>
<el-form-item label="所属类别:" prop="categoryName">
<div>{{dataForm.categoryName}}</div>
</el-form-item>
</el-form>
<div class="container">
<div class="location"><span style="font-weight: bold;color: #606266">上报位置:</span> {{dataForm.address}}</div>
<div id="map"></div>
</div>
<div class="project-handle">
<div class="project-detail">
<div class="project-detail-tip">议题详情</div>
<el-form label-position="right"
label-width="120px">
<el-form-item label="议题内容:"
prop="eventContent">
<div>{{dataForm.issueContent}}</div>
<el-image v-for="url in dataForm.images"
style="width: 100px; height: 100px; margin-right: 10px"
:key="url"
:src="url"
:preview-src-list="previewImgList"
@click="clickImg(url)">
</el-image>
</el-form-item>
<el-form-item label="所属网格:"
prop="ownGrid">
<div>{{dataForm.allDeptNames}}</div>
</el-form-item>
<el-form-item v-if="dataForm.groupName && dataForm.groupName.length > 0"
label="议题来源:"
prop="ownGrid">
<div>{{dataForm.groupName}}</div>
</el-form-item>
<el-form-item label="上报时间:"
prop="distributeTime">
<div>
{{dataForm.distributeTime}}
</div>
</el-form-item>
<el-form-item label="上报人:"
prop="nickName">
<div>{{dataForm.nickName}}</div>
</el-form-item>
<el-form-item label="电话:"
prop="mobile">
<div>{{dataForm.mobile}}</div>
</el-form-item>
<el-form-item label="所属类别:"
prop="categoryName">
<div>{{dataForm.categoryName}}</div>
</el-form-item>
</el-form>
<div class="container">
<div class="location"><span style="font-weight: bold;color: #606266">上报位置:</span> {{dataForm.address}}</div>
<div id="map"></div>
</div>
</div>
<div class="project-progress">
<div class="project-progress-tip">处理进展</div>
<el-timeline>
<el-timeline-item v-for="(item, index) in timeLineList"
:key="item.id"
:color="item.type === 'init' ? 'red' : '#ffa546'">
<div :id="`content${index}`"
style="line-height:25px; ">
<div :style="{ marginBottom: '10px', width: '35px', height: '20px', fontSize: '12px', borderRadius: '4px', background: '#ffa546', color: '#fff', textAlign: 'center', lineHeight: '20px'}"
v-if="item.type !== 'init'">
{{'议题'}}
</div>
<div class="project-progress">
<div class="project-progress-tip">处理进展</div>
<el-timeline>
<el-timeline-item
v-for="(item, index) in timeLineList"
:key="item.id"
:color="item.type === 'init' ? 'red' : '#ffa546'">
<div :id="`content${index}`" style="line-height:25px; ">
<div
:style="{ marginBottom: '10px', width: '35px', height: '20px', fontSize: '12px', borderRadius: '4px', background: '#ffa546', color: '#fff', textAlign: 'center', lineHeight: '20px'}"
v-if="item.type !== 'init'">
{{'议题'}}
</div>
<div><span style="font-weight: bold; color: rgb(96, 98, 102);">[{{item | formatState}}]</span> {{item.createdTime}}</div>
<div v-if="item.state === 3">
<div><span style="font-weight: bold; color: rgb(96, 98, 102);">来源社群</span>{{item.groupName}}</div>
<div><span style="font-weight: bold; color: rgb(96, 98, 102);">处理人</span>{{item.handlerDept}}</div>
<div><span style="font-weight: bold; color: rgb(96, 98, 102);">处理人电话</span>{{item.mobile}}</div>
</div>
<div v-if="item.state !== 3">
<div><span style="font-weight: bold; color: rgb(96, 98, 102);">处理部门</span>{{item.handlerDept}}</div>
</div>
<div><span style="font-weight: bold; color: rgb(96, 98, 102);">处理意见</span> {{item.advice}}</div>
<div style="display: flex;">
<el-image v-for="url in item.images"
style="width: 60px; height: 60px; object-fit: cover; margin-right: 8px; border-radius: 2px;"
:key="url"
:src="url"
:preview-src-list="previewImgList"
alt="处理图片"
@click="clickImg(url)">
</el-image>
</div>
</div>
</el-timeline-item>
</el-timeline>
<div><span style="font-weight: bold; color: rgb(96, 98, 102);">[{{item | formatState}}]</span> {{item.createdTime}}</div>
<div v-if="item.state === 3">
<div><span style="font-weight: bold; color: rgb(96, 98, 102);">来源社群</span>{{item.groupName}}</div>
<div><span style="font-weight: bold; color: rgb(96, 98, 102);">处理人</span>{{item.handlerDept}}</div>
<div><span style="font-weight: bold; color: rgb(96, 98, 102);">处理人电话</span>{{item.mobile}}</div>
</div>
<div v-if="item.state !== 3">
<div><span style="font-weight: bold; color: rgb(96, 98, 102);">处理部门</span>{{item.handlerDept}}</div>
</div>
<div class="handle-operation">
<div class="handle-operation-tip">处理操作</div>
<el-form ref="dataForm" label-width="120px" label-position="right" style="width: 720px;" :model="dataForm" :rules="dataRule">
<el-form-item label="处理:" prop="state">
<el-select v-model="dataForm.state" placeholder="请选择">
<el-option
v-for="item in verifyOptions"
:key="item.verifyFlag"
:label="item.verifyTitle"
:value="item.verifyFlag">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="处理意见:" prop="advice">
<el-input v-model="dataForm.advice" type="textarea" placeholder="请您填写居民诉求的处理情况及答复意见,向居民公开展示,500字以内"></el-input>
</el-form-item>
<el-form-item style="float: right;">
<el-button size="small" style="width: 95px" type="primary" :disabled="isAble" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
<el-button size="small" style="width: 95px" @click="backToItemDeal">返回</el-button>
</el-form-item>
</el-form>
<div><span style="font-weight: bold; color: rgb(96, 98, 102);">处理意见</span> {{item.advice}}</div>
<div style="display: flex;">
<el-image v-for="url in item.images"
style="width: 60px; height: 60px; object-fit: cover; margin-right: 8px; border-radius: 2px;"
:key="url"
:src="url"
:preview-src-list="previewImgList"
alt="处理图片"
@click="clickImg(url)">
</el-image>
</div>
</div>
</el-timeline-item>
</el-timeline>
</div>
<div class="handle-operation">
<div class="handle-operation-tip">处理操作</div>
<el-form ref="dataForm"
label-width="120px"
label-position="right"
style="width: 720px;"
:model="dataForm"
:rules="dataRule">
<el-form-item label="处理:"
prop="state">
<el-select v-model="dataForm.state"
placeholder="请选择">
<el-option v-for="item in verifyOptions"
:key="item.verifyFlag"
:label="item.verifyTitle"
:value="item.verifyFlag">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="处理意见:"
prop="advice">
<el-input v-model="dataForm.advice"
type="textarea"
placeholder="请您填写居民诉求的处理情况及答复意见,向居民公开展示,500字以内"></el-input>
</el-form-item>
<el-form-item style="float: right;">
<el-button size="small"
style="width: 95px"
type="primary"
:disabled="isAble"
@click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
<el-button size="small"
style="width: 95px"
@click="backToItemDeal">返回</el-button>
</el-form-item>
</el-form>
</div>
</div>
</template>
<script>
@ -225,7 +248,7 @@ export default {
})
})
this.initBmap(this.dataForm.issueLatitude, this.dataForm.issueLongitude)
}).catch(() => {})
}).catch(() => { })
},
//
dataFormSubmitHandle: debounce(function () {
@ -236,9 +259,9 @@ export default {
if (this.dataForm.advice.length > 500) {
return this.$message.error('处理意见不超过500字')
}
this.isAble =true
this.isAble = true
this.$http['post']('/events/issue/issueWaitHandleSubmit', this.dataForm).then(({ data: res }) => {
this.isAble =false
this.isAble = false
if (res.code !== 0) {
return this.$message.error(res.msg)
}
@ -252,7 +275,7 @@ export default {
}
})
this.$parent.selectComponent = 'IssueProcessList'
}).catch(() => {})
}).catch(() => { })
})
}, 1000, { 'leading': true, 'trailing': false })
}
@ -260,151 +283,151 @@ export default {
</script>
<style lang="scss">
.project-handle {
.el-timeline {
padding-left: 9px;
font-size: 13px;
}
.el-textarea {
width: 600px !important;
}
.el-input {
width: 600px !important;
}
}
.el-form-item__label {
font-weight: bold;
}
.project-handle {
.el-timeline {
padding-left: 9px;
font-size: 13px;
}
.el-textarea {
width: 600px !important;
}
.el-input {
width: 600px !important;
}
}
.el-form-item__label {
font-weight: bold;
}
</style>
<style lang="scss" scoped>
.project-handle {
.project-handle {
width: 100%;
height: calc(100vh - 120px);
background: #ffffff;
box-sizing: border-box;
padding: 10px;
.project-detail {
width: 79%;
height: 49%;
border: 2px solid #ccc;
box-sizing: border-box;
padding: 10px;
padding-top: 20px;
float: left;
margin-bottom: 1%;
position: relative;
.project-detail-tip {
position: absolute;
top: 0;
left: 0;
width: 80px;
height: 30px;
line-height: 30px;
color: #ffffff;
background: #4ac38b;
text-align: center;
}
.el-form {
width: 58%;
height: 100%;
float: left;
overflow-y: auto;
&::-webkit-scrollbar {
width: 5px;
height: 1px;
}
&::-webkit-scrollbar-thumb {
border-radius: 5px;
background: #fff;
}
&::-webkit-scrollbar-track {
border-radius: 10px;
background: #fff;
}
}
.container {
width: 40%;
height: 100%;
float: right;
.location {
height: 30px;
line-height: 30px;
}
#map {
width: 100%;
height: calc(100vh - 120px);
background: #ffffff;
box-sizing: border-box;
padding: 10px;
.project-detail {
width: 79%;
height: 49%;
border: 2px solid #ccc;
box-sizing: border-box;
padding: 10px;
padding-top: 20px;
float:left;
margin-bottom: 1%;
position:relative;
.project-detail-tip {
position: absolute;
top: 0;
left:0;
width: 80px;
height: 30px;
line-height: 30px;
color: #ffffff;
background: #4ac38b;
text-align:center;
}
.el-form {
width: 58%;
height: 100%;
float:left;
overflow-y:auto;
&::-webkit-scrollbar {
width: 5px;
height: 1px;
}
&::-webkit-scrollbar-thumb {
border-radius: 5px;
background: #fff;
}
&::-webkit-scrollbar-track {
border-radius: 10px;
background: #fff;
}
}
.container {
width: 40%;
height: 100%;
float: right;
.location {
height: 30px;
line-height: 30px;
}
#map {
width: 100%;
height: calc(100% - 30px);
}
}
}
.project-progress {
width: 20%;
height: 100%;
float: right;
border: 2px solid #ccc;
box-sizing: border-box;
margin-left: 1%;
padding-top: 20px;
overflow-y:auto;
position: relative;
padding-top: 40px;
.project-progress-tip {
position: absolute;
top: 0;
left:0;
width: 80px;
height: 30px;
line-height: 30px;
color: #ffffff;
background: #0098ff;
text-align:center;
}
&::-webkit-scrollbar {
width: 5px;
height: 1px;
}
&::-webkit-scrollbar-thumb {
border-radius: 5px;
background: #aaa;
}
&::-webkit-scrollbar-track {
border-radius: 10px;
background: #ccc;
}
}
.handle-operation {
padding-top: 30px;
box-sizing: border-box;
width: 79%;
height: 49%;
box-sizing: border-box;
border: 2px solid #ccc;
float:left;
position: relative;
overflow-y: auto;
.handle-operation-tip {
position: absolute;
top: 0;
left:0;
width: 80px;
height: 30px;
line-height: 30px;
color: #ffffff;
background: #ff7600;
text-align:center;
}
&::-webkit-scrollbar {
width: 5px;
height: 1px;
}
&::-webkit-scrollbar-thumb {
border-radius: 5px;
background: #aaa;
}
&::-webkit-scrollbar-track {
border-radius: 10px;
background: #ccc;
}
}
height: calc(100% - 30px);
}
}
}
.project-progress {
width: 20%;
height: 100%;
float: right;
border: 2px solid #ccc;
box-sizing: border-box;
margin-left: 1%;
padding-top: 20px;
overflow-y: auto;
position: relative;
padding-top: 40px;
.project-progress-tip {
position: absolute;
top: 0;
left: 0;
width: 80px;
height: 30px;
line-height: 30px;
color: #ffffff;
background: #0098ff;
text-align: center;
}
&::-webkit-scrollbar {
width: 5px;
height: 1px;
}
&::-webkit-scrollbar-thumb {
border-radius: 5px;
background: #aaa;
}
&::-webkit-scrollbar-track {
border-radius: 10px;
background: #ccc;
}
}
.handle-operation {
padding-top: 30px;
box-sizing: border-box;
width: 79%;
height: 49%;
box-sizing: border-box;
border: 2px solid #ccc;
float: left;
position: relative;
overflow-y: auto;
.handle-operation-tip {
position: absolute;
top: 0;
left: 0;
width: 80px;
height: 30px;
line-height: 30px;
color: #ffffff;
background: #ff7600;
text-align: center;
}
&::-webkit-scrollbar {
width: 5px;
height: 1px;
}
&::-webkit-scrollbar-thumb {
border-radius: 5px;
background: #aaa;
}
&::-webkit-scrollbar-track {
border-radius: 10px;
background: #ccc;
}
}
}
</style>

266
src/views/modules/events/issue-process-list.vue

@ -1,116 +1,170 @@
<template>
<el-card shadow="never"
class="aui-card--fill">
<el-card shadow="never" class="aui-card--fill">
<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-cascader v-model="ids" :options="options" :props="{ checkStrictly: true }" clearable>
<el-cascader
v-model="ids"
:options="options"
:props="{ checkStrictly: true }"
clearable
>
</el-cascader>
</el-form-item>
<el-form-item label="时间"
prop="startTime">
<el-date-picker v-model="dataForm.startTime"
type="date"
:picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期时间">
<el-form-item label="议题编号" prop="issueCode">
<el-input
v-model="dataForm.issueCode"
placeholder="请输入议题编号"
></el-input>
</el-form-item>
<el-form-item label="时间" prop="startTime">
<el-date-picker
v-model="dataForm.startTime"
type="date"
:picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期时间"
>
</el-date-picker>
</el-form-item>
<el-form-item label="至"
label-width="25px"
prop="endTime">
<el-date-picker v-model="dataForm.endTime"
type="date"
:picker-options="pickerBeginDateAfter"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期时间">
<el-form-item label="至" label-width="25px" prop="endTime">
<el-date-picker
v-model="dataForm.endTime"
type="date"
:picker-options="pickerBeginDateAfter"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期时间"
>
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item>
</el-form>
<el-table v-loading="dataListLoading"
:data="dataList"
border
@selection-change="dataListSelectionChangeHandle"
style="width: 100%;">
<el-table-column label="序号"
type="index"
show-overflow-tooltip
align="center"
width="50"></el-table-column>
<el-table-column prop="issueContent"
label="议题内容"
header-align="center"
width="330"
align="left"></el-table-column>
<el-table-column prop="createdTime"
label="提交时间"
header-align="center"
width="160"
align="center"></el-table-column>
<el-table-column prop="nickName"
label="提交人"
header-align="center"
width="120"
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">
<el-table
v-loading="dataListLoading"
:data="dataList"
border
@selection-change="dataListSelectionChangeHandle"
style="width: 100%;"
>
<el-table-column
label="序号"
type="index"
show-overflow-tooltip
align="center"
width="50"
></el-table-column>
<el-table-column
prop="issueContent"
label="议题内容"
header-align="center"
width="198"
align="center"
></el-table-column>
<el-table-column
prop="issueCode"
label="议题编号"
header-align="center"
width="142"
align="center"
></el-table-column>
<el-table-column
prop="createdTime"
label="提交时间"
header-align="center"
width="152"
align="center"
></el-table-column>
<el-table-column
prop="nickName"
label="提交人"
header-align="center"
width="120"
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">
<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:deal')"
type="text"
size="small"
@click="dealAction(scope.row.id)">{{ $t('deal') }}</el-button>
<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:deal')"
type="text"
size="small"
@click="dealAction(scope.row.id)"
>{{ $t('deal') }}</el-button
>
</template>
</el-table-column>
</el-table>
<el-pagination :current-page="page"
:page-sizes="[10, 20, 50, 100]"
:page-size="limit"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="pageSizeChangeHandle"
@current-change="pageCurrentChangeHandle">
<el-pagination
:current-page="page"
:page-sizes="[10, 20, 50, 100]"
:page-size="limit"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="pageSizeChangeHandle"
@current-change="pageCurrentChangeHandle"
>
</el-pagination>
<!-- 弹窗, 新增 / 修改 -->
<process-deal v-if="processDealVisible"
ref="processDeal"
@refreshDataList="getDataList"></process-deal>
<detail v-if="detailVisible"
ref="detail"
@refreshDataList="getDataList"></detail>
<process-deal
v-if="processDealVisible"
ref="processDeal"
@refreshDataList="getDataList"
></process-deal>
<detail
v-if="detailVisible"
ref="detail"
@refreshDataList="getDataList"
></detail>
</div>
</el-card>
</template>
@ -136,12 +190,13 @@ export default {
streetId: '',
communityId: '',
gridId: '',
state: '0'
state: '0',
issueCode: ''
},
ids: [],
options: [],
pickerBeginDateBefore: {
disabledDate: (time) => {
disabledDate: time => {
let beginDateVal = this.dataForm.startTime
if (beginDateVal) {
return time.getTime() > new Date(beginDateVal).getTime()
@ -149,7 +204,7 @@ export default {
}
},
pickerBeginDateAfter: {
disabledDate: (time) => {
disabledDate: time => {
let EndDateVal = this.dataForm.endTime
if (EndDateVal) {
return time.getTime() < new Date(EndDateVal).getTime()
@ -166,7 +221,7 @@ export default {
this.getOptions()
},
watch: {
'ids': function (val) {
ids: function (val) {
if (val.length === 0) {
this.dataForm.streetId = ''
this.dataForm.communityId = ''
@ -199,12 +254,15 @@ export default {
this.$router.push({ path: '/events-issue-process', query: { id: id } })
},
getOptions () {
this.$http.get(`/sys/user/deptOptions/getByLoginUser`).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.options = res.data.options
}).catch(() => {})
this.$http
.get(`/sys/user/deptOptions/getByLoginUser`)
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.options = res.data.options
})
.catch(() => {})
}
}
}

285
src/views/modules/events/item-close-list.vue

@ -1,110 +1,159 @@
<template>
<el-card shadow="never"
class="aui-card--fill">
<div class="mod-item__item}">
<el-form :inline="true"
:model="dataForm"
@keyup.enter.native="getDataList()">
<el-form-item label="所属机构">
<el-cascader v-model="ids" :options="options" :props="{ checkStrictly: true }" clearable>
</el-cascader>
</el-form-item>
<el-form-item label="时间"
prop="startTime">
<el-date-picker v-model="dataForm.startTime"
type="date"
:picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期时间">
</el-date-picker>
</el-form-item>
<el-form-item label="至"
label-width="25px"
prop="endTime">
<el-date-picker v-model="dataForm.endTime"
type="date"
:picker-options="pickerBeginDateAfter"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期时间">
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item>
</el-form>
<el-table v-loading="dataListLoading"
:data="dataList"
border
@selection-change="dataListSelectionChangeHandle"
style="width: 100%;">
<el-table-column label="序号"
type="index"
show-overflow-tooltip
align="center"
width="50"></el-table-column>
<el-table-column prop="itemContent"
label="项目内容"
header-align="center"
width="330"
align="left"></el-table-column>
<el-table-column prop="createdTime"
label="转成项目时间"
header-align="center"
width="160"
align="center"></el-table-column>
<el-table-column prop="nickName"
label="提交人"
header-align="center"
width="120"
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">
<el-button v-if="$hasPermission('events:item:look')"
type="text"
size="small"
@click="detailAction(scope.row.id)">{{ $t('look') }}</el-button>
</template>
</el-table-column>
</el-table>
<el-pagination :current-page="page"
:page-sizes="[10, 20, 50, 100]"
:page-size="limit"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="pageSizeChangeHandle"
@current-change="pageCurrentChangeHandle">
</el-pagination>
<detail v-if="detailVisible"
ref="detailRef"
@refreshDataList="getDataList"></detail>
</div>
</el-card>
<el-card shadow="never" class="aui-card--fill">
<div class="mod-item__item}">
<el-form
:inline="true"
:model="dataForm"
@keyup.enter.native="getDataList()"
>
<el-form-item label="所属机构">
<el-cascader
v-model="ids"
:options="options"
:props="{ checkStrictly: true }"
clearable
>
</el-cascader>
</el-form-item>
<el-form-item label="项目编号" prop="itemCode">
<el-input
v-model="dataForm.itemCode"
placeholder="请输入项目编号"
></el-input>
</el-form-item>
<el-form-item label="时间" prop="startTime">
<el-date-picker
v-model="dataForm.startTime"
type="date"
:picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期时间"
>
</el-date-picker>
</el-form-item>
<el-form-item label="至" label-width="25px" prop="endTime">
<el-date-picker
v-model="dataForm.endTime"
type="date"
:picker-options="pickerBeginDateAfter"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期时间"
>
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item>
</el-form>
<el-table
v-loading="dataListLoading"
:data="dataList"
border
@selection-change="dataListSelectionChangeHandle"
style="width: 100%;"
>
<el-table-column
label="序号"
type="index"
show-overflow-tooltip
align="center"
width="50"
></el-table-column>
<el-table-column
prop="itemContent"
label="项目内容"
header-align="center"
width="198"
align="center"
></el-table-column>
<el-table-column
prop="itemCode"
label="项目编号"
header-align="center"
width="142"
align="center"
></el-table-column>
<el-table-column
prop="createdTime"
label="转成项目时间"
header-align="center"
width="152"
align="center"
></el-table-column>
<el-table-column
prop="nickName"
label="提交人"
header-align="center"
width="120"
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">
<el-button
v-if="$hasPermission('events:item:look')"
type="text"
size="small"
@click="detailAction(scope.row.id)"
>{{ $t('look') }}</el-button
>
</template>
</el-table-column>
</el-table>
<el-pagination
:current-page="page"
:page-sizes="[10, 20, 50, 100]"
:page-size="limit"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="pageSizeChangeHandle"
@current-change="pageCurrentChangeHandle"
>
</el-pagination>
<detail
v-if="detailVisible"
ref="detailRef"
@refreshDataList="getDataList"
></detail>
</div>
</el-card>
</template>
<script>
@ -126,13 +175,14 @@ export default {
endTime: '',
streetId: '',
communityId: '',
gridId: ''
gridId: '',
itemCode: ''
},
ids: [],
options: [],
detailVisible: false,
pickerBeginDateBefore: {
disabledDate: (time) => {
disabledDate: time => {
let beginDateVal = this.dataForm.startTime
if (beginDateVal) {
return time.getTime() > new Date(beginDateVal).getTime()
@ -140,7 +190,7 @@ export default {
}
},
pickerBeginDateAfter: {
disabledDate: (time) => {
disabledDate: time => {
let EndDateVal = this.dataForm.endTime
if (EndDateVal) {
return time.getTime() < new Date(EndDateVal).getTime()
@ -156,7 +206,7 @@ export default {
this.getOptions()
},
watch: {
'ids': function (val) {
ids: function (val) {
if (val.length === 0) {
this.dataForm.streetId = ''
this.dataForm.communityId = ''
@ -185,12 +235,15 @@ export default {
this.$router.push({ path: '/events-item-close', query: { id: id } })
},
getOptions () {
this.$http.get(`/sys/user/deptOptions/getByLoginUser`).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.options = res.data.options
}).catch(() => {})
this.$http
.get(`/sys/user/deptOptions/getByLoginUser`)
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.options = res.data.options
})
.catch(() => {})
}
}
}

281
src/views/modules/events/item-deal-detail-view.vue

@ -3,8 +3,10 @@
<div style="width: 100%; height: 100%;">
<div class="project-detail">
<div class="project-detail-tip">议题详情</div>
<el-form label-position="right" label-width="120px">
<el-form-item label="议题内容:" prop="eventContent">
<el-form label-position="right"
label-width="120px">
<el-form-item label="议题内容:"
prop="eventContent">
<div>{{dataForm.itemContent}}</div>
<el-image v-for="url in dataForm.images"
style="width: 100px; height: 100px; margin-right: 10px"
@ -14,19 +16,25 @@
@click="clickImg(url)">
</el-image>
</el-form-item>
<el-form-item v-if="dataForm.groupName && dataForm.groupName.length > 0" label="项目来源:" prop="ownGrid">
<el-form-item v-if="dataForm.groupName && dataForm.groupName.length > 0"
label="项目来源:"
prop="ownGrid">
<div>{{dataForm.groupName}}</div>
</el-form-item>
<el-form-item label="上报时间:" prop="distributeTime">
<el-form-item label="上报时间:"
prop="distributeTime">
<div>{{dataForm.distributeTime}}</div>
</el-form-item>
<el-form-item label="上报人:" prop="nickName">
<el-form-item label="上报人:"
prop="nickName">
<div>{{dataForm.nickName}}</div>
</el-form-item>
<el-form-item label="电话:" prop="mobile">
<el-form-item label="电话:"
prop="mobile">
<div>{{dataForm.mobile}}</div>
</el-form-item>
<el-form-item label="所属类别:" prop="categoryName">
<el-form-item label="所属类别:"
prop="categoryName">
<div>{{dataForm.categoryName}}</div>
</el-form-item>
<el-form-item label="项目态度:">
@ -36,7 +44,8 @@
<span>反对 {{dataForm.opposeNum}}</span>
</el-form-item>
<el-form-item label="项目评论:">
<el-button type="text" @click="innerVisible = true">查看评论</el-button>
<el-button type="text"
@click="innerVisible = true">查看评论</el-button>
</el-form-item>
</el-form>
<div class="container">
@ -47,14 +56,13 @@
<div class="project-progress">
<div class="project-progress-tip">处理进展</div>
<el-timeline>
<el-timeline-item
v-for="(item, index) in timeLineList"
:key="item.id"
:color="item.type === 'init' ? 'red' : item.type === 'project' ? '#009688' : '#ffa546'">
<div :id="`content${index}`" style="line-height:25px; ">
<div
:style="{ marginBottom: '10px', width: '35px', height: '20px', fontSize: '12px', borderRadius: '4px', background: item.type === 'project' ? '#009688': item.type === 'issue' || item.type === 'issue-project' ? '#ffa546' : '', color: '#fff', textAlign: 'center', lineHeight: '20px'}"
v-if="item.type !== 'init'">
<el-timeline-item v-for="(item, index) in timeLineList"
:key="item.id"
:color="item.type === 'init' ? 'red' : item.type === 'project' ? '#009688' : '#ffa546'">
<div :id="`content${index}`"
style="line-height:25px; ">
<div :style="{ marginBottom: '10px', width: '35px', height: '20px', fontSize: '12px', borderRadius: '4px', background: item.type === 'project' ? '#009688': item.type === 'issue' || item.type === 'issue-project' ? '#ffa546' : '', color: '#fff', textAlign: 'center', lineHeight: '20px'}"
v-if="item.type !== 'init'">
{{item.type === 'project' ? '项目': item.type === 'issue' || item.type === 'issue-project' ? '议题' : ''}}
</div>
<div><span style="font-weight: bold; color: rgb(96, 98, 102);">[{{item | formatState}}]</span> {{item.createdTime}}</div>
@ -66,15 +74,17 @@
<div v-if="item.state !== 3">
<div><span style="font-weight: bold; color: rgb(96, 98, 102);">处理部门</span>{{item.handlerDept}}</div>
</div>
<div v-if="item.itemDeptDTOS && item.itemDeptDTOS.length > 0" style="width: 100%; display: flex;">
<div v-if="item.itemDeptDTOS && item.itemDeptDTOS.length > 0"
style="width: 100%; display: flex;">
<div><span style="font-weight: bold; color: rgb(96, 98, 102);">被吹哨部门</span> </div>
<div>
<span v-for="(csDept, index1) in item.itemDeptDTOS" :key="index1">
{{ csDept.deptName }}<br/>
</span>
<span v-for="(csDept, index1) in item.itemDeptDTOS"
:key="index1">
{{ csDept.deptName }}<br />
</span>
</div>
</div>
<div><span style="font-weight: bold; color: rgb(96, 98, 102);">处理意见</span> {{item.advice}}</div>
<div><span style="font-weight: bold; color: rgb(96, 98, 102);">处理意见</span> {{item.advice}}</div>
<div style="display: flex;">
<el-image v-for="url in item.images"
style="width: 60px; height: 60px; object-fit: cover; margin-right: 8px; border-radius: 2px;"
@ -92,35 +102,53 @@
</div>
<div class="handle-operation">
<div class="handle-operation-tip">处理操作</div>
<el-form ref="dataForm" label-width="120px" label-position="right" style="width: 720px;" :model="dataForm" :rules="dataRule">
<el-form-item label="处理:" prop="handleCategory">
<el-select v-model="postDataForm.handleCategory" placeholder="请选择">
<el-option
v-for="handleResultDTO in dataForm.handleResultDTOS"
:key="handleResultDTO.processResult"
:label="handleResultDTO.processName"
:value="handleResultDTO.processResult">
<el-form ref="dataForm"
label-width="120px"
label-position="right"
style="width: 720px;"
:model="dataForm"
:rules="dataRule">
<el-form-item label="处理:"
prop="handleCategory">
<el-select v-model="postDataForm.handleCategory"
placeholder="请选择">
<el-option v-for="handleResultDTO in dataForm.handleResultDTOS"
:key="handleResultDTO.processResult"
:label="handleResultDTO.processName"
:value="handleResultDTO.processResult">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="吹哨部门:" prop="deptResultDTOS" v-if="deptResultDTOSVisible">
<el-select v-model="deptResult" multiple placeholder="请选择">
<el-option
v-for="item in dataForm.deptResultDTOS"
:key="item.deptId"
:label="item.deptName"
:value="item.deptId">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="回复居民意见:" prop="outHandleAdvice">
<el-input v-model="postDataForm.outHandleAdvice" type="textarea" placeholder="请您选择居民诉求的处理情况及答复意见,向居民公开展示"></el-input>
<el-form-item label="吹哨部门:"
prop="deptResultDTOS"
v-if="deptResultDTOSVisible">
<el-select v-model="deptResult"
multiple
placeholder="请选择">
<el-option v-for="item in dataForm.deptResultDTOS"
:key="item.deptId"
:label="item.deptName"
:value="item.deptId">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="回复居民意见:"
prop="outHandleAdvice">
<el-input v-model="postDataForm.outHandleAdvice"
type="textarea"
placeholder="请您选择居民诉求的处理情况及答复意见,向居民公开展示"></el-input>
</el-form-item>
<el-form-item label="项目处理意见:" prop="handleAdvice">
<el-input v-model="postDataForm.handleAdvice" type="textarea" placeholder="请您填写项目的实际办理情况(自己处理、吹哨报道、内部协调),便于相关部门了解项目的实际情况"></el-input>
<el-form-item label="项目处理意见:"
prop="handleAdvice">
<el-input v-model="postDataForm.handleAdvice"
type="textarea"
placeholder="请您填写项目的实际办理情况(自己处理、吹哨报道、内部协调),便于相关部门了解项目的实际情况"></el-input>
</el-form-item>
<el-form-item label="满意度评价:" prop="evaluateDeptDTOS" v-if="evaluateDeptDTOSVisible">
<div v-for="(evaluateDeptDTO, index) in dataForm.evaluateDeptDTOS" :key="index">
<el-form-item label="满意度评价:"
prop="evaluateDeptDTOS"
v-if="evaluateDeptDTOSVisible">
<div v-for="(evaluateDeptDTO, index) in dataForm.evaluateDeptDTOS"
:key="index">
<label>{{evaluateDeptDTO.deptName}}</label>&nbsp;
<el-radio-group v-model="evaluateDeptDTO.evaluationLevel">
<el-radio :label="2">非常满意</el-radio>
@ -130,35 +158,68 @@
</div>
</el-form-item>
<el-form-item style="float: right;">
<el-button size="small" type="primary" :disabled="isAble" style="width: 95px" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
<el-button size="small" style="width: 95px" @click="backToItemDeal">返回</el-button>
</el-form-item>
<el-button size="small"
type="primary"
:disabled="isAble"
style="width: 95px"
@click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
<el-button size="small"
style="width: 95px"
@click="backToItemDeal">返回</el-button>
</el-form-item>
</el-form>
</div>
</div>
<el-dialog width="90%" title="评论" :visible.sync="innerVisible" append-to-body>
<el-table :data="commentsDTOs" border style="width: 100%;">
<el-table-column prop="user.userName" label="发言人" header-align="center" align="center"></el-table-column>
<el-table-column prop="commentTime" label="发言时间" header-align="center" align="center"></el-table-column>
<el-table-column prop="content" label="发言内容" header-align="center" align="center"></el-table-column>
<el-table-column prop="replyComment.userName" label="被回复人" header-align="center" align="center"></el-table-column>
<el-table-column prop="replyComment.content" label="被回复内容" header-align="center" align="center"></el-table-column>
<el-table-column :label="$t('handle')" header-align="center" align="center" width="150">
<el-dialog width="90%"
title="评论"
:visible.sync="innerVisible"
append-to-body>
<el-table :data="commentsDTOs"
border
style="width: 100%;">
<el-table-column prop="user.userName"
label="发言人"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="commentTime"
label="发言时间"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="content"
label="发言内容"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="replyComment.userName"
label="被回复人"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="replyComment.content"
label="被回复内容"
header-align="center"
align="center"></el-table-column>
<el-table-column :label="$t('handle')"
header-align="center"
align="center"
width="150">
<template slot-scope="scope">
<el-button v-if="scope.row.shieldFlag === '0'" type="button" size="small" @click="deleteComment(scope.row.commentId)">屏蔽</el-button>
<el-button v-if="scope.row.shieldFlag === '1'" type="text" size="small">已屏蔽</el-button>
<el-button v-if="scope.row.shieldFlag === '0'"
type="button"
size="small"
@click="deleteComment(scope.row.commentId)">屏蔽</el-button>
<el-button v-if="scope.row.shieldFlag === '1'"
type="text"
size="small">已屏蔽</el-button>
</template>
</el-table-column>
</el-table>
<el-pagination
:current-page="pageIndex"
:page-sizes="[10, 20, 50, 100]"
:page-size="limitVal"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="pageSizeChangeHandleNew"
@current-change="pageCurrentChangeHandleNew">
<el-pagination :current-page="pageIndex"
:page-sizes="[10, 20, 50, 100]"
:page-size="limitVal"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="pageSizeChangeHandleNew"
@current-change="pageCurrentChangeHandleNew">
</el-pagination>
</el-dialog>
</div>
@ -367,7 +428,7 @@ export default {
this.dataForm.handleCategory = handleResultDTO.processResult
}
}
}).catch(() => {})
}).catch(() => { })
},
deleteComment (val) {
this.$http['post']('/events/item/deleteComment', { commentIds: [val] }).then(({ data: res }) => {
@ -382,7 +443,7 @@ export default {
this.getCommentList()
}
})
}).catch(() => {})
}).catch(() => { })
},
pageSizeChangeHandleNew (val) {
this.pageIndex = 1
@ -394,7 +455,7 @@ export default {
this.getCommentList()
},
getCommentList () {
this.$http.get('/events/item/comments', { params: { id: this.dataForm.id, order: this.order, orderField: this.orderField, page: this.pageIndex, limit: this.limitVal }
this.$http.get('/events/item/comments', { params: { id: this.dataForm.id, order: this.order, orderField: this.orderField, page: this.pageIndex, limit: this.limitVal }
}).then(({ data: res }) => {
if (res.code !== 0) {
this.commentsDTOs = []
@ -403,7 +464,7 @@ export default {
}
this.commentsDTOs = res.data.list
this.total = res.data.total
}).catch(() => {})
}).catch(() => { })
},
//
dataFormSubmitHandle: debounce(function () {
@ -447,24 +508,24 @@ export default {
} else {
this.postDataForm.evaluateDeptDTOS = []
}
this.isAble =true
this.isAble = true
this.$http['post'](
'/events/item/itemHandleSubmit', this.postDataForm).then(({ data: res }) => {
this.isAble =false
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.$message({
message: this.$t('prompt.success'),
type: 'success',
duration: 500,
onClose: () => {
this.visible = false
this.$emit('refreshDataList')
this.isAble = false
if (res.code !== 0) {
return this.$message.error(res.msg)
}
})
this.$parent.selectComponent = 'ItemDeal'
}).catch(() => {})
this.$message({
message: this.$t('prompt.success'),
type: 'success',
duration: 500,
onClose: () => {
this.visible = false
this.$emit('refreshDataList')
}
})
this.$parent.selectComponent = 'ItemDeal'
}).catch(() => { })
}, 1000, { 'leading': true, 'trailing': false })
}
@ -472,21 +533,21 @@ export default {
</script>
<style lang="scss">
.project-handle {
.el-timeline {
padding-left: 9px;
font-size: 13px;
}
.el-textarea {
width: 600px !important;
}
.el-input {
width: 600px !important;
}
.project-handle {
.el-timeline {
padding-left: 9px;
font-size: 13px;
}
.el-textarea {
width: 600px !important;
}
.el-form-item__label {
font-weight: bold;
.el-input {
width: 600px !important;
}
}
.el-form-item__label {
font-weight: bold;
}
</style>
<style lang="scss" scoped>
@ -503,25 +564,25 @@ export default {
box-sizing: border-box;
padding: 10px;
padding-top: 20px;
float:left;
float: left;
margin-bottom: 1%;
position:relative;
position: relative;
.project-detail-tip {
position: absolute;
top: 0;
left:0;
left: 0;
width: 80px;
height: 30px;
line-height: 30px;
color: #ffffff;
background: #4ac38b;
text-align:center;
text-align: center;
}
.el-form {
width: 58%;
height: 100%;
float:left;
overflow-y:auto;
float: left;
overflow-y: auto;
&::-webkit-scrollbar {
width: 5px;
height: 1px;
@ -557,18 +618,18 @@ export default {
box-sizing: border-box;
margin-left: 1%;
padding-top: 40px;
overflow-y:auto;
overflow-y: auto;
position: relative;
.project-progress-tip {
position: absolute;
top: 0;
left:0;
left: 0;
width: 80px;
height: 30px;
line-height: 30px;
color: #ffffff;
background: #0098ff;
text-align:center;
text-align: center;
}
&::-webkit-scrollbar {
width: 5px;
@ -590,7 +651,7 @@ export default {
height: 49%;
box-sizing: border-box;
border: 2px solid #ccc;
float:left;
float: left;
overflow-y: auto;
position: relative;
&::-webkit-scrollbar {
@ -608,13 +669,13 @@ export default {
.handle-operation-tip {
position: absolute;
top: 0;
left:0;
left: 0;
width: 80px;
height: 30px;
line-height: 30px;
color: #ffffff;
background: #ff7600;
text-align:center;
text-align: center;
}
}
}

247
src/views/modules/events/item-deal-list.vue

@ -1,109 +1,158 @@
<template>
<el-card shadow="never"
class="aui-card--fill">
<el-card shadow="never" class="aui-card--fill">
<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-cascader v-model="ids" :options="options" :props="{ checkStrictly: true }" clearable>
<el-cascader
v-model="ids"
:options="options"
:props="{ checkStrictly: true }"
clearable
>
</el-cascader>
</el-form-item>
<el-form-item label="时间"
prop="startTime">
<el-date-picker v-model="dataForm.startTime"
type="date"
:picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期时间">
<el-form-item label="项目编号" prop="itemCode">
<el-input
v-model="dataForm.itemCode"
placeholder="请输入项目编号"
></el-input>
</el-form-item>
<el-form-item label="时间" prop="startTime">
<el-date-picker
v-model="dataForm.startTime"
type="date"
:picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期时间"
>
</el-date-picker>
</el-form-item>
<el-form-item label="至"
label-width="25px"
prop="endTime">
<el-date-picker v-model="dataForm.endTime"
type="date"
:picker-options="pickerBeginDateAfter"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期时间">
<el-form-item label="至" label-width="25px" prop="endTime">
<el-date-picker
v-model="dataForm.endTime"
type="date"
:picker-options="pickerBeginDateAfter"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期时间"
>
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item>
</el-form>
<el-table v-loading="dataListLoading"
:data="dataList"
border
@selection-change="dataListSelectionChangeHandle"
style="width: 100%;">
<el-table-column label="序号"
type="index"
show-overflow-tooltip
align="center"
width="50"></el-table-column>
<el-table-column prop="itemContent"
label="项目内容"
header-align="center"
width="330"
align="left"></el-table-column>
<el-table-column prop="createdTime"
label="转成项目时间"
header-align="center"
width="160"
align="center"></el-table-column>
<el-table-column prop="nickName"
label="提交人"
header-align="center"
width="120"
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">
<el-table
v-loading="dataListLoading"
:data="dataList"
border
@selection-change="dataListSelectionChangeHandle"
style="width: 100%;"
>
<el-table-column
label="序号"
type="index"
show-overflow-tooltip
align="center"
width="50"
></el-table-column>
<el-table-column
prop="itemContent"
label="项目内容"
header-align="center"
width="200"
align="center"
></el-table-column>
<el-table-column
prop="itemCode"
label="项目编号"
header-align="center"
width="142"
align="center"
></el-table-column>
<el-table-column
prop="createdTime"
label="转成项目时间"
header-align="center"
width="152"
align="center"
></el-table-column>
<el-table-column
prop="nickName"
label="提交人"
header-align="center"
width="120"
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">
<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>
</el-table-column>
</el-table>
<el-pagination :current-page="page"
:page-sizes="[10, 20, 50, 100]"
:page-size="limit"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="pageSizeChangeHandle"
@current-change="pageCurrentChangeHandle">
<el-pagination
:current-page="page"
:page-sizes="[10, 20, 50, 100]"
:page-size="limit"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="pageSizeChangeHandle"
@current-change="pageCurrentChangeHandle"
>
</el-pagination>
<!-- 弹窗, 新增 / 修改 -->
<detail v-if="detailVisible"
ref="detail"
@refreshDataList="getDataList"></detail>
<detail
v-if="detailVisible"
ref="detail"
@refreshDataList="getDataList"
></detail>
</div>
</el-card>
</template>
@ -128,12 +177,13 @@ export default {
endTime: '',
streetId: '',
communityId: '',
gridId: ''
gridId: '',
itemCode: ''
},
ids: [],
options: [],
pickerBeginDateBefore: {
disabledDate: (time) => {
disabledDate: time => {
let beginDateVal = this.dataForm.startTime
if (beginDateVal) {
return time.getTime() > new Date(beginDateVal).getTime()
@ -141,7 +191,7 @@ export default {
}
},
pickerBeginDateAfter: {
disabledDate: (time) => {
disabledDate: time => {
let EndDateVal = this.dataForm.endTime
if (EndDateVal) {
return time.getTime() < new Date(EndDateVal).getTime()
@ -157,7 +207,7 @@ export default {
this.getOptions()
},
watch: {
'ids': function (val) {
ids: function (val) {
if (val.length === 0) {
this.dataForm.streetId = ''
this.dataForm.communityId = ''
@ -186,12 +236,15 @@ export default {
this.$router.push({ path: '/events-item-deal', query: { id: id } })
},
getOptions () {
this.$http.get(`/sys/user/deptOptions/getByLoginUser`).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.options = res.data.options
}).catch(() => {})
this.$http
.get(`/sys/user/deptOptions/getByLoginUser`)
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.options = res.data.options
})
.catch(() => {})
}
}
}

255
src/views/modules/events/item-end-list.vue

@ -1,109 +1,164 @@
<template>
<el-card shadow="never"
class="aui-card--fill">
<el-card shadow="never" class="aui-card--fill">
<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-cascader v-model="ids" :options="options" :props="{ checkStrictly: true }" clearable>
<el-cascader
v-model="ids"
:options="options"
:props="{ checkStrictly: true }"
clearable
>
</el-cascader>
</el-form-item>
<el-form-item label="时间"
prop="startTime">
<el-date-picker v-model="dataForm.startTime"
type="date"
:picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期时间">
<el-form-item label="项目编号" prop="itemCode">
<el-input
v-model="dataForm.itemCode"
placeholder="请输入项目编号"
></el-input>
</el-form-item>
<el-form-item label="时间" prop="startTime">
<el-date-picker
v-model="dataForm.startTime"
type="date"
:picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期时间"
>
</el-date-picker>
</el-form-item>
<el-form-item label="至"
label-width="25px"
prop="endTime">
<el-date-picker v-model="dataForm.endTime"
type="date"
:picker-options="pickerBeginDateAfter"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期时间">
<el-form-item label="至" label-width="25px" prop="endTime">
<el-date-picker
v-model="dataForm.endTime"
type="date"
:picker-options="pickerBeginDateAfter"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期时间"
>
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item>
</el-form>
<el-table v-loading="dataListLoading"
:data="dataList"
border
@selection-change="dataListSelectionChangeHandle"
style="width: 100%;">
<el-table-column label="序号"
type="index"
show-overflow-tooltip
align="center"
width="50"></el-table-column>
<el-table-column prop="itemContent"
label="项目内容"
header-align="center"
width="257"
align="left"></el-table-column>
<el-table-column prop="createdTime"
label="转成项目时间"
header-align="center"
width="160"
align="center"></el-table-column>
<el-table-column prop="nickName"
label="提交人"
header-align="center"
width="120"
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-column :label="$t('handle')"
fixed="right"
header-align="center"
align="center"
width="150">
<el-table
v-loading="dataListLoading"
:data="dataList"
border
@selection-change="dataListSelectionChangeHandle"
style="width: 100%;"
>
<el-table-column
label="序号"
type="index"
show-overflow-tooltip
align="center"
width="50"
></el-table-column>
<el-table-column
prop="itemContent"
label="项目内容"
header-align="center"
width="155"
align="center"
></el-table-column>
<el-table-column
prop="itemCode"
label="项目编号"
header-align="center"
width="142"
align="center"
></el-table-column>
<el-table-column
prop="createdTime"
label="转成项目时间"
header-align="center"
width="152"
align="center"
></el-table-column>
<el-table-column
prop="nickName"
label="提交人"
header-align="center"
width="100"
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"
width="65"
align="center"
></el-table-column>
<el-table-column
:label="$t('handle')"
fixed="right"
header-align="center"
align="center"
width="150"
>
<template slot-scope="scope">
<el-button v-if="$hasPermission('events:item:look')" type="text" size="small" @click="detailAction1(scope.row.id)">{{ $t('look') }}</el-button>
<el-button
v-if="$hasPermission('events:item:look')"
type="text"
size="small"
@click="detailAction1(scope.row.id)"
>{{ $t('look') }}</el-button
>
</template>
</el-table-column>
</el-table>
<el-pagination :current-page="page"
:page-sizes="[10, 20, 50, 100]"
:page-size="limit"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="pageSizeChangeHandle"
@current-change="pageCurrentChangeHandle">
<el-pagination
:current-page="page"
:page-sizes="[10, 20, 50, 100]"
:page-size="limit"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="pageSizeChangeHandle"
@current-change="pageCurrentChangeHandle"
>
</el-pagination>
<detail v-if="detailVisible"
ref="detailRef"
@refreshDataList="getDataList"></detail>
<detail
v-if="detailVisible"
ref="detailRef"
@refreshDataList="getDataList"
></detail>
</div>
</el-card>
</template>
@ -127,13 +182,14 @@ export default {
endTime: '',
streetId: '',
communityId: '',
gridId: ''
gridId: '',
itemCode: ''
},
detailVisible: false,
ids: [],
options: [],
pickerBeginDateBefore: {
disabledDate: (time) => {
disabledDate: time => {
let beginDateVal = this.dataForm.startTime
if (beginDateVal) {
return time.getTime() > new Date(beginDateVal).getTime()
@ -141,7 +197,7 @@ export default {
}
},
pickerBeginDateAfter: {
disabledDate: (time) => {
disabledDate: time => {
let EndDateVal = this.dataForm.endTime
if (EndDateVal) {
return time.getTime() < new Date(EndDateVal).getTime()
@ -157,7 +213,7 @@ export default {
this.getOptions()
},
watch: {
'ids': function (val) {
ids: function (val) {
if (val.length === 0) {
this.dataForm.streetId = ''
this.dataForm.communityId = ''
@ -186,12 +242,15 @@ export default {
this.$router.push({ path: '/events-item-end', query: { id: id } })
},
getOptions () {
this.$http.get(`/sys/user/deptOptions/getByLoginUser`).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.options = res.data.options
}).catch(() => {})
this.$http
.get(`/sys/user/deptOptions/getByLoginUser`)
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.options = res.data.options
})
.catch(() => {})
}
}
}

2
src/views/modules/group/group-approve.vue

@ -74,6 +74,8 @@ export default {
this.$nextTick(() => {
if (this.dataForm.id) {
this.getInfo()
this.dataForm.state = '10'
this.dataForm.processingOpinions = ''
}
})
},

11
src/views/modules/group/group-detail.vue

@ -29,7 +29,7 @@
<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
<el-table-column type="index" width="50" label="序号"></el-table-column>
<el-table-column prop="nickname" label="成员名称" header-align="center" align="center"></el-table-column>
<el-table-column prop="lordFlag" label="身份" header-align="center" align="center"></el-table-column>
<el-table-column prop="lordFlag" label="群主标识" header-align="center" align="center" :formatter="formatterLoadFlag"></el-table-column>
<el-table-column prop="mobile" label="联系电话" header-align="center" align="center"></el-table-column>
</el-table>
<el-pagination
@ -93,6 +93,15 @@ export default {
...res.data
}
}).catch(() => {})
},
// 01
formatterLoadFlag: function (row, column) {
let lordFlag = row.lordFlag
if (lordFlag === '0') {
return '否'
} else if (lordFlag === '1') {
return '是'
}
}
}
}

3
src/views/modules/group/topic-list.vue

@ -38,7 +38,7 @@
</el-select>
</el-form-item>
<el-form-item label="关键词" prop="keyword">
<el-input v-model="dataForm.keyword" placeholder=""></el-input>
<el-input v-model="dataForm.keyword" placeholder="" clearable ></el-input>
</el-form-item>
<el-form-item label="排序方式">
<el-select v-model="dataForm.orderType" clearable
@ -68,6 +68,7 @@
<template slot-scope="scope">
<el-button type="text" size="small" @click="look(scope.row.id)">{{ $t('look') }}</el-button>
<el-button v-if="scope.row.state !== 20" type="text" size="small" @click="close(scope.row.id)">{{ $t('close') }}</el-button>
<el-button type="text" size="small" v-if="scope.row.state ===20" :disabled="true">已关闭</el-button>
</template>
</el-table-column>
</el-table>

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

@ -114,7 +114,7 @@
header-align="center"
align="center"></el-table-column>
<el-table-column prop="unLikeNumber"
label="反对数"
label="不支持数"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="createdTime"

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

@ -114,7 +114,7 @@
header-align="center"
align="center"></el-table-column>
<el-table-column prop="unLikeNumber"
label="反对数"
label="不支持数"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="createdTime"

13
src/views/modules/news/notice-add-or-update.vue

@ -108,7 +108,7 @@ export default {
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
noticeContent: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
{ required: true, message: this.$t(' ') }
]
}
}
@ -205,12 +205,23 @@ export default {
}
}).catch(() => { })
},
removeHTMLTag (str) {
str = str.replace(/<\/?[^>]*>/g, '')
str = str.replace(/[|]*\n/g, '\n')
str = str.replace(/&nbsp;/gi, '')
return str
},
//
dataFormSubmitHandle: debounce(function () {
if (this.dataForm.noticeContent != null && this.dataForm.noticeContent !== undefined) {
this.dataForm.noticeContent = this.removeHTMLTag(this.dataForm.noticeContent)
if ((this.dataForm.noticeContent).length > 10000) {
return this.$message.error('您输入的的内容已超过字数不能提交')
} else if (this.dataForm.noticeContent.length === 0) {
return this.$message.error('通知内容不能空')
}
} else {
return this.$message.error('通知内容不能为空')
}
this.$refs['dataForm'].validate((valid) => {
if (!valid) {

306
src/views/modules/oss/oss-config.vue

@ -1,18 +1,15 @@
<template>
<el-dialog
:visible.sync="visible"
:title="$t('oss.config')"
:close-on-click-modal="false"
:close-on-press-escape="false"
>
<el-form
:model="dataForm"
:rules="dataRule"
ref="dataForm"
@keyup.enter.native="dataFormSubmitHandle()"
label-width="120px"
>
<el-form-item :label="$t('oss.type')" size="mini">
<el-dialog :visible.sync="visible"
:title="$t('oss.config')"
:close-on-click-modal="false"
:close-on-press-escape="false">
<el-form :model="dataForm"
:rules="dataRule"
ref="dataForm"
@keyup.enter.native="dataFormSubmitHandle()"
label-width="120px">
<el-form-item :label="$t('oss.type')"
size="mini">
<el-radio-group v-model="dataForm.type">
<el-radio :label="1">{{ $t('oss.type1') }}</el-radio>
<el-radio :label="2">{{ $t('oss.type2') }}</el-radio>
@ -22,206 +19,153 @@
</el-radio-group>
</el-form-item>
<template v-if="dataForm.type === 1">
<el-form-item prop="qiniuDomain" :label="$t('oss.qiniuDomain')">
<el-input
v-model="dataForm.qiniuDomain"
:placeholder="$t('oss.qiniuDomainTips')"
></el-input>
<el-form-item prop="qiniuDomain"
:label="$t('oss.qiniuDomain')">
<el-input v-model="dataForm.qiniuDomain"
:placeholder="$t('oss.qiniuDomainTips')"></el-input>
</el-form-item>
<el-form-item prop="qiniuPrefix" :label="$t('oss.qiniuPrefix')">
<el-input
v-model="dataForm.qiniuPrefix"
:placeholder="$t('oss.qiniuPrefixTips')"
></el-input>
<el-form-item prop="qiniuPrefix"
:label="$t('oss.qiniuPrefix')">
<el-input v-model="dataForm.qiniuPrefix"
:placeholder="$t('oss.qiniuPrefixTips')"></el-input>
</el-form-item>
<el-form-item prop="qiniuAccessKey" :label="$t('oss.qiniuAccessKey')">
<el-input
v-model="dataForm.qiniuAccessKey"
:placeholder="$t('oss.qiniuAccessKeyTips')"
></el-input>
<el-form-item prop="qiniuAccessKey"
:label="$t('oss.qiniuAccessKey')">
<el-input v-model="dataForm.qiniuAccessKey"
:placeholder="$t('oss.qiniuAccessKeyTips')"></el-input>
</el-form-item>
<el-form-item prop="qiniuSecretKey" :label="$t('oss.qiniuSecretKey')">
<el-input
v-model="dataForm.qiniuSecretKey"
:placeholder="$t('oss.qiniuSecretKeyTips')"
></el-input>
<el-form-item prop="qiniuSecretKey"
:label="$t('oss.qiniuSecretKey')">
<el-input v-model="dataForm.qiniuSecretKey"
:placeholder="$t('oss.qiniuSecretKeyTips')"></el-input>
</el-form-item>
<el-form-item prop="qiniuBucketName" :label="$t('oss.qiniuBucketName')">
<el-input
v-model="dataForm.qiniuBucketName"
:placeholder="$t('oss.qiniuBucketNameTips')"
></el-input>
<el-form-item prop="qiniuBucketName"
:label="$t('oss.qiniuBucketName')">
<el-input v-model="dataForm.qiniuBucketName"
:placeholder="$t('oss.qiniuBucketNameTips')"></el-input>
</el-form-item>
</template>
<template v-else-if="dataForm.type === 2">
<el-form-item prop="aliyunDomain" :label="$t('oss.aliyunDomain')">
<el-input
v-model="dataForm.aliyunDomain"
:placeholder="$t('oss.aliyunDomainTips')"
></el-input>
<el-form-item prop="aliyunDomain"
:label="$t('oss.aliyunDomain')">
<el-input v-model="dataForm.aliyunDomain"
:placeholder="$t('oss.aliyunDomainTips')"></el-input>
</el-form-item>
<el-form-item prop="aliyunPrefix" :label="$t('oss.aliyunPrefix')">
<el-input
v-model="dataForm.aliyunPrefix"
:placeholder="$t('oss.aliyunPrefixTips')"
></el-input>
<el-form-item prop="aliyunPrefix"
:label="$t('oss.aliyunPrefix')">
<el-input v-model="dataForm.aliyunPrefix"
:placeholder="$t('oss.aliyunPrefixTips')"></el-input>
</el-form-item>
<el-form-item prop="aliyunEndPoint" :label="$t('oss.aliyunEndPoint')">
<el-input
v-model="dataForm.aliyunEndPoint"
:placeholder="$t('oss.aliyunEndPointTips')"
></el-input>
<el-form-item prop="aliyunEndPoint"
:label="$t('oss.aliyunEndPoint')">
<el-input v-model="dataForm.aliyunEndPoint"
:placeholder="$t('oss.aliyunEndPointTips')"></el-input>
</el-form-item>
<el-form-item
prop="aliyunAccessKeyId"
:label="$t('oss.aliyunAccessKeyId')"
>
<el-input
v-model="dataForm.aliyunAccessKeyId"
:placeholder="$t('oss.aliyunAccessKeyIdTips')"
></el-input>
<el-form-item prop="aliyunAccessKeyId"
:label="$t('oss.aliyunAccessKeyId')">
<el-input v-model="dataForm.aliyunAccessKeyId"
:placeholder="$t('oss.aliyunAccessKeyIdTips')"></el-input>
</el-form-item>
<el-form-item
prop="aliyunAccessKeySecret"
:label="$t('oss.aliyunAccessKeySecret')"
>
<el-input
v-model="dataForm.aliyunAccessKeySecret"
:placeholder="$t('oss.aliyunAccessKeySecretTips')"
></el-input>
<el-form-item prop="aliyunAccessKeySecret"
:label="$t('oss.aliyunAccessKeySecret')">
<el-input v-model="dataForm.aliyunAccessKeySecret"
:placeholder="$t('oss.aliyunAccessKeySecretTips')"></el-input>
</el-form-item>
<el-form-item
prop="aliyunBucketName"
:label="$t('oss.aliyunBucketName')"
>
<el-input
v-model="dataForm.aliyunBucketName"
:placeholder="$t('oss.aliyunBucketNameTips')"
></el-input>
<el-form-item prop="aliyunBucketName"
:label="$t('oss.aliyunBucketName')">
<el-input v-model="dataForm.aliyunBucketName"
:placeholder="$t('oss.aliyunBucketNameTips')"></el-input>
</el-form-item>
</template>
<template v-else-if="dataForm.type === 3">
<el-form-item prop="qcloudDomain" :label="$t('oss.qcloudDomain')">
<el-input
v-model="dataForm.qcloudDomain"
:placeholder="$t('oss.qcloudDomainTips')"
></el-input>
<el-form-item prop="qcloudDomain"
:label="$t('oss.qcloudDomain')">
<el-input v-model="dataForm.qcloudDomain"
:placeholder="$t('oss.qcloudDomainTips')"></el-input>
</el-form-item>
<el-form-item prop="qcloudPrefix" :label="$t('oss.qcloudPrefix')">
<el-input
v-model="dataForm.qcloudPrefix"
:placeholder="$t('oss.qcloudPrefixTips')"
></el-input>
<el-form-item prop="qcloudPrefix"
:label="$t('oss.qcloudPrefix')">
<el-input v-model="dataForm.qcloudPrefix"
:placeholder="$t('oss.qcloudPrefixTips')"></el-input>
</el-form-item>
<el-form-item prop="qcloudAppId" :label="$t('oss.qcloudAppId')">
<el-input
v-model="dataForm.qcloudAppId"
:placeholder="$t('oss.qcloudAppIdTips')"
></el-input>
<el-form-item prop="qcloudAppId"
:label="$t('oss.qcloudAppId')">
<el-input v-model="dataForm.qcloudAppId"
:placeholder="$t('oss.qcloudAppIdTips')"></el-input>
</el-form-item>
<el-form-item prop="qcloudSecretId" :label="$t('oss.qcloudSecretId')">
<el-input
v-model="dataForm.qcloudSecretId"
:placeholder="$t('oss.qcloudSecretIdTips')"
></el-input>
<el-form-item prop="qcloudSecretId"
:label="$t('oss.qcloudSecretId')">
<el-input v-model="dataForm.qcloudSecretId"
:placeholder="$t('oss.qcloudSecretIdTips')"></el-input>
</el-form-item>
<el-form-item prop="qcloudSecretKey" :label="$t('oss.qcloudSecretKey')">
<el-input
v-model="dataForm.qcloudSecretKey"
:placeholder="$t('oss.qcloudSecretKeyTips')"
></el-input>
<el-form-item prop="qcloudSecretKey"
:label="$t('oss.qcloudSecretKey')">
<el-input v-model="dataForm.qcloudSecretKey"
:placeholder="$t('oss.qcloudSecretKeyTips')"></el-input>
</el-form-item>
<el-form-item
prop="qcloudBucketName"
:label="$t('oss.qcloudBucketName')"
>
<el-input
v-model="dataForm.qcloudBucketName"
:placeholder="$t('oss.qcloudBucketNameTips')"
></el-input>
<el-form-item prop="qcloudBucketName"
:label="$t('oss.qcloudBucketName')">
<el-input v-model="dataForm.qcloudBucketName"
:placeholder="$t('oss.qcloudBucketNameTips')"></el-input>
</el-form-item>
<el-form-item prop="qcloudRegion" :label="$t('oss.qcloudRegion')">
<el-select
v-model="dataForm.qcloudRegion"
clearable
:placeholder="$t('oss.qcloudRegionTips')"
class="w-percent-100"
>
<el-option
value="ap-beijing-1"
:label="$t('oss.qcloudRegionBeijing1')"
></el-option>
<el-option
value="ap-beijing"
:label="$t('oss.qcloudRegionBeijing')"
></el-option>
<el-option
value="ap-shanghai"
:label="$t('oss.qcloudRegionShanghai')"
></el-option>
<el-option
value="ap-guangzhou"
:label="$t('oss.qcloudRegionGuangzhou')"
></el-option>
<el-option
value="ap-chengdu"
:label="$t('oss.qcloudRegionChengdu')"
></el-option>
<el-option
value="ap-chongqing"
:label="$t('oss.qcloudRegionChongqing')"
></el-option>
<el-option
value="ap-singapore"
:label="$t('oss.qcloudRegionSingapore')"
></el-option>
<el-option
value="ap-hongkong"
:label="$t('oss.qcloudRegionHongkong')"
></el-option>
<el-option
value="na-toronto"
:label="$t('oss.qcloudRegionToronto')"
></el-option>
<el-option
value="eu-frankfurt"
:label="$t('oss.qcloudRegionFrankfurt')"
></el-option>
<el-form-item prop="qcloudRegion"
:label="$t('oss.qcloudRegion')">
<el-select v-model="dataForm.qcloudRegion"
clearable
:placeholder="$t('oss.qcloudRegionTips')"
class="w-percent-100">
<el-option value="ap-beijing-1"
:label="$t('oss.qcloudRegionBeijing1')"></el-option>
<el-option value="ap-beijing"
:label="$t('oss.qcloudRegionBeijing')"></el-option>
<el-option value="ap-shanghai"
:label="$t('oss.qcloudRegionShanghai')"></el-option>
<el-option value="ap-guangzhou"
:label="$t('oss.qcloudRegionGuangzhou')"></el-option>
<el-option value="ap-chengdu"
:label="$t('oss.qcloudRegionChengdu')"></el-option>
<el-option value="ap-chongqing"
:label="$t('oss.qcloudRegionChongqing')"></el-option>
<el-option value="ap-singapore"
:label="$t('oss.qcloudRegionSingapore')"></el-option>
<el-option value="ap-hongkong"
:label="$t('oss.qcloudRegionHongkong')"></el-option>
<el-option value="na-toronto"
:label="$t('oss.qcloudRegionToronto')"></el-option>
<el-option value="eu-frankfurt"
:label="$t('oss.qcloudRegionFrankfurt')"></el-option>
</el-select>
</el-form-item>
</template>
<template v-else-if="dataForm.type === 4">
<el-form-item prop="fastdfsDomain" :label="$t('oss.fastdfsDomain')">
<el-input
v-model="dataForm.localDomain"
:placeholder="$t('oss.fastdfsDomainTips')"
></el-input>
<el-form-item prop="fastdfsDomain"
:label="$t('oss.fastdfsDomain')">
<el-input v-model="dataForm.fastdfsDomain"
:placeholder="$t('oss.fastdfsDomainTips')"></el-input>
</el-form-item>
</template>
<template v-else-if="dataForm.type === 5">
<el-form-item prop="localDomain" :label="$t('oss.localDomain')">
<el-input
v-model="dataForm.fastdfsDomain"
:placeholder="$t('oss.localDomainTips')"
></el-input>
<el-form-item prop="localDomain"
:label="$t('oss.localDomain')">
<el-input v-model="dataForm.localDomain"
:placeholder="$t('oss.localDomainTips')"></el-input>
</el-form-item>
<el-form-item prop="localPrefix" :label="$t('oss.localPrefix')">
<el-input
v-model="dataForm.localPrefix"
:placeholder="$t('oss.localPrefixTips')"
></el-input>
<el-form-item prop="localPrefix"
:label="$t('oss.localPrefix')">
<el-input v-model="dataForm.localPrefix"
:placeholder="$t('oss.localPrefixTips')"></el-input>
</el-form-item>
<el-form-item prop="localPath" :label="$t('oss.localPath')">
<el-input
v-model="dataForm.localPath"
:placeholder="$t('oss.localPathTips')"
></el-input>
<el-form-item prop="localPath"
:label="$t('oss.localPath')">
<el-input v-model="dataForm.localPath"
:placeholder="$t('oss.localPathTips')"></el-input>
</el-form-item>
</template>
</el-form>
<template slot="footer">
<el-button @click="visible = false">{{ $t('cancel') }}</el-button>
<el-button type="primary" @click="dataFormSubmitHandle()">{{
<el-button type="primary"
@click="dataFormSubmitHandle()">{{
$t('confirm')
}}</el-button>
</template>
@ -416,7 +360,7 @@ export default {
}
this.dataForm = res.data
})
.catch(() => {})
.catch(() => { })
},
//
dataFormSubmitHandle: debounce(
@ -441,7 +385,7 @@ export default {
}
})
})
.catch(() => {})
.catch(() => { })
})
},
1000,

2
src/views/modules/user/fail-authentication.vue

@ -83,7 +83,7 @@ export default {
identityNo: '',
startTime: '',
endTime: '',
partyFlag: '',
partyFlag: '0', // (0-1-)
state: '2'
},
deptIdList: [],

7
src/views/modules/user/partymembers-add-or-update.vue

@ -74,13 +74,13 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="用户标签">
<!-- <el-form-item label="用户标签">
<el-checkbox-group v-model="dataForm.tagIds">
<el-checkbox v-for="item in tagOptions"
:key="item.tagName"
:label="item.id">{{item.tagName}}</el-checkbox>
</el-checkbox-group>
</el-form-item>
</el-form-item> -->
</el-form>
<template slot="footer">
<el-button @click="visible = false">{{ $t('cancel') }}</el-button>
@ -150,12 +150,13 @@ export default {
} else {
this.dataForm.allDeptIds = []
this.dataForm.cadreFlag = []
this.dataForm.tagIds = []
}
})
},
getByLoginUser () {
this.$http
.get(`/sys/user/deptOptions/getByLoginUser`)
.get(`/sys/dept/party/getDeptTree`)
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)

8
src/views/modules/user/partymembers.vue

@ -151,7 +151,8 @@
<el-table-column prop="identityNo"
label="身份证号"
header-align="center"
align="center"></el-table-column>
align="center"
width="180"></el-table-column>
<el-table-column prop="post"
label="职务"
header-align="center"
@ -161,10 +162,10 @@
:formatter="formatCadre"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="tagName"
<!-- <el-table-column prop="tagName"
label="角色"
header-align="center"
align="center"></el-table-column>
align="center"></el-table-column> -->
<el-table-column prop="partyOrganization"
label="所在党委"
header-align="center"
@ -418,7 +419,6 @@ export default {
this.$message.error('上传失败请重试')
},
uploadSuccess (response, file, fileList) {
this.dataListLoading = false
this.$refs.upload.clearFiles()
console.log(response)
if (response.data !== null && response.data.length > 0) {

203
src/views/modules/user/pass-authentication.vue

@ -1,63 +1,140 @@
<template>
<el-card shadow="never" class="aui-card--fill">
<el-card shadow="never"
class="aui-card--fill">
<div class="mod-epdc__user}">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item label="所属机构">
<el-cascader
v-model="deptIdList"
:options="options"
:props="{ checkStrictly: true }"
clearable>
</el-cascader>
</el-form-item>
<el-form-item label="街道" v-if="false">
<el-select v-model="dataForm.streetId" clearable placeholder="请选择" @change="getCommunityList">
<el-option v-for="(item, index) in streetOptions" :key="index" :label="item.name" :value="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="社区" v-if="false">
<el-select v-model="dataForm.communityId" clearable placeholder="请选择" @change="getGridList">
<el-option v-for="(item,index) in communityOptions" :key="index" :label="item.name" :value="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="网格" v-if="false">
<el-select v-model="dataForm.gridId" clearable placeholder="请选择">
<el-option v-for="(item,index) in gridOptions" :key="index" :label="item.name" :value="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="姓名"><el-input v-model="dataForm.realName" placeholder="请输入" clearable></el-input></el-form-item>
<el-form-item label="手机号"><el-input v-model="dataForm.mobile" placeholder="请输入" clearable></el-input></el-form-item>
<div class="block">
<el-form-item label="是否是党员">
<el-select v-model="dataForm.partyFlag" clearable placeholder="请选择" >
<el-option v-for="(item,index) in partyFlagOptions" :key="index" :label="item.name" :value="item.id"></el-option>
</el-select>
</el-form-item>
<span class="demonstration">注册时间</span>&nbsp;&nbsp;
<el-date-picker @change='setRegistTime' v-model="time" value-format="yyyy-MM-dd" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>&nbsp;
<el-form-item><el-button @click="getDataList()">{{ $t('query') }}</el-button></el-form-item>
<el-form-item><el-button v-if="$hasPermission('epdc:user:export')" type="primary" @click="exportHandle()">{{ $t('export') }}</el-button></el-form-item>
</div>
</el-form>
<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
<el-table-column label="序号" width="70px"><template slot-scope="scope"> {{scope.$index+1}} </template></el-table-column>
<el-table-column prop="realName" label="真实姓名" header-align="center" align="center"></el-table-column>
<el-table-column prop="mobile" label="手机号" header-align="center" align="center"></el-table-column>
<el-table-column prop="registerTime" label="注册时间" header-align="center" align="center"></el-table-column>
<el-table-column prop="address" 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">
<el-button type="text" size="small" @click="userGridHandle(scope.row.id)">管理网格</el-button>
<el-button type="text" size="small" @click="userDetailHandle(scope.row.id)">查看</el-button>
</template>
</el-table-column>
</el-table>
<el-pagination :current-page="page" :page-sizes="[10, 20, 50, 100]" :page-size="limit" :total="total" layout="total, sizes, prev, pager, next, jumper" @size-change="pageSizeChangeHandle" @current-change="pageCurrentChangeHandle"></el-pagination>
<!-- 弹窗, 新增 / 修改 -->
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
<user-detail v-if="userDetailVisible" ref="userDetail" @refreshDataList="getDataList"></user-detail>
<user-grid v-if="userGridVisible" ref="userGrid" @refreshDataList="getDataList"></user-grid>
<el-form :inline="true"
:model="dataForm"
@keyup.enter.native="getDataList()">
<el-form-item label="所属机构">
<el-cascader v-model="deptIdList"
:options="options"
:props="{ checkStrictly: true }"
clearable>
</el-cascader>
</el-form-item>
<el-form-item label="街道"
v-if="false">
<el-select v-model="dataForm.streetId"
clearable
placeholder="请选择"
@change="getCommunityList">
<el-option v-for="(item, index) in streetOptions"
:key="index"
:label="item.name"
:value="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="社区"
v-if="false">
<el-select v-model="dataForm.communityId"
clearable
placeholder="请选择"
@change="getGridList">
<el-option v-for="(item,index) in communityOptions"
:key="index"
:label="item.name"
:value="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="网格"
v-if="false">
<el-select v-model="dataForm.gridId"
clearable
placeholder="请选择">
<el-option v-for="(item,index) in gridOptions"
:key="index"
:label="item.name"
:value="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="姓名">
<el-input v-model="dataForm.realName"
placeholder="请输入"
clearable></el-input>
</el-form-item>
<el-form-item label="手机号">
<el-input v-model="dataForm.mobile"
placeholder="请输入"
clearable></el-input>
</el-form-item>
<div class="block">
<span class="demonstration">注册时间</span>&nbsp;&nbsp;
<el-date-picker @change='setRegistTime'
v-model="time"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"></el-date-picker>&nbsp;
<el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item>
<el-form-item>
<el-button v-if="$hasPermission('epdc:user:export')"
type="primary"
@click="exportHandle()">{{ $t('export') }}</el-button>
</el-form-item>
</div>
</el-form>
<el-table v-loading="dataListLoading"
:data="dataList"
border
@selection-change="dataListSelectionChangeHandle"
style="width: 100%;">
<el-table-column type="selection"
header-align="center"
align="center"
width="50"></el-table-column>
<el-table-column label="序号"
width="70px"><template slot-scope="scope"> {{scope.$index+1}} </template></el-table-column>
<el-table-column prop="realName"
label="真实姓名"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="mobile"
label="手机号"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="registerTime"
label="注册时间"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="address"
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">
<el-button type="text"
size="small"
@click="userGridHandle(scope.row.id)">管理网格</el-button>
<el-button type="text"
size="small"
@click="userDetailHandle(scope.row.id)">查看</el-button>
</template>
</el-table-column>
</el-table>
<el-pagination :current-page="page"
:page-sizes="[10, 20, 50, 100]"
:page-size="limit"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="pageSizeChangeHandle"
@current-change="pageCurrentChangeHandle"></el-pagination>
<!-- 弹窗, 新增 / 修改 -->
<add-or-update v-if="addOrUpdateVisible"
ref="addOrUpdate"
@refreshDataList="getDataList"></add-or-update>
<user-detail v-if="userDetailVisible"
ref="userDetail"
@refreshDataList="getDataList"></user-detail>
<user-grid v-if="userGridVisible"
ref="userGrid"
@refreshDataList="getDataList"></user-grid>
</div>
</el-card>
</template>
@ -88,7 +165,7 @@ export default {
identityNo: '',
startTime: '',
endTime: '',
partyFlag: '',
partyFlag: '0', // (0-1-)
state: '3'
},
deptIdList: [],
@ -114,7 +191,7 @@ export default {
}
this.options = res.data.options
})
.catch(() => {})
.catch(() => { })
},
watch: {
'deptIdList': function (val) {
@ -147,7 +224,7 @@ export default {
return this.$message.error(res.msg)
}
this.streetOptions = res.data
}).catch(() => {})
}).catch(() => { })
},
getCommunityList () {
this.communityOptions = this.gridOptions = []
@ -158,7 +235,7 @@ export default {
return this.$message.error(res.msg)
}
this.communityOptions = res.data
}).catch(() => {})
}).catch(() => { })
}
},
getGridList () {
@ -170,7 +247,7 @@ export default {
return this.$message.error(res.msg)
}
this.gridOptions = res.data
}).catch(() => {})
}).catch(() => { })
}
},
setRegistTime () {

2
src/views/modules/user/unauthorized.vue

@ -83,7 +83,7 @@ export default {
identityNo: '',
startTime: '',
endTime: '',
partyFlag: '',
partyFlag: '0', // (0-1-)
state: '0',
nickname: ''
},

2
src/views/modules/user/wait-authentication.vue

@ -79,7 +79,7 @@ export default {
identityNo: '',
startTime: '',
endTime: '',
partyFlag: '',
partyFlag: '0', // (0-1-)
state: '1'
},
deptIdList: [],

Loading…
Cancel
Save