Browse Source

合并分支,解决冲突

master
yujintao 6 years ago
parent
commit
c2e544bee3
  1. 247
      src/views/modules/events/issue-change-list.vue
  2. 247
      src/views/modules/events/issue-close-list.vue
  3. 266
      src/views/modules/events/issue-process-list.vue
  4. 285
      src/views/modules/events/item-close-list.vue
  5. 247
      src/views/modules/events/item-deal-list.vue
  6. 255
      src/views/modules/events/item-end-list.vue

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(() => {})
}
}
}

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(() => {})
}
}
}

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(() => {})
}
}
}

Loading…
Cancel
Save