调整

src/views/components/resiTransfer.vue

@@ -368,7 +368,7 @@ export default {
 
 
             if (!this.dataForm.newBuildingId) {
-              this.$message.warning('请选择楼宇')
+              this.$message.warning('楼栋')
               return false
             }
             if (!this.dataForm.newBuildingUnitId) {

src/views/modules/base/community/community.vue

@@ -96,7 +96,7 @@
                   ref="ref_buildingTable"
                   @refreshTree="refreshTree"></room-table>
 
-      <community-table v-if="(selTreeObj.level!=='building'||selTreeObj.level!=='neighborHood')&&!showRoomTable"
+      <community-table v-if="selTreeObj.level!=='building'&&selTreeObj.level!=='neighborHood'&&!showRoomTable"
                        @toNextLevel="toNextLevel"
                        :staffAgencyId="staffAgencyId"
                        ref="ref_communityTable"
@@ -195,7 +195,7 @@ export default {
       if (this.ownerName || this.ownerPhone || this.rentState) {
         this.showRoomTable = true
         this.$nextTick(() => {
-          this.$refs['ref_buildingTable'].loadTable(false, this.selTreeObj, this.ownerName, this.ownerPhone, this.rentState)
+          this.$refs['ref_buildingTable'].loadTable(true, this.selTreeObj, this.ownerName, this.ownerPhone, this.rentState)
         })
       } else {
         this.$message.warning('请输入查询条件')

src/views/modules/base/community/roomTable.vue

@@ -227,9 +227,15 @@ export default {
       return isChecked
     },
 
+    loadTreeFromSearch () {
+
+    },
+
     async loadTable (fromTree, treeObj, ownerName, ownerPhone, rentFlag) {
+
       this.tableLoading = true
       let params
+
       if (fromTree) {
         this.agencyObj = treeObj
         // if (this.agencyObj.level === 'community') {//只有社区和网格显示操作按钮
@@ -247,28 +253,29 @@ export default {
         // } else {
         //   this.showImportBtn = false
         // }
-        params = {
+
-          pageSize: this.pageSize,
-          pageNo: this.pageNo,
-          level: this.agencyObj.level,
-          id: this.agencyObj.id,
       }
-      } else {
       params = {
         pageSize: this.pageSize,
         pageNo: this.pageNo,
         level: this.agencyObj.level,
         id: this.agencyObj.id,
       }
+
+      if (ownerName) {
         params.ownerName = ownerName
+
+      }
+      if (ownerPhone) {
         params.ownerPhone = ownerPhone
+
+      }
+      if (rentFlag) {
         params.rentFlag = rentFlag
       }
 
       const url = "/gov/org/house/houselist"
 
-
-
       const { data, code, msg } = await requestPost(url, params)
 
       if (code === 0) {

src/views/modules/base/epidemic/natFocus/natFocusAdd.vue

@@ -127,8 +127,17 @@
                   </el-option>
                 </el-select>
               </el-form-item>
-
+              <el-form-item label="核酸检测次数小于"
+                            label-width="150px">
+                <el-input-number class="item_width_3"
+                                 v-model="formDataSearch.natCount"
+                                 size="mini"
+                                 :min="0"
+                                 :max="20"
+                                 label="核酸检测次数小于"></el-input-number>
+              </el-form-item>
               <el-form-item label="检测时间"
+                            label-width="80px"
                             prop="startTime">
                 <el-date-picker v-model="timeRange"
                                 size="mini"
@@ -142,15 +151,7 @@
                 </el-date-picker>
 
               </el-form-item>
-              <el-form-item label="核酸检测次数小于"
+
-                            label-width="150px">
-                <el-input-number class="item_width_3"
-                                 v-model="formDataSearch.natCount"
-                                 size="mini"
-                                 :min="0"
-                                 :max="20"
-                                 label="核酸检测次数小于"></el-input-number>
-              </el-form-item>
               <el-button style="margin-left:30px"
                          size="mini"
                          class="diy-button--search"
@@ -400,11 +401,11 @@ export default {
     },
 
     async initForm () {
-
+      this.tableData = []
       this.$refs['ref_form1'].resetFields();
       this.$refs['ref_form2'].resetFields();
 
-      await this.loadTable()
+      // await this.loadTable()
 
     },
 

src/views/modules/base/epidemic/natFocus/natFocusList.vue

@@ -211,33 +211,33 @@
                          header-align="center"
                          align="center"
                          label="身份证"
-                         min-width="170">
+                         width="170">
         </el-table-column>
         <el-table-column prop="allName"
                          header-align="center"
                          align="center"
                          label="所属房屋"
-                         min-width="170">
+                         min-width="200">
         </el-table-column>
         <el-table-column prop="reason"
                          header-align="center"
                          align="center"
                          label="关注原因"
-                         width="100">
+                         width="180">
         </el-table-column>
         <el-table-column prop="remark"
                          header-align="center"
                          align="center"
                          show-overflow-tooltip
                          label="备注"
-                         min-width="230">
+                         min-width="180">
         </el-table-column>
         <el-table-column prop="lastInformTime"
                          header-align="center"
                          align="center"
                          show-overflow-tooltip
                          label="最后一次通知时间"
-                         min-width="120">
+                         width="170">
         </el-table-column>
 
         <el-table-column label="操作"

src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue

@@ -384,11 +384,11 @@ export default {
       this.formData2.content = ''
     },
     async initForm () {
-
+      this.tableData = []
       this.$refs['ref_form1'].resetFields();
       this.$refs['ref_form2'].resetFields();
 
-      await this.loadTable()
+      // await this.loadTable()
 
     },
 

src/views/modules/base/epidemic/veroFocus/veroFocusList.vue

@@ -205,40 +205,40 @@
                          header-align="center"
                          align="center"
                          label="身份证"
-                         min-width="170">
+                         width="170">
         </el-table-column>
         <el-table-column prop="allName"
                          header-align="center"
                          align="center"
                          label="所属房屋"
-                         min-width="170">
+                         min-width="200">
         </el-table-column>
         <el-table-column prop="vaccinationCount"
                          header-align="center"
                          align="center"
                          label="接种针次"
-                         width="100">
+                         width="90">
         </el-table-column>
         <el-table-column prop="reason"
                          header-align="center"
                          align="center"
                          show-overflow-tooltip
                          label="关注原因"
-                         min-width="230">
+                         min-width="180">
         </el-table-column>
         <el-table-column prop="remark"
                          header-align="center"
                          align="center"
                          show-overflow-tooltip
                          label="备注"
-                         min-width="200">
+                         min-width="180">
         </el-table-column>
         <el-table-column prop="lastInformTime"
                          header-align="center"
                          align="center"
                          show-overflow-tooltip
                          label="最后一次通知时间"
-                         min-width="120">
+                         width="160">
         </el-table-column>
 
         <el-table-column label="操作"
@@ -716,7 +716,8 @@ export default {
 
 
     addFormOk () {
-      this.sendNoticeFormShow = false
+      this.addFormShow = false
+      this.editFormShow = false
       this.loadTable()
 
     },

src/views/modules/workSys/resiCate.vue

@@ -1,45 +1,46 @@
 <template>
-  <div v-if="pageLoading" class="resi-container">
+  <div v-if="pageLoading"
-    <el-card ref="searchCard" class="search-card">
+       class="resi-container">
+    <el-card ref="searchCard"
+             class="search-card">
       <div>
-        <el-form ref="searchForm" :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
+            <el-select v-model="isWarn"
-              v-model="isWarn"
                        placeholder="请选择"
                        size="small"
-              clearable
+                       clearable>
-            >
+              <el-option v-for="item in options"
-              <el-option
-                v-for="item in options"
                          :key="item.value"
                          :label="item.label"
-                :value="item.value"
+                         :value="item.value">
-              >
               </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="预警类型">
-            <el-select
+            <el-select v-model="level"
-              v-model="level"
                        placeholder="请选择"
                        size="small"
-              clearable
+                       clearable>
-            >
+              <el-option v-for="item in optionsType"
-              <el-option
-                v-for="item in optionsType"
                          :key="item.value"
                          :label="item.label"
-                :value="item.value"
+                         :value="item.value">
-              >
               </el-option>
             </el-select>
           </el-form-item>
           <el-form-item>
-            <el-button class="diy-button--search" size="small" @click="handleSearch">查询</el-button>
+            <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-button class="diy-button--reset"
+                       size="small"
+                       @click="resetForm('searchForm')">重置</el-button>
           </el-form-item>
 
         </el-form>
@@ -47,82 +48,81 @@
     </el-card>
     <el-card class="resi-card-table">
 
-      <el-table
+      <el-table :data="tableData"
-        :data="tableData"
                 row-key="id"
                 v-loading="tableLoading"
                 border
                 :height="tableHeight"
                 style="width: 100%"
-        class="resi-table"
+                class="resi-table">
-      >
+        <el-table-column label="序号"
-        <el-table-column label="序号" type="index" align="center" width="50">
+                         type="index"
+                         align="center"
+                         width="50">
         </el-table-column>
-        <el-table-column
+        <el-table-column v-for="item in tableHeader"
-          v-for="item in tableHeader"
                          :key="item.columnName"
                          :prop="item.columnName"
                          :label="item.label"
                          align="center"
-          min-width="180"
+                         min-width="180">
-        >
           <template slot-scope="scope">
-            <el-image
+            <el-image v-if="filterImage(item.columnName)"
-            v-if="filterImage(item.columnName)"
                       style="width: 70px; height: 70px"
                       :src="handleFilterSpan(scope.row, item) "
                       fit="fill"></el-image>
             <span v-else>{{ handleFilterSpan(scope.row, item) }}</span>
           </template>
         </el-table-column>
-        <el-table-column fixed="right" label="操作" align="center" width="120">
+        <el-table-column fixed="right"
+                         label="操作"
+                         align="center"
+                         width="120">
           <template slot-scope="scope">
-            <el-button
+            <el-button @click="handleLook(scope.row)"
-              @click="handleLook(scope.row)"
                        type="text"
                        size="small"
-              class="div-table-button--detail"
+                       class="div-table-button--detail">{{(scope.row.status === 'show'&&'隐藏') || '显示'}}</el-button>
-              >{{(scope.row.status === 'show'&&'隐藏') || '显示'}}</el-button
+            <el-button @click="handleEdit(scope.row)"
-            >
-            <el-button
-                @click="handleEdit(scope.row)"
                        type="text"
                        size="small"
-                class="div-table-button--edit"
+                       class="div-table-button--edit">修改</el-button>
-                >修改</el-button
-              >
           </template>
         </el-table-column>
       </el-table>
       <div>
-        <el-pagination
+        <el-pagination @size-change="handleSizeChange"
-          @size-change="handleSizeChange"
                        @current-change="handleCurrentChange"
                        :current-page.sync="currentPage"
                        :page-sizes="[20, 50, 100, 200]"
                        :page-size="pageSize"
                        layout="sizes, prev, pager, next, total"
-          :total="total"
+                       :total="total">
-        >
         </el-pagination>
       </div>
     </el-card>
 
-    <el-dialog
+    <el-dialog title="居民类别配置"
-      title="居民类别配置"
                :visible.sync="dialogVisible"
                width="50%"
                top="5vh"
                append-to-body
                class="dialog-h"
                :close-on-click-modal="false"
-      :before-close="handlerCancle"
+               :before-close="handlerCancle">
-    >
+      <el-form label-width="150px"
-      <el-form label-width="150px" :model="form" :rules="rules" ref="ruleForm" class="dialog-h-content scroll-h">
+               :model="form"
+               :rules="rules"
+               ref="ruleForm"
+               class="dialog-h-content scroll-h">
         <el-form-item label="类别名称">
-          <el-input v-model="form.label" size="small" style="width: 180px;" disabled></el-input>
+          <el-input v-model="form.label"
+                    size="small"
+                    style="width: 180px;"
+                    disabled></el-input>
         </el-form-item>
-        <el-form-item label="管理平台图标" prop="managementIcon">
+        <el-form-item label="管理平台图标"
+                      prop="managementIcon">
           <el-upload class="avatar-uploader"
                      :action="uploadUlr"
                      :data="{customerId:customerId}"
@@ -133,10 +133,12 @@
                  :src="form.managementIcon"
                  style="width:70px;height:70px"
                  class="function-icon">
-            <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+            <i v-else
+               class="el-icon-plus avatar-uploader-icon"></i>
           </el-upload>
         </el-form-item>
-        <el-form-item label="数据平台图标" prop="dataIcon">
+        <el-form-item label="数据平台图标"
+                      prop="dataIcon">
           <el-upload class="avatar-uploader"
                      :action="uploadUlr"
                      :data="{customerId:customerId}"
@@ -147,10 +149,12 @@
                  :src="form.dataIcon"
                  style="width:70px;height:70px"
                  class="function-icon">
-            <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+            <i v-else
+               class="el-icon-plus avatar-uploader-icon"></i>
           </el-upload>
         </el-form-item>
-        <el-form-item label="房屋显示图标" prop="houseShowIcon">
+        <el-form-item label="房屋显示图标"
+                      prop="houseShowIcon">
           <el-upload class="avatar-uploader"
                      :action="uploadUlr"
                      :data="{customerId:customerId}"
@@ -161,28 +165,34 @@
                  :src="form.houseShowIcon"
                  style="width:70px;height:70px"
                  class="function-icon">
-            <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+            <i v-else
+               class="el-icon-plus avatar-uploader-icon"></i>
           </el-upload>
         </el-form-item>
         <el-form-item label="是否预警">
           <el-switch v-model="form.warn"></el-switch>
         </el-form-item>
         <el-form-item label="黄色预警">
-          <el-input-number v-model="form.level1" :min="0" size="small" label="描述文字" @change="handleLevelChange"></el-input-number> 人/楼宇
+          <el-input-number v-model="form.level1"
+                           :min="0"
+                           size="small"
+                           label="描述文字"
+                           @change="handleLevelChange"></el-input-number> 人楼栋
         </el-form-item>
         <el-form-item label="红色预警">
-          <el-input-number v-model="form.level2" :min="form.level1" size="small" label="描述文字" ></el-input-number> 人/楼宇
+          <el-input-number v-model="form.level2"
+                           :min="form.level1"
+                           size="small"
+                           label="描述文字"></el-input-number> 人/楼栋
         </el-form-item>
       </el-form>
       <div class="resi-btns">
-        <el-button size="small" @click="handlerCancle">取消</el-button>
+        <el-button size="small"
-        <el-button
+                   @click="handlerCancle">取消</el-button>
-          type="primary"
+        <el-button type="primary"
                    size="small"
                    :loading="btnLoading"
-          @click="handleSUbmit"
+                   @click="handleSUbmit">提交</el-button>
-          >提交</el-button
-        >
       </div>
     </el-dialog>
 
@@ -580,14 +590,13 @@ export default {
   }
 }
 .avatar-uploader {
-  ::v-deep
+  ::v-deep .el-upload {
-  .el-upload {
     cursor: pointer;
     position: relative;
     overflow: hidden;
   }
   .el-upload:hover {
-    border-color: #409EFF;
+    border-color: #409eff;
   }
   .avatar {
     width: 70px;
@@ -606,8 +615,6 @@ export default {
   }
 }
 
-  
-
 .resi-btns {
   margin-top: 20px;
   text-align: center;