Merge branch 'dev-huji' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into dev-huji

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

@@ -52,6 +52,10 @@
                  class="diy-button--more"
                  size="small"
                  @click="deleteBatch">批量删除</el-button>
+      <el-button style=";margin-left:10px"
+                 class="diy-button--export"
+                 size="small"
+                 @click="handleExportYihuyidang()">导出一户一档</el-button>
     </div>
 
     <div class="div_table_item">
@@ -582,6 +586,38 @@ export default {
       );
     },
 
+    //导出一户一档
+    handleExportYihuyidang () {
+      let title = this.agencyObj.label
+      title = title + '-一户一档'
+      let url = "/gov/org/house/exportHouseUser"
+
+
+      let params = {
+        agencyId: '',
+        gridId: '',
+        ownerName: this.ownerName,
+        ownerPhone: this.ownerPhone,
+        rentFlag: this.rentFlag,
+        neighborHoodId: this.agencyObj.id
+
+      }
+
+
+
+      app.ajax.exportFilePost(
+        url,
+        params,
+        (data, rspMsg) => {
+
+          this.download(data, title + '.xls')
+        },
+        (rspMsg, data) => {
+          this.$message.error(rspMsg);
+        }
+      );
+    },
+
 
     // 上传文件之前的钩子
     beforeUpload (file, type) {
@@ -725,6 +761,18 @@ export default {
       type: Boolean,
       default: false,
     },
+    ownerName: {
+      type: String,
+      default: '',
+    },
+    ownerPhone: {
+      type: String,
+      default: '',
+    },
+    rentFlag: {
+      type: String,
+      default: '',
+    },
   }
 }
 </script>

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

@@ -62,7 +62,7 @@
           <div class="resi-cell-value">
 
             <el-select class="item_width_1"
-                       v-model="rentState"
+                       v-model="rentFlag"
                        placeholder="请选择"
                        size="small"
                        clearable>
@@ -92,18 +92,27 @@
                    ref="ref_neighTable"
                    :staffAgencyId="staffAgencyId"
                    :showImportBtn="showImportBtn"
+                   :ownerName="ownerName"
+                   :ownerPhone="ownerPhone"
+                   :rentFlag="rentFlag"
                    @toNextLevel="toNextLevel"
                    @refreshTree="refreshTree"></build-table>
 
       <room-table v-if="showRoomTable||selTreeObj.level==='building'"
                   :staffAgencyId="staffAgencyId"
                   :showImportBtn="showImportBtn"
+                  :ownerName="ownerName"
+                  :ownerPhone="ownerPhone"
+                  :rentFlag="rentFlag"
                   ref="ref_buildingTable"
                   @refreshTree="refreshTree"></room-table>
 
       <community-table v-if="selTreeObj.level!=='building'&&selTreeObj.level!=='neighborHood'&&!showRoomTable"
                        @toNextLevel="toNextLevel"
                        :staffAgencyId="staffAgencyId"
+                       :ownerName="ownerName"
+                       :ownerPhone="ownerPhone"
+                       :rentFlag="rentFlag"
                        ref="ref_communityTable"
                        @refreshTree="refreshTree"></community-table>
 
@@ -156,7 +165,7 @@ export default {
       ],
       ownerName: '',
       ownerPhone: '',
-      rentState: '',
+      rentFlag: '',
       showRoomTable: false,
       selObj: {},
     }
