Browse Source

Merge remote-tracking branch 'origin/release/epdc' into release/epdc

release/epdc
wanggongfeng 4 years ago
parent
commit
b11e251c7f
  1. 109
      src/views/modules/events/appeal-development-list.vue
  2. 109
      src/views/modules/events/appeal-enforce-list.vue
  3. 141
      src/views/modules/events/appeal-peo-list.vue
  4. 8
      src/views/modules/events/item-deal-list.vue
  5. 4
      src/views/modules/events/item-end-list.vue
  6. 4
      src/views/modules/events/item-reject-deal-list.vue

109
src/views/modules/events/appeal-development-list.vue

@ -23,10 +23,10 @@
>
</el-cascader>
</el-form-item>
<el-form-item label="项目内容" prop="itemCode">
<el-form-item label="诉求内容" prop="itemCode">
<el-input
v-model="dataForm.itemContent"
placeholder="请输入项目内容"
placeholder="请输入诉求内容"
clearable
@keyup.native="btKeyUpItemContent"
style="width:200px;"
@ -50,7 +50,7 @@
</el-select>
</el-form-item>
<el-form-item label="项目状态" label-width="105px">
<el-form-item label="处理状态" label-width="105px">
<el-select v-model="dataForm.itemState" clearable placeholder="请选择" style="width:200px;">
<el-option label="处理中" value="0"></el-option>
<el-option label="已结案" value="10"></el-option>
@ -123,7 +123,7 @@
prop="itemContent"
label="诉求内容"
header-align="center"
min-width="400"
min-width="300"
align="left"
show-overflow-tooltip
></el-table-column>
@ -142,19 +142,18 @@
align="center"
></el-table-column> -->
<el-table-column
prop="itemStateName"
label="项目状态"
prop="evaluationScoreName"
label="满意度"
header-align="center"
min-width="150"
align="center"
></el-table-column>
<el-table-column
prop="evaluationScoreName"
label="满意度"
prop="itemStateName"
label="处理状态"
header-align="center"
min-width="150"
align="center"
></el-table-column>
<el-table-column
prop="createdTime"
label="上报时间"
@ -166,7 +165,7 @@
prop="nickName"
label="联系人姓名"
header-align="center"
min-width="200"
min-width="100"
align="center"
show-overflow-tooltip
></el-table-column>
@ -174,9 +173,7 @@
:label="$t('handle')"
fixed="right"
header-align="center"
align="center"
width="150"
>
align="center">
<template slot-scope="scope">
<el-button
type="text"
@ -217,8 +214,8 @@ export default {
name: 'AppealList',
data () {
return {
green,
red,
green,
red,
mixinViewModuleOptions: {
getDataListURL: '/events/item/getItemAppealPage',
getDataListIsPage: true,
@ -238,11 +235,11 @@ export default {
mobile: '',
appealType: 1,
evaluationScore: '',
itemState:''
itemState: ''
},
ids: [],
options: [],
ids: [],
options: [],
addOrUpdateVisible: false,
pickerBeginDateBefore: {
disabledDate: (time) => {
@ -267,45 +264,45 @@ export default {
},
created: function () {
this.getPeoList()
this.getOptions()
this.getOptions()
},
watch: {
ids: function (val) {
if (val.length === 0) {
this.dataForm.streetId = ''
this.dataForm.communityId = ''
this.dataForm.gridId = ''
}
if (val.length === 1) {
this.dataForm.streetId = this.ids[0]
this.dataForm.communityId = ''
this.dataForm.gridId = ''
}
if (val.length === 2) {
this.dataForm.streetId = this.ids[0]
this.dataForm.communityId = this.ids[1]
this.dataForm.gridId = ''
}
if (val.length === 3) {
this.dataForm.streetId = this.ids[0]
this.dataForm.communityId = this.ids[1]
this.dataForm.gridId = this.ids[2]
}
}
},
watch: {
ids: function (val) {
if (val.length === 0) {
this.dataForm.streetId = ''
this.dataForm.communityId = ''
this.dataForm.gridId = ''
}
if (val.length === 1) {
this.dataForm.streetId = this.ids[0]
this.dataForm.communityId = ''
this.dataForm.gridId = ''
}
if (val.length === 2) {
this.dataForm.streetId = this.ids[0]
this.dataForm.communityId = this.ids[1]
this.dataForm.gridId = ''
}
if (val.length === 3) {
this.dataForm.streetId = this.ids[0]
this.dataForm.communityId = this.ids[1]
this.dataForm.gridId = this.ids[2]
}
}
},
methods: {
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(() => {
})
},
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(() => {
})
},
getPeoList () {
console.log(this.dataList)
},

109
src/views/modules/events/appeal-enforce-list.vue

@ -23,10 +23,10 @@
>
</el-cascader>
</el-form-item>
<el-form-item label="项目内容" prop="itemCode">
<el-form-item label="诉求内容" prop="itemCode">
<el-input
v-model="dataForm.itemContent"
placeholder="请输入项目内容"
placeholder="请输入诉求内容"
clearable
@keyup.native="btKeyUpItemContent"
style="width:200px;"
@ -50,7 +50,7 @@
</el-select>
</el-form-item>
<el-form-item label="项目状态" label-width="105px">
<el-form-item label="处理状态" label-width="105px">
<el-select v-model="dataForm.itemState" clearable placeholder="请选择" style="width:200px;">
<el-option label="处理中" value="0"></el-option>
<el-option label="已结案" value="10"></el-option>
@ -123,7 +123,7 @@
prop="itemContent"
label="诉求内容"
header-align="center"
min-width="400"
min-width="300"
align="left"
show-overflow-tooltip
></el-table-column>
@ -142,19 +142,18 @@
align="center"
></el-table-column> -->
<el-table-column
prop="itemStateName"
label="项目状态"
prop="evaluationScoreName"
label="满意度"
header-align="center"
min-width="150"
align="center"
></el-table-column>
<el-table-column
prop="evaluationScoreName"
label="满意度"
prop="itemStateName"
label="处理状态"
header-align="center"
min-width="150"
align="center"
></el-table-column>
<el-table-column
prop="createdTime"
label="上报时间"
@ -166,7 +165,7 @@
prop="nickName"
label="联系人姓名"
header-align="center"
min-width="200"
min-width="100"
align="center"
show-overflow-tooltip
></el-table-column>
@ -174,9 +173,7 @@
:label="$t('handle')"
fixed="right"
header-align="center"
align="center"
width="150"
>
align="center">
<template slot-scope="scope">
<el-button
type="text"
@ -217,8 +214,8 @@ export default {
name: 'AppealList',
data () {
return {
green,
red,
green,
red,
mixinViewModuleOptions: {
getDataListURL: '/events/item/getItemAppealPage',
getDataListIsPage: true,
@ -238,11 +235,11 @@ export default {
mobile: '',
appealType: 2,
evaluationScore: '',
itemState:''
itemState: ''
},
ids: [],
options: [],
ids: [],
options: [],
addOrUpdateVisible: false,
pickerBeginDateBefore: {
disabledDate: (time) => {
@ -267,45 +264,45 @@ export default {
},
created: function () {
this.getPeoList()
this.getOptions()
this.getOptions()
},
watch: {
ids: function (val) {
if (val.length === 0) {
this.dataForm.streetId = ''
this.dataForm.communityId = ''
this.dataForm.gridId = ''
}
if (val.length === 1) {
this.dataForm.streetId = this.ids[0]
this.dataForm.communityId = ''
this.dataForm.gridId = ''
}
if (val.length === 2) {
this.dataForm.streetId = this.ids[0]
this.dataForm.communityId = this.ids[1]
this.dataForm.gridId = ''
}
if (val.length === 3) {
this.dataForm.streetId = this.ids[0]
this.dataForm.communityId = this.ids[1]
this.dataForm.gridId = this.ids[2]
}
}
},
watch: {
ids: function (val) {
if (val.length === 0) {
this.dataForm.streetId = ''
this.dataForm.communityId = ''
this.dataForm.gridId = ''
}
if (val.length === 1) {
this.dataForm.streetId = this.ids[0]
this.dataForm.communityId = ''
this.dataForm.gridId = ''
}
if (val.length === 2) {
this.dataForm.streetId = this.ids[0]
this.dataForm.communityId = this.ids[1]
this.dataForm.gridId = ''
}
if (val.length === 3) {
this.dataForm.streetId = this.ids[0]
this.dataForm.communityId = this.ids[1]
this.dataForm.gridId = this.ids[2]
}
}
},
methods: {
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(() => {
})
},
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(() => {
})
},
getPeoList () {
console.log(this.dataList)
},

141
src/views/modules/events/appeal-peo-list.vue

@ -50,8 +50,7 @@
</el-select>
</el-form-item>
<el-form-item label="项目状态" label-width="105px">
<el-form-item label="处理状态" label-width="105px">
<el-select v-model="dataForm.itemState" clearable placeholder="请选择" style="width:200px;">
<el-option label="处理中" value="0"></el-option>
<el-option label="已结案" value="10"></el-option>
@ -124,7 +123,7 @@
prop="itemContent"
label="诉求内容"
header-align="center"
min-width="400"
min-width="300"
align="left"
show-overflow-tooltip
></el-table-column>
@ -143,19 +142,20 @@
align="center"
></el-table-column> -->
<el-table-column
prop="itemStateName"
label="处理状态"
prop="evaluationScoreName"
label="满意度"
header-align="center"
min-width="150"
align="center"
></el-table-column>
<el-table-column
prop="evaluationScoreName"
label="满意度"
prop="itemStateName"
label="处理状态"
header-align="center"
min-width="150"
width="100"
align="center"
></el-table-column>
:formatter="stateFormat"
>
</el-table-column>
<el-table-column
prop="createdTime"
label="上报时间"
@ -167,7 +167,7 @@
prop="nickName"
label="联系人姓名"
header-align="center"
min-width="200"
min-width="100"
align="center"
show-overflow-tooltip
></el-table-column>
@ -176,7 +176,6 @@
fixed="right"
header-align="center"
align="center"
width="150"
>
<template slot-scope="scope">
<el-button
@ -218,8 +217,8 @@ export default {
name: 'AppealList',
data () {
return {
green,
red,
green,
red,
mixinViewModuleOptions: {
getDataListURL: '/events/item/getItemAppealPage',
getDataListIsPage: true,
@ -227,7 +226,6 @@ export default {
},
dataForm: {
id: '',
itemState: '0',
startTime: '',
endTime: '',
streetId: '',
@ -239,11 +237,13 @@ export default {
mobile: '',
appealType: 0,
evaluationScore: '',
itemState:''
itemHandleDeptId: '',
itemState: ''
},
ids: [],
options: [],
ids: [],
options: [],
optionsDept: [],
addOrUpdateVisible: false,
pickerBeginDateBefore: {
disabledDate: (time) => {
@ -266,49 +266,78 @@ export default {
components: {
AddOrUpdate
},
watch: {
ids: function (val) {
if (val.length === 0) {
this.dataForm.streetId = ''
this.dataForm.communityId = ''
this.dataForm.gridId = ''
}
if (val.length === 1) {
this.dataForm.streetId = this.ids[0]
this.dataForm.communityId = ''
this.dataForm.gridId = ''
}
if (val.length === 2) {
this.dataForm.streetId = this.ids[0]
this.dataForm.communityId = this.ids[1]
this.dataForm.gridId = ''
}
if (val.length === 3) {
this.dataForm.streetId = this.ids[0]
this.dataForm.communityId = this.ids[1]
this.dataForm.gridId = this.ids[2]
}
}
},
created: function () {
this.getOptions()
},
watch: {
ids: function (val) {
if (val.length === 0) {
this.dataForm.streetId = ''
this.dataForm.communityId = ''
this.dataForm.gridId = ''
}
if (val.length === 1) {
this.dataForm.streetId = this.ids[0]
this.dataForm.communityId = ''
this.dataForm.gridId = ''
}
if (val.length === 2) {
this.dataForm.streetId = this.ids[0]
this.dataForm.communityId = this.ids[1]
this.dataForm.gridId = ''
}
if (val.length === 3) {
this.dataForm.streetId = this.ids[0]
this.dataForm.communityId = this.ids[1]
this.dataForm.gridId = this.ids[2]
methods: {
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
.post(`/sys/dept/queryAllDeptInfo`, { })
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.optionsDept = res.data
})
.catch(() => {
})
},
stateFormat (row, column) {
if (row.itemState === 0) {
if (row.itemHandleDeptId === null || row.itemHandleDeptId === '0') {
return '街道处理中'
} else {
let itemStateDetail = '网格处理中';
this.optionsDept.filter(function (item) {
if (item.id === row.itemHandleDeptId) {
if (item.typeKey === 'grid_party') {
itemStateDetail = '网格处理中'
}
if (item.typeKey === 'community_party') {
itemStateDetail = '社区处理中'
}
}
})
return itemStateDetail
}
} else if (row.itemState === 10) {
return '已结案'
}
},
created: function () {
this.getOptions()
},
methods: {
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(() => {
})
},
dealAction (id) {
this.$parent.selectComponent = 'AppealDetailView'
this.$router.push({ path: '/events-appeal-peo', query: { id: id } })

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

@ -139,7 +139,7 @@
prop="nickName"
label="联系人姓名"
header-align="center"
min-width="200"
min-width="100"
align="center"
show-overflow-tooltip
></el-table-column>
@ -147,7 +147,7 @@
prop="mobile"
label="手机号"
header-align="center"
min-width="200"
min-width="100"
align="center"
></el-table-column>
<!--<el-table-column-->
@ -238,8 +238,8 @@ export default {
name: 'ItemDealList',
data () {
return {
green,
red,
green,
red,
mixinViewModuleOptions: {
getDataListURL: '/events/item/page',
getDataListIsPage: true,

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

@ -106,7 +106,7 @@
prop="itemContent"
label="诉求内容"
header-align="center"
min-width="400"
min-width="300"
align="left"
show-overflow-tooltip
></el-table-column>
@ -136,7 +136,7 @@
prop="mobile"
label="手机号"
header-align="center"
min-width="200"
min-width="100"
align="center"
></el-table-column>
<!-- <el-table-column

4
src/views/modules/events/item-reject-deal-list.vue

@ -107,7 +107,7 @@
prop="itemContent"
label="诉求内容"
header-align="center"
min-width="400"
min-width="300"
align="left"
show-overflow-tooltip
></el-table-column>
@ -137,7 +137,7 @@
prop="mobile"
label="手机号"
header-align="center"
min-width="200"
min-width="100"
align="center"
></el-table-column>
<!--<el-table-column-->

Loading…
Cancel
Save