diff --git a/src/views/modules/shequzhili/event/cpts/event-info.vue b/src/views/modules/shequzhili/event/cpts/event-info.vue index f901c55aa..5da15c03a 100644 --- a/src/views/modules/shequzhili/event/cpts/event-info.vue +++ b/src/views/modules/shequzhili/event/cpts/event-info.vue @@ -98,7 +98,7 @@ -
+
回复人:
@@ -152,7 +152,7 @@
-
+
回复人:
@@ -181,6 +181,17 @@
+ +
+
+
回复人:
+
{{ item.departmentName }}
+
+
+
回复内容:
+
{{ item.publicReply }}
+
+
@@ -600,7 +611,7 @@ export default { this.$message.error(msg); } - if (this.eventDetailCopy.status === 'processing') { + if (this.issueDetailData.issueStatus === 'voting') { this.issuePageType = 'dispose' } else { this.issuePageType = 'info' diff --git a/src/views/modules/shequzhili/issue/cpts/eventDetail.vue b/src/views/modules/shequzhili/issue/cpts/eventDetail.vue index 0bfe2e7a5..5a9b8e4b3 100644 --- a/src/views/modules/shequzhili/issue/cpts/eventDetail.vue +++ b/src/views/modules/shequzhili/issue/cpts/eventDetail.vue @@ -6,52 +6,74 @@
所属网格: - {{ eventDetailData.topicContent||'--' }} + {{ eventDetailData.gridName||'--' }}
+ +
+ 发生时间: + {{ eventDetailData.happenTime||'--' }} +
+ +
+ 事件内容: + {{ eventDetailData.eventContent||'--' }} +
+
+ v-if="eventDetailData.imageList&&eventDetailData.imageList.length>0"> 图片:
-
+ v-if="eventDetailData.voiceList&&eventDetailData.voiceList.length>0"> 音频:
- 发布人: - {{ eventDetailData.topicPublisher||'--' }} + 反映渠道: + {{ eventDetailData.sourceTypeName||'--' }}
-
- 发布时间: - {{ eventDetailData.topicPublisherTimeShow||'--' }} + 地址: + {{ eventDetailData.address||'--' }} +
+
+ 报事人: + {{ eventDetailData.name||'--' }}
-
- 联系方式: - {{ eventDetailData.topicPublisherMobile||'--' }} + 手机号: + {{ eventDetailData.mobile||'--' }}
- 发布小组: - {{ eventDetailData.groupName||'--' }} + 身份证号: + {{ eventDetailData.idCard||'--' }} +
+
+ 痛点难点: + {{ eventDetailData.difficultPointName||'--' }} +
+
+ 满意度: + {{ eventDetailData.satisfactionName||'--' }}
diff --git a/src/views/modules/shequzhili/issue/cpts/issue-detail.vue b/src/views/modules/shequzhili/issue/cpts/issue-detail.vue index e3d886b38..c4ab9ad7e 100644 --- a/src/views/modules/shequzhili/issue/cpts/issue-detail.vue +++ b/src/views/modules/shequzhili/issue/cpts/issue-detail.vue @@ -54,10 +54,10 @@ @click="handleToTopic">查看话题>--
-
+
意见和建议: -
查看全部
@@ -168,11 +168,10 @@
-
满意度评价: -
查看全部
diff --git a/src/views/modules/shequzhili/issue/cpts/process-form-demand.vue b/src/views/modules/shequzhili/issue/cpts/process-form-demand.vue deleted file mode 100644 index 77c0193f0..000000000 --- a/src/views/modules/shequzhili/issue/cpts/process-form-demand.vue +++ /dev/null @@ -1,703 +0,0 @@ - - - - - - - - - - diff --git a/src/views/modules/shequzhili/issue/cpts/process-form-project.vue b/src/views/modules/shequzhili/issue/cpts/process-form-project.vue deleted file mode 100644 index b8d3af313..000000000 --- a/src/views/modules/shequzhili/issue/cpts/process-form-project.vue +++ /dev/null @@ -1,640 +0,0 @@ - - - - - - - - - - diff --git a/src/views/modules/shequzhili/issue/cpts/process-form-replay.vue b/src/views/modules/shequzhili/issue/cpts/process-form-replay.vue deleted file mode 100644 index 0eeceaa40..000000000 --- a/src/views/modules/shequzhili/issue/cpts/process-form-replay.vue +++ /dev/null @@ -1,252 +0,0 @@ - - - - - - - - - - diff --git a/src/views/modules/shequzhili/issue/cptsAudit/eventDetail.vue b/src/views/modules/shequzhili/issue/cptsAudit/eventDetail.vue new file mode 100644 index 000000000..5a9b8e4b3 --- /dev/null +++ b/src/views/modules/shequzhili/issue/cptsAudit/eventDetail.vue @@ -0,0 +1,204 @@ + + + + + + + + + + + diff --git a/src/views/modules/shequzhili/issue/cptsAudit/issue-detail.vue b/src/views/modules/shequzhili/issue/cptsAudit/issue-detail.vue new file mode 100644 index 000000000..fa2852b93 --- /dev/null +++ b/src/views/modules/shequzhili/issue/cptsAudit/issue-detail.vue @@ -0,0 +1,156 @@ + + + + + diff --git a/src/views/modules/shequzhili/issue/cptsAudit/issue-info.vue b/src/views/modules/shequzhili/issue/cptsAudit/issue-info.vue new file mode 100644 index 000000000..280464295 --- /dev/null +++ b/src/views/modules/shequzhili/issue/cptsAudit/issue-info.vue @@ -0,0 +1,308 @@ + + + + + diff --git a/src/views/modules/shequzhili/issue/cptsAudit/process-form.vue b/src/views/modules/shequzhili/issue/cptsAudit/process-form.vue new file mode 100644 index 000000000..4a8c61878 --- /dev/null +++ b/src/views/modules/shequzhili/issue/cptsAudit/process-form.vue @@ -0,0 +1,188 @@ + + + + + + + + + + diff --git a/src/views/modules/shequzhili/issue/cptsAudit/topicDetail.vue b/src/views/modules/shequzhili/issue/cptsAudit/topicDetail.vue new file mode 100644 index 000000000..de29ff5d4 --- /dev/null +++ b/src/views/modules/shequzhili/issue/cptsAudit/topicDetail.vue @@ -0,0 +1,186 @@ + + + + + + + + + + + diff --git a/src/views/modules/shequzhili/issue/issueAuditList.vue b/src/views/modules/shequzhili/issue/issueAuditList.vue index 4bfc5fbd6..2f6983ed1 100644 --- a/src/views/modules/shequzhili/issue/issueAuditList.vue +++ b/src/views/modules/shequzhili/issue/issueAuditList.vue @@ -10,7 +10,7 @@ - @@ -38,7 +38,7 @@ class="item_width_2" size="small" type="date" - value-format="yyyy-MM-dd HH:mm:ss" + value-format="yyyyMMdd" value="yyyy-MM-dd" placeholder="开始时间"> @@ -48,7 +48,7 @@ class="item_width_2 data-tag" size="small" type="date" - value-format="yyyy-MM-dd HH:mm:ss" + value-format="yyyyMMdd" value="yyyy-MM-dd" placeholder="结束时间"> @@ -194,7 +194,7 @@ import { requestPost } from "@/js/dai/request"; import nextTick from "dai-js/tools/nextTick"; import { mapGetters } from "vuex"; -import issueInfo from "./cpts/issue-info"; +import issueInfo from "./cptsAudit/issue-info"; import axios from "axios"; export default { @@ -258,10 +258,10 @@ export default { pageSize: window.localStorage.getItem("pageSize") || 20, total: 1, endPickerOptions: { - disabledDate: endDisabledDate + // disabledDate: endDisabledDate }, startPickerOptions: { - disabledDate: startDisabledDate + // disabledDate: startDisabledDate }, issueId: '', issueDetailData: {}, @@ -271,8 +271,8 @@ export default { computed: { maxTableHeight () { return this.$store.state.inIframe - ? this.clientHeight - 410 + this.iframeHeigh - : this.clientHeight - 410; + ? this.clientHeight - 360 + this.iframeHeigh + : this.clientHeight - 360; }, ...mapGetters(["clientHeight", "iframeHeight"]), }, @@ -373,11 +373,13 @@ export default { }, async handleWatch (row) { - this.issueId = row.issueId - const url = "/gov/issue/manage/votingissuedetail"; + this.issueId = row.issueApplicationId + + const url = "/gov/issue/issueaudit/applicationdetail"; + // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/detail"; const { data, code, msg } = await requestPost(url, { - issueId: this.issueId, + issueApplicationId: this.issueId, }); if (code === 0) { @@ -391,13 +393,13 @@ export default { //加载组织数据 async handleAudit (row) { - this.issueId = row.issueId - // this.issueId = '29bbec4b08bb11edbb6b0050568f8cf7' - const url = "/gov/issue/manage/votingissuedetail"; + this.issueId = row.issueApplicationId + + const url = "/gov/issue/issueaudit/applicationdetail"; // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/detail"; const { data, code, msg } = await requestPost(url, { - issueId: this.issueId, + issueApplicationId: this.issueId, }); if (code === 0) { @@ -466,6 +468,7 @@ export default { }, resetSearch () { + this.agencyIdArray = [] this.formData = { orgId: '', orgType: '', @@ -476,11 +479,9 @@ export default { } - - this.pageNo = 1 - this.getTableData(); - // this.loadTable() + // this.getTableData(); + }, deepTree (arr, child) { if (Array.isArray(arr) && arr.length > 0) { diff --git a/src/views/modules/shequzhili/issue/issueList.vue b/src/views/modules/shequzhili/issue/issueList.vue index 16d595690..3b955295b 100644 --- a/src/views/modules/shequzhili/issue/issueList.vue +++ b/src/views/modules/shequzhili/issue/issueList.vue @@ -10,7 +10,7 @@ - @@ -38,7 +38,7 @@ class="item_width_2" size="small" type="date" - value-format="yyyy-MM-dd HH:mm:ss" + value-format="yyyyMMdd" value="yyyy-MM-dd" placeholder="开始时间"> @@ -48,7 +48,7 @@ class="item_width_2 data-tag" size="small" type="date" - value-format="yyyy-MM-dd HH:mm:ss" + value-format="yyyyMMdd" value="yyyy-MM-dd" placeholder="结束时间"> @@ -154,13 +154,7 @@ label="状态" width="80" :show-overflow-tooltip="true"> - 0) {