@@ -197,11 +206,11 @@ export default {
   methods: {
 
     handleSearch () {
-      if (this.ownerName || this.ownerPhone || this.rentState) {
+      if (this.ownerName || this.ownerPhone || this.rentFlag) {
         this.showRoomTable = true
 
         this.$nextTick(() => {
-          this.$refs['ref_buildingTable'].loadTable('search', this.selTreeObj, this.ownerName, this.ownerPhone, this.rentState)
+          this.$refs['ref_buildingTable'].loadTable('search', this.selTreeObj, this.ownerName, this.ownerPhone, this.rentFlag)
         })
       } else {
         this.$message.warning('请输入查询条件')
@@ -214,7 +223,7 @@ export default {
     resetSearch () {
       this.ownerName = ''
       this.ownerPhone = ''
-      this.rentState = ''
+      this.rentFlag = ''
 
       this.pageSize = 10
       this.pageNo = 1
@@ -285,7 +294,7 @@ export default {
     handleNodeClick (obj) {
       this.ownerName = ''
       this.ownerPhone = ''
-      this.rentState = ''
+      this.rentFlag = ''
       this.showRoomTable = false
 
       this.selObj = JSON.parse(JSON.stringify(obj))

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

@@ -61,6 +61,7 @@
                      size="small"
                      class="diy-button--delete">导入房屋数据</el-button>
         </el-upload>
+
       </div>
       <el-button style="margin-left:10px"
                  class="diy-button--reset"
@@ -75,6 +76,10 @@
                  class="diy-button--more"
                  size="small"
                  @click="deleteBatch">批量删除</el-button>
+      <el-button style=";margin-left:10px"
+                 class="diy-button--export"
+                 size="small"
+                 @click="handleExportYihuyidang()">导出一户一档</el-button>
 
     </div>
 
@@ -562,6 +567,44 @@ export default {
       );
     },
 
+    //导出一户一档
+    handleExportYihuyidang () {
+      let title = this.agencyObj.label
+      title = title + '-一户一档'
+      let url = "/gov/org/house/exportHouseUser"
+
+
+      let params = {
+        agencyId: '',
+        gridId: '',
+        ownerName: this.ownerName,
+        ownerPhone: this.ownerPhone,
+        rentFlag: this.rentFlag,
+      }
+
+      if (this.agencyObj.level === 'grid') {
+        params.gridId = this.agencyObj.id
+        params.agencyId = ''
+      } else {
+        params.gridId = ''
+        params.agencyId = this.agencyObj.id
+      }
+
+      app.ajax.exportFilePost(
+        url,
+        params,
+        (data, rspMsg) => {
+
+          this.download(data, title + '.xls')
+        },
+        (rspMsg, data) => {
+          this.$message.error(rspMsg);
+        }
+      );
+    },
+
+
+
     // 上传文件之前的钩子
     beforeUpload (file, type) {
       this.files = file;
@@ -717,6 +760,18 @@ export default {
       type: String,
       default: '',
     },
+    ownerName: {
+      type: String,
+      default: '',
+    },
+    ownerPhone: {
+      type: String,
+      default: '',
+    },
+    rentFlag: {
+      type: String,
+      default: '',
+    },
 
   }
 }

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

@@ -35,6 +35,10 @@
                  class="diy-button--more"
                  size="small"
                  @click="deleteBatch">批量删除</el-button>
+      <el-button style=";margin-left:10px"
+                 class="diy-button--export"
+                 size="small"
+                 @click="handleExportYihuyidang()">导出一户一档</el-button>
     </div>
 
     <div class="div_table_item ">
@@ -603,6 +607,36 @@ export default {
       );
     },
 
+    //导出一户一档
+    handleExportYihuyidang () {
+      let title = this.agencyObj.label
+      title = title + '-一户一档'
+      let url = "/gov/org/house/exportHouseUser"
+
+
+      let params = {
+        agencyId: '',
+        gridId: '',
+        ownerName: this.ownerName,
+        ownerPhone: this.ownerPhone,
+        rentFlag: this.rentFlag,
+        buildingId: this.agencyObj.id
+      }
+
+
+
+      app.ajax.exportFilePost(
+        url,
+        params,
+        (data, rspMsg) => {
+
+          this.download(data, title + '.xls')
+        },
+        (rspMsg, data) => {
+          this.$message.error(rspMsg);
+        }
+      );
+    },
     // 上传文件之前的钩子
     beforeUpload (file) {
       this.files = file;
@@ -730,6 +764,18 @@ export default {
       type: Boolean,
       default: false,
     },
+    ownerName: {
+      type: String,
+      default: '',
+    },
+    ownerPhone: {
+      type: String,
+      default: '',
+    },
+    rentFlag: {
+      type: String,
+      default: '',
+    },
   }
 }
 </script>

src/views/modules/base/huji/immigration/edit.vue

@@ -123,8 +123,6 @@
         >
           <el-input
             class="item_width_1"
-            maxlength="50"
-            show-word-limit
             style="margin-right: 20px"
             placeholder="请输入姓名	"
             v-model="fmData.name"
@@ -213,16 +211,16 @@
         </el-form-item>
 
         <el-form-item
-          label="迁入时间"
+          label="迁入日期"
           prop="inTime"
           label-width="150px"
           style="display: block"
         >
           <el-date-picker
             v-model="fmData.inTime"
-            type="date"
+            type="datetime"
             placeholder="迁入时间"
-            value-format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd HH:mm:ss"
             class="item_width_1"
           >
           </el-date-picker>
@@ -288,27 +286,26 @@
 
         <el-form-item
           label="户主姓名"
-          prop="houseHolderName"
+          prop="householderName"
           label-width="150px"
           style="display: block"
         >
           <el-input
             class="item_width_1"
             placeholder="请输入户主姓名"
-            :disabled="fmData.alreadyHaveMaster"
+            v-model="fmData.householderName"
-            v-model="fmData.houseName"
           >
           </el-input>
         </el-form-item>
 
         <el-form-item
           label="与户主关系"
-          prop="houseHolderRelation"
+          prop="householderRelation"
           label-width="150px"
           style="display: block"
         >
           <el-select
-            v-model.trim="fmData.houseRelation"
+            v-model.trim="fmData.householderRelation"
             placeholder="与户主关系"
             size="small"
             clearable
@@ -365,9 +362,11 @@ function iniFmData() {
     address: '',
     sourceAddressPathCode: '',
     sourceAddressCode: '',
-    houseName: '',
+    householderName: '',
-    houseRelation: '',
+    moveNumber: '',
-    alreadyHaveMaster: false
+    householderRelation: '',
+    alreadyHaveMaster: false,
+    isReplace: '0'
   }
 }
 
@@ -401,7 +400,8 @@ export default {
         // checkStrictly: true,
         lazy: true,
         lazyLoad: this.lzayLoadArea
-      }
+      },
+      userInfo: {}
     }
   },
   components: {},
@@ -489,7 +489,9 @@ export default {
               type: 'error',
               message: `请联系${data.resiAgencyName}迁出该居民后操作`
             })
