From 95d064d0f89df0789c0fda9f1d69e025da4a72aa Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Thu, 27 Oct 2022 18:17:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E6=88=BF=E5=AF=BC=E5=85=A5=E6=88=BF?=
 =?UTF-8?q?=E5=B1=8B=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/fangwu.xlsx                            | Bin 0 -> 18432 bytes
 public/renfang.xlsx                           | Bin 0 -> 18944 bytes
 .../modules/news/allnews-add-or-update.vue    |   2 +-
 .../personroom/epidemicbuildingunit.vue       | 105 ++++++++++++++++--
 4 files changed, 95 insertions(+), 12 deletions(-)
 create mode 100644 public/fangwu.xlsx
 create mode 100644 public/renfang.xlsx

diff --git a/public/fangwu.xlsx b/public/fangwu.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..8e819236c5d8a4262ac0db63736e12fd44f67d79
GIT binary patch
literal 18432
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
L1MCF||J?9De<%t5

literal 0
HcmV?d00001

diff --git a/public/renfang.xlsx b/public/renfang.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..cb6579ee185dc8b82dc465b28f14a5eb31a7aec0
GIT binary patch
literal 18944
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

literal 0
HcmV?d00001

diff --git a/src/views/modules/news/allnews-add-or-update.vue b/src/views/modules/news/allnews-add-or-update.vue
index cb9b29a..9ec3d96 100644
--- a/src/views/modules/news/allnews-add-or-update.vue
+++ b/src/views/modules/news/allnews-add-or-update.vue
@@ -374,7 +374,7 @@ export default {
   }
 }
 </script>
-<style>
+<style scoped>
 .avatar-uploader .el-upload {
   border: 1px dashed #d9d9d9;
   border-radius: 6px;
diff --git a/src/views/modules/personroom/epidemicbuildingunit.vue b/src/views/modules/personroom/epidemicbuildingunit.vue
index 76169e2..eafd4d9 100644
--- a/src/views/modules/personroom/epidemicbuildingunit.vue
+++ b/src/views/modules/personroom/epidemicbuildingunit.vue
@@ -38,13 +38,10 @@
         <el-form-item>
           <el-button v-if="$hasPermission(':epidemicbuildingunit:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
         </el-form-item>
+
         <el-form-item>
-          <el-button type="primary">
-            <a :href="`https://epdc-yushan.elinkservice.cn/epdc-admin/fang.xlsx`"
-               target="_blank"
-               download="人房信息表.xlsx"
-               style="color: #ffffff">{{ $t('exportTemplate') }}</a>
-          </el-button>
+          <el-button type="primary"
+                     @click="templateSelect">导入模板</el-button>
         </el-form-item>
         <el-form-item label="导入网格"
                       label-width="90px">
@@ -57,7 +54,11 @@
         </el-form-item>
         <el-form-item>
           <el-button type="primary"
-                     @click="beforeImportUser">导入</el-button>
+                     @click="beforeImportUser">人房导入</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary"
+                     @click="beforeImportHouse">房屋导入</el-button>
         </el-form-item>
         <el-form-item>
           <el-upload ref="upload"
@@ -67,10 +68,20 @@
                      :on-error='errorExceed'>
             <el-button id="importBut"
                        style="display: none"
-                       type="primary">导入</el-button>
+                       type="primary">人房导入</el-button>
+          </el-upload>
+        </el-form-item>
+        <el-form-item>
+          <el-upload ref="uploadHouse"
+                     :action="uploadHouseUrl"
+                     :limit="1"
+                     :on-success='uploadHouseSuccess'
+                     :on-error='errorHouseExceed'>
+            <el-button id="importHouseBut"
+                       style="display: none"
+                       type="primary">房屋导入</el-button>
           </el-upload>
         </el-form-item>
-
         <el-form-item>
           <el-button type="primary" @click="exports()">一户一码</el-button>
         </el-form-item>
@@ -144,7 +155,7 @@
                      @click="exportError">导出错误数据</el-button>
         </template>
       </el-dialog>
-      <el-dialog title="一户一码" :visible.sync="dialogVisibleExcel" width="30%">
+      <el-dialog title="一户一码" :visible.sync="dialogVisibleExcel" width="35%">
         <div style="text-align: center">
           <el-form class="but-sty" inline label-width="90px">
             <el-form-item>
@@ -179,6 +190,31 @@
           <el-button @click="dialogVisibleExcel = false">取 消</el-button>
         </span>
       </el-dialog>
+      <el-dialog title="导出选择" :visible.sync="dialogVisibleTemplate" width="30%">
+        <div style="text-align: center">
+          <el-form class="but-sty" inline label-width="90px">
+            <el-form-item>
+              <el-button type="primary">
+                <a :href="`https://epdc-yushan.elinkservice.cn/epdc-admin/renfang.xlsx`"
+                   target="_blank"
+                   download="人房信息表.xlsx"
+                   style="color: #ffffff">人房信息模板</a>
+              </el-button>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary">
+                <a :href="`https://epdc-yushan.elinkservice.cn/epdc-admin/fangwu.xlsx`"
+                   target="_blank"
+                   download="房屋信息表.xlsx"
+                   style="color: #ffffff">房屋信息模板</a>
+              </el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="dialogVisibleTemplate = false">取 消</el-button>
+        </span>
+      </el-dialog>
     </div>
   </el-card>
 </template>
@@ -200,6 +236,7 @@ export default {
         exportErrorInfoURL: '/custom/epidemicusererror/export4Room'
       },
       uploadUrl: '',
+      uploadHouseUrl: '',
       options: [],
       zLoading: false,
       faultDataVisible: false,
@@ -213,6 +250,7 @@ export default {
         id: ''
       },
       exportTemplate: false,
+      dialogVisibleTemplate: false,
       dialogVisibleExcel: false,
     }
   },
