-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 确定
+
+
+
+
+
+
+
+
+
+
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..cd5910c4a
--- /dev/null
+++ b/src/views/modules/shequzhili/issue/cpts/evaluationDetail.vue
@@ -0,0 +1,216 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
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..5a9b8e4b3
--- /dev/null
+++ b/src/views/modules/shequzhili/issue/cpts/eventDetail.vue
@@ -0,0 +1,204 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
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..3a83fb3e7
--- /dev/null
+++ b/src/views/modules/shequzhili/issue/cpts/issue-detail.vue
@@ -0,0 +1,498 @@
+
+
+
+ 议题详情
+
+
+
+
+ 议题标题:
+ {{ issueInfo.issueTitle }}
+
+
+
+ 处理意见:
+ {{ issueInfo.issueSuggestion||'--' }}
+
+
+ 所属网格:
+ {{ issueInfo.belongsGridName||'--' }}
+
+
+ 议题发表人:
+ {{ issueInfo.issueInitiator||'--' }}
+
+
+
+
议题来源:
+
查看话题
+
查看事件
+
+
查看话题>--
+
+
+
+
+
+
分类:
+
+
+ {{ item.name }}
+
+
+
--
+
+
+
+
更改分类
+
+ 确定
+
+
+
+
+
+
标签:
+
+
+ {{ item.name }}
+
+
+
--
+
+
+
+
更改标签
+
+
+
+
+
+
+
+
+
+
+
+
+ 确定
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ issueTrend.realityVoteCount }}/{{
+ issueTrend.shouldVoteCount
+ }}
+
+
已表决/应表决
+
+
+
{{ issueTrend.supportAmount }}
+
支持
+
+
+
{{ issueTrend.oppositionAmount }}
+
反对
+
+
+
+
+
+
+
+
+
+
+ 关闭
+
+
+
+
+
+
+
+
+
+
+
+
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..d70182a70
--- /dev/null
+++ b/src/views/modules/shequzhili/issue/cpts/issue-info.vue
@@ -0,0 +1,451 @@
+
+
+
+
+
+
+
+
+
+
+
处理进展
+
+
+
+
{{ item.processName }}
+
+ {{ item.processTime }}
+
+
+
+
+
+
回复人:
+
{{ item.departmentName }}
+
+
+
回复内容:
+
{{ item.publicReply|| item.progressDesc}}
+
+
+
+
+
+
+
回复人:
+
{{ item.departmentName }}
+
+
+
回复内容:
+
{{ item.publicReply }}
+
+
+
+
+
处理部门:
+
{{ item.departmentName }}
+
+
+
+
+
说 明:
+
+ {{ item.publicReply }}
+
+
+
+
+
内部备注:
+
+ {{ item.internalRemark }}
+
+
+
+
+
+
+
+
+
处理部门:
+
{{ item.departmentName }}
+
+
+
说明:
+
{{ item.progressDesc }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 @@
+
+
+
+
+
+
+
+
+
+ 转项目
+ 关闭
+
+
+
+
+
+
+
+
+
+
+
+ (project.staffList = ret)"
+ @close="visibleStaffPanel = false" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 已解决
+ 无需解决
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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..3c7ff4e9e
--- /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/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..eac1c06d2
--- /dev/null
+++ b/src/views/modules/shequzhili/issue/cptsAudit/issue-detail.vue
@@ -0,0 +1,213 @@
+
+
+
+ 议题详情
+
+
+
+
+ 议题标题:
+ {{ issueInfo.issueTitle }}
+
+
+
+ 处理意见:
+ {{ issueInfo.issueSuggestion||'--' }}
+
+
+ 所属网格:
+ {{ issueInfo.gridName||'--' }}
+
+
+
+ 话题内容:
+ {{ topicInfo.topicContent||'--' }}
+
+
+
+
图片:
+
![]()
+
+
+
+ 发布人:
+ {{ topicInfo.publishedUser||'--' }}
+
+
+
+ 发布时间:
+ {{ topicInfo.publishedTime||'--' }}
+
+
+
+
+
+
+
+
+ 关闭
+
+
+
+
+
+
+
+
+
+
+
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..4357faf2a
--- /dev/null
+++ b/src/views/modules/shequzhili/issue/cptsAudit/issue-info.vue
@@ -0,0 +1,319 @@
+
+
+
+
+
+
+
+
+
+
+
处理进展
+
+
+
+
{{ '待审核' }}
+
{{ '驳回' }}
+
+
+
+
+
+
提交审核时间:
+
{{ item.operateTime }}
+
+
+
+
驳回时间:
+
{{ item.operateTime }}
+
+
+
+
驳回人:
+
{{ item.staffName }}
+
+
+
驳回理由:
+
{{ item.reason }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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
new file mode 100644
index 000000000..3f2f71c6a
--- /dev/null
+++ b/src/views/modules/shequzhili/issue/issueAuditList.vue
@@ -0,0 +1,510 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 至
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 审核
+
+ 查看
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/shequzhili/issue/issueList.vue b/src/views/modules/shequzhili/issue/issueList.vue
new file mode 100644
index 000000000..974af1788
--- /dev/null
+++ b/src/views/modules/shequzhili/issue/issueList.vue
@@ -0,0 +1,558 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 至
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 处理
+
+ 查看
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
index dfced3f53..66168167a 100644
--- a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
+++ b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
@@ -308,11 +308,11 @@
-
-
-
+
@@ -470,6 +478,7 @@ import issueInfo from "./issue-info";
import eventInfo from "./event-info";
import projectEvaluation from "./project-evaluation";
import dateFormat from "dai-js/tools/dateFormat";
+import issueInfoOrigin from "../../issue/cpts/issue-info";
function iniData () {
return {
@@ -587,6 +596,9 @@ function iniData () {
tagOptions: [],
visibleTagPanel: false,
selectedTagData: [],
+
+ issuePageType: '',
+ issueDetailData: {},
};
}
@@ -613,6 +625,7 @@ export default {
eventInfo,
projectEvaluation,
selectStaff,
+ issueInfoOrigin
},
data: iniData,
@@ -853,8 +866,30 @@ export default {
}
},
- handleWatchOrigin () {
+ async handleWatchOrigin () {
+
+
+ const url = "/gov/issue/manage/votingissuedetail";
+
+ const { data, code, msg } = await requestPost(url, {
+ issueId: this.projectInfo.originId,
+ });
+
+ if (code === 0) {
+
+ this.issueDetailData = { ...data };
+
+ } else {
+ this.$message.error(msg);
+ }
this.pageType = "origin-info";
+ if (this.issueDetailData.issueStatus === 'voting') {
+ this.issuePageType = 'dispose'
+ } else {
+ this.issuePageType = 'info'
+ }
+ this.pageTypeCopy = 'issue'
+
},
handleBackInfo () {
this.pageType = "info";
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 @@
-
-
-
+
+
+
-
-
+
+
-
-
+
+
至
-
+
-
-
-
+
+
+
- 查询
- 重置
+ 查询
+ 重置
@@ -82,185 +69,147 @@
- 新增
- 下载模板
-
- {{ importBtnTitle }}
+ 新增
+ 下载模板
+
+ {{ importBtnTitle }}
- 导出
+ 导出
-
-
-
+
+
+
-
+
-
+
-
+
-
+
+
+
-
+
-
+
-
+
- 处理
-
- 查看
-
-
- 删除
+ 处理
+
+ 查看
+
+
+ 删除
-
+
-
@@ -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 {
}
},
diff --git a/src/views/modules/shujuduibi/canji.vue b/src/views/modules/shujuduibi/canji.vue
index 0d7a877c7..776bc7992 100644
--- a/src/views/modules/shujuduibi/canji.vue
+++ b/src/views/modules/shujuduibi/canji.vue
@@ -19,7 +19,11 @@
- 全部更新
diff --git a/src/views/modules/shujuduibi/siwang.vue b/src/views/modules/shujuduibi/siwang.vue
index 274c8566a..cdea89fa1 100644
--- a/src/views/modules/shujuduibi/siwang.vue
+++ b/src/views/modules/shujuduibi/siwang.vue
@@ -19,7 +19,11 @@
- 全部更新
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 @@
-