Merge branch 'dev_1024' into dev

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

@@ -122,6 +122,71 @@
               </el-date-picker>
             </el-form-item>
 
+            <el-form-item label="所属房屋">
+              <div class="resi-cell-value">
+                <div class="resi-cell-col">
+                  <el-form-item prop="neighborHoodId">
+                    <el-select v-model.trim="neighborHoodId"
+                               placeholder="小区"
+                               size="small"
+                               clearable
+                               class="resi-cell-select"
+                               @change="handleChangeV">
+                      <el-option v-for="item in optionsV"
+                                 :key="item.value"
+                                 :label="item.label"
+                                 :value="item.value">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item prop="buildingId">
+                    <el-select v-model.trim="buildingId"
+                               placeholder="楼号"
+                               :disabled="!neighborHoodId"
+                               size="small"
+                               clearable
+                               class="resi-cell-select resi-cell-select-middle list_item_width_1"
+                               @change="handleChangeB">
+                      <el-option v-for="item in optionsB"
+                                 :key="item.value"
+                                 :label="item.label"
+                                 :value="item.value">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item prop="buildingUnitId">
+                    <el-select v-model.trim="buildingUnitId"
+                               placeholder="单元"
+                               size="small"
+                               :disabled="!buildingId"
+                               clearable
+                               class="resi-cell-select resi-cell-select-middle list_item_width_1"
+                               @change="handleChangeD">
+                      <el-option v-for="item in optionsD"
+                                 :key="item.value"
+                                 :label="item.label"
+                                 :value="item.value">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item prop="houseId">
+                    <el-select v-model.trim="houseId"
+                               placeholder="房号"
+                               :disabled="!buildingUnitId"
+                               size="small"
+                               clearable
+                               class="resi-cell-select resi-cell-select-middle list_item_width_1">
+                      <el-option v-for="item in optionsH"
+                                 :key="item.value"
+                                 :label="item.label"
+                                 :value="item.value">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </div>
+              </div>
+            </el-form-item>
+
             <el-button style="margin-left:30px"
                        size="small"
                        class="diy-button--search"
@@ -155,6 +220,10 @@
                     :ownerPhone="ownerPhone"
                     :rentFlag="rentFlag"
                     :purpose="purpose"
+                    :neighborHoodId="neighborHoodId"
+                    :buildingId="buildingId"
+                    :buildingUnitId="buildingUnitId"
+                    :houseId="houseId"
                     :remark="remark"
                     :updateStartDate="updateStartDate"
                     :updateEndDate="updateEndDate"
@@ -187,6 +256,7 @@ import roomTable from './roomTable'
 import { requestPost } from "@/js/dai/request";
 import { mapGetters } from 'vuex'
 import { Loading } from 'element-ui' // 引入Loading服务
