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: ''
     }
   },
 
@@ -799,7 +803,7 @@ export default {
           } else {
             console.log("获取查询详情成功", res.data);
             this.demandUserList = res.data;
-              // debugger
+
             if (this.icResiUserId && this.formType === 'add') {
               this.demandUserList.forEach((item) => {
 
@@ -807,6 +811,8 @@ export default {
                   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" />
@@ -39,6 +40,10 @@ export default {
       type: String,
       required: 'true'
     },
+    selGridId: {
+      type: String,
+      required: 'true'
+    },
   },
 
   components: {

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'"
@@ -396,6 +398,9 @@ export default {
 
       pageType: '',
       icResiUserId: '',
+      selGridId: '',
+      eventId: '',
+      enterpriseId: '',
     };
   },
 
@@ -421,7 +426,7 @@ export default {
 
   methods: {
     handleClickDotBtn (type, info) {
-      // debugger
+
       this.pageType = type
       if (type == "create-service") {
         // 点击网格发起服务
@@ -434,8 +439,10 @@ export default {
       } else if (type == "create-demand") {
         // 发起需求
         this.icResiUserId = info.icResiUserId
+        this.selGridId = info.gridId
       } else if (type == "watch-xuncha") {
 
+        this.enterpriseId = info.enterpriseId
       }
     },