Merge branch 'bug_mk' into test

src/views/modules/base/diyInfo.vue

@@ -141,6 +141,10 @@ export default {
     search: {
       type: Object,
       default: () => {}
+    },
+    virtualResi:{
+      type:Boolean,
+      default:false
     }
   },
   components: {
@@ -331,6 +335,9 @@ export default {
           })
         }
       }
+      if(this.virtualResi){
+        params.gridType = 'virtual'
+      }
       await this.$http({
         method: 'POST',
         url,

src/views/modules/base/organization/organization.vue

@@ -1638,7 +1638,6 @@ export default {
     },
     // 添加网格
     async submitGrid () {
-        debugger
         this.$refs.addGridForm.validate(async (result) => {
             if (result === true) {
                 const url = "/gov/org/grid/addgrid";
@@ -1661,7 +1660,7 @@ export default {
                 if (code === 0) {
                     this.$message.success("添加成功");
                     this.dialogVisibleGrid = false;
-                    this.GridForm = [];
+                    this.GridFormRest();
                     this.getAgencyList();
                     this.getDepartmentList();
                     this.getGridList();

src/views/modules/base/virtualResi.vue

@@ -302,7 +302,7 @@
         <el-dialog :visible.sync="diyDialog" :close-on-click-modal="false" :close-on-press-escape="false" width="1150px"
             top="5vh" class="dialog-h">
             <diy-info v-if="diyDialog" ref="ref_diy" :list="exportList" :search="searchForm"
-                @close="handleDiyClose"></diy-info>
+                @close="handleDiyClose" :virtualResi="true"></diy-info>
         </el-dialog>
 
         <baobiao ref="baobiao" />