diff --git a/src/assets/scss/modules/shequzhili/event-info.scss b/src/assets/scss/modules/shequzhili/event-info.scss index 39f48b60..ad8cad49 100644 --- a/src/assets/scss/modules/shequzhili/event-info.scss +++ b/src/assets/scss/modules/shequzhili/event-info.scss @@ -396,7 +396,8 @@ display: flex; .detail-field { - width: 100px; + flex:0 0 100px; + text-align: justify; text-align-last: justify; } diff --git a/src/mixins/view-module.js b/src/mixins/view-module.js index d8f48fa0..dcfabd2e 100644 --- a/src/mixins/view-module.js +++ b/src/mixins/view-module.js @@ -42,17 +42,18 @@ export default { methods: { // 获取数据列表 query () { - 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.post = true - this.$http.post( - this.mixinViewModuleOptions.getDataListURL, - params + this.dataListLoading = true + this.$http.get( + this.mixinViewModuleOptions.getDataListURL, + { + params: { + order: this.order, + orderField: this.orderField, + page: this.mixinViewModuleOptions.getDataListIsPage ? this.page : null, + limit: this.mixinViewModuleOptions.getDataListIsPage ? this.limit : null, + ...this.dataForm + } + } ).then(({ data: res }) => { this.dataListLoading = false if (res.code !== 0) { diff --git a/src/mixins/view-post.js b/src/mixins/view-post.js new file mode 100644 index 00000000..ba5b51be --- /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/components/resiForm.vue b/src/views/components/resiForm.vue index 57f0397d..7246d608 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) diff --git a/src/views/main-shuju/main-navbar.vue b/src/views/main-shuju/main-navbar.vue index 9fccdcd9..e0715272 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: { diff --git a/src/views/modules/communityParty/members/index.vue b/src/views/modules/communityParty/members/index.vue index d2891de2..3077d9d7 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 = '' diff --git a/src/views/modules/partymember/icpartymemberpoint.vue b/src/views/modules/partymember/icpartymemberpoint.vue index ff99cfb9..6180d89c 100644 --- a/src/views/modules/partymember/icpartymemberpoint.vue +++ b/src/views/modules/partymember/icpartymemberpoint.vue @@ -183,10 +183,10 @@ + + + diff --git a/src/views/modules/shequzhili/event/cpts/add.vue b/src/views/modules/shequzhili/event/cpts/add.vue index 6c689aca..3bc96785 100644 --- a/src/views/modules/shequzhili/event/cpts/add.vue +++ b/src/views/modules/shequzhili/event/cpts/add.vue @@ -201,11 +201,11 @@ @@ -307,21 +307,7 @@ export default { ], formData: iniFmData(), - formDataTemp: { - address: "山东省青岛市市南区徐州路21号戊", - // categoryList: ["1015", "1016"], - eventContent: "asdfasdfasdfasdf", - gridId: "63d5ff92ea981b1c58e4914ac894c610", - happenTime: "2022-05-05 12:00:00", - idCard: "211103190909090909", - imageList: ["https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/internal/20220518/0818246db4cc4ac7bcd84bea69a8b38c.png"], - latitude: 36.07120507831775, - longitude: 120.38806572319174, - mobile: "15111111111", - name: "张三", - reportUserId: "", - sourceType: "1", - }, + //地图相关 @@ -406,6 +392,10 @@ export default { "formData.reportUserId": function (val) { this.$emit("changeUserId", val) }, + "formData.gridId": function (val) { + this.selGridId = val + this.$emit("changeGridId", val) + } }, async mounted () { @@ -415,9 +405,7 @@ export default { this.getCategoryList() this.initMap() - // this.formData = { - // ...this.formDataTemp - // } + }, methods: { @@ -442,7 +430,6 @@ export default { this.formData.mobile = selPerson.demandUserMobile this.formData.reportUserId = selPerson.demandUserId this.formData.idCard = selPerson.idCard - console.log(selPerson) this.personTableShow = false; @@ -460,7 +447,7 @@ export default { // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/epidemicPrevention/page" let params = { agencyId: '', - gridId: this.formData.gridId, + gridId: this.selGridId, name: "", } diff --git a/src/views/modules/shequzhili/event/cpts/event-detail.vue b/src/views/modules/shequzhili/event/cpts/event-detail.vue index 2853aa23..13709ebd 100644 --- a/src/views/modules/shequzhili/event/cpts/event-detail.vue +++ b/src/views/modules/shequzhili/event/cpts/event-detail.vue @@ -70,18 +70,29 @@
查看需求
+
+ 满意度: +
{{info.satisfactionName}}
+
-
关闭
+ - + +

满意度评价

@@ -106,13 +117,11 @@
-
+
关闭 - 确定 @@ -225,9 +234,9 @@ export default { this.info = JSON.parse(JSON.stringify(this.eventDetailData)); //如果已经评价过,进行回显 - if (this.info.status === 'closed_case' && this.info.satisfactionName) { - this.changeSatisfyType(this.info.satisfaction) - } + // if (this.info.status === 'closed_case' && this.info.satisfactionName) { + // this.changeSatisfyType(this.info.satisfaction) + // } } // this.getApiData(); diff --git a/src/views/modules/shequzhili/event/cpts/event-info.vue b/src/views/modules/shequzhili/event/cpts/event-info.vue index b6569ada..6a1346c8 100644 --- a/src/views/modules/shequzhili/event/cpts/event-info.vue +++ b/src/views/modules/shequzhili/event/cpts/event-info.vue @@ -6,7 +6,8 @@ + @changeUserId="changeUserId" + @changeGridId="changeGridId">
@@ -15,7 +16,8 @@ + :demandUserMobile="demandUserMobile" + :gridId="gridId">
{ diff --git a/src/views/modules/shequzhili/event/cpts/process-form-project.vue b/src/views/modules/shequzhili/event/cpts/process-form-project.vue index 7aafae75..8309e930 100644 --- a/src/views/modules/shequzhili/event/cpts/process-form-project.vue +++ b/src/views/modules/shequzhili/event/cpts/process-form-project.vue @@ -128,14 +128,15 @@
-

选择标签

-
@@ -118,6 +119,10 @@ export default { type: String, default: "", }, + gridId: { + type: String, + default: "", + }, eventId: { type: String, default: "", diff --git a/src/views/modules/shequzhili/event/eventList.vue b/src/views/modules/shequzhili/event/eventList.vue index c3d146a4..2664af1d 100644 --- a/src/views/modules/shequzhili/event/eventList.vue +++ b/src/views/modules/shequzhili/event/eventList.vue @@ -254,11 +254,11 @@ size="small" class="div-table-button--edit">处理 - + class="div-table-button--edit">去评价 {{ eventInfo.gridName }}
- 上报时间: - {{ eventInfo.createdTime }} + 发生时间: + {{ eventInfo.happenTime }}
diff --git a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue index 8893a3f5..3eb8819c 100644 --- a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue +++ b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue @@ -299,6 +299,7 @@ export default { this.dataLoading = false + // this.assignData() }, @@ -423,11 +424,11 @@ export default { { name: "已完成", - value: data.closedRatio * 100 + value: Math.floor(data.closedRatio * 10000) / 100 }, { name: "处理中", - value: data.processingRatio * 100 + value: Math.floor(data.processingRatio * 10000) / 100 }, ] diff --git a/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue b/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue index 970060f7..337b8d78 100644 --- a/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue +++ b/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue @@ -104,6 +104,8 @@
diff --git a/src/views/modules/visual/communityParty/community.vue b/src/views/modules/visual/communityParty/community.vue index ac60395b..79f533a5 100644 --- a/src/views/modules/visual/communityParty/community.vue +++ b/src/views/modules/visual/communityParty/community.vue @@ -109,7 +109,7 @@
-
+
联建活动分类统计
@@ -1260,6 +1260,7 @@ export default { } .calc-h { height: calc(100vh - 240px); + padding-bottom: 20px; } .wd50 { width: 50%; @@ -1298,7 +1299,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 db6d9541..c4160ff6 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 }}