+import nextTick from 'dai-js/tools/nextTick'
 
 let loading // 加载动画
 export default {
@@ -263,6 +333,17 @@ export default {
       startPickerOptions: {
         disabledDate: startDisabledDate
       },
+
+      optionsV: [],
+      optionsB: [],
+      optionsH: [],
+      optionsD: [],
+      neighborHoodId: "",
+      buildingId: "",
+      buildingUnitId: "",
+      houseId: "",
+      selGridId: '',
+      selAgencyId: ''
     }
   },
   components: {
@@ -274,6 +355,7 @@ export default {
     await this.loadOrgData()
     await this.loadTree()
     // await this.loadOpenNode()
+    this.getValiheList('', '')
 
     await this.$refs['ref_communityTable'].loadTable(true, this.selTreeObj)
     if (this.treeData.length > 0) {
@@ -299,6 +381,113 @@ export default {
     ...mapGetters(['clientHeight', 'iframeHeight'])
   },
   methods: {
+    handleChangeV (val) {
+
+      this.buildingId = "";
+      this.buildingUnitId = "";
+      this.houseId = "";
+      this.getBuildList();
+      // this.getUniList();
+      // this.getHouseList();
+    },
+    handleChangeB (val) {
+
+      this.buildingUnitId = "";
+      this.houseId = "";
+      this.getUniList();
+      // this.getHouseList();
+    },
+    handleChangeD () {
+      this.houseId = "";
+      this.getHouseList();
+    },
+
+    async getValiheList () {
+      const { user } = this.$store.state;
+      if (!this.selGridId) {
+        this.selAgencyId = this.selAgencyId ? this.selAgencyId : user.agencyId
+      }
+
+      const url = "/gov/org/icneighborhood/neighborhood-options";
+      // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/epidemicPrevention/page"
+      let params = {
+        gridId: this.selGridId,
+        agencyId: this.selAgencyId,
+        isPage: false
+      };
+
+      const { data, code, msg } = await requestPost(url, params);
+
+      if (code === 0) {
+        this.optionsV = data;
+
+        this.neighborHoodId = ""
+        this.buildingId = "";
+        this.buildingUnitId = "";
+        this.houseId = "";
+      } else {
+        this.$message.error(msg);
+      }
+
+
+    },
+
+    async getBuildList () {
+      const url = "/gov/org/icbuilding/buildingoption";
+      // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/epidemicPrevention/page"
+      let params = {
+        neighborHoodId: this.neighborHoodId,
+      };
+
+      const { data, code, msg } = await requestPost(url, params);
+
+      if (code === 0) {
+        this.optionsB = data;
+        this.buildingId = "";
+        this.buildingUnitId = "";
+        this.houseId = "";
+      } else {
+        this.$message.error(msg);
+      }
+
+
+    },
+    async getUniList () {
+
+      const url = "/gov/org/icbuildingunit/unitoption";
+      // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/epidemicPrevention/page"
+      let params = {
+        buildingId: this.buildingId,
+      };
+
+      const { data, code, msg } = await requestPost(url, params);
+
+      if (code === 0) {
+        this.optionsD = data;
+        this.buildingUnitId = "";
+        this.houseId = "";
+      } else {
+        this.$message.error(msg);
+      }
+
+
+    },
+    getHouseList () {
+      this.$http
+        .post("/gov/org/ichouse/houseoption", { unitId: this.buildingUnitId })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+
+            this.optionsH = res.data;
+            this.houseId = "";
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+    },
 
     handleSearch () {
       // if (this.ownerName || this.ownerPhone || this.rentFlag || this.purpose || this.remark) {
@@ -323,6 +512,10 @@ export default {
       this.remark = ''
       this.updateStartDate = ''
       this.updateEndDate = ''
+      this.neighborHoodId = ''
+      this.buildingId = ''
+      this.buildingUnitId = ''
+      this.houseId = ''
 
       this.pageSize = 10
       this.pageNo = 1
@@ -392,7 +585,7 @@ export default {
 
     },
 
-    handleNodeClick (obj) {
+    async handleNodeClick (obj) {
       this.ownerName = ''
       this.ownerPhone = ''
       this.rentFlag = ''
@@ -404,18 +597,40 @@ export default {
 
       this.selObj = JSON.parse(JSON.stringify(obj))
       this.getTreeObj(obj)
+      await nextTick(1000)
+
+      if (obj.level === 'building') {//点击楼栋
+        this.$refs['ref_buildingTable'].loadTable('tree', this.selTreeObj)
+        this.selAgencyId = ''
+        this.selGridId = ''
+        await this.getValiheList()
+        this.neighborHoodId = this.selTreeObj.pid
+        await this.getBuildList()
+        this.buildingId = this.selTreeObj.id
+        await this.getUniList()
 
-      this.$nextTick(() => {
-        if (obj.level === 'building') {//点击楼栋
-          this.$refs['ref_buildingTable'].loadTable('tree', this.selTreeObj)
 
-        } else if (obj.level === 'neighborHood') {//点击小区
-          this.$refs['ref_neighTable'].loadTable(true, this.selTreeObj)
+      } else if (obj.level === 'neighborHood') {//点击小区
+        this.$refs['ref_neighTable'].loadTable(true, this.selTreeObj)
+        this.selAgencyId = ''
+        this.selGridId = ''
+        await this.getValiheList()
+        this.neighborHoodId = this.selTreeObj.id
+        await this.getBuildList()
+
+      } else {
+        this.$refs['ref_communityTable'].loadTable(true, this.selTreeObj)
 
+        if (obj.level === 'grid') {
+          this.selAgencyId = ''
+          this.selGridId = this.selTreeObj.id
         } else {
-          this.$refs['ref_communityTable'].loadTable(true, this.selTreeObj)
+          this.selAgencyId = this.selTreeObj.id
+          this.selGridId = ''
         }
-      })
+        this.getValiheList('', '')
+      }
+
 
     },
 
@@ -507,7 +722,7 @@ export default {
         obj.longitude = this.centerPoint[1]
       }
       this.selTreeObj = obj
-      console.log(this.selTreeObj)
+      console.log('selTreeObj', this.selTreeObj)
 
     },
 

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

@@ -332,6 +332,10 @@ export default {
         sortType: this.sortType,
         updateStartDate: this.updateStartDate,
         updateEndDate: this.updateEndDate,
+        neighborHoodId: this.neighborHoodId,
+        buildingId: this.buildingId,
+        buildingUnitId: this.buildingUnitId,
+        houseId: this.houseId,
       };
       this.$refs.baobiao.init({
         elseParams: {
@@ -436,6 +440,10 @@ export default {
         sortType: this.sortType,
         updateStartDate: this.updateStartDate,
         updateEndDate: this.updateEndDate,
+        neighborHoodId: this.neighborHoodId,
+        buildingId: this.buildingId,
+        buildingUnitId: this.buildingUnitId,
+        houseId: this.houseId,
       };
 
       const url = "/gov/org/house/houselist";
@@ -637,6 +645,10 @@ export default {
         updateStartDate: this.updateStartDate,
         updateEndDate: this.updateEndDate,
         buildingId: this.agencyObj.id,
+        neighborHoodId: this.neighborHoodId,
+        buildingId: this.buildingId,
+        buildingUnitId: this.buildingUnitId,
+        houseId: this.houseId,
       };
 
       if (this.agencyObj.level === "grid") {
@@ -734,6 +746,10 @@ export default {
         remark: this.remark,
         updateStartDate: this.updateStartDate,
         updateEndDate: this.updateEndDate,
+        neighborHoodId: this.neighborHoodId,
+        buildingId: this.buildingId,
+        buildingUnitId: this.buildingUnitId,
+        houseId: this.houseId,
         buildingId: "",
         neighborHoodId: "",
       };
@@ -926,6 +942,22 @@ export default {
       type: String,
       default: "",
     },
+    neighborHoodId: {
+      type: String,
+      default: "",
+    },
+    buildingId: {
+      type: String,
+      default: "",
+    },
+    buildingUnitId: {
+      type: String,
+      default: "",
+    },
+    houseId: {
+      type: String,
+      default: "",
+    },
   },
 };
 </script>

src/views/modules/base/epidemic/antiInfo.vue

@@ -141,6 +141,22 @@
 
           </el-form-item>
 
+          <el-form-item label="核酸检测时间"
+                        label-width="110px"
+                        prop="natStartDate">
+            <el-date-picker v-model="timeRange"
+                            size="small"
+                            type="daterange"
+                            @change="handleTimeChange"
+                            format="yyyy-MM-dd"
+                            value-format="yyyy-MM-dd"
+                            range-separator="至"
+                            start-placeholder="开始时间"
+                            end-placeholder="结束时间">
+            </el-date-picker>
+
+          </el-form-item>
+
           <el-button style="margin-left:30px"
                      size="small"
                      class="diy-button--search"
@@ -153,7 +169,14 @@
       </el-form>
     </div>
     <div class="div_table">
+      <div class="div_btn">
+
+        <el-button style="float:left;margin-left:10px"
+                   class="diy-button--reset"
+                   size="small"
+                   @click="handleExport">导出</el-button>
 
+      </div>
       <el-table class="table"
                 :data="tableData"
                 border
@@ -482,6 +505,8 @@ export default {
         age: {},
         startBirthDay: '',
         endBirthDay: '',
+        natStartDate: '',
+        natEndDate: '',
       },
       formDetail: {
         name: '',
@@ -533,7 +558,7 @@ export default {
     this.getGridList()
     this.getValiheList()
     await this.loadTable()
-    this.sHeight = this.$refs.div_search.offsetHeight + 230
+    this.sHeight = this.$refs.div_search.offsetHeight + 270
   },
   activated () {
     this.$refs['ref_table'].doLayout()
@@ -567,6 +592,18 @@ export default {
 
     },
 
+    handleTimeChange (time) {
+      if (time) {
+        this.searchForm.natStartDate = time[0]
+        this.searchForm.natEndDate = time[1]
+
+      } else {
+        this.searchForm.natStartDate = ''
+        this.searchForm.natEndDate = ''
+
+      }
+    },
+
     handleAgeChange (val) {
       console.log('val----age---', val)
       if (val.start) {
@@ -867,6 +904,7 @@ export default {
 
     //重置搜索条件
     resetSearch () {
+      this.timeRange = []
       this.$refs.ref_searchform.resetFields()
       this.searchForm.buildingId = ''
       this.searchForm.unitId = ''
@@ -874,12 +912,63 @@ export default {
       this.searchForm.age = {}
       this.searchForm.startBirthDay = ''
       this.searchForm.endBirthDay = ''
+      this.searchForm.natStartDate = ''
+      this.searchForm.natEndDate = ''
       this.pageSize = 20
       this.pageNo = 1
-      this.loadTable()
+      // this.loadTable()
     },
 
 
+    //导出表格
+    async handleExport () {
+      let title = '居民防疫信息'
+
+      const url = "/epmetuser/epidemicPrevention/epidemicPreventionExport"
+      let params = {
+        pageSize: this.pageSize,
+        pageNo: this.pageNo,
+        ...this.searchForm
+      }
+      app.ajax.exportFilePost(
+        url,
+        params,
+        (data, rspMsg) => {
+          this.download(data, title + '.xlsx')
+        },
+        (rspMsg, data) => {
+          this.$message.error(rspMsg);
+        }
+      );
+
+    },
+
+    // 下载文件
+    download (data, fileName) {
+      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);
+      }
+
+    },
+
     handleSizeChange (val) {
       this.pageSize = val
       this.pageNo = 1

src/views/modules/base/epidemic/natInfo/natList.vue

@@ -22,7 +22,6 @@
           <el-form-item label="本辖区居民">
             <el-select class="list_item_width_1"
                        size="small"
-                       :disabled="formData.orgType!='current'"
                        v-model.trim="formData.isResiUser"
                        placeholder="请选择">
               <el-option v-for="item in isResiUserList"

src/views/modules/base/epidemic/natInfo/noNatList.vue

@@ -64,6 +64,31 @@
             </el-input>
 
           </el-form-item>
+          <el-form-item label="核酸检测时间">
+            <el-date-picker class="list_item_width_1"
+                            v-model="formData.natDate"
+                            format="yyyy-MM-dd"
+                            value-format="yyyyMMdd"
+                            type="date"
+                            size="small"
+                            clearable
+                            placeholder="选择时间">
+            </el-date-picker>
+          </el-form-item>
+
+          <el-form-item label="检测状态">
+            <el-select class="list_item_width_1"
+                       size="small"
+                       clearable
+                       v-model.trim="formData.status"
+                       placeholder="请选择">
+              <el-option v-for="item in statusList"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
 
           <el-button style="margin-left:30px"
                      size="small"
@@ -275,13 +300,25 @@ export default {
           label: '是'
         },
       ],
+      statusList: [
+        {
+          value: '1',
+          label: '已检测'
+        },
+        {
+          value: '0',
+          label: '未检测'
+        },
+      ],
 
       formData: {
         importDate: '',//导入时间
         name: '',//姓名
         mobile: '',//手机号
         idCard: '',//身份证号码
-        isResiUser: ''//是否客户下居民(0:否  1:是)	
+        isResiUser: '',//是否客户下居民(0:否  1:是)	
+        status: '',//1已检测；0未检测
+        natDate: ''
 
       },
 
@@ -544,8 +581,9 @@ export default {
         name: '',//姓名
         mobile: '',//手机号
         idCard: '',//身份证号码
-        importDate: ''
-
+        importDate: '',
+        status: '',//1已检测；0未检测
+        natDate: ''
       }