From f9af1c3a79cda2f3a1cc40c21a07c9e1b792e695 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Mon, 14 Mar 2022 10:21:35 +0800
Subject: [PATCH] dd

---
 src/assets/scss/buttonstyle.scss              |  2 +-
 src/views/components/resiSearch.vue           |  2 +-
 src/views/modules/base/resi.vue               | 85 ++++++++++++++-----
 .../modules/communityParty/elegant/index.vue  | 43 ++++++++--
 .../modules/communityService/sqzzz/index.vue  | 22 +++--
 .../serviceMatter/service.vue                 | 12 ++-
 .../serviceMatter/serviceForm.vue             | 12 ++-
 .../modules/workPc/guidance/categoryList.vue  | 14 +--
 src/views/modules/workSys/demandCate.vue      | 10 +--
 src/views/modules/workSys/elegantCate.vue     | 15 ++--
 src/views/modules/workSys/elegantEdit.vue     | 11 ++-
 src/views/modules/workSys/resiCate.vue        |  7 +-
 12 files changed, 168 insertions(+), 67 deletions(-)

diff --git a/src/assets/scss/buttonstyle.scss b/src/assets/scss/buttonstyle.scss
index 60017850..a5f6b533 100644
--- a/src/assets/scss/buttonstyle.scss
+++ b/src/assets/scss/buttonstyle.scss
@@ -86,7 +86,7 @@
 
 //查看
 .div-table-button--detail {
-  color: #1c6afd !important;
+  color: #3E8EF7 !important;
   text-decoration: underline !important;
 }
 
diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index 2e31ee63..72503bad 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -189,7 +189,7 @@
           <el-button type="primary" size="mini">查询</el-button>
         </el-col> -->
         <el-col :span="24">
-          <el-button type="primary" size="mini" @click="handleSearch">查询</el-button>
+          <el-button type="primary" size="small" @click="handleSearch">查询</el-button>
         </el-col>
       </el-row>
       <div class="resi-down" @click="handleOpenSearch">
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 073a5622..76ac5305 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -7,14 +7,10 @@
                  @search="handleSearch" />
     <el-card class="resi-card-table">
       <div class="resi-row-btn">
-        <el-button type="success"
+        <el-button
                    size="small"
+                   class="diy-button--add"
                    @click="handleAdd">新增</el-button>
-        <el-button type="warning"
-                   size="small"
-                   :loading="exportBtn"
-                   @click="handleExport">{{exportBtnTitle}}</el-button>
-        <!-- <el-button type="primary" size="small">下载人口模板</el-button> -->
         <el-upload ref="upload"
                    class="upload-demo"
                    action="uploadUlr"
@@ -26,10 +22,22 @@
                    :on-success="handleExcelSuccess"
                    :before-upload="beforeExcelUpload"
                    :http-request="uploadHttpRequest">
-          <el-button type="danger"
+          <el-button 
                      size="small"
+                     class="diy-button--delete"
                      :loading="importLoading">{{importBtnTitle}}</el-button>
         </el-upload>
+        <el-button 
+                   size="small"
+                   class="diy-button--reset"
+                   :loading="exportBtn"
+                   @click="handleExport">{{exportBtnTitle}}</el-button>
+        <!-- <el-button type="primary" size="small">下载人口模板</el-button> -->
+        <el-button
+                   class="diy-button--export"
+                   size="small"
+                   @click="handleExportModule('room')">下载人口模板</el-button>
+        
 
       </div>
       <el-table ref="ref_table" :data="tableData"
@@ -77,16 +85,18 @@
             <el-button @click="handleTransfer(scope.row)"
                        type="text"
                        size="small"
-                       class="btn-color-look">调动</el-button>
+                       class="div-table-button--detail"
+                       >调动</el-button>
             <el-button @click="handleChangeRecord(scope.row)"
                        type="text"
                        size="small"
-                       class="btn-color-look">变更记录</el-button>
+                       class="div-table-button--detail"
+                       >变更记录</el-button>
             <template v-if="filterEdit(scope.row.ORG_ID)">
               <el-button @click="handleEdit(scope.row)"
                          type="text"
                          size="small"
