Merge branch 'dev-220309' into dev

src/views/components/resiSearch.vue

@@ -52,6 +52,7 @@
                   placeholder="楼号"
                   size="small"
                   clearable
+                  style="width: 120px;"
                   class="resi-cell-select"
                   :disabled="changeVDisabled"
                   @clear="handleClearBuild"
@@ -71,6 +72,7 @@
                   placeholder="单元"
                   size="small"
                   clearable
+                  style="width: 120px;"
                   class="resi-cell-select"
                   @click="handleClearDan"
                   @change="handleChangeD"
@@ -86,9 +88,10 @@
                 <el-select
                   v-model.trim="form.HOME_ID"
                   :disabled="changeDDisabled"
-                  placeholder="楼号"
+                  placeholder="房号"
                   size="small"
                   clearable
+                  style="width: 120px;"
                   class="resi-cell-select"
                 >
                   <el-option

src/views/modules/base/resi.vue

@@ -63,7 +63,8 @@
                          align="center"
                          :fixed="item.columnName == 'NAME' ? 'left' : false"
                          :show-overflow-tooltip="true"
-                         :width="item.itemType === 'radio' ? computedWidth(item.label) : 180">
+                         >
+                         <!-- :width="item.itemType === 'radio' ? computedWidth(item.label) : 180" -->
           <template slot-scope="scope">
             <a v-if="item.columnName == 'NAME'"
                class="name-a"

src/views/modules/communityParty/elegant/index.vue

@@ -48,6 +48,10 @@
       
       <div class="resi-row-btn">
         <el-button class="diy-button--add" size="small" @click="handleAdd">新增</el-button>
+        <el-button
+                   class="diy-button--export"
+                   size="small"
+                   @click="handleExportModule('room')">下载模板</el-button>
         <el-upload
           ref="upload"
           class="upload-demo"
@@ -62,11 +66,9 @@
           >
           <el-button size="small" class="diy-button--delete" :loading="importLoading">{{importBtnTitle}}</el-button>
         </el-upload>
+        
         <el-button class="diy-button--reset" size="small" :loading="exportBtn" @click="handleExport">{{ exportBtnTitle }}</el-button>
-        <!-- <el-button
-                   class="diy-button--export"
-                   size="small"
-                   @click="handleExportModule('room')">下载模板</el-button> -->
+        
       </div>
       
       <el-table
@@ -381,7 +383,7 @@ export default {
       this.unloadPencent = Number(file.percentage.toFixed(0))
     },
     async handleExportModule () {
-      let url = "/resi/partymember/import/template-download"
+      let url = "/resi/partymember/icpartymemberstyle/import/template-download"
       
 
       let params = {}

src/views/modules/communityService/sqzzz/index.vue

@@ -35,6 +35,10 @@
         <el-button class="diy-button--add" size="small" @click="handleAdd"
           >新增</el-button
         >
+        <el-button
+                   class="diy-button--export"
+                   size="small"
+                   @click="handleExportModule('room')">下载模板</el-button>
         <el-upload
           ref="upload"
           class="upload-btn"
@@ -232,6 +236,35 @@ export default {
     this.getTableData();
   },
   methods: {
+    async handleExportModule () {
+      let url = "/heart/iccommunityselforganization/import-template-download"
+      
+
+      let params = {}
+      await this.$http
+        .post(url, params)
+        .then(res => {
+          // this.download(res.data, title + '.xls')
+          if (res.headers["content-disposition"]) {
+            let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
+            console.log('filename', fileName)
+            let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
+            var url = window.URL.createObjectURL(blob)
+            var aLink = document.createElement('a')
+            aLink.style.display = 'none'
+            aLink.href = url
+            aLink.setAttribute('download', fileName)
+            document.body.appendChild(aLink)
+            aLink.click()
+            document.body.removeChild(aLink) //下载完成移除元素
+            window.URL.revokeObjectURL(url) //释放掉blob对象
+          } else this.$message.error('下载失败')
+        })
+        .catch(err => {
+          console.log('err', err)
+          return this.$message.error('网络错误')
+        })
+    },
     // 上传大图标成功
     handleExcelSuccess(res, file) {
       if (res.code === 0 && res.msg === "success") {