From a687ef97e3d1c0275a4a09493163fdd4664d82ab Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Mon, 6 Jun 2022 09:17:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=BF=E4=B8=BB=E7=94=B5=E8=AF=9D=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/base/community/community.vue      |   2 +-
 src/views/modules/base/community/roomForm.vue | 504 +++++++++---------
 .../modules/base/community/roomTable.vue      |   2 +-
 3 files changed, 254 insertions(+), 254 deletions(-)

diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue
index 43a4c7bb..43472844 100644
--- a/src/views/modules/base/community/community.vue
+++ b/src/views/modules/base/community/community.vue
@@ -48,7 +48,7 @@
 
               </el-input>
             </el-form-item>
-            <el-form-item label="房主手机"
+            <el-form-item label="联系方式"
                           prop="ownerPhone">
               <el-input v-model="ownerPhone"
                         class="item_width_2"
diff --git a/src/views/modules/base/community/roomForm.vue b/src/views/modules/base/community/roomForm.vue
index 0c1f7341..e425cd56 100644
--- a/src/views/modules/base/community/roomForm.vue
+++ b/src/views/modules/base/community/roomForm.vue
@@ -91,13 +91,13 @@
                     v-model="dataForm.ownerName">
           </el-input>
         </el-form-item>
-        <el-form-item label="房主电话"
+        <el-form-item label="联系方式"
                       prop="ownerPhone"
                       label-width="150px"
                       style="display: block">
           <el-input class="item_width_1"
                     type='number'
-                    placeholder="请输入房主电话"
+                    placeholder="请输入联系方式"
                     v-model="dataForm.ownerPhone">
           </el-input>
         </el-form-item>
@@ -136,260 +136,260 @@
 </template>
 
 <script>
-    import { mapGetters } from 'vuex'
-    import { Loading } from 'element-ui' // 引入Loading服务
-    import { requestPost, requestGet } from '@/js/dai/request'
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost, requestGet } from '@/js/dai/request'
+
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
+      btnDisable: false,
+      unitList: [],
+
+      houseId: '', //房屋ID
+      houseType: '1',
+      purpose: '1',
+      rentFlag: 0,
+      dataForm: {
+        neighborHoodId: '', // 所属小区ID
+        buildingId: '',//所属楼栋ID
+        buildingUnitId: '',//所属单元ID
+        doorName: '',//门牌号
+        houseType: '',//房屋类型【楼房，平房，别墅】
+        purpose: '',//房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】
+        rentFlag: 0,//房屋状态【是：1，否：0】	出租1、闲置2、自住	0
+        ownerPhone: '', //联系方式
+        ownerName: '', //房主名字
+        ownerIdCard: '', //房主身份证
+        remark: ''
+      },
+
+      keyWords: '',
+      agencyObj: {},
 