-                         class="btn-color-edit">编辑</el-button>
+                         class="div-table-button--edit">编辑</el-button>
               <el-popconfirm title="删除之后无法回复，确认删除？"
                              @onConfirm="handleDel(scope.row)">
                 <!-- <el-button slot="reference"
@@ -102,7 +112,7 @@
         <div class="div_del">
           <el-checkbox :indeterminate="isIndeterminate"
                       v-model="selAllFlag"
-                      :disabled="tableData.length==0"
+                      :disabled="selAllFlagDisabled"
                       @change="handleSelectAll">全选</el-checkbox>
           <el-button v-if="selection.length > 0" style="margin-left:15px"
                     type="danger"
@@ -277,6 +287,7 @@ export default {
       disabled: false,
       pageLoading: false,
       selAllFlag: false,
+      selAllFlagDisabled: false,
       isIndeterminate: false,
       dialogEditVisible: false,
       dialogVisible: false,
@@ -473,6 +484,35 @@ export default {
       this.conditions = val
       this.getTableData()
     },
+    async handleExportModule () {
+      let url = "/epmetuser/icresiuser/import/download-template"
+      
+
+      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('网络错误')
+        })
+    },
     // 下载文件
     download (data, fileName) {
       console.log('data', data)
@@ -859,6 +899,11 @@ export default {
                 isChecked: this.filterEdit(item.ORG_ID)
               }
             })
+            let _selAllFlagDisabled = true
+            this.tableData.forEach(item => {
+              if (item.isChecked) _selAllFlagDisabled = false
+            })
+            this.selAllFlagDisabled = _selAllFlagDisabled
             this.total = res.data.total
           }
         })
@@ -1135,15 +1180,15 @@ export default {
     margin-left: 10px;
     border: 0;
   }
