diff --git a/src/views/modules/communityService/measure/info.vue b/src/views/modules/communityService/measure/info.vue index 59e1a4d8..36346c68 100644 --- a/src/views/modules/communityService/measure/info.vue +++ b/src/views/modules/communityService/measure/info.vue @@ -370,6 +370,10 @@ export default { icResiUserId: { type: String, default: '' + }, + selGridId: { + type: String, + default: '' } }, @@ -469,7 +473,7 @@ export default { } else { this.getInfo(); } - + this.pageLoading = true; @@ -799,14 +803,16 @@ export default { } else { console.log("获取查询详情成功", res.data); this.demandUserList = res.data; - // debugger - if(this.icResiUserId && this.formType==='add') { - this.demandUserList.forEach((item) => { - + + if (this.icResiUserId && this.formType === 'add') { + this.demandUserList.forEach((item) => { + if (item.demandUserId == this.icResiUserId) this.selectDemandUser = item.label; }); this.form.demandUserId = this.icResiUserId + + this.form.gridId = this.selGridId } } }) diff --git a/src/views/modules/visual/command/cpts/demandInfo.vue b/src/views/modules/visual/command/cpts/demandInfo.vue index bac6c9b0..d01a7eb0 100644 --- a/src/views/modules/visual/command/cpts/demandInfo.vue +++ b/src/views/modules/visual/command/cpts/demandInfo.vue @@ -16,6 +16,7 @@ :source="'visiual'" :formType="'add'" :icResiUserId="icResiUserId" + :selGridId="selGridId" @handleClose="handleClose" @handleOk="handleOk" @dialogOk="handleEditSuccess" /> @@ -35,7 +36,11 @@ import demandInfoOrigin from "@/views/modules/communityService/measure/info"; export default { name: "dialogInfo", props: { - icResiUserId: { + icResiUserId: { + type: String, + required: 'true' + }, + selGridId: { type: String, required: 'true' }, diff --git a/src/views/modules/visual/command/cpts/eventInfo.vue b/src/views/modules/visual/command/cpts/eventInfo.vue index 7e260517..18338b24 100644 --- a/src/views/modules/visual/command/cpts/eventInfo.vue +++ b/src/views/modules/visual/command/cpts/eventInfo.vue @@ -36,7 +36,10 @@ import eventInfo from "@/views/modules/shequzhili/event/cpts/event-info"; export default { name: "dialogInfo", props: { - + eventId: { + type: String, + required: 'true' + }, }, components: { @@ -49,7 +52,7 @@ export default { loading: false, pageType: 'dispose', - eventId: '1552537796854706177', + // eventId: '', eventDetailData: {}, }; }, diff --git a/src/views/modules/visual/command/cpts/qsydw.vue b/src/views/modules/visual/command/cpts/qsydw.vue index 9bf2dd8c..11f7e780 100644 --- a/src/views/modules/visual/command/cpts/qsydw.vue +++ b/src/views/modules/visual/command/cpts/qsydw.vue @@ -76,7 +76,10 @@ import record from "@/views/modules/shequzhili/tuceng/anquan/xuncha/cpts/record" export default { name: "dialogInfo", props: { - + enterpriseId: { + type: String, + required: 'true' + }, }, components: { @@ -93,7 +96,7 @@ export default { eventDetailData: {}, enterpriseInfo: {}, - enterpriseId: '1544585407179968514', + // enterpriseId: '', }; diff --git a/src/views/modules/visual/command/index.vue b/src/views/modules/visual/command/index.vue index dd21355a..426f8381 100644 --- a/src/views/modules/visual/command/index.vue +++ b/src/views/modules/visual/command/index.vue @@ -160,6 +160,7 @@