From 7f472dc4e9bdbe21a229e21634dcbe20d9b1cd54 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Wed, 3 Aug 2022 17:23:13 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86-?=
=?UTF-8?q?=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../modules/shequzhili/xiangmu/index.vue | 59 +++++++++++++++----
1 file changed, 49 insertions(+), 10 deletions(-)
diff --git a/src/views/modules/shequzhili/xiangmu/index.vue b/src/views/modules/shequzhili/xiangmu/index.vue
index 886314332..99b6f8774 100644
--- a/src/views/modules/shequzhili/xiangmu/index.vue
+++ b/src/views/modules/shequzhili/xiangmu/index.vue
@@ -148,51 +148,90 @@
+
+
+ {{ scope.row.publicReply }}
+
+
+
+
+ 网格上报
+ 居民上报
+ 巡查上报
+ 议题上报
+
+
+
+
+
+
+ {{ scope.row.status == 'pending' ? '处理中' : '已结案' }}
+
Date: Thu, 4 Aug 2022 15:55:19 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86?=
=?UTF-8?q?=E5=8F=98=E6=9B=B4123?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../modules/shequzhili/xiangmu/index.vue | 419 ++++++++++++++----
1 file changed, 327 insertions(+), 92 deletions(-)
diff --git a/src/views/modules/shequzhili/xiangmu/index.vue b/src/views/modules/shequzhili/xiangmu/index.vue
index 99b6f8774..2d7ba6e23 100644
--- a/src/views/modules/shequzhili/xiangmu/index.vue
+++ b/src/views/modules/shequzhili/xiangmu/index.vue
@@ -10,72 +10,126 @@
class="demo-form-inline"
>
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
- 至
-
+ 至
+
-
-
-
-
-
-
+
+
-
- 查询
- 重置
+ 查询
+ 重置
@@ -120,7 +174,7 @@
导出导出
@@ -141,17 +195,22 @@
+
+ {{ scope.row.firstName + '-' + scope.row.secondName }}
+
@@ -175,6 +235,7 @@
prop="createdTime"
align="center"
label="上报时间"
+ width="160"
:show-overflow-tooltip="true"
>
@@ -182,7 +243,8 @@
@@ -190,6 +252,7 @@
@@ -198,24 +261,32 @@
+ >
+
+
+
+
+
+
-
+ />
+
-
+ />
+
{//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
+ let nowData = Date.now()
+ if (this.fmData.startTime) {
+ let startTime = new Date(this.fmData.startTime)
+ return time.getTime() > nowData || time.getTime() < startTime || time.getTime() === startTime
+ } else {
+ return time.getTime() > nowData
+ }
+
+ }
+ let startDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
+ let nowData = Date.now()
+ return time.getTime() > nowData
+ }
return {
pageType: "list", // 列表list 处理dispose 详情info 议题详情issue-info
@@ -327,25 +425,46 @@ export default {
optionsStatus: [
{
value: "pending",
- label: "未结案",
+ label: "处理中",
},
{
value: "closed",
label: "已结案",
},
],
-
- fmData: {
- title: "",
- status: "",
- startDate: "",
- endDate: "",
- date: ["", ""],
+ qudaoArray: [
+ {
+ value: "agency",
+ label: "网格上报",
+ },
+ {
+ value: "ic_event",
+ label: "居民上报",
+ },
+ {
+ value: "work_event",
+ label: "巡查上报",
+ },
+ {
+ value: "issue",
+ label: "议题上报",
+ }
+ ],
+ orgId: '',
+ checkStaffId: false,
+ exportLoading: false,
+ cateOptions: [],
+ optionsA: [],
+ fmData: { ..._form },
+ endPickerOptions: {
+ disabledDate: endDisabledDate
+ },
+ startPickerOptions: {
+ disabledDate: startDisabledDate
},
-
importBtnTitle: "导入",
importLoading: false,
-
+ eventTypeCheck: [],
currentProject: {
projectId: "",
userId: "",
@@ -356,8 +475,8 @@ export default {
computed: {
maxTableHeight() {
return this.$store.state.inIframe
- ? this.clientHeight - 360 + this.iframeHeigh
- : this.clientHeight - 360;
+ ? this.clientHeight - 410 + this.iframeHeigh
+ : this.clientHeight - 410;
},
...mapGetters(["clientHeight", "iframeHeight"]),
},
@@ -374,6 +493,8 @@ export default {
},
mounted() {
this.getTableData();
+ this.getGridList()
+ this.getCateOptions()
},
methods: {
async handleExportModule() {
@@ -449,12 +570,12 @@ export default {
message: "导入中，请到系统管理-导入记录中查看进度",
duration: 0,
});
- const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
- formData.append("file", file.file); //添加文件对象
+ const fmData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
+ fmData.append("file", file.file); //添加文件对象
await this.$http
.post(
"/heart/iccommunityselforganization/importcommunityselforganization",
- formData
+ fmData
)
.then((res) => {
console.log("res-up", res);
@@ -473,7 +594,7 @@ export default {
// window.SITE_CONFIG["apiURL"] +
// "/heart/iccommunityselforganization/importcommunityselforganization",
// method: "post",
- // data: formData,
+ // data: fmData,
// // responseType: "blob",
// })
// .then((res) => {
@@ -495,7 +616,48 @@ export default {
this.importBtnTitle = "导入";
this.$refs.upload.clearFiles();
},
+ handleCalscChange(val) {
+ console.log('val-----', val)
+ const arr = val.split('-')
+ this.fmData.orgId = arr[1]
+ this.fmData.orgType = arr[0]
+ },
+ handleCheckbox(val) {
+ const { user } = this.$store.state
+ console.log('val---', val)
+ if (val) this.fmData.staffId = user.id
+ else this.fmData.staffId = ''
+ },
+ handleEventType(val) {
+ // console.log('val-----eee', val)
+ console.log('nodes---', this.$refs.cascaderEvent.getCheckedNodes())
+ const nodes = this.$refs.cascaderEvent.getCheckedNodes()
+ this.fmData.firstIdList = []
+ this.fmData.secondIdList = []
+ let level1 = nodes.filter(item => item.level === 1)
+ let level2 = nodes.filter(item => item.level === 2)
+ console.log('level2----1', level2)
+ level1.forEach(item => {
+ console.log('level2----2', level2)
+ if (item.hasChildren) {
+ for (let i = level2.length - 1; i >= 0; i--) {
+ if (level2[i].parent.value === item.value) level2.splice(i, 1)
+ }
+ }
+ })
+ this.fmData.firstIdList = level1.map(item => item.value)
+ this.fmData.secondIdList = level2.map(item => item.value)
+ },
+ cascaderClick (node, nodeData) {
+ console.log('node---', node)
+ console.log('nodeData---', nodeData)
+ // this.fmData.agencyId = nodeData.objectId;
+ // this.fmData.level = nodeData.objectType
+ // this.$refs.cascaderUnit.checkedValue = nodeData.id;
+ // this.$refs.cascaderUnit.computePresentText();
+ // this.$refs.cascaderUnit.toggleDropDownVisible(false);
+ },
handleSizeChange(val) {
console.log(`每页 ${val} 条`);
this.pageSize = val;
@@ -509,18 +671,26 @@ export default {
},
handleSearch(val) {
- console.log(this.fmData);
+ console.log(JSON.stringify(this.fmData));
this.pageNo = 1;
this.getTableData();
},
resetForm(formName) {
this.$refs[formName].resetFields();
+ this.fmData = {
+ ..._form
+ }
+ this.eventTypeCheck = []
+ this.orgId = ''
+ this.checkStaffId = false
this.handleSearch();
},
async handleChu() {
- const url = "/gov/project/project/project-list-export";
+ // const url = "/gov/project/project/project-list-export";
+ const url = '/gov/project/project/orgprojectexport'
const { pageSize, pageNo, fmData } = this;
+ this.exportLoading = true
axios({
url: window.SITE_CONFIG["apiURL"] + url,
method: "post",
@@ -546,8 +716,10 @@ export default {
aLink.click();
document.body.removeChild(aLink); //下载完成移除元素
window.URL.revokeObjectURL(url); //释放掉blob对象
+ this.exportLoading = false
})
.catch((err) => {
+ this.exportLoading = false
console.log("获取导出情失败", err);
return this.$message.error("网络错误");
});
@@ -602,7 +774,8 @@ export default {
async getTableData() {
// const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/project-list";
- const url = "/gov/project/project/project-list";
+ // const url = "/gov/project/project/project-list";
+ const url ='/gov/project/project/orgprojectlist'
const { pageSize, pageNo, fmData } = this;
const { data, code, msg } = await requestPost(url, {
pageSize,
@@ -614,12 +787,67 @@ export default {
this.total = data.total || 0;
this.tableData = data.list
? data.list.map((item) => {
- return item;
+ return {
+ ...item,
+ urlList: item.urlList && item.urlList.map(n => n.url)
+ };
})
: [];
} else {
}
},
+ async getCateOptions() {
+ const url = "/gov/issue/issueprojectcategorydict/list";
+
+ const { data, code, msg } = await requestPost(url, {});
+
+ if (code === 0) {
+ // this.cateOptions = data.map((item) => {
+ // item.subCategory.forEach((subitem) => {
+ // delete subitem.subCategory;
+ // });
+ // return item;
+ // });
+ this.cateOptions = this.deepTree(data, 'subCategory')
+ } else {
+ this.$message.error(msg);
+ }
+ },
+ getGridList() {
+ const { user } = this.$store.state
+ this.dataListLoading = true
+ const params = {
+ agencyId: user.agencyId,
+ client: 'gov'
+ }
+ this.$http
+ // .post('/gov/org/userhouse/service/serviceScopeTree')
+ .post('/data/aggregator/org/agencytree', params)
+ // .post('/gov/org/customeragency/staffinagencylist')
+ .then(({ data: res }) => {
+ if (res.code !== 0) {
+ return this.$message.error(res.msg)
+ } else {
+ console.log('获取查询详情成功', res.data)
+ this.optionsA = this.deepTree(res.data, 'subOrgList')
+ console.log('optionsA----', this.optionsA)
+ }
+ })
+ .catch(() => {
+ return this.$message.error('网络错误')
+ })
+ },
+ deepTree(arr, child) {
+ if (Array.isArray(arr) && arr.length > 0) {
+ return arr.map(item => {
+ if (child === 'subOrgList') item.value = item.orgType + '-' + item.orgId
+ return {
+ ...item,
+ [child]: item[child] && item[child].length > 0 && this.deepTree(item[child], child) || null
+ }
+ })
+ }
+ }
},
};
@@ -701,6 +929,13 @@ export default {
.resi-cell-select:last-child {
margin-right: 0;
}
+ .item_width_2 {
+ width: 200px;
+ }
+}
+
+.data-tag {
+ margin: 0 5px;
}
.mt10 {
From 39e4920fda7914cc72ec14e1caa1ad84ba34af27 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Thu, 4 Aug 2022 16:59:59 +0800
Subject: [PATCH 3/4] dd
---
src/views/modules/shequzhili/xiangmu/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/modules/shequzhili/xiangmu/index.vue b/src/views/modules/shequzhili/xiangmu/index.vue
index 2d7ba6e23..e5fd933ed 100644
--- a/src/views/modules/shequzhili/xiangmu/index.vue
+++ b/src/views/modules/shequzhili/xiangmu/index.vue
@@ -313,7 +313,7 @@
>
Date: Fri, 5 Aug 2022 10:02:23 +0800
Subject: [PATCH 4/4] dd
---
src/views/modules/shequzhili/xiangmu/index.vue | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/views/modules/shequzhili/xiangmu/index.vue b/src/views/modules/shequzhili/xiangmu/index.vue
index e5fd933ed..608d5e6dd 100644
--- a/src/views/modules/shequzhili/xiangmu/index.vue
+++ b/src/views/modules/shequzhili/xiangmu/index.vue
@@ -15,7 +15,8 @@
prop="orgId">
@@ -619,8 +620,8 @@ export default {
handleCalscChange(val) {
console.log('val-----', val)
const arr = val.split('-')
- this.fmData.orgId = arr[1]
- this.fmData.orgType = arr[0]
+ this.fmData.orgId = arr[0]
+ this.fmData.orgType = arr[1] === 'grid' ? 'grid' : 'agency'
},
handleCheckbox(val) {
const { user } = this.$store.state
@@ -822,14 +823,18 @@ export default {
}
this.$http
// .post('/gov/org/userhouse/service/serviceScopeTree')
- .post('/data/aggregator/org/agencytree', params)
+ // .post('/data/aggregator/org/agencytree', params)
// .post('/gov/org/customeragency/staffinagencylist')
+ .post('/gov/org/customeragency/agencygridtree')
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
} else {
console.log('获取查询详情成功', res.data)
- this.optionsA = this.deepTree(res.data, 'subOrgList')
+ // let { agencyList, subAgencyList } = res.data
+ let _arr = []
+ _arr.push(res.data)
+ this.optionsA = this.deepTree(_arr, 'subAgencyList')
console.log('optionsA----', this.optionsA)
}
})
@@ -840,7 +845,7 @@ export default {
deepTree(arr, child) {
if (Array.isArray(arr) && arr.length > 0) {
return arr.map(item => {
- if (child === 'subOrgList') item.value = item.orgType + '-' + item.orgId
+ // if (child === 'subAgencyList') item.value = item.orgType + '-' + item.orgId
return {
...item,
[child]: item[child] && item[child].length > 0 && this.deepTree(item[child], child) || null