-  .el-button--success {
-    background: rgba(34, 193, 195, 1);
-  }
-  .el-button--warning {
-    background: rgba(254, 179, 73, 1);
-  }
-  .el-button--danger {
-    background: rgba(254, 98, 82, 1);
-  }
+  // .el-button--success {
+  //   background: rgba(34, 193, 195, 1);
+  // }
+  // .el-button--warning {
+  //   background: rgba(254, 179, 73, 1);
+  // }
+  // .el-button--danger {
+  //   background: rgba(254, 98, 82, 1);
+  // }
 }
 .resi-other {
   width: 100%;
diff --git a/src/views/modules/communityParty/elegant/index.vue b/src/views/modules/communityParty/elegant/index.vue
index 4f37bb3d..c5a9d56b 100644
--- a/src/views/modules/communityParty/elegant/index.vue
+++ b/src/views/modules/communityParty/elegant/index.vue
@@ -38,8 +38,8 @@
             <el-input v-model="searchForm.mainDeed" placeholder="请输入" class="input-width" clearable></el-input>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" @click="handleSearch">查询</el-button>
-            <el-button type="yellow" @click="resetForm('searchForm')">重置</el-button>
+            <el-button class="diy-button--search" size="small" @click="handleSearch">查询</el-button>
+            <el-button class="diy-button--reset" size="small" @click="resetForm('searchForm')">重置</el-button>
           </el-form-item>
         </el-form>
       </div>
@@ -47,8 +47,7 @@
     <el-card class="resi-card-table">
       
       <div class="resi-row-btn">
-        <el-button type="success" @click="handleAdd">新增</el-button>
-        <el-button type="warning" size="small" :loading="exportBtn" @click="handleExport">{{ exportBtnTitle }}</el-button>
+        <el-button class="diy-button--add" size="small" @click="handleAdd">新增</el-button>
         <el-upload
           ref="upload"
           class="upload-demo"
@@ -61,8 +60,13 @@
           :before-upload="beforeExcelUpload"
           :http-request="uploadHttpRequest"
           >
-          <el-button type="danger" :loading="importLoading">{{importBtnTitle}}</el-button>
+          <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
@@ -376,6 +380,35 @@ export default {
       this.uploading = true
       this.unloadPencent = Number(file.percentage.toFixed(0))
     },
+    async handleExportModule () {
+      let url = "/resi/partymember/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('网络错误')
+        })
+    },
     beforeExcelUpload (file) {
       console.log('file', file)
       const isType = file.type === 'application/vnd.ms-excel'
diff --git a/src/views/modules/communityService/sqzzz/index.vue b/src/views/modules/communityService/sqzzz/index.vue
index e461ecb0..ef13f05a 100644
--- a/src/views/modules/communityService/sqzzz/index.vue
+++ b/src/views/modules/communityService/sqzzz/index.vue
@@ -24,15 +24,15 @@
             </el-date-picker>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" @click="handleSearch">查询</el-button>
-            <el-button type="yellow" @click="resetForm('searchForm')">重置</el-button>
+            <el-button class="diy-button--search" size="small" @click="handleSearch">查询</el-button>
+            <el-button class="diy-button--reset" size="small" @click="resetForm('searchForm')">重置</el-button>
           </el-form-item>
         </el-form>
       
       </el-card>
     <el-card class="resi-card-table">
       <div class="resi-row-btn">
-        <el-button type="success" size="small" @click="handleAdd"
+        <el-button class="diy-button--add" size="small" @click="handleAdd"
           >新增</el-button
         >
         <el-upload
@@ -48,12 +48,12 @@
           :before-upload="beforeExcelUpload"
           :http-request="uploadHttpRequest"
         >
-          <el-button type="warning" size="small" :loading="importLoading">{{
+          <el-button size="small" class="diy-button--delete" :loading="importLoading">{{
             importBtnTitle
           }}</el-button>
         </el-upload>
 
-        <el-button @click="handleChu" type="danger" size="small"
+        <el-button @click="handleChu" class="diy-button--reset" size="small"
           >excel导出</el-button
         >
       </div>
@@ -92,7 +92,7 @@
             > -->
             <el-button
               type="text"
-              style="color: #1c6afd"
+              class="div-table-button--detail"
               size="small"
               @click="handleScore(scope.row)"
               >积分记录</el-button
@@ -102,7 +102,7 @@
               @click="handleEdit(scope.$index)"
               type="text"
               size="small"
-              style="margin-right: 10px; color: #00a7a9"
+              class="div-table-button--edit"
               >编辑</el-button
             >
 
@@ -115,7 +115,8 @@
                 slot="reference"
                 type="text"
                 size="small"
-                style="color: #d51010"
+                class="div-table-button--delete"
+                style="margin-left: 10px;"
                 >删除</el-button
               >
             </el-popconfirm>
@@ -457,6 +458,11 @@ export default {
     // border-right: 1px solid rgba(33, 149, 254, 1);
   }
 }
+.resi-table {
+  ::v-deep .el-button--text {
+    text-decoration: underline;
+  }
+}
 .resi-card-table {
   margin-top: 20px;
 }
diff --git a/src/views/modules/systemManagement/serviceMatter/service.vue b/src/views/modules/systemManagement/serviceMatter/service.vue
index 9af01fe1..ce2e0970 100644
--- a/src/views/modules/systemManagement/serviceMatter/service.vue
+++ b/src/views/modules/systemManagement/serviceMatter/service.vue
@@ -3,9 +3,7 @@
 
     <div class="div_table">
       <div class="div_btn">
-        <el-button style=""
-                   type="green"
-                   size="small"
+        <el-button class="diy-button--add" size="small"
                    @click="handleAdd">新增</el-button>
 
       </div>
@@ -47,17 +45,17 @@
           <template slot-scope="scope">
             <el-button v-if="scope.row.usableFlag"
                        type="text"
-                       style="color:#D51010;text-decoration: underline;"
+                       class="div-table-button--delete"
                        size="small"
                        @click="handleDisable(scope.row,'disable')">禁用</el-button>
             <el-button v-if="!scope.row.usableFlag"
                        type="text"
-                       style="color:#D51010;text-decoration: underline;"
+                       class="div-table-button--detail"
                        size="small"
                        @click="handleDisable(scope.row,'able')">启用</el-button>
 
             <el-button type="text"
-                       style="color:#00A7A9;text-decoration: underline;"
+                       class="div-table-button--edit"
                        size="small"
                        @click="handleEdit(scope.row)">修改</el-button>
 
@@ -72,7 +70,7 @@
                :close-on-click-modal="false"
                :close-on-press-escape="false"
                :title="formTitle"
-               width="950px"
+               width="50%"
                top="5vh"
                @closed="diaClose">
       <service-form ref="ref_form"
diff --git a/src/views/modules/systemManagement/serviceMatter/serviceForm.vue b/src/views/modules/systemManagement/serviceMatter/serviceForm.vue
index 7a5c420a..06a415fa 100644
--- a/src/views/modules/systemManagement/serviceMatter/serviceForm.vue
+++ b/src/views/modules/systemManagement/serviceMatter/serviceForm.vue
@@ -35,13 +35,21 @@
       </div>
 
     </div>
-    <div class="div_btn">
+    <!-- <div class="div_btn">
       <el-button @click="handleCancle">取 消</el-button>
       <el-button v-if="formType != 'detail'"
                  type="primary"
                  :disabled="btnDisable"
                  @click="handleComfirm">确 定</el-button>
-    </div>
+    </div> -->
+     <div class="resi-btns">
+        <el-button size="small"
+                   @click="handleCancle">取 消</el-button>
+        <el-button v-if="formType != 'detail'" type="primary"
+                   size="small"
+                   :disabled="btnDisable"
+                   @click="handleComfirm">确 定</el-button>
+      </div>
   </div>
 </template>
 
diff --git a/src/views/modules/workPc/guidance/categoryList.vue b/src/views/modules/workPc/guidance/categoryList.vue
index 76b65a46..d2f8db1e 100644
--- a/src/views/modules/workPc/guidance/categoryList.vue
+++ b/src/views/modules/workPc/guidance/categoryList.vue
@@ -49,21 +49,23 @@
 
             <el-button v-if="scope.row.status==='enable'"
                        type="text"
-                       size="mini"
+                       size="small"
+                       class="div-table-button--detail"
                        @click="confirmChangeState(scope.row,'disable')">禁用</el-button>
             <el-button v-if="scope.row.status==='disable'"
                        type="text"
-                       size="mini"
+                       size="small"
+                       class="div-table-button--detail"
                        @click="confirmChangeState(scope.row,'enable')">启用</el-button>
 
             <el-button type="text"
-                       size="mini"
-                       class="btn-color-edit"
+                       size="small"
+                       class="div-table-button--edit"
                        @click="handleEdit(scope.row)">修改</el-button>
 
             <el-button type="text"
-                       size="mini"
-                       class="btn-color-del"
+                       size="small"
+                       class="div-table-button--delete"
                        @click="confirmDel(scope.row)">删除</el-button>
           </template>
         </el-table-column>
diff --git a/src/views/modules/workSys/demandCate.vue b/src/views/modules/workSys/demandCate.vue
index 12d75d2d..ecd3095f 100644
--- a/src/views/modules/workSys/demandCate.vue
+++ b/src/views/modules/workSys/demandCate.vue
@@ -14,14 +14,14 @@
             </el-select>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" @click="handleSearch">查询</el-button>
+            <el-button class="diy-button--search" size="small" @click="handleSearch">查询</el-button>
           </el-form-item>
         </el-form>
       </div>
     </el-card>
     <el-card class="resi-card-table">
       <div class="resi-row-btn">
-        <el-button type="success" @click="handleAdd('1', 'add')">新增分类</el-button>
+        <el-button class="diy-button--add" size="small" @click="handleAdd('1', 'add')">新增分类</el-button>
       </div>
       
       <el-table
@@ -54,7 +54,7 @@
               @click="handleLook(scope.row)"
               type="text"
               size="small"
-              class="btn-color-look"
+              class="div-table-button--detail"
               >{{(scope.row.usableFlag&&'禁用') || '启用'}}</el-button
             >
             <el-button
@@ -62,14 +62,14 @@
                 @click="handleAdd('2', 'add', scope.row)"
                 type="text"
                 size="small"
-                class="btn-color-del"
+                class="div-table-button--delete"
                 >添加二级分类</el-button
               >
             <el-button
                 @click="handleEdit(scope.row, 'edit')"
                 type="text"
                 size="small"
-                class="btn-color-edit"
+                class="div-table-button--edit"
                 >编辑</el-button
               >
           </template>
diff --git a/src/views/modules/workSys/elegantCate.vue b/src/views/modules/workSys/elegantCate.vue
index d0a5320d..8c4d4707 100644
--- a/src/views/modules/workSys/elegantCate.vue
+++ b/src/views/modules/workSys/elegantCate.vue
@@ -3,24 +3,25 @@
     <el-card class="resi-card-table">
       <div class="mod-sys__menu">
         <div class="resi-row-btn">
-          <el-button class=""
-                    type="success"
+          <el-button class="diy-button--add"
+                    size="small"
                     @click="addShow()">新增</el-button>
         </div>
         <el-table v-loading="dataListLoading"
                   :data="dataList"
                   :default-expand-all="false"
                   row-key="categoryId"
-                  :cell-style="cellStyle"
                   :height="tableHeight"
                   border
                   style="width: 100%;" class="resi-table">
           <el-table-column prop="categoryName"
                           label="分类名称"
+                          align="center"
                           header-align="center"
                           min-width="150"></el-table-column>
           <el-table-column prop="stateShow"
                           label="状态"
+                          align="center"
                           header-align="center"
                           min-width="150"></el-table-column>
 
@@ -32,21 +33,21 @@
           <el-table-column label="操作"
                           fixed="right"
                           header-align="center"
-                          align="left"
+                          align="center"
                           width="350">
             <template slot-scope="scope">
 
               <el-button type="text"
                         size="small"
-                         class="btn-color-look"
+                         class="div-table-button--detail"
                         @click="disableCategory(scope.row)">{{ scope.row.btnShow}}</el-button>
               <el-button type="text"
                         size="small"
-                        class="btn-color-edit"
+                        class="div-table-button--edit"
                         @click="editShow(scope.row)">修改</el-button>
               <el-button type="text"
                         size="small"
-                        class="btn-color-del"
+                        class="div-table-button--delete"
                         @click="deleteCategory(scope.row)">删除</el-button>
             </template>
           </el-table-column>
diff --git a/src/views/modules/workSys/elegantEdit.vue b/src/views/modules/workSys/elegantEdit.vue
index a86870d8..702a9d5b 100644
--- a/src/views/modules/workSys/elegantEdit.vue
+++ b/src/views/modules/workSys/elegantEdit.vue
@@ -34,11 +34,18 @@
       </div>
 
     </el-form>
-    <template slot="footer">
+    <!-- <template slot="footer">
       <el-button @click="visible = false;resetData()">{{ $t('cancel') }}</el-button>
       <el-button type="primary"
                  @click="saveForm()">{{ $t('confirm') }}</el-button>
-    </template>
+    </template> -->
+     <div class="resi-btns">
+        <el-button size="small"
+                   @click="visible = false;resetData()">取消</el-button>
+        <el-button type="primary"
+                   size="small"
+                   @click="saveForm">提交</el-button>
+      </div>
   </el-dialog>
 </template>
 
diff --git a/src/views/modules/workSys/resiCate.vue b/src/views/modules/workSys/resiCate.vue
index 4dfde7e2..0d150e89 100644
--- a/src/views/modules/workSys/resiCate.vue
+++ b/src/views/modules/workSys/resiCate.vue
@@ -36,7 +36,7 @@
             </el-select>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" @click="handleSearch">查询</el-button>
+            <el-button class="diy-button--search" size="small" @click="handleSearch">查询</el-button>
           </el-form-item>
         </el-form>
       </div>
@@ -77,14 +77,14 @@
               @click="handleLook(scope.row)"
               type="text"
               size="small"
-              class="btn-color-look"
+              class="div-table-button--detail"
               >{{(scope.row.status === 'show'&&'隐藏') || '显示'}}</el-button
             >
             <el-button
                 @click="handleEdit(scope.row)"
                 type="text"
                 size="small"
-                class="btn-color-edit"
+                class="div-table-button--edit"
                 >编辑</el-button
               >
           </template>
@@ -108,6 +108,7 @@
       title="居民类别配置"
       :visible.sync="dialogVisible"
       width="50%"
+      top="5vh"
       append-to-body
       class="dialog-h"
       :close-on-click-modal="false"