@@ -225,6 +263,8 @@ export default {
         this.gridIdImport = val[val.length - 1]
         this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/custom/epidemicbuildingunit/importHouse?token=
            ${Cookies.get('token')}&gridId=` + val[val.length - 1]
+        this.uploadHouseUrl = `${window.SITE_CONFIG['apiURL']}/custom/epidemicbuildingunit/importHouseSimple?token=
+           ${Cookies.get('token')}&gridId=` + val[val.length - 1]
       } else {
         this.gridIdImport = ''
       }
@@ -316,10 +356,31 @@ export default {
         }
       })
     },
+    uploadHouseSuccess (response, file, fileList) {
+      this.uploeadLoeading = false
+      this.$refs.uploadHouse.clearFiles()
+      if (response.code === 0) {
+        this.$message({
+          message: response.data,
+          type: 'success',
+          duration: 5000,
+          onClose: () => {
+            this.getDataList()
+          }
+        })
+        this.getDataList()
+        return
+      }
+      this.$message.error('上传失败请重试')
+    },
     errorExceed (file, fileList) {
       this.uploeadLoeading = false
       this.$message.error('上传失败请重试')
     },
+    errorHouseExceed (file, fileList) {
+      this.uploeadLoeading = false
+      this.$message.error('上传失败请重试')
+    },
     updateMa () {
       this.$http.post(`/custom/epidemicbuildingunit/updateMaCode`).then(({ data: res }) => {
         if (res.code !== 0) {
@@ -412,7 +473,9 @@ export default {
       }
       this.zLoading = false
     },
-
+    templateSelect () {
+      this.dialogVisibleTemplate = true
+    },
     downloadMa (id) {
         this.$http.post(`/custom/epidemicbuildingunit/createHouseQrcode`, {id: id}, { responseType: 'blob' }).then(res => {
             let fileName = '房屋二维码.png'
@@ -455,6 +518,26 @@ export default {
       }).then(() => {
         document.getElementById('importBut').click()
       }).catch(() => { })
+    },
+    beforeImportHouse () {
+      //所属组织全都不选，直接上传
+      if (this.gridIdImport === '' || this.gridIdImport === undefined) {
+        this.$message({
+          type: 'warning',
+          message: '请先选择网格'
+        });
+        return false
+      }
+      //选中网格
+      let selectGird = this.$refs['deptTree'].getCheckedNodes()[0].label
+
+      this.$confirm(`确定将房屋导入到${selectGird}?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        document.getElementById('importHouseBut').click()
+      }).catch(() => { })
     }
   }
 }