diff --git a/src/App.vue b/src/App.vue index d0d398635..26f72c928 100644 --- a/src/App.vue +++ b/src/App.vue @@ -155,7 +155,7 @@ export default { position: relative; max-height: 83vh; box-sizing: border-box; - padding: 0 0 20px !important; + padding: 0 0 16px !important; .dialog-h-content { max-height: calc(83vh - 80px); box-sizing: border-box; diff --git a/src/views/modules/communityService/gxxq/addForm.vue b/src/views/modules/communityService/gxxq/addForm.vue index d077de204..f447c1f55 100644 --- a/src/views/modules/communityService/gxxq/addForm.vue +++ b/src/views/modules/communityService/gxxq/addForm.vue @@ -108,7 +108,12 @@ - + + @@ -334,7 +339,7 @@ export default { formData: { serviceTypeLevel1Id: "", // 公共服务（政策级别）一级分类id commonServiceTypeId: "", // 公共服务（政策级别）二级分类id - assignFlag: false, + assignFlag: 0, resiSearchTagId: "", //查找享受服务人员 resiSearchTagName: "", //享受服务人员名称 title: "", //服务名称 @@ -362,7 +367,7 @@ export default { ], content: [ { required: true, message: "详细说明不能为空", trigger: "bulr" }, - { max: 1000, message: "不能超出1000个字符" , trigger: 'blur'}, + { max: 1000, message: "不能超出1000个字符", trigger: "blur" }, ], }, newDataRule: { @@ -437,17 +442,14 @@ export default { this.formData.commonServiceTypeId = data.commonServiceTypeId; this.formData.title = data.title; this.formData.content = data.content; + this.formData.assignFlag = data.assignFlag this.formData.resiSearchTagId = data.resiSearchTagId; this.newFormData.serviceTimeStart = data.assignInfo.serviceTimeStart; this.newFormData.serviceTimeEnd = data.assignInfo.serviceTimeEnd; this.newFormData.serverOrgType = data.assignInfo.serverOrgType; this.newFormData.serverOrgId = data.assignInfo.serverOrgId; this.newFormData.noticeApproches = data.assignInfo.noticeApproches; - if (data.assignFlag == 1) { - this.formData.assignFlag = true; - } else { - this.formData.assignFlag = false; - } + for (let i in data.assignInfo.serviceScopeList) { this.newFormData.serviceScopeList.push( data.assignInfo.serviceScopeList[i].objectId @@ -628,7 +630,6 @@ export default { // console.log(item[key]); for (let i of vals) { if (item[key] === i) { - console.log(item[key]); this.sarr.push(item); } else if (item["objectType"] == "district") { this.getLastItem(item.children, vals, key); @@ -673,12 +674,6 @@ export default { }, async addFuwu() { - // 指派服务绑定0或1 - if (this.formData.assignFlag) { - this.formData.assignFlag = 1; - } else { - this.formData.assignFlag = 0; - } // 通知服务方方式,如果都没有选中传数组字符串'0' if (this.newFormData.noticeApproches.length == 0) { this.newFormData.noticeApproches.push(0); @@ -706,9 +701,27 @@ export default { this.newFormData.serviceScopeList.forEach((item) => { if (typeof item != "string") { arr.push(item); - }; + } + }); + // 选中的数据中有不是网格或者社区或者楼栋的就停止它 + let isOk = false; + arr.findIndex((item) => { + if ( + item.objectType == "neighborhood" || + item.objectType == "agency" || + item.objectType == "grid" + ) { + isOk = true; + } else { + return (isOk = false); + } }); - //只有网格社区楼栋才可以,其他不行 + console.log(isOk); + if (!isOk) { + this.newArr = []; + this.$message.error("请选择正确的网格,社区,楼栋!"); + return; + } this.newFormData.serviceScopeList = arr; var url = ""; var params = {}; @@ -736,15 +749,15 @@ export default { } // const url = 'http://yapi.elinkservice.cn/mock/245/governance/icServiceProject/service/initiate' console.log(params); - const { data, code, msg } = await requestPost(url, params); - - if (code === 0) { - this.$message.success("添加成功"); - this.resetData(); - this.$emit("handleComfirm"); - } else if(code>=8000){ - this.$message.error(msg); - } + // const { data, code, msg } = await requestPost(url, params); + + // if (code === 0) { + // this.$message.success("添加成功"); + // this.resetData(); + // this.$emit("handleComfirm"); + // } else if(code>=8000){ + // this.$message.error(msg); + // } }, handleCancle() { @@ -756,7 +769,7 @@ export default { this.formData = { serviceTypeLevel1Id: "", // 公共服务（政策级别）一级分类id commonServiceTypeId: "", // 公共服务（政策级别）二级分类id - assignFlag: false, + assignFlag: 0, resiSearchTagId: "", //查找享受服务人员 resiSearchTagName: "", //享受服务人员名称 title: "", //服务名称 @@ -770,7 +783,7 @@ export default { serviceTimeEnd: "", //服务截止时间yyyy-MM-dd serverOrgType: "", //服务组织类型 社区自组织：community_org， 志愿者：ic_user_volunteer， 联建单位：party_unit serverOrgId: "", //服务组织Id - } + }; }, // 开启加载动画 startLoading() { diff --git a/src/views/modules/shequzhili/event/cpts/event-detail.vue b/src/views/modules/shequzhili/event/cpts/event-detail.vue index 15afd51b3..6c8ae6415 100644 --- a/src/views/modules/shequzhili/event/cpts/event-detail.vue +++ b/src/views/modules/shequzhili/event/cpts/event-detail.vue @@ -61,7 +61,7 @@
痛点难点： - {{ info.difficultPointName }} + {{ info.markTypeName|| '--' }}
diff --git a/src/views/modules/shequzhili/event/cpts/process-form-demand.vue b/src/views/modules/shequzhili/event/cpts/process-form-demand.vue index 528621a91..d0adfadb0 100644 --- a/src/views/modules/shequzhili/event/cpts/process-form-demand.vue +++ b/src/views/modules/shequzhili/event/cpts/process-form-demand.vue @@ -501,26 +501,33 @@ export default { } }, - handleServiceChange (type, val) { - if (val === "social_org") { - if (type === "add") { - this.getServiceuserList(val, "add_demand"); - } else { - this.getServiceuserList(val, "query_demand"); - } - } else { - this.getServiceuserList(val, ""); + async handleServiceChange(serverOrgType,val) { + if (!val) return false; + if (this.formData.categoryCode == "") { + this.$message.error("请先选择服务类型!"); + return; + } + const url = "/actual/base/serviceitem/listServerOrg"; + let params = { + serviceTypeId: this.formData.categoryCode, + serverOrgType: val, + businessType: "common_service", + }; + let { data, code, msg } = await requestPost(url, params); + if (code == 0) { + this.serviceOptiondList = data; + } else if (code >= 8000) { + this.$message.error(msg); } }, - - async getServiceuserList (serviceType, query) { + async getServiceuserList (serviceType) { if (!serviceType) return false; const { demandUserId } = this.formData; const params = { - serviceName: "", + serviceName: this.formData.categoryCode, serviceType: serviceType, - queryPurpose: query, + queryPurpose: 'query', }; 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 285746c95..e03b4970a 100644 --- a/src/views/modules/shequzhili/event/cpts/process-form-project.vue +++ b/src/views/modules/shequzhili/event/cpts/process-form-project.vue @@ -120,7 +120,7 @@
- diff --git a/src/views/modules/shequzhili/event/eventList.vue b/src/views/modules/shequzhili/event/eventList.vue index a3975a201..9071a252c 100644 --- a/src/views/modules/shequzhili/event/eventList.vue +++ b/src/views/modules/shequzhili/event/eventList.vue @@ -2,68 +2,76 @@
- +
- - - - + + + - - - - + + + - - + + - - + + clearable + class="u-item-width-normal" + @change="handleEventType" + /> - - + + - - + + - - + + 至 - + - - - + + + - - 查询 - 重置 + 查询 + 重置
@@ -144,247 +165,308 @@
-
+ 新增 + + 导出 + + + 标记 + + 标记为难点堵点 + 标记为矛盾纠纷 + 标记为自身问题 + + 新增 - - 导出 - - - 标记 - - 标记为难点堵点 - 标记为矛盾纠纷 - 标记为自身问题 - - - 取消标记 + @click="handleCancalDiffcult" + class="diy-button--white" + size="small" + >取消标记
- - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - +
- +
-
-
-
- +
+
- +
-
- +
- 取消 - + 取消
-
@@ -398,27 +480,32 @@ import axios from "axios"; export default { components: { eventInfo }, - data () { - let endDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键 - let nowData = Date.now() + data() { + let endDisabledDate = (time) => { + //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键 + let nowData = Date.now(); if (this.formData.startTime) { - let startTime = new Date(this.formData.startTime) - return time.getTime() > nowData || time.getTime() < startTime || time.getTime() === startTime + let startTime = new Date(this.formData.startTime); + return ( + time.getTime() > nowData || + time.getTime() < startTime || + time.getTime() === startTime + ); } else { - return time.getTime() > nowData + return time.getTime() > nowData; } - - } - let startDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键 - let nowData = Date.now() - return time.getTime() > nowData - } + }; + let startDisabledDate = (time) => { + //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键 + let nowData = Date.now(); + return time.getTime() > nowData; + }; return { pageType: "list", // 列表list 新增add 处理dispose 详情info user: {}, - agencyId: '', - gridList: [],//所属网格list--场所区域 + agencyId: "", + gridList: [], //所属网格list--场所区域 tableData: [], statusArray: [ @@ -455,17 +542,16 @@ export default { ], formData: { - gridId: '', - sourceType: '', - eventContent: '', - name: '', - mobile: '', - startTime: '', - endTime: '', - status: '', + gridId: "", + sourceType: "", + eventContent: "", + name: "", + mobile: "", + startTime: "", + endTime: "", + status: "", firstIdList: [], secondIdList: [], - }, cateOptions: [], eventTypeCheck: [], @@ -473,24 +559,23 @@ export default { pageSize: window.localStorage.getItem("pageSize") || 20, total: 1, endPickerOptions: { - disabledDate: endDisabledDate + disabledDate: endDisabledDate, }, startPickerOptions: { - disabledDate: startDisabledDate + disabledDate: startDisabledDate, }, - eventId: '', + eventId: "", eventDetailData: {}, - showVoice: false, - selVoiceUrl: '', + selVoiceUrl: "", - multipleSelection: [] + multipleSelection: [], }; }, computed: { - maxTableHeight () { + maxTableHeight() { return this.$store.state.inIframe ? this.clientHeight - 410 + this.iframeHeigh : this.clientHeight - 410; @@ -499,114 +584,108 @@ export default { }, watch: { "formData.endTime": function (val) { - if (val && val != '') { - let arrayTemp = val.split(' ') - this.formData.endTime = arrayTemp[0] + ' 23:59:59' + if (val && val != "") { + let arrayTemp = val.split(" "); + this.formData.endTime = arrayTemp[0] + " 23:59:59"; } - }, }, - mounted () { - console.log(this.$store.state) - this.user = this.$store.state.user + mounted() { + console.log(this.$store.state); + this.user = this.$store.state.user; - this.agencyId = this.user.agencyId + this.agencyId = this.user.agencyId; this.loadGrid(); this.getTableData(); - this.getCateOptions() + this.getCateOptions(); }, methods: { - handleEventType (val) { + handleEventType(val) { // console.log('val-----eee', val) - console.log('nodes---', this.$refs.cascaderEvent.getCheckedNodes()) - const nodes = this.$refs.cascaderEvent.getCheckedNodes() - this.formData.firstIdList = [] - this.formData.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) + console.log("nodes---", this.$refs.cascaderEvent.getCheckedNodes()); + const nodes = this.$refs.cascaderEvent.getCheckedNodes(); + this.formData.firstIdList = []; + this.formData.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) + if (level2[i].parent.value === item.value) level2.splice(i, 1); } } - }) - this.formData.firstIdList = level1.map(item => item.value) - this.formData.secondIdList = level2.map(item => item.value) + }); + this.formData.firstIdList = level1.map((item) => item.value); + this.formData.secondIdList = level2.map((item) => item.value); }, - handleSelectionChange (val) { + handleSelectionChange(val) { this.multipleSelection = []; - val.forEach(element => { - this.multipleSelection.push(element.icEventId) + val.forEach((element) => { + this.multipleSelection.push(element.icEventId); }); - console.log(this.multipleSelection) + console.log(this.multipleSelection); }, - async handleMarkDiffcult (command) { - const url = "/governance/icEvent/difficultpointevent" + async handleMarkDiffcult(command) { + const url = "/governance/icEvent/difficultpointevent"; let params = { icEventIdList: this.multipleSelection, - type: command - } + type: command, + }; - const { data, code, msg } = await requestPost(url, params) + const { data, code, msg } = await requestPost(url, params); if (code === 0) { - - this.$message.success('标记成功') + this.$message.success("标记成功"); this.getTableData(); } else { - this.$message.error(msg) + this.$message.error(msg); } - }, - async handleCancalDiffcult () { - const url = "/governance/icEvent/difficultpointevent" + async handleCancalDiffcult() { + const url = "/governance/icEvent/difficultpointevent"; let params = { icEventIdList: this.multipleSelection, - type: "0" - } + type: "0", + }; - const { data, code, msg } = await requestPost(url, params) + const { data, code, msg } = await requestPost(url, params); if (code === 0) { - - this.$message.success('取消标记成功') + this.$message.success("取消标记成功"); this.getTableData(); } else { - this.$message.error(msg) + this.$message.error(msg); } }, - handleSearch (val) { + handleSearch(val) { console.log(this.formData); this.pageNo = 1; this.getTableData(); }, - async loadGrid () { - const url = "/gov/org/customergrid/gridoption" + async loadGrid() { + const url = "/gov/org/customergrid/gridoption"; let params = { agencyId: this.agencyId, - purpose: "query" - } + purpose: "query", + }; - const { data, code, msg } = await requestPost(url, params) + const { data, code, msg } = await requestPost(url, params); if (code === 0) { - this.gridList = data - + this.gridList = data; } else { - this.$message.error(msg) + this.$message.error(msg); } - }, - async handleExport () { + async handleExport() { const url = "/governance/icEvent/export"; const { pageSize, pageNo, formData } = this; axios({ @@ -641,13 +720,12 @@ export default { }); }, - async handleAdd () { - + async handleAdd() { this.pageType = "add"; }, - async handleWatch (row) { - this.eventId = row.icEventId + async handleWatch(row) { + this.eventId = row.icEventId; const url = "/governance/icEvent/detail"; // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/detail"; @@ -656,7 +734,6 @@ export default { }); if (code === 0) { - this.eventDetailData = { ...data }; this.pageType = "info"; } else { @@ -665,8 +742,8 @@ export default { }, //加载组织数据 - async handleDispose (row) { - this.eventId = row.icEventId + async handleDispose(row) { + this.eventId = row.icEventId; const url = "/governance/icEvent/detail"; // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/detail"; @@ -675,7 +752,6 @@ export default { }); if (code === 0) { - this.eventDetailData = { ...data }; this.pageType = "dispose"; } else { @@ -684,43 +760,42 @@ export default { }, //显示语音窗口 - handleShowVoice (url) { - this.selVoiceUrl = url - this.showVoice = true + handleShowVoice(url) { + this.selVoiceUrl = url; + this.showVoice = true; }, - handleClose () { + handleClose() { this.pageType = "list"; - this.eventId = "" - this.getTableData() - + this.eventId = ""; + this.getTableData(); }, - handleOk () { + handleOk() { this.pageType = "list"; - this.eventId = "" - this.pageNo = 1 - this.getTableData() - - + this.eventId = ""; + this.pageNo = 1; + this.getTableData(); }, - handleEditSuccess () { + handleEditSuccess() { this.handleClose(); this.getTableData(); }, - async handleDel (rowData) { + async handleDel(rowData) { let message = "确认删除?"; this.$confirm(message, "提示", { confirmButtonText: "确定", cancelButtonText: "取消", type: "warning", - }).then(() => { - this.delEvent(rowData.icEventId); - }).catch((err) => { }); + }) + .then(() => { + this.delEvent(rowData.icEventId); + }) + .catch((err) => {}); }, - async delEvent (eventId) { + async delEvent(eventId) { const url = "/governance/icEvent/delete"; let idsArr = [eventId]; @@ -734,7 +809,7 @@ export default { } }, - async getTableData () { + async getTableData() { const url = "/governance/icEvent/list"; // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/list"; const { pageSize, pageNo, formData } = this; @@ -744,12 +819,11 @@ export default { ...formData, }); if (code === 0) { - this.total = data.total || 0; this.tableData = data.list ? data.list.map((item) => { - return item; - }) + return item; + }) : []; // this.tableData.forEach(item => { @@ -768,7 +842,7 @@ export default { this.$message.error(msg); } }, - async getCateOptions () { + async getCateOptions() { const url = "/governance/issueprojectcategorydict/list"; const { data, code, msg } = await requestPost(url, {}); @@ -780,55 +854,56 @@ export default { // }); // return item; // }); - this.cateOptions = this.deepTree(data, 'subCategory') + this.cateOptions = this.deepTree(data, "subCategory"); } else { this.$message.error(msg); } }, - handleSizeChange (val) { - + handleSizeChange(val) { this.pageSize = val; window.localStorage.setItem("pageSize", val); this.getTableData(); }, - handleCurrentChange (val) { - + handleCurrentChange(val) { this.pageNo = val; this.getTableData(); }, - resetSearch () { + resetSearch() { this.formData = { - gridId: '', - sourceType: '', - eventContent: '', - name: '', - mobile: '', - startTime: '', - endTime: '', - status: '', + gridId: "", + sourceType: "", + eventContent: "", + name: "", + mobile: "", + startTime: "", + endTime: "", + status: "", firstIdList: [], secondIdList: [], - } - this.eventTypeCheck = [] - + }; + this.eventTypeCheck = []; - this.pageNo = 1 + this.pageNo = 1; this.getTableData(); // this.loadTable() }, - deepTree (arr, child) { + deepTree(arr, child) { if (Array.isArray(arr) && arr.length > 0) { - return arr.map(item => { + return arr.map((item) => { // if (child === 'subAgencyList') item.value = item.orgType + '-' + item.orgId return { ...item, - [child]: item[child] && item[child].length > 0 && this.deepTree(item[child], child) || null - } - }) + [child]: + (item[child] && + item[child].length > 0 && + this.deepTree(item[child], child)) || + null, + }; + }); } - } + }, }, }; @@ -840,8 +915,15 @@ export default { width: 200px; } } - ::v-deep .el-dropdown__caret-button{ +::v-deep .el-dropdown__caret-button { height: 32px; } - +::v-deep .el-image-viewer__close { + top: 129px; + right: 129px; + width: 40px; + height: 40px; + font-size: 40px; + color: #fff; +} diff --git a/src/views/modules/shequzhili/issue/cpts/add.vue b/src/views/modules/shequzhili/issue/cpts/add.vue index 7ac195e71..e0934efab 100644 --- a/src/views/modules/shequzhili/issue/cpts/add.vue +++ b/src/views/modules/shequzhili/issue/cpts/add.vue @@ -767,7 +767,7 @@ export default { diff --git a/src/views/modules/shequzhili/issue/cpts/suggestDetail.vue b/src/views/modules/shequzhili/issue/cpts/suggestDetail.vue index bef6bbfb8..51683d087 100644 --- a/src/views/modules/shequzhili/issue/cpts/suggestDetail.vue +++ b/src/views/modules/shequzhili/issue/cpts/suggestDetail.vue @@ -1,82 +1,87 @@