From 6524258ada440cc9159dfb973ebe1f4233d582ca Mon Sep 17 00:00:00 2001 From: jiangyy Date: Mon, 10 Oct 2022 17:19:28 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/js/util.js | 5 +- src/views/modules/base/epidemic/travel.vue | 2 +- .../shequzhili/event/cpts/event-detail.vue | 9 + .../shequzhili/event/cpts/event-info.vue | 68 +- .../event/cpts/process-form-issue.vue | 253 ++++++ .../shequzhili/event/cpts/process-form.vue | 23 +- .../modules/shequzhili/event/eventList.vue | 24 +- .../modules/shequzhili/issue/cpts/add.vue | 778 ++++++++++++++++++ .../issue/cpts/evaluationDetail.vue | 210 +++++ .../shequzhili/issue/cpts/eventDetail.vue | 182 ++++ .../shequzhili/issue/cpts/issue-detail.vue | 443 ++++++++++ .../shequzhili/issue/cpts/issue-info.vue | 446 ++++++++++ .../issue/cpts/process-form-demand.vue | 703 ++++++++++++++++ .../issue/cpts/process-form-project.vue | 640 ++++++++++++++ .../issue/cpts/process-form-replay.vue | 252 ++++++ .../shequzhili/issue/cpts/process-form.vue | 330 ++++++++ .../shequzhili/issue/cpts/suggestDetail.vue | 202 +++++ .../shequzhili/issue/cpts/topicDetail.vue | 190 +++++ .../shequzhili/issue/issueAuditList.vue | 509 ++++++++++++ .../modules/shequzhili/issue/issueList.vue | 553 +++++++++++++ src/views/modules/workPc/guidance/addForm.vue | 3 +- 21 files changed, 5806 insertions(+), 19 deletions(-) create mode 100644 src/views/modules/shequzhili/event/cpts/process-form-issue.vue create mode 100644 src/views/modules/shequzhili/issue/cpts/add.vue create mode 100644 src/views/modules/shequzhili/issue/cpts/evaluationDetail.vue create mode 100644 src/views/modules/shequzhili/issue/cpts/eventDetail.vue create mode 100644 src/views/modules/shequzhili/issue/cpts/issue-detail.vue create mode 100644 src/views/modules/shequzhili/issue/cpts/issue-info.vue create mode 100644 src/views/modules/shequzhili/issue/cpts/process-form-demand.vue create mode 100644 src/views/modules/shequzhili/issue/cpts/process-form-project.vue create mode 100644 src/views/modules/shequzhili/issue/cpts/process-form-replay.vue create mode 100644 src/views/modules/shequzhili/issue/cpts/process-form.vue create mode 100644 src/views/modules/shequzhili/issue/cpts/suggestDetail.vue create mode 100644 src/views/modules/shequzhili/issue/cpts/topicDetail.vue create mode 100644 src/views/modules/shequzhili/issue/issueAuditList.vue create mode 100644 src/views/modules/shequzhili/issue/issueList.vue diff --git a/src/js/util.js b/src/js/util.js index eceb943be..eef08ea21 100644 --- a/src/js/util.js +++ b/src/js/util.js @@ -15,7 +15,10 @@ export default { let message = '' for (var oneObj in messageObj) { - message = message + messageObj[oneObj][0].message + '
' + if(messageObj[oneObj][0].message){ + message = message + messageObj[oneObj][0].message + '
' + } + } Vue.prototype.$message({ diff --git a/src/views/modules/base/epidemic/travel.vue b/src/views/modules/base/epidemic/travel.vue index f7fda935a..dc69ea127 100644 --- a/src/views/modules/base/epidemic/travel.vue +++ b/src/views/modules/base/epidemic/travel.vue @@ -279,7 +279,7 @@ size="small" @click="handleVisiteList(scope.row) ">随访记录 - + 查看需求 +
+ 已转议题: +
查看议题
+
满意度: @@ -287,6 +293,9 @@ export default { handleToDemand () { this.$emit("handleToDemand") }, + handleToIssue () { + this.$emit("handleToIssue") + }, //满意度评价 handleSatisfy () { diff --git a/src/views/modules/shequzhili/event/cpts/event-info.vue b/src/views/modules/shequzhili/event/cpts/event-info.vue index a62f736d5..f901c55aa 100644 --- a/src/views/modules/shequzhili/event/cpts/event-info.vue +++ b/src/views/modules/shequzhili/event/cpts/event-info.vue @@ -43,6 +43,7 @@ :source="source" @handleToProject="handleToProject" @handleToDemand="handleToDemand" + @handleToIssue="handleToIssue" @handleClose="handleClose">
+
+ +
@@ -211,6 +221,7 @@ import { Loading } from "element-ui"; // 引入Loading服务 import foldText from "@/views/components/foldText"; import projectInfoOrigin from "../../xiangmu/cpts/project-info"; import demandInfoOrigin from "@/views/modules/communityService/measure/info"; +import issueInfoOrigin from "../../issue/cpts/issue-info"; import dateFormat from "dai-js/tools/dateFormat"; import eventAdd from "./add"; import eventDetail from "./event-detail"; @@ -227,6 +238,7 @@ function iniData () { replayInfo: {}, demand: {}, project: {}, + issueInfo: {}, //新增 demandUserId: '', @@ -238,7 +250,10 @@ function iniData () { projectProcess: [], projectPageType: 'info', - pageTypeCopy: '' + pageTypeCopy: '', + + issuePageType: '', + issueDetailData: {}, }; } @@ -274,7 +289,8 @@ export default { eventDetail, processForm, projectInfoOrigin, - demandInfoOrigin + demandInfoOrigin, + issueInfoOrigin }, data: iniData, @@ -423,6 +439,18 @@ export default { // this.eventInfoData.categoryList = [] // this.eventInfoData.categoryList.push(this.demand.categoryId) console.log('demond', this.demand) + } else if (this.formData.operationType === '3') { + this.project = {} + this.demand = {} + this.replayInfo = {} + this.issueInfo = this.$refs.ref_processinfo_add.issueInfo + + if (this.issueInfo.categoryList && this.issueInfo.categoryList.length > 0) { + this.eventInfoData.categoryList = [] + this.eventInfoData.categoryList.push(this.issueInfo.categoryList[0].id) + } + console.log('issueInfo', this.issueInfo) + } } @@ -431,7 +459,8 @@ export default { ...this.eventInfoData, // replayInfo: this.replayInfo, project: this.project, - demand: this.demand + demand: this.demand, + issueInfo: this.issueInfo } console.log('this.formData', this.formData) @@ -496,6 +525,17 @@ export default { console.log('demond', this.demand) let url = '/gov/project/icEvent/icEventToDemand' await this.submitDispose(url, this.demand) + } else if (this.formData.operationType === '3') { + this.replayInfo = {} + this.demand = {} + this.project = {} + this.issueInfo = this.$refs.ref_processinfo_dispose.issueInfo + //项目的属性同事件一样 + + console.log('issueInfo', this.issueInfo) + let url = '/gov/project/icEvent/icEventToIssue' + await this.submitDispose(url, this.issueInfo) + } else { this.$message.info("请选择一种处理方式"); } @@ -545,6 +585,28 @@ export default { this.pageTypeCopy = 'demand' }, + async handleToIssue () { + const url = "/gov/issue/manage/votingissuedetail"; + + const { data, code, msg } = await requestPost(url, { + issueId: this.eventDetailCopy.operationId, + }); + + if (code === 0) { + + this.issueDetailData = { ...data }; + + } else { + this.$message.error(msg); + } + + if (this.eventDetailCopy.status === 'processing') { + this.issuePageType = 'dispose' + } else { + this.issuePageType = 'info' + } + this.pageTypeCopy = 'issue' + }, handleCloseProject () { this.getProjectProcess() this.pageTypeCopy = 'info' diff --git a/src/views/modules/shequzhili/event/cpts/process-form-issue.vue b/src/views/modules/shequzhili/event/cpts/process-form-issue.vue new file mode 100644 index 000000000..d48ac2f3c --- /dev/null +++ b/src/views/modules/shequzhili/event/cpts/process-form-issue.vue @@ -0,0 +1,253 @@ + + + + + + + + + + diff --git a/src/views/modules/shequzhili/event/cpts/process-form.vue b/src/views/modules/shequzhili/event/cpts/process-form.vue index 560b8aeda..5ef9b381d 100644 --- a/src/views/modules/shequzhili/event/cpts/process-form.vue +++ b/src/views/modules/shequzhili/event/cpts/process-form.vue @@ -19,6 +19,7 @@ 回复 立项 转服务 + 转议题 @@ -50,6 +51,13 @@ :eventDetailData="eventDetailData"> +
+ + +
@@ -62,6 +70,7 @@ import { requestPost } from "@/js/dai/request"; import processFormReplay from "./process-form-replay"; import processFormProject from "./process-form-project"; import processFormDemand from "./process-form-demand"; +import processFormIssue from "./process-form-issue"; let loading; // 加载动画 @@ -87,6 +96,7 @@ export default { replayInfo: {}, demand: {}, project: {}, + issueInfo: {}, okflag: false, eventDetailCopy: {} @@ -96,7 +106,8 @@ export default { components: { processFormReplay, processFormProject, - processFormDemand + processFormDemand, + processFormIssue }, computed: { dataRule () { @@ -201,6 +212,16 @@ export default { this.okflag = true + } else { + return false + } + } else if (this.operationType === '3') { + this.$refs.ref_process_form_issue.getIssueInfo() + if (this.$refs.ref_process_form_issue.okflag) { + this.issueInfo = this.$refs.ref_process_form_issue.formData + + this.okflag = true + } else { return false } diff --git a/src/views/modules/shequzhili/event/eventList.vue b/src/views/modules/shequzhili/event/eventList.vue index 64527997b..3dc1889a2 100644 --- a/src/views/modules/shequzhili/event/eventList.vue +++ b/src/views/modules/shequzhili/event/eventList.vue @@ -268,7 +268,7 @@ :show-overflow-tooltip="true" label="发生时间"> - { - if (item.operationType === '2') { - item.operationTypeShow = '已转服务' - } - if (item.operationType === '1') { - item.operationTypeShow = '已立项' - } - if (item.operationType === '0') { - item.operationTypeShow = '已回复' - } + // this.tableData.forEach(item => { + // if (item.operationType === '2') { + // item.operationTypeShow = '已转服务' + // } + // if (item.operationType === '1') { + // item.operationTypeShow = '已立项' + // } + // if (item.operationType === '0') { + // item.operationTypeShow = '已回复' + // } - }); + // }); } else { this.$message.error(msg); } diff --git a/src/views/modules/shequzhili/issue/cpts/add.vue b/src/views/modules/shequzhili/issue/cpts/add.vue new file mode 100644 index 000000000..dfb95312d --- /dev/null +++ b/src/views/modules/shequzhili/issue/cpts/add.vue @@ -0,0 +1,778 @@ + + + + + + diff --git a/src/views/modules/shequzhili/issue/cpts/evaluationDetail.vue b/src/views/modules/shequzhili/issue/cpts/evaluationDetail.vue new file mode 100644 index 000000000..b401aa503 --- /dev/null +++ b/src/views/modules/shequzhili/issue/cpts/evaluationDetail.vue @@ -0,0 +1,210 @@ + + + + + + + + + + + diff --git a/src/views/modules/shequzhili/issue/cpts/eventDetail.vue b/src/views/modules/shequzhili/issue/cpts/eventDetail.vue new file mode 100644 index 000000000..0bfe2e7a5 --- /dev/null +++ b/src/views/modules/shequzhili/issue/cpts/eventDetail.vue @@ -0,0 +1,182 @@ + + + + + + + + + + + diff --git a/src/views/modules/shequzhili/issue/cpts/issue-detail.vue b/src/views/modules/shequzhili/issue/cpts/issue-detail.vue new file mode 100644 index 000000000..e3d886b38 --- /dev/null +++ b/src/views/modules/shequzhili/issue/cpts/issue-detail.vue @@ -0,0 +1,443 @@ + + + + + diff --git a/src/views/modules/shequzhili/issue/cpts/issue-info.vue b/src/views/modules/shequzhili/issue/cpts/issue-info.vue new file mode 100644 index 000000000..bc79795da --- /dev/null +++ b/src/views/modules/shequzhili/issue/cpts/issue-info.vue @@ -0,0 +1,446 @@ + + + + + diff --git a/src/views/modules/shequzhili/issue/cpts/process-form-demand.vue b/src/views/modules/shequzhili/issue/cpts/process-form-demand.vue new file mode 100644 index 000000000..77c0193f0 --- /dev/null +++ b/src/views/modules/shequzhili/issue/cpts/process-form-demand.vue @@ -0,0 +1,703 @@ + + + + + + + + + + diff --git a/src/views/modules/shequzhili/issue/cpts/process-form-project.vue b/src/views/modules/shequzhili/issue/cpts/process-form-project.vue new file mode 100644 index 000000000..b8d3af313 --- /dev/null +++ b/src/views/modules/shequzhili/issue/cpts/process-form-project.vue @@ -0,0 +1,640 @@ + + + + + + + + + + diff --git a/src/views/modules/shequzhili/issue/cpts/process-form-replay.vue b/src/views/modules/shequzhili/issue/cpts/process-form-replay.vue new file mode 100644 index 000000000..0eeceaa40 --- /dev/null +++ b/src/views/modules/shequzhili/issue/cpts/process-form-replay.vue @@ -0,0 +1,252 @@ + + + + + + + + + + diff --git a/src/views/modules/shequzhili/issue/cpts/process-form.vue b/src/views/modules/shequzhili/issue/cpts/process-form.vue new file mode 100644 index 000000000..2287fcf9e --- /dev/null +++ b/src/views/modules/shequzhili/issue/cpts/process-form.vue @@ -0,0 +1,330 @@ + + + + + + + + + + diff --git a/src/views/modules/shequzhili/issue/cpts/suggestDetail.vue b/src/views/modules/shequzhili/issue/cpts/suggestDetail.vue new file mode 100644 index 000000000..071ce19fe --- /dev/null +++ b/src/views/modules/shequzhili/issue/cpts/suggestDetail.vue @@ -0,0 +1,202 @@ + + + + + + + + + + + diff --git a/src/views/modules/shequzhili/issue/cpts/topicDetail.vue b/src/views/modules/shequzhili/issue/cpts/topicDetail.vue new file mode 100644 index 000000000..69267555b --- /dev/null +++ b/src/views/modules/shequzhili/issue/cpts/topicDetail.vue @@ -0,0 +1,190 @@ + + + + + + + + + + + diff --git a/src/views/modules/shequzhili/issue/issueAuditList.vue b/src/views/modules/shequzhili/issue/issueAuditList.vue new file mode 100644 index 000000000..4bfc5fbd6 --- /dev/null +++ b/src/views/modules/shequzhili/issue/issueAuditList.vue @@ -0,0 +1,509 @@ + + + + + diff --git a/src/views/modules/shequzhili/issue/issueList.vue b/src/views/modules/shequzhili/issue/issueList.vue new file mode 100644 index 000000000..16d595690 --- /dev/null +++ b/src/views/modules/shequzhili/issue/issueList.vue @@ -0,0 +1,553 @@ + + + + + diff --git a/src/views/modules/workPc/guidance/addForm.vue b/src/views/modules/workPc/guidance/addForm.vue index 8bea54ce7..ac33b8c1b 100644 --- a/src/views/modules/workPc/guidance/addForm.vue +++ b/src/views/modules/workPc/guidance/addForm.vue @@ -106,7 +106,8 @@ -