From 670c2b8cce76ad46b83b3fe48cedc7852c6500aa Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Wed, 15 Jun 2022 14:58:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=AA=E8=83=BD=E4=B8=8B=E8=BD=BD=E5=8D=95?=
 =?UTF-8?q?=E4=B8=AA=E7=BD=91=E6=A0=BC=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epidemicbuildingunit-add-or-update.vue    | 14 ++++-----
 .../personroom/epidemicbuildingunit.vue       | 31 +++++++++++++++++--
 2 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/src/views/modules/personroom/epidemicbuildingunit-add-or-update.vue b/src/views/modules/personroom/epidemicbuildingunit-add-or-update.vue
index 3a6d12a..270a741 100644
--- a/src/views/modules/personroom/epidemicbuildingunit-add-or-update.vue
+++ b/src/views/modules/personroom/epidemicbuildingunit-add-or-update.vue
@@ -5,7 +5,7 @@
       <el-row>
         <el-col :span="8">
           <el-form-item label="所在镇街" prop="streetId">
-              <el-select v-model="dataForm.streetId" @change="selectModel($event)" placeholder="请选择">
+              <el-select :disabled="dataForm.id" v-model="dataForm.streetId" @change="selectModel($event)" placeholder="请选择">
                   <el-option
                           v-for="item in streetArr"
                           :key="item.deptId"
@@ -19,7 +19,7 @@
         <el-col :span="8">
           <el-form-item label="所在村居"
                         prop="communityId">
-            <el-select v-model="dataForm.communityId" @change="selectGrid($event)"
+            <el-select :disabled="dataForm.id" v-model="dataForm.communityId" @change="selectGrid($event)"
                       placeholder="请选择"
                       >
               <el-option v-for="item in communitys"
@@ -33,7 +33,7 @@
         <el-col :span="8">
           <el-form-item label="所在网格"
                         prop="gridId">
-            <el-select v-model="dataForm.gridId" @change="selectPlot($event)"
+            <el-select :disabled="dataForm.id" v-model="dataForm.gridId" @change="selectPlot($event)"
                       placeholder="请选择"
                       >
               <el-option v-for="item in grids"
@@ -53,7 +53,7 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="所在小区" prop="plotId">
-              <el-select v-model="dataForm.plotId" @change="selectBuilding($event)" placeholder="请选择">
+              <el-select :disabled="dataForm.id" v-model="dataForm.plotId" @change="selectBuilding($event)" placeholder="请选择">
                   <el-option
                           v-for="item in plotArr"
                           :key="item.dictValue"
@@ -68,7 +68,7 @@
       <el-row>
         <el-col :span="8">
           <el-form-item label="楼栋" prop="buildingId">
-                  <el-select v-model="dataForm.buildingId" clearable placeholder="请选择">
+                  <el-select :disabled="dataForm.id" v-model="dataForm.buildingId" clearable placeholder="请选择">
                       <el-option
                               v-for="item in buildingArr"
                               :key="item.dictValue"
@@ -81,12 +81,12 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="单元" prop="unit">
-              <el-input v-model="dataForm.unit" placeholder="单元"></el-input>
+              <el-input :disabled="dataForm.id" v-model="dataForm.unit" placeholder="单元"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
             <el-form-item label="门牌号" prop="roomNo">
-                <el-input v-model="dataForm.roomNo" placeholder="门牌号"></el-input>
+                <el-input :disabled="dataForm.id" v-model="dataForm.roomNo" placeholder="门牌号"></el-input>
             </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/modules/personroom/epidemicbuildingunit.vue b/src/views/modules/personroom/epidemicbuildingunit.vue
index a0ac7c9..2a6bf60 100644
--- a/src/views/modules/personroom/epidemicbuildingunit.vue
+++ b/src/views/modules/personroom/epidemicbuildingunit.vue
@@ -39,8 +39,7 @@
         </el-form-item>
         <el-form-item label="导入网格"
                       label-width="90px">
-          <el-cascader v-model="deptIdListUpload"
-                       ref="deptTree"
+          <el-cascader v-model="deptIdListDownload"
                        :options="options"
                        :props="{ checkStrictly: false }"
                        clearable>
@@ -146,6 +145,16 @@
               <el-button type="primary"
                          @click="updateMaUrl">生成缩略图</el-button>
             </el-form-item>
+            <br/>
+            <el-form-item label="选择网格"
+                          label-width="90px">
+              <el-cascader v-model="deptIdListDownload"
+                           ref="deptTree"
+                           :options="options"
+                           :props="{ checkStrictly: false }"
+                           clearable>
+              </el-cascader>
+            </el-form-item>
             <el-form-item>
               <el-button type="primary" v-loading="zLoading"
                          @click="downloadUrl">批量下载</el-button>
@@ -182,6 +191,8 @@ export default {
       faultDataVisible: false,
       errordataList: [],
       deptIdListUpload: [],
+      gridIdDownload: '',
+      deptIdListDownload: [],
       roomTypeArr: [],
       roomUseArr: [],
       dataForm: {
@@ -203,6 +214,13 @@ export default {
       } else {
         this.gridIdImport = ''
       }
+    },
+    'deptIdListDownload': function (val) {
+      if (val.length > 0) {
+        this.gridIdDownload = val[val.length - 1]
+      } else {
+        this.gridIdDownload = ''
+      }
     }
   },
   created: function () {
@@ -316,10 +334,19 @@ export default {
       }).catch(() => {})
     },
     downloadUrl () {
+      if (this.gridIdDownload === ''){
+        this.$message({
+          type: 'warning',
+          message: '请选择网格'
+        });
+        return
+      }
+
       this.zLoading = true
       this.$http(
               { method: 'post',
                 url: '/custom/epidemicbuildingunit/downloadZip',
+                data: {gridId: this.gridIdDownload},
                 responseType: 'blob'}).then(({ data: res }) => {
         if (!res) {
           this.zLoading = false