From 0b5312d0189319d196b8c963954066f8e8c6471c Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Tue, 31 May 2022 08:53:24 +0800 Subject: [PATCH 1/6] dd --- src/views/modules/visual/communityParty/community.vue | 6 +++--- src/views/modules/visual/communityParty/dialogInfo.vue | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/modules/visual/communityParty/community.vue b/src/views/modules/visual/communityParty/community.vue index ac60395b7..3e24fb92c 100644 --- a/src/views/modules/visual/communityParty/community.vue +++ b/src/views/modules/visual/communityParty/community.vue @@ -109,7 +109,7 @@ -
+
联建活动分类统计
@@ -1298,7 +1298,7 @@ export default { .mt0 { margin: 0; } -.mt20 { - margin-top: 20px; +.mt40 { + margin-top: 40px; } diff --git a/src/views/modules/visual/communityParty/dialogInfo.vue b/src/views/modules/visual/communityParty/dialogInfo.vue index db6d95418..c4160ff69 100644 --- a/src/views/modules/visual/communityParty/dialogInfo.vue +++ b/src/views/modules/visual/communityParty/dialogInfo.vue @@ -46,11 +46,11 @@ 活动时间： {{ info.activityTime }}
-
+
活动地址： {{ info.address }} From 0c9980bd3d2c0fb8f190dfb1887ba046453751aa Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Tue, 31 May 2022 09:09:15 +0800 Subject: [PATCH 2/6] dd --- src/views/modules/visual/communityParty/community.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/modules/visual/communityParty/community.vue b/src/views/modules/visual/communityParty/community.vue index 3e24fb92c..79f533a5c 100644 --- a/src/views/modules/visual/communityParty/community.vue +++ b/src/views/modules/visual/communityParty/community.vue @@ -1260,6 +1260,7 @@ export default { } .calc-h { height: calc(100vh - 240px); + padding-bottom: 20px; } .wd50 { width: 50%; From 4d40dc1ed5f793472a477476f34880b94623b751 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Tue, 31 May 2022 09:28:09 +0800 Subject: [PATCH 3/6] dd --- src/views/modules/communityParty/members/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/communityParty/members/index.vue b/src/views/modules/communityParty/members/index.vue index d2891de28..3077d9d71 100644 --- a/src/views/modules/communityParty/members/index.vue +++ b/src/views/modules/communityParty/members/index.vue @@ -483,7 +483,7 @@ export default { handleTimeChange (val) { if (val.length > 0) { this.searchForm.rdsjStartDate = val[0] - this.searchForm.rdsjEndDate = val[0] + this.searchForm.rdsjEndDate = val[1] } else { this.searchForm.rdsjStartDate = '' this.searchForm.rdsjEndDate = '' From aa18a1d871787d4a6dea989d51cb561a81cbae45 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Tue, 31 May 2022 10:59:37 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=BF=97=E6=84=BF=E8=80=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/resiForm.vue | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue index 57f0397d6..7246d608c 100644 --- a/src/views/components/resiForm.vue +++ b/src/views/components/resiForm.vue @@ -509,6 +509,7 @@ export default { this.form.GENDER = sex == 1 ? '1' : '2' this.form.IS_OLD_PEOPLE = age >= 60 ? '1' : '0' this.form.IS_BDHJ = huji == _id ? '1' : '' + this.validateIdcard(this.form.ID_CARD) console.log('age-----', age, _id) }, handleOpenSearch () { @@ -670,6 +671,22 @@ export default { if (this.supportAdd) newForm = this.handlerMuscForm() return newForm }, + validateIdcard (idCard) { + this.$http + .post('/epmetuser/icresiuser/getUserRoleByIdCard', { idCard }) + .then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg) + } else { + console.log('获取查询详情成功', res.data) + if (res.data.isVolunteer == '1') this.form.IS_VOLUNTEER = '1' + else this.form.IS_VOLUNTEER = '0' + } + }) + .catch(() => { + return this.$message.error('网络错误') + }) + }, getGridList () { const { user } = this.$store.state console.log('agencyId', user) From aa9a0ba9a9415ff94b855c163c16e99eed2a3ca0 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 31 May 2022 11:03:17 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=9A=82=E6=97=B6=20=E4=BA=BF=E8=81=94?= =?UTF-8?q?=E8=A1=97=E9=81=93=E5=92=8C=20=E5=BE=AE=E7=AC=91=E5=B4=82?= =?UTF-8?q?=E5=B1=B1=E6=98=BE=E7=A4=BA=20=E7=A4=BE=E5=8C=BA=E6=B2=BB?= =?UTF-8?q?=E7=90=86-=E3=80=8B=E5=A4=9A=E5=85=83=E5=8C=96=E8=8F=9C?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/main-shuju/main-navbar.vue | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/views/main-shuju/main-navbar.vue b/src/views/main-shuju/main-navbar.vue index 9fccdcd9c..e0715272f 100644 --- a/src/views/main-shuju/main-navbar.vue +++ b/src/views/main-shuju/main-navbar.vue @@ -164,7 +164,18 @@ export default { // this.showHeader = false; // } this.changeCustomerName(); - this.$store.state.mainShuju.menuList = window.SITE_CONFIG["menuShujuList"]; + const customerId = localStorage.getItem("customerId"); + let siteconfigElement = window.SITE_CONFIG["menuShujuList"]; + //暂时 亿联街道和 微笑崂山显示 社区治理-》多元化菜单 + if ("04c0d396e298f13e57aa5904a657eaa6" != customerId && "3fdd0380deff5b30f45376cdf995d1c1" != customerId){ + for (let index in siteconfigElement){ + if (siteconfigElement[index].id == '6'){ + let newMenuArr = siteconfigElement[index].children.filter(item =>item.id !== 'duoyuanfuwufenxi'); + siteconfigElement[index].children = newMenuArr; + } + } + } + this.$store.state.mainShuju.menuList = siteconfigElement; }, computed: {}, methods: { From 40f6b2cbe83392325e9aac5bf150f3cfec10af28 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Tue, 31 May 2022 16:22:13 +0800 Subject: [PATCH 6/6] dd --- src/mixins/view-post.js | 167 ++++++++++++++++++ .../partymember/icpartymemberpoint.vue | 4 +- 2 files changed, 169 insertions(+), 2 deletions(-) create mode 100644 src/mixins/view-post.js diff --git a/src/mixins/view-post.js b/src/mixins/view-post.js new file mode 100644 index 000000000..ba5b51bec --- /dev/null +++ b/src/mixins/view-post.js @@ -0,0 +1,167 @@ +import Cookies from 'js-cookie' +import qs from 'qs' +export default { + data () { + /* eslint-disable */ + return { + // 设置属性 + mixinViewModuleOptions: { + createdIsNeed: true, // 此页面是否在创建时，调用查询数据列表接口？ + activatedIsNeed: false, // 此页面是否在激活（进入）时，调用查询数据列表接口？ + getDataListURL: '', // 数据列表接口，API地址 + getDataListIsPage: false, // 数据列表接口，是否需要分页？ + deleteURL: '', // 删除接口，API地址 + deleteIsBatch: false, // 删除接口，是否需要批量？ + deleteIsBatchKey: 'id', // 删除接口，批量状态下由那个key进行标记操作？比如：pid，uid... + exportURL: '' // 导出接口，API地址 + }, + // 默认属性 + dataForm: {}, // 查询条件 + dataList: [], // 数据列表 + order: '', // 排序，asc／desc + orderField: '', // 排序，字段 + page: 1, // 当前页码 + limit: 10, // 每页数 + total: 0, // 总条数 + dataListLoading: false, // 数据列表，loading状态 + dataListSelections: [], // 数据列表，多选项 + addOrUpdateVisible: false // 新增／更新，弹窗visible状态 + } + /* eslint-enable */ + }, + created () { + if (this.mixinViewModuleOptions.createdIsNeed) { + this.query() + } + }, + activated () { + if (this.mixinViewModuleOptions.activatedIsNeed) { + this.query() + } + }, + methods: { + // 获取数据列表 + query () { + this.dataListLoading = true + const params = { + order: this.order, + orderField: this.orderField, + page: this.mixinViewModuleOptions.getDataListIsPage ? this.page : null, + limit: this.mixinViewModuleOptions.getDataListIsPage ? this.limit : null, + ...this.dataForm + } + this.$http.post( + this.mixinViewModuleOptions.getDataListURL, + params + ).then(({ data: res }) => { + this.dataListLoading = false + if (res.code !== 0) { + this.dataList = [] + this.total = 0 + return this.$message.error(res.msg) + } + this.dataList = this.mixinViewModuleOptions.getDataListIsPage ? res.data.list : res.data + this.total = this.mixinViewModuleOptions.getDataListIsPage ? res.data.total : 0 + this.dataList.forEach(item => { + if (item.gender) { + item.gender = item.gender == '0' ? '女' : item.gender == '1' ? '男' : item.gender + } + }) + }).catch(() => { + this.dataListLoading = false + }) + }, + // 多选 + dataListSelectionChangeHandle (val) { + this.dataListSelections = val + }, + // 排序 + dataListSortChangeHandle (data) { + if (!data.order || !data.prop) { + this.order = '' + this.orderField = '' + return false + } + this.order = data.order.replace(/ending$/, '') + this.orderField = data.prop.replace(/([A-Z])/g, '_$1').toLowerCase() + this.query() + }, + // 分页, 每页条数 + pageSizeChangeHandle (val) { + this.page = 1 + this.limit = val + this.query() + }, + // 分页, 当前页 + pageCurrentChangeHandle (val) { + this.page = val + this.query() + }, + getDataList: function () { + this.page = 1 + this.query() + }, + // 新增 / 修改 + addOrUpdateHandle (id) { + this.addOrUpdateVisible = true + this.$nextTick(() => { + this.$refs.addOrUpdate.dataForm.id = id + this.$refs.addOrUpdate.init() + }) + }, + // 删除 + deleteHandle (id) { + if (this.mixinViewModuleOptions.deleteIsBatch && !id && this.dataListSelections.length <= 0) { + return this.$message({ + message: this.$t('prompt.deleteBatch'), + type: 'warning', + duration: 500 + }) + } + this.$confirm(this.$t('prompt.info', { 'handle': this.$t('delete') }), this.$t('prompt.title'), { + confirmButtonText: this.$t('confirm'), + cancelButtonText: this.$t('cancel'), + type: 'warning' + }).then(() => { + this.$http.delete( + `${this.mixinViewModuleOptions.deleteURL}${this.mixinViewModuleOptions.deleteIsBatch ? '' : '/' + id}`, + this.mixinViewModuleOptions.deleteIsBatch ? { + 'data': id ? [id] : this.dataListSelections.map(item => item[this.mixinViewModuleOptions.deleteIsBatchKey]) + } : {} + ).then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg) + } + this.$message({ + message: this.$t('prompt.success'), + type: 'success', + duration: 500, + onClose: () => { + this.query() + } + }) + }).catch(() => {}) + }).catch(() => {}) + }, + // 导出 + exportHandle () { + var params = qs.stringify({ + 'token': localStorage.getItem('token'), + ...this.dataForm + }) + window.location.href = `${window.SITE_CONFIG['apiURL']}${this.mixinViewModuleOptions.exportURL}?${params}` + }, + // 时间段控件取值变化事件-清空一个其他都清空 + changeTime (dateValue) { + var startTimeIsNull = this.dataForm.startTime === '' || this.dataForm.startTime === 'null' || this.dataForm.startTime === null + var endTimeIsNull = this.dataForm.endTime === '' || this.dataForm.endTime === 'null' || this.dataForm.endTime === null + if (dateValue === null || dateValue === '' || dateValue === 'null') { + this.dataForm.startTime = '' + this.dataForm.endTime = '' + } else if (startTimeIsNull || endTimeIsNull) { + this.dataForm.startTime = dateValue + this.dataForm.endTime = dateValue + } + } + } +} diff --git a/src/views/modules/partymember/icpartymemberpoint.vue b/src/views/modules/partymember/icpartymemberpoint.vue index ff99cfb9b..6180d89cb 100644 --- a/src/views/modules/partymember/icpartymemberpoint.vue +++ b/src/views/modules/partymember/icpartymemberpoint.vue @@ -183,10 +183,10 @@