+            this.btnDisable = true
           }
+          this.userInfo = { ...data }
         } else {
           this.$message.error(msg)
         }
@@ -500,15 +502,15 @@ export default {
       console.log('label-----', this.$refs.nowArea.getCheckedNodes())
       if (val.length > 0) {
         const labels = this.$refs.nowArea.getCheckedNodes()[0].pathLabels
-        this.fmData.presentAddressCode = val[val.length - 1]
+        this.fmData.sourceAddressCode = val[val.length - 1]
-        this.fmData.presentAddress = labels.join('-')
+        this.fmData.sourceAddress = labels.join('-')
-        this.fmData.presentAddressPathCode = val.join(',')
+        this.fmData.sourceAddressPathCode = val.join(',')
-        console.log('presentAddress', this.formData.presentAddress)
+        console.log('sourceAddress', this.fmData.sourceAddressPathCode)
-        this.$refs.ref_form.clearValidate('presentAddress')
+        this.$refs.ref_form.clearValidate('sourceAddress')
       } else {
-        this.fmData.presentAddressCode = ''
+        this.fmData.sourceAddressCode = ''
-        this.fmData.presentAddress = ''
+        this.fmData.sourceAddress = ''
-        this.fmData.presentAddressPathCode = ''
+        this.fmData.sourceAddressPathCode = ''
       }
     },
     handleBlurId(val) {
@@ -707,9 +709,10 @@ export default {
             return this.$message.error(res.msg)
           } else {
             console.log('获取户主信息成功', res.data)
+            
+            if (res.data) {
               const { name } = res.data
-            if (name) {
+              this.fmData.householderName = name
-              this.fmData.houseHolderName = name
               this.alreadyHaveMaster = true
             } else {
               this.alreadyHaveMaster = false
@@ -725,8 +728,14 @@ export default {
       this.$refs.ref_form.resetFields()
 
       this.formType = type
+      
       if (id) {
-        this.getDatail(id)
+        await this.getDatail(id)
+      }
+      if (this.formType != 'add') {
+        this.getBuildList()
+        this.getUniList()
+        this.getHouseList()
       }
     },
     async getDatail(moveInId) {
@@ -735,17 +744,18 @@ export default {
       const params = {
         moveInId: moveInId || ''
       }
-      const { data, code, msg } = await requestPost(url, this.fmData)
+      const { data, code, msg } = await requestPost(url, params)
       if (code === 0) {
         this.fmData = { ...data }
+        this.nowAllCode = data.sourceAddressPathCode && data.sourceAddressPathCode.split(',')
       } else this.$message.error(msg)
     },
 
     async handleComfirm() {
       this.btnDisable = true
-      setTimeout(() => {
+      // setTimeout(() => {
-        this.btnDisable = false
+      //   this.btnDisable = false
-      }, 10000)
+      // }, 10000)
       this.$refs['ref_form'].validate((valid, messageObj) => {
         if (!valid) {
           app.util.validateRule(messageObj)
@@ -763,9 +773,27 @@ export default {
     },
 
     async submit() {
+      if (this.fmData.isCHeck && this.userInfo && this.userInfo.resiHomeId) {
+        const { user } = this.$store.state
+        if (user.agencyId == this.userInfo.resiAgencyId) {
+          if (this.userInfo.resiHomeId !== this.fmData.homeId) {
+            this.$confirm('居民信息中房屋信息与当前选择房屋不一致，是否更新？', '提示', {
+              confirmButtonText: '更新',
+              cancelButtonText: '取消',
+              type: 'warning'
+            }).then(() => {
+              this.fmData.isReplace = '1'
+            }).catch(() => {
+              this.fmData.isReplace = '0'       
+            });
+            return
+          }
+        }
+        
+      }
       let url = ''
       if (this.formType === 'add') {
-        url = '/epmetuser/icMoveIn/save'
+        url = '/epmetuser/icMoveIn/add'
       } else {
         url = '/epmetuser/icMoveIn/edit'
 
@@ -795,6 +823,7 @@ export default {
     resetData() {
       this.orgId = ''
       this.nowAllCode = []
+      this.btnDisable = false
       this.fmData = iniFmData()
     }
   }

src/views/modules/base/huji/immigration/index.vue

@@ -235,7 +235,7 @@
         border
         style="width: 100%"
         class="resi-table"
-        :height="maxTableHeight"
+        :height="tableHeight"
       >
         <el-table-column
           label="序号"
@@ -269,13 +269,12 @@
         </el-table-column>
 
         <el-table-column
-          prop="homeName"
+          prop="allName"
           label="所属房屋"
           align="center"
           min-width="160"
           :show-overflow-tooltip="true"
-        >
+        />
-        </el-table-column>
 
         <el-table-column
           prop="mobile"
@@ -317,7 +316,7 @@
         </el-table-column>
 
         <el-table-column
-          prop="source"
+          prop="sourceAddress"
           min-width="160"
           align="center"
           label="由何地迁入"
@@ -333,7 +332,7 @@
         </el-table-column>
 
         <el-table-column
-          prop="houseName"
+          prop="householderName"
           min-width="100"
           align="center"
           label="户主姓名"
@@ -341,7 +340,7 @@
         </el-table-column>
 
         <el-table-column
-          prop="houseRelationName"
+          prop="householderRelationName"
           align="center"
           min-width="100"
           label="与户主关系"
@@ -432,7 +431,7 @@ export default {
       openSearch: false,
 
       formShow: false,
-      formTitle: '出生登记',
+      formTitle: '迁入登记',
 
       pageNo: 1,
       pageSize: window.localStorage.getItem('pageSize') || 20,
@@ -475,18 +474,21 @@ export default {
       importBtnTitle: '导入',
       importLoading: false,
 
-      //积分记录
+      searchH: 0,
-      scoreDiaTitle: '积分记录',
+      tableHeight: 0
-      scoreDiaShow: false
     }
   },
   computed: {
+    ...mapGetters(['clientHeight', 'iframeHeight']),
     maxTableHeight() {
-      return this.$store.state.inIframe
+      console.log('computed-searchH---', this.searchH)
-        ? this.clientHeight - 360 + this.iframeHeigh
+      const h = this.clientHeight - this.searchH + this.iframeHeight
-        : this.clientHeight - 360
+      const _h = this.clientHeight - this.searchH
+      console.log('computed-searchH---_h', _h)
+      return this.$store.state.inIframe ? h : _h
+      
     },
-    ...mapGetters(['clientHeight', 'iframeHeight']),
+    
     changeVDisabled() {
       return !this.fmData.villageId
     },
@@ -506,12 +508,23 @@ export default {
         this.fmData.startTime = ''
         this.fmData.endTime = ''
       }
+    },
+    searchH() {
+      const h = this.clientHeight - this.searchH + this.iframeHeight
+      const _h = this.clientHeight - this.searchH
+      console.log('computed-searchH---_h', _h)
+      
+      this.$nextTick(() => {
+        this.tableHeight = this.$store.state.inIframe ? h : _h
+      })
     }
   },
   mounted() {
     this.getGridList()
     this.getValiheList()
     this.getTableData()
+    this.searchH = this.$refs.searchCard.$el.offsetHeight + 260
+    console.log('searchH----', this.$refs.searchCard.$el.offsetHeight)
   },
   methods: {
     handleClearVillage() {
@@ -796,22 +809,85 @@ export default {
 
     async handleChu() {
       const url =
-        '/heart/iccommunityselforganization/exportcommunityselforganization'
+        '/epmetuser/icMoveIn/export'
       const { pageSize, pageNo, fmData } = this
-      axios({
+      await this.$http({
-        url: window.SITE_CONFIG['apiURL'] + url,
+        method: 'POST',
-        method: 'post',
+        url,
+        responseType: 'blob',
         data: {
           pageSize,
           pageNo,
           ...fmData
-        },
+        }
-        responseType: 'blob'
       })
-        .then((res) => {
+        .then(res => {
-          let fileName = window.decodeURI(
+          console.log('res----dddd', res)
-            res.headers['content-disposition'].split(';')[1].split('=')[1]
+          // this.download(res.data, title + '.xls')
-          )
+          // this.getTemplateList()
+          
+          // this.exportLoading = false
+          // if (res.data.code && res.data.code == 9999) {
+          //   return this.$message.error(res.data.msg)
+          // }
+          this.formatData(res)
+          
+        })
+        .catch(err => {
+          console.log('err', err)
+          this.exportLoading = false
+          return this.$message.error('网络错误')
+        })
+      // axios({
+      //   url: window.SITE_CONFIG['apiURL'] + url,
+      //   method: 'post',
+      //   data: {
+      //     pageSize,
+      //     pageNo,
+      //     ...fmData
+      //   },
+      //   responseType: 'blob'
+      // })
+      //   .then((res) => {
+      //     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对象
+      //   })
+      //   .catch((err) => {
+      //     console.log('获取导出情失败', err)
+      //     return this.$message.error('网络错误')
+      //   })
+    },
+    formatData(res) {
+      const fileReader = new FileReader()
+      fileReader.onloadend = () => {
+        try {
+          const jsonData = JSON.parse(fileReader.result) // 说明是普通对象数据，后台转换失败
+          // 后台信息
+          console.log('jsonData---1', jsonData)
+          return this.$message.error(jsonData.msg)
+        } catch (err) { // 解析成对象失败，说明是正常的文件流
+          // 下载文件
+          console.log('errr-----', err, this)
+          this.downloadFile(res)
+        }
+      }
+      fileReader.readAsText(res.data)
+    },
+    downloadFile(res) {
+      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)
@@ -823,11 +899,9 @@ export default {
         aLink.click()
         document.body.removeChild(aLink) //下载完成移除元素
         window.URL.revokeObjectURL(url) //释放掉blob对象
-        })
+        this.$message.success('导出成功')
-        .catch((err) => {
+        this.$emit('close')
-          console.log('获取导出情失败', err)
+      } else this.$message.error('下载失败')
-          return this.$message.error('网络错误')
-        })
     },
 
     async handleWatch(rowIndex) {
@@ -923,9 +997,9 @@ export default {
   overflow: visible;
 }
 
-.demo-form-inline .resi-cell {
+.demo-form-inline {
-  display: flex;
+  // display: flex;
-  align-items: center;
+  // align-items: center;
   // margin-bottom: 20px;
 
   .resi-cell-label {
@@ -965,6 +1039,7 @@ export default {
     margin-right: 0;
   }
 }
+
 .mt10 {
   margin-top: 10px;
 }