Browse Source

修改bug 新增所属机构查询功能

master
曲树通 6 years ago
parent
commit
15e6f935ef
  1. 3
      src/views/modules/news/allnews-add-or-update.vue
  2. 8
      src/views/modules/news/allnews.vue
  3. 1
      src/views/modules/news/allnotice-add-or-update.vue
  4. 39
      src/views/modules/news/allnotice.vue

3
src/views/modules/news/allnews-add-or-update.vue

@ -44,6 +44,7 @@
v-loading="loading" v-loading="loading"
prop="newsImageUrl"> prop="newsImageUrl">
<el-upload class="avatar-uploader" <el-upload class="avatar-uploader"
disabled="true"
:action="uploadUrl" :action="uploadUrl"
:show-file-list="false" :show-file-list="false"
:on-success="handleAvatarSuccess" :on-success="handleAvatarSuccess"
@ -61,6 +62,7 @@
prop="newsReleaseStartTime"> prop="newsReleaseStartTime">
<el-date-picker @change='setRegistTime' <el-date-picker @change='setRegistTime'
v-model="time" v-model="time"
readonly="true"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
type="daterange" type="daterange"
range-separator="至" range-separator="至"
@ -278,6 +280,7 @@ export default {
modules: { modules: {
toolbar: this.quillEditorToolbarOptions toolbar: this.quillEditorToolbarOptions
}, },
readOnly: true,
theme: 'snow' theme: 'snow'
}) })
this.quillEditor.container.style.height = `${300}px` this.quillEditor.container.style.height = `${300}px`

8
src/views/modules/news/allnews.vue

@ -5,12 +5,12 @@
<el-form :inline="true" <el-form :inline="true"
:model="dataForm" :model="dataForm"
@keyup.enter.native="getDataList()"> @keyup.enter.native="getDataList()">
<!-- <el-form-item label="所属机构"> <el-form-item label="所属机构">
<el-cascader v-model="deptIdList" <el-cascader v-model="deptIdList"
:options="options" :options="options"
:props="{ checkStrictly: true }" :props="{ checkStrictly: true }"
clearable></el-cascader> clearable></el-cascader>
</el-form-item> --> </el-form-item>
<!--<el-form-item label="所属街道" <!--<el-form-item label="所属街道"
prop="deptId"> prop="deptId">
<el-select v-model="dataForm.streetId" <el-select v-model="dataForm.streetId"
@ -117,6 +117,10 @@
label="不支持数" label="不支持数"
header-align="center" header-align="center"
align="center"></el-table-column> align="center"></el-table-column>
<el-table-column prop="allDeptNames"
label="所属网格"
header-align="center"
align="center"></el-table-column>
<el-table-column prop="createdTime" <el-table-column prop="createdTime"
label="提交时间" label="提交时间"
header-align="center" header-align="center"

1
src/views/modules/news/allnotice-add-or-update.vue

@ -128,6 +128,7 @@ export default {
modules: { modules: {
toolbar: this.quillEditorToolbarOptions toolbar: this.quillEditorToolbarOptions
}, },
readOnly: true,
theme: 'snow' theme: 'snow'
}) })
// // (使element upload) // // (使element upload)

39
src/views/modules/news/allnotice.vue

@ -5,6 +5,12 @@
<el-form :inline="true" <el-form :inline="true"
:model="dataForm" :model="dataForm"
@keyup.enter.native="getDataList()"> @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> <el-form-item>
<el-input v-model="dataForm.noticeTitle" <el-input v-model="dataForm.noticeTitle"
placeholder="通知标题" placeholder="通知标题"
@ -68,11 +74,11 @@
fixed="right" fixed="right"
header-align="center" header-align="center"
align="center" align="center"
width="300"> width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="$hasPermission('news:notice:update')" <el-button v-if="$hasPermission('news:notice:update')"
type="primary" type="text"
size="mini" size="small"
@click="addOrUpdateHandle(scope.row.id)">查看</el-button> @click="addOrUpdateHandle(scope.row.id)">查看</el-button>
</template> </template>
</el-table-column> </el-table-column>
@ -107,8 +113,11 @@ export default {
deleteIsBatch: true deleteIsBatch: true
}, },
dataForm: { dataForm: {
noticeTitle: '' noticeTitle: '',
} gridId: ''
},
options: [],
deptIdList: []
} }
}, },
components: { components: {
@ -154,6 +163,26 @@ export default {
return row.street return row.street
} }
} }
},
watch: {
'deptIdList': function (val) {
if (val.length !== 0) {
this.dataForm.gridId = val[val.length - 1]
} else {
this.dataForm.gridId = ''
}
}
},
created () {
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(() => { })
} }
} }
</script> </script>

Loading…
Cancel
Save