+    }
+  },
+  components: {},
+  mounted () {
 
-    let loading // 加载动画
-    export default {
-        data () {
-            return {
-                formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
-                btnDisable: false,
-                unitList: [],
+  },
 
-                houseId: '', //房屋ID
-                houseType: '1',
-                purpose: '1',
-                rentFlag: 0,
-                dataForm: {
-                    neighborHoodId: '', // 所属小区ID
-                    buildingId: '',//所属楼栋ID
-                    buildingUnitId: '',//所属单元ID
-                    doorName: '',//门牌号
-                    houseType: '',//房屋类型【楼房，平房，别墅】
-                    purpose: '',//房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】
-                    rentFlag: 0,//房屋状态【是：1，否：0】	出租1、闲置2、自住	0
-                    ownerPhone: '', //房主电话
-                    ownerName: '', //房主名字
-                    ownerIdCard: '', //房主身份证
-                    remark: ''
-                },
-
-                keyWords: '',
-                agencyObj: {},
-
-            }
-        },
-        components: {},
-        mounted () {
-
-        },
-
-        methods: {
-            async initForm (type, row, agencyObj) {
-
-                this.$refs.ref_form.resetFields();
-                this.agencyObj = agencyObj
-                this.formType = type
-                if (row) {
-
-                    this.houseId = row.houseId
-                    await this.loadHouseInfo()
-                    // this.dataForm = JSON.parse(JSON.stringify(row))
-                    // this.houseId = this.dataForm.houseId
-
-                    // this.dataForm.buildingUnitId = this.dataForm.unitNumKey
-                    // this.dataForm = { ...  this.dataForm }
-                    // this.houseType = this.dataForm.houseTypeKey
-                    // this.purpose = this.dataForm.purposeKey
-                    // this.rentFlag = parseInt(this.dataForm.rentFlagKey)
-
-                } else {
-
-                    this.dataForm.neighborHoodId = this.agencyObj.neighborHoodId
-                    this.dataForm.buildingId = this.agencyObj.id
-                }
-
-
-                await this.loadUnitList()
-
-            },
-
-            async loadHouseInfo () {
-
-                const url = "/gov/org/ichouse/" + this.houseId
-
-                const { data, code, msg } = await requestGet(url)
-
-                if (code === 0) {
-                    // debugger
-                    this.dataForm = { ...data }
-
-                    this.houseType = this.dataForm.houseType
-                    this.purpose = this.dataForm.purpose
-                    this.rentFlag = parseInt(this.dataForm.rentFlag)
-
-
-                } else {
-                    this.$message.error(msg)
-                }
-
-            },
-
-            //加载单元
-            async loadUnitList () {
-                const url = '/gov/org/building/buildingunitlist'
-
-                let params = {
-                    buildingId: this.dataForm.buildingId
-                }
-
-                const { data, code, msg } = await requestPost(url, params)
-
-                if (code === 0) {
-                    this.unitList = data
-                } else {
-                    this.$message.error(msg)
-                }
-            },
-
-            async handleComfirm () {
-                this.btnDisable = true
-                setTimeout(() => {
-                    this.btnDisable = false
-                }, 10000)
-
-                this.dataForm.houseType = this.houseType
-                this.dataForm.purpose = this.purpose
-                this.dataForm.rentFlag = this.rentFlag
-                this.$refs['ref_form'].validate((valid, messageObj) => {
-                    if (!valid) {
-                        this.btnDisable = false
-                        app.util.validateRule(messageObj)
-                    } else {
-                        this.addRoom()
-                    }
-
-                })
-            },
-
-            async addRoom () {
-                const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X
-                if (this.dataForm.ownerIdCard && regCard.test(this.dataForm.ownerIdCard) === false) {
-                    this.btnDisable = false
-                    this.$message({
-                        type: 'warning',
-                        message: '请输入正确的身份证号码'
-                    })
-                    return false;
-                }
-                const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
-                if (this.dataForm.ownerPhone && regPhone.test(this.dataForm.ownerPhone) === false) {
-                    this.btnDisable = false
-                    this.$message({
-                        type: 'warning',
-                        message: '请输入正确的手机号码'
-                    })
-                    return false;
-                }
-
-                let url = ''
-
-                if (this.formType === 'add') {
-                    url = '/gov/org/house/houseadd'
-                } else {
-                    url = '/gov/org/house/houseupdate'
-                    this.dataForm.houseId = this.houseId
-                }
-
-                const { data, code, msg } = await requestPost(url, this.dataForm)
-                this.btnDisable = false
-                if (code === 0) {
-                    this.$message({
-                        type: 'success',
-                        message: '操作成功'
-                    })
-                    this.resetData()
-                    this.$emit('dialogOk')
-
-                } else {
-
-                    this.$message.error(msg)
-                }
-
-            },
-
-            handleCancle () {
-                this.resetData()
-                this.$emit('dialogCancle')
-
-            },
-
-            resetData () {
-                this.houseId = '' //房屋ID
-                this.houseType = '1'
-                this.purpose = '1'
-                this.rentFlag = 0
-                this.dataForm = {
-                    neighborHoodId: '', // 所属小区ID
-                    buildingId: '',//所属楼栋ID
-                    buildingUnitId: '',//所属单元ID
-                    doorName: '',//门牌号
-                    houseType: '1',//房屋类型【楼房，平房，别墅】
-                    purpose: '1',//房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】
-                    rentFlag: 0,//是否出租【是：1，否：0】
-                    ownerPhone: '', //房主电话
-                    ownerName: '', //房主名字
-                    ownerIdCard: '', //房主身份证
-                    remark: '' // 备注
-                }
-
-            },
-            // 开启加载动画
-            startLoading () {
-                loading = Loading.service({
-                    lock: true, // 是否锁定
-                    text: '正在加载……', // 加载中需要显示的文字
-                    background: 'rgba(0,0,0,.7)' // 背景颜色
-                })
-            },
-            // 结束加载动画
-            endLoading () {
-                // clearTimeout(timer);
-                if (loading) {
-                    loading.close()
-                }
-            }
-        },
-        computed: {
-            dataRule () {
-                return {
-                    buildingUnitId: [
-                        { required: true, message: '所属单元不能为空', trigger: 'blur' },
-                    ],
-                    doorName: [
-                        { required: true, message: '门牌号不能为空', trigger: 'blur' }
-                    ],
-                    houseType: [
-                        { required: true, message: '房屋类型不能为空', trigger: 'blur' }
-                    ],
-                    purpose: [
-                        { required: true, message: '房屋用途不能为空', trigger: 'blur' }
-                    ],
-                    rentFlag: [
-                        { required: true, message: '是否出租不能为空', trigger: 'blur' }
-                    ],
-                    ownerPhone: [
-                        { required: false }
-                    ],
-                    ownerName: [
-                        { required: false }
-                    ],
-                    ownerIdCard: [
-                        { required: false }
-                    ],
-                    remark: [
-                        { required: false }
-                    ],
-                }
-            },
-
-        },
-        props: {}
+  methods: {
+    async initForm (type, row, agencyObj) {
+
+      this.$refs.ref_form.resetFields();
+      this.agencyObj = agencyObj
+      this.formType = type
+      if (row) {
+
+        this.houseId = row.houseId
+        await this.loadHouseInfo()
+        // this.dataForm = JSON.parse(JSON.stringify(row))
+        // this.houseId = this.dataForm.houseId
+
+        // this.dataForm.buildingUnitId = this.dataForm.unitNumKey
+        // this.dataForm = { ...  this.dataForm }
+        // this.houseType = this.dataForm.houseTypeKey
+        // this.purpose = this.dataForm.purposeKey
+        // this.rentFlag = parseInt(this.dataForm.rentFlagKey)
+
+      } else {
+
+        this.dataForm.neighborHoodId = this.agencyObj.neighborHoodId
+        this.dataForm.buildingId = this.agencyObj.id
+      }
+
+
+      await this.loadUnitList()
+
+    },
+
+    async loadHouseInfo () {
+
+      const url = "/gov/org/ichouse/" + this.houseId
+
+      const { data, code, msg } = await requestGet(url)
+
+      if (code === 0) {
+        // debugger
+        this.dataForm = { ...data }
+
+        this.houseType = this.dataForm.houseType
+        this.purpose = this.dataForm.purpose
+        this.rentFlag = parseInt(this.dataForm.rentFlag)
+
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+
+    //加载单元
+    async loadUnitList () {
+      const url = '/gov/org/building/buildingunitlist'
+
+      let params = {
+        buildingId: this.dataForm.buildingId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.unitList = data
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    async handleComfirm () {
+      this.btnDisable = true
+      setTimeout(() => {
+        this.btnDisable = false
+      }, 10000)
+
+      this.dataForm.houseType = this.houseType
+      this.dataForm.purpose = this.purpose
+      this.dataForm.rentFlag = this.rentFlag
+      this.$refs['ref_form'].validate((valid, messageObj) => {
+        if (!valid) {
+          this.btnDisable = false
+          app.util.validateRule(messageObj)
+        } else {
+          this.addRoom()
+        }
+
+      })
+    },
+
+    async addRoom () {
+      const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X
+      if (this.dataForm.ownerIdCard && regCard.test(this.dataForm.ownerIdCard) === false) {
+        this.btnDisable = false
+        this.$message({
+          type: 'warning',
+          message: '请输入正确的身份证号码'
+        })
+        return false;
+      }
+      const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
+      if (this.dataForm.ownerPhone && regPhone.test(this.dataForm.ownerPhone) === false) {
+        this.btnDisable = false
+        this.$message({
+          type: 'warning',
+          message: '请输入正确的手机号码'
+        })
+        return false;
+      }
+
+      let url = ''
+
+      if (this.formType === 'add') {
+        url = '/gov/org/house/houseadd'
+      } else {
+        url = '/gov/org/house/houseupdate'
+        this.dataForm.houseId = this.houseId
+      }
+
+      const { data, code, msg } = await requestPost(url, this.dataForm)
+      this.btnDisable = false
+      if (code === 0) {
+        this.$message({
+          type: 'success',
+          message: '操作成功'
+        })
+        this.resetData()
+        this.$emit('dialogOk')
+
+      } else {
+
+        this.$message.error(msg)
+      }
+
+    },
+
+    handleCancle () {
+      this.resetData()
+      this.$emit('dialogCancle')
+
+    },
+
+    resetData () {
+      this.houseId = '' //房屋ID
+      this.houseType = '1'
+      this.purpose = '1'
+      this.rentFlag = 0
+      this.dataForm = {
+        neighborHoodId: '', // 所属小区ID
+        buildingId: '',//所属楼栋ID
+        buildingUnitId: '',//所属单元ID
+        doorName: '',//门牌号
+        houseType: '1',//房屋类型【楼房，平房，别墅】
+        purpose: '1',//房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】
+        rentFlag: 0,//是否出租【是：1，否：0】
+        ownerPhone: '', //联系方式
+        ownerName: '', //房主名字
+        ownerIdCard: '', //房主身份证
+        remark: '' // 备注
+      }
+
+    },
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
     }
+  },
+  computed: {
+    dataRule () {
+      return {
+        buildingUnitId: [
+          { required: true, message: '所属单元不能为空', trigger: 'blur' },
+        ],
+        doorName: [
+          { required: true, message: '门牌号不能为空', trigger: 'blur' }
+        ],
+        houseType: [
+          { required: true, message: '房屋类型不能为空', trigger: 'blur' }
+        ],
+        purpose: [
+          { required: true, message: '房屋用途不能为空', trigger: 'blur' }
+        ],
+        rentFlag: [
+          { required: true, message: '是否出租不能为空', trigger: 'blur' }
+        ],
+        ownerPhone: [
+          { required: false }
+        ],
+        ownerName: [
+          { required: false }
+        ],
+        ownerIdCard: [
+          { required: false }
+        ],
+        remark: [
+          { required: false }
+        ],
+      }
+    },
+
+  },
+  props: {}
+}
 </script>
 <style lang="scss" scoped >
-  @import "@/assets/scss/modules/visual/communityManageForm.scss";
+@import "@/assets/scss/modules/visual/communityManageForm.scss";
 </style>
diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index 4f87e3f3..c2fef85e 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -102,7 +102,7 @@
                          width="90">
         </el-table-column>
         <el-table-column prop="ownerPhone"
-                         label="房主电话"
+                         label="联系方式"
                          width="110">
         </el-table-column>
         <el-table-column prop="ownerIdCard"