Merge branch 'dev-fivelayer0725' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into dev-fivelayer0725

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') {
+            if (this.icResiUserId && this.formType === 'add') {
-               this.demandUserList.forEach((item) => {
+              this.demandUserList.forEach((item) => {
-                
+
                 if (item.demandUserId == this.icResiUserId)
                   this.selectDemandUser = item.label;
               });
               this.form.demandUserId = this.icResiUserId
+
+              this.form.gridId = this.selGridId
             }
           }
         })

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'
     },

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: {},
     };
   },

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: '',
 
 
     };

src/views/modules/visual/command/index.vue

@@ -160,6 +160,7 @@
 
     <event-info v-if="pageType==='watch-event'"
                 ref="ref_event"
+                :eventId="eventId"
                 @handleClose="handleClose" />
 
     <service-info v-if="pageType==='create-service'"
@@ -173,6 +174,7 @@
 
     <qsydw v-if="pageType==='watch-xuncha'"
            ref="ref_xuncha"
+           :enterpriseId="enterpriseId"
            @handleClose="handleClose" />
 
     <!-- <people v-if="pageType==='watch-resi'"
@@ -395,7 +397,10 @@ export default {
       searchResult: iniSearchResult(),
 
       pageType: '',
-      icResiUserId:'',
+      icResiUserId: '',
+      selGridId: '',
+      eventId: '',
+      enterpriseId: '',
     };
   },
 
@@ -421,21 +426,23 @@ export default {
 
   methods: {
     handleClickDotBtn (type, info) {
-      // debugger
+
       this.pageType = type
       if (type == "create-service") {
         // 点击网格发起服务
       } else if (type == "watch-resi") {
-        this.toSubAgency('people',info.icResiUserId)
+        this.toSubAgency('people', info.icResiUserId)
-         this.icResiUserId = info.icResiUserId
+        this.icResiUserId = info.icResiUserId
         // 查看居民详情
       } else if (type == "watch-event") {
         // 查看事件
       } else if (type == "create-demand") {
         // 发起需求
         this.icResiUserId = info.icResiUserId
-      }else if(type=="watch-xuncha"){
+        this.selGridId = info.gridId
+      } else if (type == "watch-xuncha") {
 
+        this.enterpriseId = info.enterpriseId
       }
     },