dd

src/assets/scss/people-info.scss

@@ -8,11 +8,20 @@
 
     .wrap {
         position: relative;
-        margin: 120px auto;
+        margin: 5vh auto;
-        padding: 20px;
+        height: 90vh;
-        width: 1000px;
+        width: 1040px;
         background-color: #fff;
 
+        .wrap2 {
+            box-sizing: border-box;
+            padding: 20px;
+            height: 90vh;
+            width: 1040px;
+            overflow-y: auto;
+            overflow-x: hidden;
+        }
+
         .title {
             padding: 10px;
             font-size: 22px;
@@ -33,6 +42,7 @@
 
         .btn-close {
             position: absolute;
+            z-index: 2;
             top: -30px;
             right: -30px;
             cursor: pointer;

src/views/modules/base/resi.vue

@@ -48,6 +48,7 @@
                 @selection-change="selectionChange">
         <el-table-column type="selection"
                          fixed="left"
+                         align="center"
                          :selectable="checkSelect"
                          width="55" />
         <el-table-column label="序号"
@@ -489,8 +490,12 @@ export default {
 
 
       let params = {}
-      await this.$http
+      await this.$http({
-        .post(url, params)
+        method: 'POST',
+        url,
+        responseType: 'blob',
+        data: params
+      })
         .then(res => {
           console.log('res----dddd', res)
           // this.download(res.data, title + '.xls')

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

@@ -66,7 +66,6 @@
           >
           <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>
         
       </div>
@@ -382,28 +381,68 @@ export default {
       this.uploading = true
       this.unloadPencent = Number(file.percentage.toFixed(0))
     },
+    download (data, fileName) {
+      console.log('data', data)
+      if (!data) {
+        return
+      }
+
+      var csvData = new Blob([data])
+
+      if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+        window.navigator.msSaveOrOpenBlob(csvData, fileName)
+      }
+      // for Non-IE (chrome, firefox etc.)
+      else {
+        var a = document.createElement('a')
+        document.body.appendChild(a)
+        a.style = 'display: none'
+        var url = window.URL.createObjectURL(csvData)
+        a.href = url
+        a.download = fileName
+        a.click()
+        a.remove()
+        window.URL.revokeObjectURL(url)
+      }
+    },
     async handleExportModule () {
       let url = "/resi/partymember/icpartymemberstyle/import/template-download"
       
 
       let params = {}
-      await this.$http
+      // app.ajax.exportFilePost(
-        .post(url, params)
+      //   url,
+      //   params,
+      //   (data, rspMsg) => {
+
+      //     this.download(data, 'a.xls')
+      //   },
+      //   (rspMsg, data) => {
+      //     this.$message.error(rspMsg);
+      //   }
+      // );
+      await this.$http({
+        method: 'POST',
+        url,
+        responseType: 'blob',
+        data: params
+      })
         .then(res => {
-          // this.download(res.data, title + '.xls')
+          console.log('res-------dd', res)
           if (res.headers["content-disposition"]) {
             let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
-            console.log('filename', fileName)
+            this.download(res.data, fileName)
-            let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
+            // console.log('filename', fileName)
-            var url = window.URL.createObjectURL(blob)
+            // let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
-            var aLink = document.createElement('a')
+            // var url = window.URL.createObjectURL(blob)
-            aLink.style.display = 'none'
+            // var aLink = document.createElement('a')
-            aLink.href = url
+            // aLink.style.display = 'none'
-            aLink.setAttribute('download', fileName)
+            // aLink.href = url
-            document.body.appendChild(aLink)
+            // aLink.setAttribute('download', fileName)
-            aLink.click()
+            // document.body.appendChild(aLink)
-            document.body.removeChild(aLink) //下载完成移除元素
+            // aLink.click()
-            window.URL.revokeObjectURL(url) //释放掉blob对象
+            // document.body.removeChild(aLink) //下载完成移除元素
+            // window.URL.revokeObjectURL(url) //释放掉blob对象
           } else this.$message.error('下载失败')
         })
         .catch(err => {

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

@@ -17,11 +17,13 @@
               :key="'ct' + index"
               v-for="(item, index) in tableData"
             >
-              <div class="item-btns">
+              <div
-                <a v-if="currentIndex == index" @click="handleEdit">修改</a>
+                class="item-btn"
-                <a v-if="currentIndex == index" @click="handleDel">删除</a>
+                v-if="currentIndex == index"
+                @click="handleEdit"
+              >
+                修改
               </div>
-
               <div class="item-name">{{ item.centerName }}</div>
               <div class="item-prop">
                 <div class="prop-field">社区地址：</div>
@@ -79,6 +81,7 @@
                   @click="handleOrder(scope.$index)"
                   type="text"
                   size="small"
+                  style="color: #1c6afd"
                   >预约</el-button
                 >
 
@@ -86,7 +89,7 @@
                   @click="handleOrderList(scope.$index)"
                   type="text"
                   size="small"
-                  style="margin-right: 10px; color: #00a7a9"
+                  style="margin-right: 10px; color: #1c6afd"
                   >预约记录</el-button
                 >
               </template>
@@ -155,7 +158,7 @@
 </template>
 
 <script>
-import { requestPost } from "@/js/dai/request2";
+import { requestPost } from "@/js/dai/request";
 import nextTick from "dai-js/tools/nextTick";
 import { mapGetters } from "vuex";
 import editForm from "./cpts/edit";
@@ -311,19 +314,21 @@ export default {
       this.$refs.eleOrderList.init(this.tableData[this.currentIndex], index);
     },
 
-    async handleDel() {
+    async handleDel(rowData, rowIndex) {
-      if (!confirm("删除后不可恢复，确定删除？")) return;
+      console.log(rowData, rowIndex);
-
+      const url =
-      const item = this.tableData[this.currentIndex];
+        "/heart/iccommunityselforganization/delcommunityselforganization";
-      const url = "/gov/org/icpartyservicecenter/del";
+      const { tableData } = this;
 
-      const { data, code, msg } = await requestPost(url, [
+      const { data, code, msg } = await requestPost(url, {
-        item.partyServiceCenterId,
+        orgId: tableData[rowIndex].orgId,
-      ]);
+      });
 
       if (code === 0) {
         this.$message.success("删除成功！");
         this.getTableData();
+      } else {
+        this.$message.success("操作失败！");
       }
     },
 
@@ -356,6 +361,8 @@ export default {
 
       if (code === 0) {
         this.agencyId = data.agencyId;
+      } else {
+        this.$message.error(msg);
       }
     },
   },
@@ -409,37 +416,21 @@ export default {
           background-color: #ffffff;
           box-shadow: 0 0 10px #6aa;
         }
-
+        .item-btn {
-        .item-btns {
           position: absolute;
           top: 5px;
           right: 5px;
-          // width: 120px;
+          font-size: 14px;
-
+          color: #00a7a9;
-          a {
+          width: 50px;
-            display: inline-block;
+          line-height: 30px;
-            margin-left: 1px;
+          text-align: center;
-            font-size: 14px;
+          cursor: pointer;
-            color: rgb(235, 192, 4);
+          &:hover {
-            width: 40px;
+            // text-decoration: underline;
-            line-height: 30px;
+            color: #00a7a9;
-            text-align: center;
-            cursor: pointer;
-            &:nth-child(2) {
-              color: #aaa;
-              &:hover {
-                // text-decoration: underline;
-                color: #666;
-              }
-            }
-
-            &:hover {
-              // text-decoration: underline;
-              color: rgb(250, 208, 23);
-            }
           }
         }
-
         .item-name {
           font-size: 16px;
           font-weight: bold;

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

@@ -131,12 +131,10 @@
               </el-date-picker>
             </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-item>
-              <el-button type="yellow" @click="resetForm('searchForm')"
+              <el-button class="diy-button--reset" size="small" @click="resetForm('searchForm')">重置</el-button>
-                >重置</el-button
-              >
             </el-form-item>
           </div>
         </el-form>
@@ -145,7 +143,7 @@
     <el-card class="resi-card-table">
      
       <div class="resi-row-btn">
-        <el-button type="success" @click="handleAdd('add')">新增需求</el-button>
+        <el-button class="diy-button--add" size="small" @click="handleAdd('add')">新增</el-button>
       </div>
 
       <el-table

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

@@ -241,8 +241,12 @@ export default {
       
 
       let params = {}
-      await this.$http
+      await this.$http({
-        .post(url, params)
+        method: 'POST',
+        url,
+        responseType: 'blob',
+        data: params
+      })
         .then(res => {
           // this.download(res.data, title + '.xls')
           if (res.headers["content-disposition"]) {

src/views/modules/importRecord/index.vue

@@ -1,9 +1,7 @@
 <template>
   <div class="resi-container">
     <el-card class="resi-card-table">
-      <div class="resi-row-btn">
+
-        <h2 type="success" size="small">导入记录</h2>
-      </div>
       <el-table
         :data="tableData"
         border

src/views/modules/shequ/cpts/fangwu-info.vue

@@ -202,6 +202,8 @@ export default {
 }
 .form {
   margin-top: 30px;
+  height: 60vh;
+  overflow-y: auto;
 }
 </style>
 <style>

src/views/modules/shequ/cpts/people-more.vue

@@ -1,109 +1,142 @@
 <template>
   <div class="m-pop">
     <div class="wrap">
-      <div class="title">
-        <span>更多信息</span>
-      </div>
-
       <div class="btn-close" @click="handleClose">
         <img src="@/assets/img/shuju/people/close.png" />
       </div>
-
+      <div class="wrap2">
-      <div
+        <div class="title">
-        :key="'fieldSubList' + index"
+          <span>更多信息</span>
-        v-for="(fieldSubList, index) in fieldList"
-      >
-        <div class="list">
-          <div class="item" v-if="index == 0">
-            <span class="item-field">所属网格：</span>
-            <span>{{ gridName }}</span>
-          </div>
-          <div class="item" v-if="index == 0">
-            <span class="item-field">所属小区：</span>
-            <span>{{ xiaoquName }}</span>
-          </div>
-          <div class="item" v-if="index == 0">
-            <span class="item-field">所属楼宇：</span>
-            <span>{{ louName }}-{{ danyuanName }}</span>
-          </div>
-          <div class="item" v-if="index == 0">
-            <span class="item-field">所属家庭：</span>
-            <span>{{ homeName }}</span>
-          </div>
-          <div class="item" :key="field.itemId" v-for="field in fieldSubList">
-            <span class="item-field">{{ field.label }}：</span>
-
-            <span
-              v-if="
-                field.itemType == 'select' ||
-                field.itemType == 'radio' ||
-                field.itemType == 'checkbox' ||
-                field.itemType == 'cascader'
-              "
-              >{{
-                info[field.columnName] == null
-                  ? "--"
-                  : getOptionLabel(
-                      field.options,
-                      info[field.columnName],
-                      field.itemType
-                    )
-              }}</span
-            >
-
-            <span v-else>{{
-              info[field.columnName] == null ? "--" : info[field.columnName]
-            }}</span>
-          </div>
         </div>
 
-        <div class="line"></div>
-      </div>
-
-      <div class="tabs">
         <div
-          class="tab-btn"
+          :key="'fieldSubList' + index"
-          @click="subStartGroupIndex"
+          v-for="(fieldSubList, index) in fieldList"
-          v-if="groupList.length > 9"
         >
-          <img src="@/assets/img/shuju/people/arrow-double-left.png" />
+          <div class="list">
-        </div>
+            <div class="item" v-if="index == 0">
-        <div
+              <span class="item-field">所属网格：</span>
-          v-show="index >= startGroupIndex && index < startGroupIndex + 9"
+              <span>{{ gridName }}</span>
-          class="tab"
+            </div>
-          :class="groupIndex % groupList.length == index ? 'z-on' : ''"
+            <div class="item" v-if="index == 0">
-          :key="'tab' + index"
+              <span class="item-field">所属小区：</span>
-          @click="groupIndex = index"
+              <span>{{ xiaoquName }}</span>
-          v-for="(item, index) in groupList"
+            </div>
-        >
+            <div class="item" v-if="index == 0">
-          {{ item.label }}
+              <span class="item-field">所属楼宇：</span>
+              <span>{{ louName }}-{{ danyuanName }}</span>
+            </div>
+            <div class="item" v-if="index == 0">
+              <span class="item-field">所属家庭：</span>
+              <span>{{ homeName }}</span>
+            </div>
+            <div class="item" :key="field.itemId" v-for="field in fieldSubList">
+              <span class="item-field">{{ field.label }}：</span>
+
+              <span
+                v-if="
+                  field.itemType == 'select' ||
+                  field.itemType == 'radio' ||
+                  field.itemType == 'checkbox' ||
+                  field.itemType == 'cascader'
+                "
+                >{{
+                  info[field.columnName] == null
+                    ? "--"
+                    : getOptionLabel(
+                        field.options,
+                        info[field.columnName],
+                        field.itemType
+                      )
+                }}</span
+              >
+
+              <span v-else>{{
+                info[field.columnName] == null ? "--" : info[field.columnName]
+              }}</span>
+            </div>
+          </div>
+
+          <div class="line"></div>
         </div>
-        <div
+
-          class="tab-btn"
+        <div class="tabs">
-          @click="addStartGroupIndex"
+          <div
-          v-if="groupList.length > 9"
+            class="tab-btn"
-        >
+            @click="subStartGroupIndex"
-          <img src="@/assets/img/shuju/people/arrow-double-right.png" />
+            v-if="groupList.length > 9"
+          >
+            <img src="@/assets/img/shuju/people/arrow-double-left.png" />
+          </div>
+          <div
+            v-show="index >= startGroupIndex && index < startGroupIndex + 9"
+            class="tab"
+            :class="groupIndex % groupList.length == index ? 'z-on' : ''"
+            :key="'tab' + index"
+            @click="groupIndex = index"
+            v-for="(item, index) in groupList"
+          >
+            {{ item.label }}
+          </div>
+          <div
+            class="tab-btn"
+            @click="addStartGroupIndex"
+            v-if="groupList.length > 9"
+          >
+            <img src="@/assets/img/shuju/people/arrow-double-right.png" />
+          </div>
         </div>
-      </div>
 
-      <div
-        :key="'group' + index"
-        v-show="groupIndex % groupList.length == index"
-        v-for="(group, index) in groupList"
-      >
         <div
-          v-if="
+          :key="'group' + index"
-            group.tableName == 'ic_resi_demand' &&
+          v-show="groupIndex % groupList.length == index"
-            Array.isArray(allInfo.ic_resi_demand) &&
+          v-for="(group, index) in groupList"
-            allInfo.ic_resi_demand.length > 0
-          "
         >
           <div
-            class="list"
+            v-if="
-            :key="'ic_resi_demand' + infoIndex"
+              group.tableName == 'ic_resi_demand' &&
-            v-for="(infoItem, infoIndex) in allInfo.ic_resi_demand"
+              Array.isArray(allInfo.ic_resi_demand) &&
+              allInfo.ic_resi_demand.length > 0
+            "
           >
+            <div
+              class="list"
+              :key="'ic_resi_demand' + infoIndex"
+              v-for="(infoItem, infoIndex) in allInfo.ic_resi_demand"
+            >
+              <div
+                class="item"
+                :key="field.itemId"
+                v-for="field in group.itemList"
+              >
+                <span class="item-field">{{ field.label }}：</span>
+                <span
+                  v-if="
+                    field.itemType == 'select' ||
+                    field.itemType == 'radio' ||
+                    field.itemType == 'checkbox' ||
+                    field.itemType == 'cascader'
+                  "
+                  >{{
+                    infoItem[field.columnName] == null
+                      ? "--"
+                      : getOptionLabel(
+                          field.options,
+                          infoItem[field.columnName],
+                          field.itemType
+                        )
+                  }}</span
+                >
+
+                <span v-else>{{
+                  infoItem[field.columnName] == null
+                    ? "--"
+                    : infoItem[field.columnName]
+                }}</span>
+              </div>
+            </div>
+          </div>
+          <div class="list" v-else>
             <div
               class="item"
               :key="field.itemId"
@@ -118,52 +151,24 @@
                   field.itemType == 'cascader'
                 "
                 >{{
-                  infoItem[field.columnName] == null
+                  !allInfo[group.tableName] ||
+                  allInfo[group.tableName][0][field.columnName] == null
                     ? "--"
                     : getOptionLabel(
                         field.options,
-                        infoItem[field.columnName],
+                        allInfo[group.tableName][0][field.columnName],
                         field.itemType
                       )
                 }}</span
               >
 
               <span v-else>{{
-                infoItem[field.columnName] == null
-                  ? "--"
-                  : infoItem[field.columnName]
-              }}</span>
-            </div>
-          </div>
-        </div>
-        <div class="list" v-else>
-          <div class="item" :key="field.itemId" v-for="field in group.itemList">
-            <span class="item-field">{{ field.label }}：</span>
-            <span
-              v-if="
-                field.itemType == 'select' ||
-                field.itemType == 'radio' ||
-                field.itemType == 'checkbox' ||
-                field.itemType == 'cascader'
-              "
-              >{{
                 !allInfo[group.tableName] ||
                 allInfo[group.tableName][0][field.columnName] == null
                   ? "--"
-                  : getOptionLabel(
+                  : allInfo[group.tableName][0][field.columnName]
-                      field.options,
+              }}</span>
-                      allInfo[group.tableName][0][field.columnName],
+            </div>
-                      field.itemType
-                    )
-              }}</span
-            >
-
-            <span v-else>{{
-              !allInfo[group.tableName] ||
-              allInfo[group.tableName][0][field.columnName] == null
-                ? "--"
-                : allInfo[group.tableName][0][field.columnName]
-            }}</span>
           </div>
         </div>
       </div>
@@ -499,8 +504,4 @@ export default {
 };
 </script>
 
-<style
+<style lang="scss" src="@/assets/scss/people-info.scss" scoped></style>
-  lang="scss"
-  src="@/assets/scss/people-info.scss"
-  scoped
-></style>

src/views/modules/shequ/cpts/xuqiu-info.vue

@@ -219,6 +219,8 @@ export default {
 }
 .form {
   margin-top: 30px;
+  height: 60vh;
+  overflow-y: auto;
 }
 </style>
 <style>

src/views/modules/workSys/demandCate.vue

@@ -5,6 +5,7 @@
              class="search-card">
       <div>
         <el-form :inline="true"
+                  ref="searchForm"
                  :model="form"
                  class="demo-form-inline">
           <el-form-item label="需求分类">
@@ -25,6 +26,9 @@
                        size="small"
                        @click="handleSearch">查询</el-button>
           </el-form-item>
+          <el-form-item>
+            <el-button class="diy-button--reset" size="small" @click="resetForm('searchForm')">重置</el-button>
+          </el-form-item>
         </el-form>
       </div>
     </el-card>
@@ -32,7 +36,7 @@
       <div class="resi-row-btn">
         <el-button class="diy-button--add"
                    size="small"
-                   @click="handleAdd('1', 'add')">新增分类</el-button>
+                   @click="handleAdd('1', 'add')">新增</el-button>
       </div>
 
       <el-table :data="tableData"
@@ -220,6 +224,11 @@ export default {
       }
       return _val || row[item.columnName]
     },
+    resetForm(formName) {
+      
+      this.form.firstCategoryCode = ''
+      this.handleSearch();
+    },
     handleSearch (val) {
       console.log('searchhh--', val)
       this.currentPage = 1

src/views/modules/workSys/resiCate.vue

@@ -2,7 +2,7 @@
   <div v-if="pageLoading" class="resi-container">
     <el-card ref="searchCard" class="search-card">
       <div >
-        <el-form :inline="true" :model="form" class="demo-form-inline">
+        <el-form ref="searchForm" :inline="true" :model="form" class="demo-form-inline">
           <el-form-item label="是否预警">
             <el-select
               v-model="isWarn"
@@ -38,6 +38,10 @@
           <el-form-item>
             <el-button class="diy-button--search" size="small" @click="handleSearch">查询</el-button>
           </el-form-item>
+          <el-form-item>
+            <el-button class="diy-button--reset" size="small" @click="resetForm('searchForm')">重置</el-button>
+          </el-form-item>
+          
         </el-form>
       </div>
     </el-card>
@@ -335,6 +339,12 @@ export default {
       }
       return _val || row[item.columnName]
     },
+    resetForm(formName) {
+      
+      this.isWarn = ''
+      this.level = ''
+      this.handleSearch();
+    },
     handleSearch(val) {
       console.log('searchhh--', val)
       this.currentPage = 1