diff --git a/src/views/modules/shequzhili/issue/cpts/issue-detail.vue b/src/views/modules/shequzhili/issue/cpts/issue-detail.vue index 0ab40d1a8..8d7b536d2 100644 --- a/src/views/modules/shequzhili/issue/cpts/issue-detail.vue +++ b/src/views/modules/shequzhili/issue/cpts/issue-detail.vue @@ -34,8 +34,7 @@ @click="handleToTopic">查看话题>-- -
+
意见和建议：
查看全部
diff --git a/src/views/modules/shequzhili/issue/issueAuditList.vue b/src/views/modules/shequzhili/issue/issueAuditList.vue index 564e08474..3f2f71c6a 100644 --- a/src/views/modules/shequzhili/issue/issueAuditList.vue +++ b/src/views/modules/shequzhili/issue/issueAuditList.vue @@ -434,7 +434,7 @@ export default { async getTableData () { const url = "/gov/issue/issueaudit/auditList"; - // const url = "http://yapi.elinkservice.cn/mock/102/gov/issue/issue/allIssueList"; + const { pageSize, pageNo, formData } = this; const { data, code, msg } = await requestPost(url, { pageSize, diff --git a/src/views/modules/shequzhili/issue/issueList.vue b/src/views/modules/shequzhili/issue/issueList.vue index c9f0d229e..974af1788 100644 --- a/src/views/modules/shequzhili/issue/issueList.vue +++ b/src/views/modules/shequzhili/issue/issueList.vue @@ -134,17 +134,22 @@ :show-overflow-tooltip="true" label="转议题时间"> - + + @@ -456,7 +461,7 @@ export default { async getTableData () { const url = "/gov/issue/issue/allIssueList"; - // const url = "http://yapi.elinkservice.cn/mock/102/gov/issue/issue/allIssueList"; + const { pageSize, pageNo, formData } = this; const { data, code, msg } = await requestPost(url, { pageSize, @@ -473,6 +478,14 @@ export default { : []; this.tableData.forEach(item => { + if (item.sourceType === 'ic_event') { + item.sourceTypeName = '事件' + } else if (item.sourceType === 'resi_topic') { + item.sourceTypeName = '话题' + } else { + item.sourceTypeName = '--' + } + if (item.operationType === '2') { item.operationTypeShow = '已转服务' } diff --git a/src/views/modules/shequzhili/xiangmu/index.vue b/src/views/modules/shequzhili/xiangmu/index.vue index 36e244ab0..bcef8c2d0 100644 --- a/src/views/modules/shequzhili/xiangmu/index.vue +++ b/src/views/modules/shequzhili/xiangmu/index.vue @@ -1,80 +1,67 @@ @@ -275,7 +224,7 @@ import axios from "axios"; export default { components: { projectInfo }, - data() { + data () { return { pageType: "list", // 列表list 处理dispose 详情info 议题详情issue-info @@ -315,7 +264,7 @@ export default { }; }, computed: { - maxTableHeight() { + maxTableHeight () { return this.$store.state.inIframe ? this.clientHeight - 360 + this.iframeHeigh : this.clientHeight - 360; @@ -333,11 +282,11 @@ export default { } }, }, - mounted() { + mounted () { this.getTableData(); }, methods: { - async handleExportModule() { + async handleExportModule () { let url = "/heart/iccommunityselforganization/import-template-download"; let params = {}; @@ -374,18 +323,18 @@ export default { }); }, // 上传大图标成功 - handleExcelSuccess(res, file) { + handleExcelSuccess (res, file) { if (res.code === 0 && res.msg === "success") { console.log("resss---ppp", res); } else { this.$message.error(res.msg); } }, - handleProgress(event, file, fileList) { + handleProgress (event, file, fileList) { console.log("percentage", file.percentage); }, - beforeExcelUpload(file) { + beforeExcelUpload (file) { console.log("file", file); const isType = file.type === "application/vnd.ms-excel"; const isTypeComputer = @@ -402,7 +351,7 @@ export default { } return fileType && isLt1M; }, - async uploadHttpRequest(file) { + async uploadHttpRequest (file) { this.importLoading = true; this.importBtnTitle = "正在上传中..."; this.$message({ @@ -457,29 +406,29 @@ export default { this.$refs.upload.clearFiles(); }, - handleSizeChange(val) { + handleSizeChange (val) { console.log(`每页 ${val} 条`); this.pageSize = val; window.localStorage.setItem("pageSize", val); this.getTableData(); }, - handleCurrentChange(val) { + handleCurrentChange (val) { console.log(`当前页: ${val}`); this.pageNo = val; this.getTableData(); }, - handleSearch(val) { + handleSearch (val) { console.log(this.fmData); this.pageNo = 1; this.getTableData(); }, - resetForm(formName) { + resetForm (formName) { this.$refs[formName].resetFields(); this.handleSearch(); }, - async handleChu() { + async handleChu () { const url = "/gov/project/project/project-list-export"; const { pageSize, pageNo, fmData } = this; axios({ @@ -514,8 +463,8 @@ export default { }); }, - async handleAdd() {}, - async handleWatch(rowIndex) { + async handleAdd () { }, + async handleWatch (rowIndex) { let item = this.tableData[rowIndex]; this.currentProject = { projectId: item.projectId, @@ -523,7 +472,7 @@ export default { this.pageType = "info"; }, - async handleEdit(rowIndex) { + async handleEdit (rowIndex) { let item = this.tableData[rowIndex]; this.currentProject = { projectId: item.projectId, @@ -531,19 +480,19 @@ export default { this.pageType = "edit"; }, - handleClose() { + handleClose () { this.pageType = "list"; this.currentProject = { projectId: "", }; }, - handleEditSuccess() { + handleEditSuccess () { this.handleClose(); this.getTableData(); }, - async handleDel(rowData, rowIndex) { + async handleDel (rowData, rowIndex) { console.log(rowData, rowIndex); const url = "/heart/iccommunityselforganization/delcommunityselforganization"; @@ -561,7 +510,7 @@ export default { } }, - async getTableData() { + async getTableData () { // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/project-list"; const url = "/gov/project/project/project-list"; const { pageSize, pageNo, fmData } = this; @@ -575,9 +524,28 @@ export default { this.total = data.total || 0; this.tableData = data.list ? data.list.map((item) => { - return item; - }) + return item; + }) : []; + + + this.tableData.forEach(item => { + if (item.origin === 'issue') { + item.originName = '议题 ' + } else if (item.origin === 'agency') { + item.originName = '项目立项' + } else if (item.origin === 'resi_event') { + item.originName = '旧版事件上报' + } else if (item.origin === 'work_event') { + item.originName = '巡查上报' + } else if (item.origin === 'ic_event') { + item.originName = '事件' + } else { + item.sourceTypeName = '--' + } + + + }); } else { } },