From 84ba01559f03e9337fe232d071fbf64cfbc9e868 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Fri, 11 Jul 2025 16:02:47 +0800
Subject: [PATCH] 家庭成员测试

---
 src/api/owner/addOwnerMemberApi.js                |  19 +++++++++++++++----
 src/components/community/AddPropertyCommunity.vue |  42 ++++++++++--------------------------------
 src/components/community/addCommunity.vue         |   4 ++--
 src/components/contract/searchRoom.vue            | 230 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/components/owner/addOwnerMember.vue           | 231 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------------------------------------------------------
 src/components/owner/deleteOwner.vue              |   3 ++-
 src/components/owner/editOwnerMember.vue          | 251 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/components/owner/ownerDetailMember.vue        |  33 ++++++++++++++++-----------------
 src/components/room/addShops.vue                  |  21 ++++++++++-----------
 src/components/room/editRoom.vue                  |  23 ++++++++++++++---------
 src/components/room/searchRoom.vue                |   8 ++++----
 src/components/store/AddPropertyCompany.vue       |   6 +++---
 src/components/store/EditPropertyCompany.vue      |  14 ++------------
 src/i18n/commonLang.js                            |   4 ++++
 src/views/contract/contractChangeDetailLang.js    |  24 ------------------------
 src/views/owner/ownerBindRoom.vue                 |   4 ++--
 src/views/owner/ownerDetail.vue                   |   2 +-
 src/views/owner/ownerDetailLang.js                | 148 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/room/addRoomViewList.vue                |   4 ++--
 src/views/room/shopsList.vue                      |   2 +-
 src/views/store/propertyCompanyManageList.vue     |  44 +++++++++-----------------------------------
 21 files changed, 407 insertions(+), 710 deletions(-)
 delete mode 100644 src/components/contract/searchRoom.vue

diff --git a/src/api/owner/addOwnerMemberApi.js b/src/api/owner/addOwnerMemberApi.js
index a9f32ed..e8514e0 100644
--- a/src/api/owner/addOwnerMemberApi.js
+++ b/src/api/owner/addOwnerMemberApi.js
@@ -8,11 +8,22 @@ export function saveOwnerMember(data) {
       data
     }).then(response => {
       const res = response.data
-      if (res.code === 0) {
         resolve(res)
-      } else {
-        reject(new Error(res.msg || 'Failed to save owner member'))
-      }
+    }).catch(error => {
+      reject(error)
+    })
+  })
+}
+
+export function editOwnerMember(data) {
+  return new Promise((resolve, reject) => {
+    request({
+      url: '/owner.editOwnerMember',
+      method: 'post',
+      data
+    }).then(response => {
+      const res = response.data
+        resolve(res)
     }).catch(error => {
       reject(error)
     })
diff --git a/src/components/community/AddPropertyCommunity.vue b/src/components/community/AddPropertyCommunity.vue
index 026b5d9..b852efd 100644
--- a/src/components/community/AddPropertyCommunity.vue
+++ b/src/components/community/AddPropertyCommunity.vue
@@ -1,42 +1,20 @@
 <template>
-  <el-dialog
-    :title="$t('propertyCommunity.add.title')"
-    :visible.sync="visible"
-    width="50%"
-    @close="handleClose"
-  >
-    <el-form ref="form" :model="form" label-width="120px">
+  <el-dialog :title="$t('propertyCommunity.add.title')" :visible.sync="visible" width="50%" @close="handleClose">
+    <el-form ref="form" :model="form" label-width="120px" class="text-left">
       <el-form-item :label="$t('propertyCommunity.add.openCommunity')">
-        <el-select
-          v-model="form.communityIds"
-          multiple
-          filterable
-          style="width: 100%"
-          :placeholder="$t('propertyCommunity.add.selectCommunity')"
-        >
-          <el-option
-            v-for="item in communitys"
-            :key="item.communityId"
-            :label="item.name"
-            :value="item.communityId"
-          />
+        <el-select v-model="form.communityIds" multiple filterable style="width: 100%"
+          :placeholder="$t('propertyCommunity.add.selectCommunity')">
+          <el-option v-for="item in communitys" :key="item.communityId" :label="item.name" :value="item.communityId" />
         </el-select>
       </el-form-item>
 
-      <el-form-item
-        v-if="form.communityIds && form.communityIds.length > 0"
-        :label="$t('propertyCommunity.add.functions')"
-      >
+      <el-form-item v-if="form.communityIds && form.communityIds.length > 0"
+        :label="$t('propertyCommunity.add.functions')">
         <el-checkbox v-model="form.isAll" @change="handleAllChange">
           {{ $t('propertyCommunity.add.all') }}
         </el-checkbox>
-        <el-checkbox
-          v-for="item in menuGroups"
-          :key="item.gId"
-          v-model="form.groupIds"
-          :label="item.gId"
-          @change="handleItemChange"
-        >
+        <el-checkbox v-for="item in menuGroups" :key="item.gId" v-model="form.groupIds" :label="item.gId"
+          @change="handleItemChange">
           {{ item.name }}
         </el-checkbox>
       </el-form-item>
@@ -99,7 +77,7 @@ export default {
         const params = {
           communityName: ''
         }
-        const  data  = await listNoEnterCommunity(params)
+        const data = await listNoEnterCommunity(params)
         this.communitys = data
       } catch (error) {
         this.$message.error(this.$t('propertyCommunity.fetchError'))
diff --git a/src/components/community/addCommunity.vue b/src/components/community/addCommunity.vue
index 71ead9d..2928757 100644
--- a/src/components/community/addCommunity.vue
+++ b/src/components/community/addCommunity.vue
@@ -1,6 +1,6 @@
 <template>
-  <el-dialog :title="$t('addCommunity.title')" :visible.sync="visible" width="60%" @close="clearAddCommunityInfo">
-    <el-form ref="form" :model="addCommunityInfo" label-width="120px">
+  <el-dialog :title="$t('addCommunity.title')" :visible.sync="visible" width="40%" @close="clearAddCommunityInfo">
+    <el-form ref="form" :model="addCommunityInfo" label-width="120px" class="text-left">
       <el-form-item :label="$t('addCommunity.name')" prop="name" required>
         <el-input v-model="addCommunityInfo.name" :placeholder="$t('addCommunity.namePlaceholder')" />
       </el-form-item>
diff --git a/src/components/contract/searchRoom.vue b/src/components/contract/searchRoom.vue
deleted file mode 100644
index 0d72d6e..0000000
--- a/src/components/contract/searchRoom.vue
+++ /dev/null
@@ -1,230 +0,0 @@
-<template>
-  <el-dialog
-    :title="$t('searchRoom.title')"
-    :visible.sync="dialogVisible"
-    width="80%"
-    @close="handleClose"
-  >
-    <el-form v-if="searchRoomInfo.showSearchCondition" inline>
-      <el-form-item :label="$t('searchRoom.buildingNo')">
-        <el-input
-          v-model="searchRoomInfo._currentFloorNum"
-          :placeholder="$t('searchRoom.buildingNoPlaceholder')"
-          :readonly="searchRoomInfo.floorNumInputReadonly"
-        ></el-input>
-      </el-form-item>
-      
-      <el-form-item :label="$t('searchRoom.roomNo')">
-        <el-input
-          v-model="searchRoomInfo._currentRoomNum"
-          :placeholder="$t('searchRoom.roomNoPlaceholder')"
-        ></el-input>
-      </el-form-item>
-      
-      <el-form-item>
-        <el-button type="primary" @click="searchRooms">
-          <i class="el-icon-search"></i>
-          {{ $t('common.search') }}
-        </el-button>
-        <el-button @click="resetRooms">
-          <i class="el-icon-refresh"></i>
-          {{ $t('common.reset') }}
-        </el-button>
-      </el-form-item>
-    </el-form>
-    
-    <el-table :data="searchRoomInfo.rooms" border>
-      <el-table-column
-        prop="roomId"
-        :label="$t('searchRoom.roomId')"
-        align="center"
-      />
-      
-      <el-table-column
-        prop="floorNum"
-        :label="$t('searchRoom.buildingNo')"
-        align="center"
-      >
-        <template slot-scope="scope">
-          {{ scope.row.floorNum }}{{ $t('searchRoom.building') }}
-        </template>
-      </el-table-column>
-      
-      <el-table-column
-        prop="unitNum"
-        :label="$t('searchRoom.unitNo')"
-        align="center"
-      >
-        <template slot-scope="scope">
-          {{ scope.row.unitNum }}{{ $t('searchRoom.unit') }}
-        </template>
-      </el-table-column>
-      
-      <el-table-column
-        prop="roomNum"
-        :label="$t('searchRoom.roomNo')"
-        align="center"
-      >
-        <template slot-scope="scope">
-          {{ scope.row.roomNum }}{{ $t('searchRoom.room') }}
-        </template>
-      </el-table-column>
-      
-      <el-table-column
-        prop="layer"
-        :label="$t('searchRoom.floor')"
-        align="center"
-      >
-        <template slot-scope="scope">
-          {{ scope.row.layer }}{{ $t('searchRoom.floorUnit') }}
-        </template>
-      </el-table-column>
-      
-      <el-table-column
-        :label="$t('common.operation')"
-        align="center"
-        width="120"
-      >
-        <template slot-scope="scope">
-          <el-button
-            type="primary"
-            size="mini"
-            @click="chooseRoom(scope.row)"
-          >
-            {{ $t('common.select') }}
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    
-    <div class="pagination-wrapper">
-      <el-pagination
-        :current-page="pagination.current"
-        :page-sizes="[10, 20, 30, 50]"
-        :page-size="pagination.size"
-        :total="pagination.total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { queryRooms } from '@/api/contract/contractChangeDetailApi'
-import { getCommunityId } from '@/api/community/communityApi'
-
-export default {
-  name: 'SearchRoom',
-  props: {
-    emitChooseRoom: {
-      type: String,
-      default: ''
-    },
-    emitLoadData: {
-      type: String,
-      default: ''
-    },
-    roomFlag: {
-      type: String,
-      default: ''
-    },
-    showSearchCondition: {
-      type: String,
-      default: 'true'
-    }
-  },
-  data() {
-    return {
-      dialogVisible: false,
-      searchRoomInfo: {
-        rooms: [],
-        _currentRoomNum: '',
-        _currentFloorNum: '',
-        floorNumInputReadonly: false,
-        showSearchCondition: this.showSearchCondition === 'true'
-      },
-      pagination: {
-        current: 1,
-        size: 10,
-        total: 0
-      },
-      communityId: ''
-    }
-  },
-  created() {
-    this.communityId = getCommunityId()
-  },
-  methods: {
-    open() {
-      this.dialogVisible = true
-      this.refreshSearchRoomData()
-      this.loadAllRoomInfo(1, 10)
-    },
-    chooseRoom(room) {
-      this.$emit(this.emitChooseRoom, 'chooseRoom', room)
-      this.$emit(this.emitLoadData, 'listRoomData', {
-        roomId: room.roomId
-      })
-      this.dialogVisible = false
-    },
-    searchRooms() {
-      this.loadAllRoomInfo(1, 15, this.searchRoomInfo._currentRoomNum)
-    },
-    resetRooms() {
-      this.searchRoomInfo._currentFloorNum = ''
-      this.searchRoomInfo._currentRoomNum = ''
-      this.loadAllRoomInfo(1, 15)
-    },
-    handleSizeChange(val) {
-      this.pagination.size = val
-      this.loadAllRoomInfo(this.pagination.current, val)
-    },
-    handleCurrentChange(val) {
-      this.pagination.current = val
-      this.loadAllRoomInfo(val, this.pagination.size)
-    },
-    handleClose() {
-      this.searchRoomInfo._currentRoomNum = ''
-    },
-    refreshSearchRoomData() {
-      this.searchRoomInfo._currentRoomNum = ''
-    },
-    loadAllRoomInfo(page, row, roomNum) {
-      const params = {
-        page,
-        row,
-        communityId: this.communityId,
-        roomNum,
-        floorNum: this.searchRoomInfo._currentFloorNum,
-        roomFlag: this.roomFlag
-      }
-
-      let url = '/room.queryRooms'
-      if (this.roomFlag === '1') {
-        url = '/room.queryRoomsWithSell'
-      } else if (this.roomFlag === '2') {
-        url = '/room.queryRoomsWithOutSell'
-      }
-
-      queryRooms(params, url)
-        .then(response => {
-          const roomInfo = response.data
-          this.searchRoomInfo.rooms = roomInfo.rooms
-          this.pagination.total = roomInfo.records
-        })
-        .catch(error => {
-          console.error('请求失败:', error)
-        })
-    }
-  }
-}
-</script>
-
-<style scoped>
-.pagination-wrapper {
-  margin-top: 20px;
-  text-align: right;
-}
-</style>
\ No newline at end of file
diff --git a/src/components/owner/addOwnerMember.vue b/src/components/owner/addOwnerMember.vue
index a888295..457c494 100644
--- a/src/components/owner/addOwnerMember.vue
+++ b/src/components/owner/addOwnerMember.vue
@@ -1,191 +1,108 @@
 <template>
-  <el-dialog
-    :title="$t('addOwnerMember.title')"
-    :visible.sync="dialogVisible"
-    width="80%"
-    @close="_closeSaveOwnerModal"
-  >
+  <el-dialog :title="$t('addOwnerMember.title')" :visible.sync="dialogVisible" width="80%"
+    @close="_closeSaveOwnerModal">
     <el-form :model="addOwnerMemberInfo" :rules="rules" ref="form" label-width="120px">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item :label="$t('addOwnerMember.personRole')" prop="personRole">
-            <el-select
-              v-model="addOwnerMemberInfo.personRole"
-              :placeholder="$t('addOwnerMember.placeholder.personRole')"
-              class="w100"
-            >
-              <el-option
-                v-for="item in roleOptions"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
+            <el-select v-model="addOwnerMemberInfo.personRole"
+              :placeholder="$t('addOwnerMember.placeholder.personRole')" class="w100">
+              <el-option v-for="item in roleOptions" :key="item.value" :label="item.label" :value="item.value" />
             </el-select>
           </el-form-item>
-          
+
           <el-form-item :label="$t('addOwnerMember.name')" prop="name">
-            <el-input
-              v-model.trim="addOwnerMemberInfo.name"
-              :placeholder="$t('addOwnerMember.placeholder.name')"
-              clearable
-            />
+            <el-input v-model.trim="addOwnerMemberInfo.name" :placeholder="$t('addOwnerMember.placeholder.name')"
+              clearable />
           </el-form-item>
-          
+
           <el-form-item :label="$t('addOwnerMember.link')" prop="link">
-            <el-input
-              v-model.trim="addOwnerMemberInfo.link"
-              :placeholder="$t('addOwnerMember.placeholder.link')"
-              clearable
-            />
+            <el-input v-model.trim="addOwnerMemberInfo.link" :placeholder="$t('addOwnerMember.placeholder.link')"
+              clearable />
           </el-form-item>
-          
+
           <el-form-item :label="$t('addOwnerMember.sex')" prop="sex">
-            <el-select
-              v-model="addOwnerMemberInfo.sex"
-              :placeholder="$t('addOwnerMember.placeholder.sex')"
-              class="w100"
-            >
-              <el-option
-                v-for="item in sexOptions"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
+            <el-select v-model="addOwnerMemberInfo.sex" :placeholder="$t('addOwnerMember.placeholder.sex')"
+              class="w100">
+              <el-option v-for="item in sexOptions" :key="item.value" :label="item.label" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
-        
+
         <el-col :span="12" class="text-center">
           <div class="avatar-uploader">
-            <img
-              v-if="addOwnerMemberInfo.ownerPhotoUrl"
-              :src="addOwnerMemberInfo.ownerPhotoUrl"
-              class="avatar"
-              :alt="$t('addOwnerMember.photo')"
-            >
-            <img
-              v-else
-              src="/img/noPhoto.jpg"
-              class="avatar"
-              :alt="$t('addOwnerMember.photo')"
-            >
+            <img v-if="addOwnerMemberInfo.ownerPhotoUrl" :src="addOwnerMemberInfo.ownerPhotoUrl" class="avatar"
+              :alt="$t('addOwnerMember.photo')">
+            <img v-else src="/img/noPhoto.jpg" class="avatar" :alt="$t('addOwnerMember.photo')">
           </div>
-          <el-button
-            type="primary"
-            class="mt10"
-            @click="_uploadPhoto"
-          >
+          <el-button type="primary" class="mt10" @click="_uploadPhoto">
             {{ $t('addOwnerMember.uploadPhoto') }}
           </el-button>
-          <input
-            type="file"
-            ref="fileInput"
-            accept=".jpg,.jpeg,.png"
-            @change="_choosePhoto"
-            style="display: none"
-          >
+          <input type="file" ref="fileInput" accept=".jpg,.jpeg,.png" @change="_choosePhoto" style="display: none">
         </el-col>
       </el-row>
-      
+
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item :label="$t('addOwnerMember.concactLink')">
-            <el-input
-              v-model.trim="addOwnerMemberInfo.concactLink"
-              :placeholder="$t('addOwnerMember.placeholder.concactLink')"
-              clearable
-            />
+            <el-input v-model.trim="addOwnerMemberInfo.concactLink"
+              :placeholder="$t('addOwnerMember.placeholder.concactLink')" clearable />
           </el-form-item>
-          
+
           <el-form-item :label="$t('addOwnerMember.address')">
-            <el-input
-              v-model.trim="addOwnerMemberInfo.address"
-              :placeholder="$t('addOwnerMember.placeholder.address')"
-              clearable
-            />
+            <el-input v-model.trim="addOwnerMemberInfo.address" :placeholder="$t('addOwnerMember.placeholder.address')"
+              clearable />
           </el-form-item>
         </el-col>
-        
+
         <el-col :span="12">
           <el-form-item :label="$t('addOwnerMember.idCard')">
-            <el-input
-              v-model.trim="addOwnerMemberInfo.idCard"
-              :placeholder="$t('addOwnerMember.placeholder.idCard')"
-              clearable
-            />
+            <el-input v-model.trim="addOwnerMemberInfo.idCard" :placeholder="$t('addOwnerMember.placeholder.idCard')"
+              clearable />
           </el-form-item>
-          
+
           <el-form-item :label="$t('addOwnerMember.remark')">
-            <el-input
-              v-model.trim="addOwnerMemberInfo.remark"
-              :placeholder="$t('addOwnerMember.placeholder.remark')"
-              clearable
-            />
+            <el-input v-model.trim="addOwnerMemberInfo.remark" :placeholder="$t('addOwnerMember.placeholder.remark')"
+              clearable />
           </el-form-item>
         </el-col>
       </el-row>
-      
-      <template v-for="(item,index) in addOwnerMemberInfo.attrs">
+
+      <template v-for="(item, index) in addOwnerMemberInfo.attrs">
         <el-row :gutter="20" v-if="index % 2 === 0" :key="index">
           <el-col :span="12">
             <el-form-item :label="item.specName" v-if="item.specType === '2233'">
-              <el-input
-                v-model="item.value"
-                :placeholder="item.specHoldplace"
-                clearable
-              />
+              <el-input v-model="item.value" :placeholder="item.specHoldplace" clearable />
             </el-form-item>
-            
+
             <el-form-item :label="item.specName" v-if="item.specType === '3344'">
-              <el-select
-                v-model="item.value"
-                :placeholder="item.specHoldplace"
-                class="w100"
-              >
-                <el-option
-                  v-for="value in item.values"
-                  :key="value.value"
-                  :label="value.valueName"
-                  :value="value.value"
-                />
+              <el-select v-model="item.value" :placeholder="item.specHoldplace" class="w100">
+                <el-option v-for="value in item.values" :key="value.value" :label="value.valueName"
+                  :value="value.value" />
               </el-select>
             </el-form-item>
           </el-col>
-          
-          <el-col :span="12" v-if="index < addOwnerMemberInfo.attrs.length-1">
-            <el-form-item 
-              :label="addOwnerMemberInfo.attrs[index+1].specName" 
-              v-if="addOwnerMemberInfo.attrs[index+1].specType === '2233'"
-            >
-              <el-input
-                v-model="addOwnerMemberInfo.attrs[index+1].value"
-                :placeholder="addOwnerMemberInfo.attrs[index+1].specHoldplace"
-                clearable
-              />
+
+          <el-col :span="12" v-if="index < addOwnerMemberInfo.attrs.length - 1">
+            <el-form-item :label="addOwnerMemberInfo.attrs[index + 1].specName"
+              v-if="addOwnerMemberInfo.attrs[index + 1].specType === '2233'">
+              <el-input v-model="addOwnerMemberInfo.attrs[index + 1].value"
+                :placeholder="addOwnerMemberInfo.attrs[index + 1].specHoldplace" clearable />
             </el-form-item>
-            
-            <el-form-item 
-              :label="addOwnerMemberInfo.attrs[index+1].specName" 
-              v-if="addOwnerMemberInfo.attrs[index+1].specType === '3344'"
-            >
-              <el-select
-                v-model="addOwnerMemberInfo.attrs[index+1].value"
-                :placeholder="addOwnerMemberInfo.attrs[index+1].specHoldplace"
-                class="w100"
-              >
-                <el-option
-                  v-for="value in addOwnerMemberInfo.attrs[index+1].values"
-                  :key="value.value"
-                  :label="value.valueName"
-                  :value="value.value"
-                />
+
+            <el-form-item :label="addOwnerMemberInfo.attrs[index + 1].specName"
+              v-if="addOwnerMemberInfo.attrs[index + 1].specType === '3344'">
+              <el-select v-model="addOwnerMemberInfo.attrs[index + 1].value"
+                :placeholder="addOwnerMemberInfo.attrs[index + 1].specHoldplace" class="w100">
+                <el-option v-for="value in addOwnerMemberInfo.attrs[index + 1].values" :key="value.value"
+                  :label="value.valueName" :value="value.value" />
               </el-select>
             </el-form-item>
           </el-col>
         </el-row>
       </template>
     </el-form>
-    
+
     <div slot="footer" class="dialog-footer">
       <el-button @click="_closeSaveOwnerModal">{{ $t('common.cancel') }}</el-button>
       <el-button type="primary" @click="saveOwnerMemberInfo">{{ $t('common.save') }}</el-button>
@@ -195,8 +112,11 @@
 
 <script>
 import { getCommunityId } from '@/api/community/communityApi'
-import { getAttrSpec, getAttrValue } from '@/api/community/communityApi'
+import { getAttrValue } from '@/api/community/communityApi'
 import { uploadFile } from '@/api/staff/addStaffApi'
+import { getAttrSpecList } from '@/api/dev/attrSpecApi'
+import { saveOwnerMember } from '@/api/owner/addOwnerMemberApi'
+
 
 export default {
   name: 'AddOwnerMember',
@@ -253,26 +173,25 @@ export default {
     }
   },
   methods: {
-    open(ownerId) {
-      this.addOwnerMemberInfo.ownerId = ownerId
+    open(params) {
+      this.addOwnerMemberInfo.ownerId = params.ownerId
       this._loadOwnerAttrSpec()
       this.dialogVisible = true
       this.$nextTick(() => {
         this.$refs.form.clearValidate()
       })
     },
-    
-    saveOwnerMemberInfo() {
+
+    async saveOwnerMemberInfo() {
       this.$refs.form.validate(valid => {
         if (valid) {
           const params = {
             ...this.addOwnerMemberInfo,
             communityId: getCommunityId()
           }
-          
-          this.$http.post('/owner.saveOwnerMember', params)
+          saveOwnerMember(params)
             .then(res => {
-              if (res.data.code === 0) {
+              if (res.code === 0) {
                 this.$message.success(this.$t('common.saveSuccess'))
                 this.dialogVisible = false
                 this.$emit('save-success')
@@ -287,10 +206,10 @@ export default {
         }
       })
     },
-    
+
     _loadOwnerAttrSpec() {
       this.addOwnerMemberInfo.attrs = []
-      getAttrSpec('building_owner_attr').then(data => {
+      getAttrSpecList({ page: 1, row: 100, tableName: 'building_owner_attr' }).then(data => {
         data.forEach(item => {
           if (item.specShow === 'Y') {
             item.value = ''
@@ -301,7 +220,7 @@ export default {
         })
       })
     },
-    
+
     _loadAttrValue(specCd, values) {
       getAttrValue(specCd).then(data => {
         data.forEach(item => {
@@ -311,11 +230,11 @@ export default {
         })
       })
     },
-    
+
     _uploadPhoto() {
       this.$refs.fileInput.click()
     },
-    
+
     _choosePhoto(event) {
       const files = event.target.files
       if (files && files.length > 0) {
@@ -324,16 +243,16 @@ export default {
           this.$message.error(this.$t('addOwnerMember.validate.photoSize'))
           return
         }
-        
+
         this._doUploadImage(file)
       }
     },
-    
+
     _doUploadImage(file) {
       const formData = new FormData()
       formData.append('uploadFile', file)
       formData.append('communityId', getCommunityId())
-      
+
       uploadFile(formData).then(res => {
         this.addOwnerMemberInfo.ownerPhoto = res.fileId
         this.addOwnerMemberInfo.ownerPhotoUrl = res.url
@@ -342,7 +261,7 @@ export default {
         this.$message.error(this.$t('addOwnerMember.uploadFailed'))
       })
     },
-    
+
     _closeSaveOwnerModal() {
       this.dialogVisible = false
       this.$refs.form.resetFields()
@@ -370,18 +289,22 @@ export default {
 .w100 {
   width: 100%;
 }
+
 .mt10 {
   margin-top: 10px;
 }
+
 .text-center {
   text-align: center;
 }
+
 .avatar-uploader {
   width: 100%;
   display: flex;
   justify-content: center;
   margin-bottom: 10px;
 }
+
 .avatar {
   width: 150px;
   height: 150px;
diff --git a/src/components/owner/deleteOwner.vue b/src/components/owner/deleteOwner.vue
index 849a17b..7a527c9 100644
--- a/src/components/owner/deleteOwner.vue
+++ b/src/components/owner/deleteOwner.vue
@@ -33,7 +33,8 @@ export default {
     async confirmDelete() {
       try {
         await deleteOwner({
-          ownerId: this.owner.ownerId
+          ownerId: this.owner.ownerId,
+          memberId: this.owner.memberId
         })
         this.$message.success(this.$t('listOwner.deleteSuccess'))
         this.visible = false
diff --git a/src/components/owner/editOwnerMember.vue b/src/components/owner/editOwnerMember.vue
index 1a4eb6f..587e9e6 100644
--- a/src/components/owner/editOwnerMember.vue
+++ b/src/components/owner/editOwnerMember.vue
@@ -1,197 +1,109 @@
 <template>
-  <el-dialog
-    :title="$t('editOwnerMember.title')"
-    :visible.sync="dialogVisible"
-    width="80%"
-    @close="_closeEditOwnerMemberModal"
-  >
+  <el-dialog :title="$t('editOwnerMember.title')" :visible.sync="dialogVisible" width="80%"
+    @close="_closeEditOwnerMemberModal">
     <el-form :model="editOwnerMemberInfo" :rules="rules" ref="form" label-width="120px">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item :label="$t('editOwnerMember.personRole')" prop="personRole">
-            <el-select
-              v-model="editOwnerMemberInfo.personRole"
-              :placeholder="$t('editOwnerMember.placeholder.personRole')"
-              class="w100"
-            >
-              <el-option
-                v-for="item in roleOptions"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
+            <el-select v-model="editOwnerMemberInfo.personRole"
+              :placeholder="$t('editOwnerMember.placeholder.personRole')" class="w100">
+              <el-option v-for="item in roleOptions" :key="item.value" :label="item.label" :value="item.value" />
             </el-select>
           </el-form-item>
-          
+
           <el-form-item :label="$t('editOwnerMember.name')" prop="name">
-            <el-input
-              v-model.trim="editOwnerMemberInfo.name"
-              :placeholder="$t('editOwnerMember.placeholder.name')"
-              clearable
-            />
+            <el-input v-model.trim="editOwnerMemberInfo.name" :placeholder="$t('editOwnerMember.placeholder.name')"
+              clearable />
           </el-form-item>
-          
+
           <el-form-item :label="$t('editOwnerMember.link')" prop="link">
-            <el-input
-              v-model.trim="editOwnerMemberInfo.link"
-              :placeholder="$t('editOwnerMember.placeholder.link')"
-              clearable
-              maxlength="11"
-            />
+            <el-input v-model.trim="editOwnerMemberInfo.link" :placeholder="$t('editOwnerMember.placeholder.link')"
+              clearable maxlength="11" />
           </el-form-item>
-          
-          <el-form-item 
-            :label="$t('editOwnerMember.sex')" 
-            prop="sex"
-            v-if="editOwnerMemberInfo.personType === 'P'"
-          >
-            <el-select
-              v-model="editOwnerMemberInfo.sex"
-              :placeholder="$t('editOwnerMember.placeholder.sex')"
-              class="w100"
-            >
-              <el-option
-                v-for="item in sexOptions"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
+
+          <el-form-item :label="$t('editOwnerMember.sex')" prop="sex" v-if="editOwnerMemberInfo.personType === 'P'">
+            <el-select v-model="editOwnerMemberInfo.sex" :placeholder="$t('editOwnerMember.placeholder.sex')"
+              class="w100">
+              <el-option v-for="item in sexOptions" :key="item.value" :label="item.label" :value="item.value" />
             </el-select>
           </el-form-item>
-          
+
           <el-form-item :label="$t('editOwnerMember.address')">
-            <el-input
-              v-model.trim="editOwnerMemberInfo.address"
-              :placeholder="$t('editOwnerMember.placeholder.address')"
-              clearable
-            />
+            <el-input v-model.trim="editOwnerMemberInfo.address"
+              :placeholder="$t('editOwnerMember.placeholder.address')" clearable />
           </el-form-item>
         </el-col>
-        
+
         <el-col :span="12" class="text-center">
           <div class="avatar-uploader">
-            <img
-              v-if="editOwnerMemberInfo.ownerPhotoUrl"
-              :src="editOwnerMemberInfo.ownerPhotoUrl"
-              class="avatar"
-              :alt="$t('editOwnerMember.photo')"
-              @error="handleImageError"
-            >
-            <img
-              v-else
-              src="/img/noPhoto.jpg"
-              class="avatar"
-              :alt="$t('editOwnerMember.photo')"
-            >
+            <img v-if="editOwnerMemberInfo.ownerPhotoUrl" :src="editOwnerMemberInfo.ownerPhotoUrl" class="avatar"
+              :alt="$t('editOwnerMember.photo')" @error="handleImageError">
+            <img v-else src="/img/noPhoto.jpg" class="avatar" :alt="$t('editOwnerMember.photo')">
           </div>
-          <el-button
-            type="primary"
-            class="mt10"
-            @click="_uploadEditMemberPhoto"
-          >
+          <el-button type="primary" class="mt10" @click="_uploadEditMemberPhoto">
             {{ $t('editOwnerMember.uploadPhoto') }}
           </el-button>
-          <input
-            type="file"
-            ref="fileInput"
-            accept=".jpg,.jpeg,.png"
-            @change="_chooseEditMemberPhoto"
-            style="display: none"
-          >
+          <input type="file" ref="fileInput" accept=".jpg,.jpeg,.png" @change="_chooseEditMemberPhoto"
+            style="display: none">
         </el-col>
       </el-row>
-      
+
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item :label="$t('editOwnerMember.concactLink')">
-            <el-input
-              v-model.trim="editOwnerMemberInfo.concactLink"
-              :placeholder="$t('editOwnerMember.placeholder.concactLink')"
-              clearable
-            />
+            <el-input v-model.trim="editOwnerMemberInfo.concactLink"
+              :placeholder="$t('editOwnerMember.placeholder.concactLink')" clearable />
           </el-form-item>
         </el-col>
-        
+
         <el-col :span="12">
           <el-form-item :label="$t('editOwnerMember.idCard')">
-            <el-input
-              v-model.trim="editOwnerMemberInfo.idCard"
-              :placeholder="$t('editOwnerMember.placeholder.idCard')"
-              clearable
-            />
+            <el-input v-model.trim="editOwnerMemberInfo.idCard" :placeholder="$t('editOwnerMember.placeholder.idCard')"
+              clearable />
           </el-form-item>
-          
+
           <el-form-item :label="$t('editOwnerMember.remark')">
-            <el-input
-              v-model.trim="editOwnerMemberInfo.remark"
-              :placeholder="$t('editOwnerMember.placeholder.remark')"
-              clearable
-            />
+            <el-input v-model.trim="editOwnerMemberInfo.remark" :placeholder="$t('editOwnerMember.placeholder.remark')"
+              clearable />
           </el-form-item>
         </el-col>
       </el-row>
-      
-      <template v-for="(item,index) in editOwnerMemberInfo.attrs">
+
+      <template v-for="(item, index) in editOwnerMemberInfo.attrs">
         <el-row :gutter="20" v-if="index % 2 === 0" :key="index">
           <el-col :span="12">
             <el-form-item :label="item.specName" v-if="item.specType === '2233'">
-              <el-input
-                v-model="item.value"
-                :placeholder="item.specHoldplace"
-                clearable
-              />
+              <el-input v-model="item.value" :placeholder="item.specHoldplace" clearable />
             </el-form-item>
-            
+
             <el-form-item :label="item.specName" v-if="item.specType === '3344'">
-              <el-select
-                v-model="item.value"
-                :placeholder="item.specHoldplace"
-                class="w100"
-              >
-                <el-option
-                  v-for="value in item.values"
-                  :key="value.value"
-                  :label="value.valueName"
-                  :value="value.value"
-                />
+              <el-select v-model="item.value" :placeholder="item.specHoldplace" class="w100">
+                <el-option v-for="value in item.values" :key="value.value" :label="value.valueName"
+                  :value="value.value" />
               </el-select>
             </el-form-item>
           </el-col>
-          
-          <el-col :span="12" v-if="index < editOwnerMemberInfo.attrs.length-1">
-            <el-form-item 
-              :label="editOwnerMemberInfo.attrs[index+1].specName" 
-              v-if="editOwnerMemberInfo.attrs[index+1].specType === '2233'"
-            >
-              <el-input
-                v-model="editOwnerMemberInfo.attrs[index+1].value"
-                :placeholder="editOwnerMemberInfo.attrs[index+1].specHoldplace"
-                clearable
-              />
+
+          <el-col :span="12" v-if="index < editOwnerMemberInfo.attrs.length - 1">
+            <el-form-item :label="editOwnerMemberInfo.attrs[index + 1].specName"
+              v-if="editOwnerMemberInfo.attrs[index + 1].specType === '2233'">
+              <el-input v-model="editOwnerMemberInfo.attrs[index + 1].value"
+                :placeholder="editOwnerMemberInfo.attrs[index + 1].specHoldplace" clearable />
             </el-form-item>
-            
-            <el-form-item 
-              :label="editOwnerMemberInfo.attrs[index+1].specName" 
-              v-if="editOwnerMemberInfo.attrs[index+1].specType === '3344'"
-            >
-              <el-select
-                v-model="editOwnerMemberInfo.attrs[index+1].value"
-                :placeholder="editOwnerMemberInfo.attrs[index+1].specHoldplace"
-                class="w100"
-              >
-                <el-option
-                  v-for="value in editOwnerMemberInfo.attrs[index+1].values"
-                  :key="value.value"
-                  :label="value.valueName"
-                  :value="value.value"
-                />
+
+            <el-form-item :label="editOwnerMemberInfo.attrs[index + 1].specName"
+              v-if="editOwnerMemberInfo.attrs[index + 1].specType === '3344'">
+              <el-select v-model="editOwnerMemberInfo.attrs[index + 1].value"
+                :placeholder="editOwnerMemberInfo.attrs[index + 1].specHoldplace" class="w100">
+                <el-option v-for="value in editOwnerMemberInfo.attrs[index + 1].values" :key="value.value"
+                  :label="value.valueName" :value="value.value" />
               </el-select>
             </el-form-item>
           </el-col>
         </el-row>
       </template>
     </el-form>
-    
+
     <div slot="footer" class="dialog-footer">
       <el-button @click="_closeEditOwnerMemberModal">{{ $t('common.cancel') }}</el-button>
       <el-button type="primary" @click="editOwnerMemberMethod">{{ $t('common.save') }}</el-button>
@@ -201,7 +113,10 @@
 
 <script>
 import { getCommunityId } from '@/api/community/communityApi'
-import { getAttrSpec, getAttrValue } from '@/api/community/communityApi'
+import { getAttrSpecList } from '@/api/dev/attrSpecApi'
+import { getAttrValueList } from '@/api/dev/attrValueApi'
+import { editOwnerMember } from '@/api/owner/addOwnerMemberApi'
+
 import { uploadFile } from '@/api/staff/addStaffApi'
 
 export default {
@@ -267,9 +182,9 @@ export default {
         ownerPhotoUrl: member.faceUrl,
         attrs: []
       }
-      
+
       this._loadEditOwnerMemberAttrSpec().then(() => {
-        if (Object.prototype.hasOwnProperty.call(member,'ownerAttrDtos')) {
+        if (Object.prototype.hasOwnProperty.call(member, 'ownerAttrDtos')) {
           const ownerAttrDtos = member.ownerAttrDtos
           this.editOwnerMemberInfo.attrs.forEach(attrItem => {
             ownerAttrDtos.forEach(item => {
@@ -280,14 +195,14 @@ export default {
             })
           })
         }
-        
+
         this.dialogVisible = true
         this.$nextTick(() => {
           this.$refs.form.clearValidate()
         })
       })
     },
-    
+
     editOwnerMemberMethod() {
       this.$refs.form.validate(valid => {
         if (valid) {
@@ -295,15 +210,15 @@ export default {
             ...this.editOwnerMemberInfo,
             communityId: getCommunityId()
           }
-          
-          this.$http.post('/owner.editOwnerMember', params)
+
+          editOwnerMember(params)
             .then(res => {
-              if (res.data.code === 0) {
+              if (res.code === 0) {
                 this.$message.success(this.$t('common.saveSuccess'))
                 this.dialogVisible = false
                 this.$emit('save-success')
               } else {
-                this.$message.error(res.data.msg || this.$t('common.saveFailed'))
+                this.$message.error(res.msg || this.$t('common.saveFailed'))
               }
             })
             .catch(err => {
@@ -313,12 +228,12 @@ export default {
         }
       })
     },
-    
+
     _loadEditOwnerMemberAttrSpec() {
       return new Promise(resolve => {
         this.editOwnerMemberInfo.attrs = []
-        getAttrSpec('building_owner_attr').then(data => {
-          data.forEach(item => {
+        getAttrSpecList({ page: 1, row: 100, tableName: 'building_owner_attr' }).then(data => {
+          data.data.forEach(item => {
             if (item.specShow === 'Y') {
               item.value = ''
               item.values = []
@@ -330,21 +245,21 @@ export default {
         })
       })
     },
-    
+
     _loadEditMemberAttrValue(specCd, values) {
-      getAttrValue(specCd).then(data => {
-        data.forEach(item => {
+      getAttrValueList({ specCd: specCd, page: 1, row: 100 }).then(data => {
+        data.data.forEach(item => {
           if (item.valueShow === 'Y') {
             values.push(item)
           }
         })
       })
     },
-    
+
     _uploadEditMemberPhoto() {
       this.$refs.fileInput.click()
     },
-    
+
     _chooseEditMemberPhoto(event) {
       const files = event.target.files
       if (files && files.length > 0) {
@@ -353,16 +268,16 @@ export default {
           this.$message.error(this.$t('editOwnerMember.validate.photoSize'))
           return
         }
-        
+
         this._doUploadImageEditOwnerMember(file)
       }
     },
-    
+
     _doUploadImageEditOwnerMember(file) {
       const formData = new FormData()
       formData.append('uploadFile', file)
       formData.append('communityId', getCommunityId())
-      
+
       uploadFile(formData).then(res => {
         this.editOwnerMemberInfo.ownerPhoto = res.fileId
         this.editOwnerMemberInfo.ownerPhotoUrl = res.url
@@ -371,12 +286,12 @@ export default {
         this.$message.error(this.$t('editOwnerMember.uploadFailed'))
       })
     },
-    
+
     _closeEditOwnerMemberModal() {
       this.dialogVisible = false
       this.$refs.form.resetFields()
     },
-    
+
     handleImageError(e) {
       e.target.src = '/img/noPhoto.jpg'
     }
@@ -388,18 +303,22 @@ export default {
 .w100 {
   width: 100%;
 }
+
 .mt10 {
   margin-top: 10px;
 }
+
 .text-center {
   text-align: center;
 }
+
 .avatar-uploader {
   width: 100%;
   display: flex;
   justify-content: center;
   margin-bottom: 10px;
 }
+
 .avatar {
   width: 150px;
   height: 150px;
diff --git a/src/components/owner/ownerDetailMember.vue b/src/components/owner/ownerDetailMember.vue
index cfe47af..acb82dc 100644
--- a/src/components/owner/ownerDetailMember.vue
+++ b/src/components/owner/ownerDetailMember.vue
@@ -1,19 +1,18 @@
 <template>
   <div class="margin-top">
-    <el-row class="margin-top-lg">
+    <el-row class="">
       <el-col :span="4" class="padding-right-xs padding-left-xl">
         <el-input v-model="ownerDetailMemberInfo.name" type="text"
           :placeholder="$t('ownerDetailMember.placeholder.name')" class="form-control"></el-input>
       </el-col>
       <el-col :span="4" class="padding-right-xs padding-right-xl">
-        <el-button type="primary" size="small" style="margin-left:10px"
-          @click="_qureyOwnerDetailMember()">
+        <el-button type="primary" size="small" style="margin-left:10px" @click="_qureyOwnerDetailMember()">
           <i class="el-icon-search"></i>{{ $t('common.query') }}
         </el-button>
       </el-col>
       <el-col :span="16" class="text-right">
-        <el-button type="primary" size="small" style="margin-left:10px"
-          v-if="hasPrivilege('502023032885101706')" @click="openAddMemberModel()">
+        <el-button type="primary" size="small" style="margin-left:10px" v-if="hasPrivilege('502023032885101706')"
+          @click="openAddMemberModel()">
           <i class="el-icon-plus"></i>{{ $t('common.add') }}
         </el-button>
       </el-col>
@@ -24,14 +23,13 @@
           <template slot-scope="scope">
             <img style="width: 60px; height: 60px;" class="border-radius" v-if="scope.row.faceUrl"
               :src="scope.row.faceUrl" @click="_viewOwnerFace(scope.row.faceUrl)" />
-            <img style="width: 60px; height: 60px;" class="border-radius" v-else
-              src="/img/noPhoto.jpg" />
+            <img style="width: 60px; height: 60px;" class="border-radius" v-else src="/img/noPhoto.jpg" />
           </template>
         </el-table-column>
         <el-table-column prop="name" :label="$t('ownerDetailMember.name')" align="center"></el-table-column>
         <el-table-column prop="sex" :label="$t('ownerDetailMember.gender')" align="center">
           <template slot-scope="scope">
-            {{scope.row.sex == 0 ? $t('common.male') : $t('common.female')}}
+            {{ scope.row.sex == 0 ? $t('common.male') : $t('common.female') }}
           </template>
         </el-table-column>
         <el-table-column prop="personRoleName" :label="$t('ownerDetailMember.role')" align="center"></el-table-column>
@@ -41,8 +39,7 @@
         <el-table-column :label="$t('common.operation')" align="center" width="180">
           <template slot-scope="scope">
             <el-button-group>
-              <el-button size="mini" @click="_openEditOwnerModel(scope.row)"
-                v-if="hasPrivilege('502023032899781711')">
+              <el-button size="mini" @click="_openEditOwnerModel(scope.row)" v-if="hasPrivilege('502023032899781711')">
                 {{ $t('common.edit') }}
               </el-button>
               <el-button size="mini" @click="_openDeleteOwnerModel(scope.row)"
@@ -53,18 +50,14 @@
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination
-        @current-change="handleCurrentChange"
-        :current-page="pagination.currentPage"
-        :page-size="pagination.pageSize"
-        :total="pagination.total"
-        layout="total, prev, pager, next, jumper">
+      <el-pagination @current-change="handleCurrentChange" :current-page="pagination.currentPage"
+        :page-size="pagination.pageSize" :total="pagination.total" layout="total, prev, pager, next, jumper">
       </el-pagination>
     </div>
 
     <add-owner-member ref="addOwnerMember" @refresh="_loadOwnerDetailMemberData"></add-owner-member>
     <edit-owner-member ref="editOwnerMember" @refresh="_loadOwnerDetailMemberData"></edit-owner-member>
-    <delete-owner ref="deleteOwner" @refresh="_loadOwnerDetailMemberData"></delete-owner>
+    <delete-owner ref="deleteOwner" @refresh="_loadOwnerDetailMemberData" @success="_loadOwnerDetailMemberData"></delete-owner>
   </div>
 </template>
 
@@ -123,6 +116,7 @@ export default {
       this._loadOwnerDetailMemberData(1, this.pagination.pageSize)
     },
     openAddMemberModel() {
+      
       this.$refs.addOwnerMember.open({ ownerId: this.ownerDetailMemberInfo.ownerId })
     },
     _openDeleteOwnerModel(member) {
@@ -153,18 +147,23 @@ export default {
 .margin-top {
   margin-top: 20px;
 }
+
 .margin-top-lg {
   margin-top: 30px;
 }
+
 .padding-right-xs {
   padding-right: 5px;
 }
+
 .padding-left-xl {
   padding-left: 20px;
 }
+
 .border-radius {
   border-radius: 4px;
 }
+
 .text-right {
   text-align: right;
 }
diff --git a/src/components/room/addShops.vue b/src/components/room/addShops.vue
index c9e00e6..165fcbc 100644
--- a/src/components/room/addShops.vue
+++ b/src/components/room/addShops.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="$t('shops.addShop')" :visible.sync="dialogVisible" width="50%">
+  <el-dialog :title="$t('shops.addShop')" :visible.sync="dialogVisible" width="40%">
     <el-form ref="form" :model="formData" :rules="rules" label-width="120px">
       <el-form-item :label="$t('shops.shopNumber')" prop="roomNum">
         <el-input v-model="formData.roomNum" :placeholder="$t('shops.shopNumberPlaceholder')"></el-input>
@@ -8,8 +8,7 @@
         <el-input v-model="formData.layer" :placeholder="$t('shops.floorRequired')"></el-input>
       </el-form-item>
       <el-form-item :label="$t('shops.building')" prop="floorId">
-        <el-select v-model="formData.floorId" 
-          :placeholder="$t('shops.building')" style="width: 100%">
+        <el-select v-model="formData.floorId" :placeholder="$t('shops.building')" style="width: 100%">
           <el-option v-for="item in floors" :key="item.floorId" :label="item.floorNum + $t('shops.building')"
             :value="item.floorId"></el-option>
         </el-select>
@@ -42,7 +41,7 @@
 <script>
 import { saveShops } from '@/api/room/shopsApi'
 import { getFloors } from '@/api/room/roomApi'
-import {getCommunityId} from '@/api/community/communityApi'
+import { getCommunityId } from '@/api/community/communityApi'
 
 export default {
   name: 'AddShops',
@@ -136,13 +135,13 @@ export default {
           this.$message.error(this.$t('common.saveFailed'))
         })
     },
-     async searchFloors() {
-        const {apiFloorDataVoList} = await getFloors({
-          communityId: getCommunityId(),
-          page:1,
-          row:100
-        })
-        this.floors = apiFloorDataVoList
+    async searchFloors() {
+      const { apiFloorDataVoList } = await getFloors({
+        communityId: getCommunityId(),
+        page: 1,
+        row: 100
+      })
+      this.floors = apiFloorDataVoList
     },
   }
 }
diff --git a/src/components/room/editRoom.vue b/src/components/room/editRoom.vue
index 3997358..7df2530 100644
--- a/src/components/room/editRoom.vue
+++ b/src/components/room/editRoom.vue
@@ -25,29 +25,32 @@
         </el-col>
         <el-col :span="12">
           <el-form-item :label="$t('room.editRoom.roomType')" required>
-            <el-select v-model="form.roomSubType" :placeholder="$t('room.editRoom.placeholder.roomType')" style="width: 100%;">
+            <el-select v-model="form.roomSubType" :placeholder="$t('room.editRoom.placeholder.roomType')"
+              style="width: 100%;">
               <el-option v-for="item in roomSubTypes" :key="item.statusCd" :label="item.name" :value="item.statusCd" />
             </el-select>
           </el-form-item>
         </el-col>
       </el-row>
 
-      <el-row>
+      <!-- <el-row>
         <el-col :span="12">
           <el-form-item :label="$t('room.editRoom.apartment1')" required>
-            <el-select v-model="form.apartment1" :placeholder="$t('room.editRoom.placeholder.apartment')" style="width: 100%;">
+            <el-select v-model="form.apartment1" :placeholder="$t('room.editRoom.placeholder.apartment')"
+              style="width: 100%;">
               <el-option v-for="item in apartment1Options" :key="item.value" :label="item.label" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item :label="$t('room.editRoom.apartment2')" required>
-            <el-select v-model="form.apartment2" :placeholder="$t('room.editRoom.placeholder.apartment')" style="width: 100%;">
+            <el-select v-model="form.apartment2" :placeholder="$t('room.editRoom.placeholder.apartment')"
+              style="width: 100%;">
               <el-option v-for="item in apartment2Options" :key="item.value" :label="item.label" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
+      </el-row> -->
 
       <el-row>
         <el-col :span="12">
@@ -79,15 +82,16 @@
       <el-row v-if="form.state !== '2002'">
         <el-col :span="12">
           <el-form-item :label="$t('room.editRoom.roomState')" required>
-            <el-select v-model="form.state" :placeholder="$t('room.editRoom.placeholder.roomState')" style="width: 100%;">
+            <el-select v-model="form.state" :placeholder="$t('room.editRoom.placeholder.roomState')"
+              style="width: 100%;">
               <el-option v-for="item in roomStateOptions" :key="item.value" :label="item.label" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item :label="$t('room.editRoom.endTime')" required>
-            <el-date-picker v-model="form.endTime" type="date" :placeholder="$t('room.editRoom.placeholder.endTime')" style="width: 100%;"
-              value-format="yyyy-MM-dd" />
+            <el-date-picker v-model="form.endTime" type="date" :placeholder="$t('room.editRoom.placeholder.endTime')"
+              style="width: 100%;" value-format="yyyy-MM-dd" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -102,7 +106,8 @@
       </div>
 
       <el-form-item :label="$t('room.editRoom.remark')">
-        <el-input v-model="form.remark" type="textarea" :placeholder="$t('room.editRoom.placeholder.remark')" :rows="3" />
+        <el-input v-model="form.remark" type="textarea" :placeholder="$t('room.editRoom.placeholder.remark')"
+          :rows="3" />
       </el-form-item>
     </el-form>
 
diff --git a/src/components/room/searchRoom.vue b/src/components/room/searchRoom.vue
index 1d5cd12..ec4b69c 100644
--- a/src/components/room/searchRoom.vue
+++ b/src/components/room/searchRoom.vue
@@ -2,11 +2,11 @@
   <el-dialog :title="$t('searchRoom.title')" :visible.sync="dialogVisible" width="70%" @close="handleClose">
     <div class="ibox">
       <el-row v-if="showSearchCondition">
-        <el-col :span="8">
+        <el-col :span="4">
           <el-input :placeholder="$t('searchRoom.floorNumPlaceholder')" :readonly="floorNumInputReadonly"
             v-model.trim="currentFloorNum" clearable />
         </el-col>
-        <el-col :span="8" :offset="1">
+        <el-col :span="4" :offset="1">
           <el-input :placeholder="$t('searchRoom.roomNumPlaceholder')" v-model.trim="currentRoomNum" clearable />
         </el-col>
         <el-col :span="6" :offset="1">
@@ -58,7 +58,7 @@
     </div>
   </el-dialog>
 </template>
-  
+
 <script>
 import { queryRooms, queryRoomsWithSell, queryRoomsWithOutSell } from '@/api/room/roomApi'
 import { getCommunityId } from '@/api/community/communityApi'
@@ -176,7 +176,7 @@ export default {
   }
 }
 </script>
-  
+
 <style scoped>
 .el-input {
   width: 100%;
diff --git a/src/components/store/AddPropertyCompany.vue b/src/components/store/AddPropertyCompany.vue
index 676dc72..412954c 100644
--- a/src/components/store/AddPropertyCompany.vue
+++ b/src/components/store/AddPropertyCompany.vue
@@ -1,6 +1,6 @@
 <template>
-  <el-dialog :title="$t('propertyCompanyManage.add')" :visible="visible" width="70%" @close="handleClose">
-    <el-form ref="form" :model="formData" label-width="120px">
+  <el-dialog :title="$t('propertyCompanyManage.add')" :visible="visible" width="40%" @close="handleClose">
+    <el-form ref="form" :model="formData" label-width="120px" class="text-left">
       <el-form-item :label="$t('propertyCompanyManage.name')" prop="name" required>
         <el-input v-model="formData.name" />
       </el-form-item>
@@ -89,7 +89,7 @@ export default {
     },
     async fetchCommunities() {
       try {
-        const  data  = await listNoEnterCommunity({
+        const data = await listNoEnterCommunity({
           communityName: ''
         })
         this.communities = data
diff --git a/src/components/store/EditPropertyCompany.vue b/src/components/store/EditPropertyCompany.vue
index 6cbe57f..6d6a786 100644
--- a/src/components/store/EditPropertyCompany.vue
+++ b/src/components/store/EditPropertyCompany.vue
@@ -1,10 +1,5 @@
 <template>
-  <el-dialog 
-    :title="$t('propertyCompanyManage.edit')" 
-    :visible.sync="visible" 
-    width="70%"
-    @close="handleClose"
-  >
+  <el-dialog :title="$t('propertyCompanyManage.edit')" :visible.sync="visible" width="40%" @close="handleClose">
     <el-form ref="form" :model="formData" label-width="120px">
       <el-form-item :label="$t('propertyCompanyManage.name')" prop="name" required>
         <el-input v-model="formData.name" />
@@ -19,12 +14,7 @@
         <el-input v-model="formData.corporation" />
       </el-form-item>
       <el-form-item :label="$t('propertyCompanyManage.foundingTime')" prop="foundingTime" required>
-        <el-date-picker
-          v-model="formData.foundingTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          style="width: 100%"
-        />
+        <el-date-picker v-model="formData.foundingTime" type="date" value-format="yyyy-MM-dd" style="width: 100%" />
       </el-form-item>
       <el-form-item :label="$t('propertyCompanyManage.landmark')" prop="nearbyLandmarks" required>
         <el-input v-model="formData.nearbyLandmarks" />
diff --git a/src/i18n/commonLang.js b/src/i18n/commonLang.js
index fe09ced..c14c9e5 100644
--- a/src/i18n/commonLang.js
+++ b/src/i18n/commonLang.js
@@ -55,6 +55,8 @@ export const messages = {
         examine:'Examine',
         audit:'Audit',
         choose:'Choose',
+        submitSuccess:'Submit successfully',
+        saveSuccess:'successfully',
       }
     },
     zh: {
@@ -113,6 +115,8 @@ export const messages = {
         examine:'审核',
         audit:'审核',
         choose:'选择',
+        submitSuccess:'提交成功',
+        saveSuccess:'成功',
       }
     }
   } 
\ No newline at end of file
diff --git a/src/views/contract/contractChangeDetailLang.js b/src/views/contract/contractChangeDetailLang.js
index 4d4e498..3ebb09d 100644
--- a/src/views/contract/contractChangeDetailLang.js
+++ b/src/views/contract/contractChangeDetailLang.js
@@ -56,18 +56,6 @@ export const messages = {
       squareMeters: 'Square Meters',
       confirmDelete: 'Are you sure to delete this room?'
     },
-    searchRoom: {
-      title: 'Select Room',
-      buildingNo: 'Building No',
-      buildingNoPlaceholder: 'Input building number',
-      roomNo: 'Room No',
-      roomNoPlaceholder: 'Input room number',
-      roomId: 'Room ID',
-      building: 'Building',
-      unit: 'Unit',
-      room: 'Room',
-      floorUnit: 'Floor'
-    },
     purchaseApprovers: {
       title: 'Approver Information',
       orgName: 'Organization',
@@ -152,18 +140,6 @@ export const messages = {
       squareMeters: '平方米',
       confirmDelete: '确定删除该房屋吗？'
     },
-    searchRoom: {
-      title: '选择房屋',
-      buildingNo: '楼栋编号',
-      buildingNoPlaceholder: '输入楼栋编号',
-      roomNo: '房屋编号',
-      roomNoPlaceholder: '输入房屋编号',
-      roomId: '房屋ID',
-      building: '号楼',
-      unit: '单元',
-      room: '室',
-      floorUnit: '层'
-    },
     purchaseApprovers: {
       title: '审批人信息',
       orgName: '所属组织',
diff --git a/src/views/owner/ownerBindRoom.vue b/src/views/owner/ownerBindRoom.vue
index 8039451..9d7f7b3 100644
--- a/src/views/owner/ownerBindRoom.vue
+++ b/src/views/owner/ownerBindRoom.vue
@@ -58,7 +58,7 @@
         <search-room ref="searchRoomRef" :roomFlag="2" @chooseRoom="handleChooseRoom" />
     </div>
 </template>
-  
+
 <script>
 import { sellRoom } from '@/api/owner/roomBindOwnerApi'
 import { getCommunityId } from '@/api/community/communityApi'
@@ -174,7 +174,7 @@ export default {
     }
 }
 </script>
-  
+
 <style scoped>
 .room-bind-owner-container {
     padding: 20px;
diff --git a/src/views/owner/ownerDetail.vue b/src/views/owner/ownerDetail.vue
index afcf408..df10e29 100644
--- a/src/views/owner/ownerDetail.vue
+++ b/src/views/owner/ownerDetail.vue
@@ -117,7 +117,7 @@
       </el-row>
     </div>
 
-    <divider/>
+    <divider />
 
     <div class="margin-top-sm">
       <el-tabs v-model="ownerDetailInfo._currentTab" @tab-click="changeTab(ownerDetailInfo._currentTab)">
diff --git a/src/views/owner/ownerDetailLang.js b/src/views/owner/ownerDetailLang.js
index c3c9bb1..3138d2b 100644
--- a/src/views/owner/ownerDetailLang.js
+++ b/src/views/owner/ownerDetailLang.js
@@ -223,6 +223,80 @@ export const messages = {
       unused: 'Unused',
       used: 'Used',
       effectiveTime: 'Effective Time'
+    },
+    addOwnerMember: {
+      title: 'Add Member',
+      personRole: 'Person Role',
+      name: 'Name',
+      link: 'Phone',
+      sex: 'Gender',
+      concactLink: 'Alternate Phone',
+      address: 'Address',
+      idCard: 'ID Card',
+      remark: 'Remark',
+      photo: 'Photo',
+      uploadPhoto: 'Upload Photo',
+      placeholder: {
+        personRole: 'Required, please select person role',
+        name: 'Required, please enter name',
+        link: 'Required, please enter phone number',
+        sex: 'Required, please select gender',
+        concactLink: 'Optional, please enter alternate phone',
+        address: 'Optional, please enter address',
+        idCard: 'Optional, please enter ID card',
+        remark: 'Optional, please enter remark'
+      },
+      role: {
+        tenant: 'Tenant',
+        family: 'Family Member',
+        staff: 'Company Staff',
+        other: 'Other'
+      },
+      validate: {
+        nameLength: 'Name length must be between 2 and 64 characters',
+        phoneFormat: 'Invalid phone number format',
+        idCardFormat: 'Invalid ID card format',
+        remarkLength: 'Remark length cannot exceed 200 characters',
+        photoSize: 'Photo size cannot exceed 2MB'
+      },
+      uploadFailed: 'Photo upload failed'
+    },
+    editOwnerMember: {
+      title: 'Edit Member',
+      personRole: 'Person Role',
+      name: 'Name',
+      link: 'Phone',
+      sex: 'Gender',
+      concactLink: 'Alternate Phone',
+      address: 'Address',
+      idCard: 'ID Card',
+      remark: 'Remark',
+      photo: 'Photo',
+      uploadPhoto: 'Upload Photo',
+      placeholder: {
+        personRole: 'Required, please select person role',
+        name: 'Required, please enter name',
+        link: 'Required, please enter phone number',
+        sex: 'Required, please select gender',
+        concactLink: 'Optional, please enter alternate phone',
+        address: 'Optional, please enter address',
+        idCard: 'Optional, please enter ID card',
+        remark: 'Optional, please enter remark'
+      },
+      role: {
+        tenant: 'Tenant',
+        family: 'Family Member',
+        staff: 'Company Staff',
+        other: 'Other'
+      },
+      validate: {
+        nameLength: 'Name length must be between 2 and 64 characters',
+        phoneFormat: 'Invalid phone number format',
+        idCardFormat: 'Invalid ID card format',
+        remarkLength: 'Remark length cannot exceed 200 characters',
+        photoSize: 'Photo size cannot exceed 2MB'
+      },
+      uploadFailed: 'Photo upload failed'
     }
   },
   zh: {
@@ -449,6 +523,80 @@ export const messages = {
       unused: '未使用',
       used: '已使用',
       effectiveTime: '生效时间'
+    },
+    addOwnerMember: {
+      title: '添加成员',
+      personRole: '人员角色',
+      name: '客户名称',
+      link: '联系手机',
+      sex: '性别',
+      concactLink: '备用手机',
+      address: '地址',
+      idCard: '身份证',
+      remark: '备注',
+      photo: '照片',
+      uploadPhoto: '上传照片',
+      placeholder: {
+        personRole: '必填，请选择人员角色',
+        name: '必填，请填写客户名称',
+        link: '必填，请填写联系方式',
+        sex: '必填，请选择性别',
+        concactLink: '可选，请填写备用手机',
+        address: '可填，请填写地址',
+        idCard: '可选，请填写身份证',
+        remark: '可填，请填写备注'
+      },
+      role: {
+        tenant: '租客',
+        family: '家庭成员',
+        staff: '公司员工',
+        other: '其他'
+      },
+      validate: {
+        nameLength: '姓名长度必须在2位至64位',
+        phoneFormat: '手机号格式错误',
+        idCardFormat: '身份证格式不对',
+        remarkLength: '备注长度不能超过200位',
+        photoSize: '图片大小不能超过2MB'
+      },
+      uploadFailed: '照片上传失败'
+    },
+    editOwnerMember: {
+      title: '修改成员',
+      personRole: '人员角色',
+      name: '客户名称',
+      link: '联系手机',
+      sex: '性别',
+      concactLink: '备用手机',
+      address: '地址',
+      idCard: '身份证',
+      remark: '备注',
+      photo: '照片',
+      uploadPhoto: '上传照片',
+      placeholder: {
+        personRole: '必填，请选择人员角色',
+        name: '必填，请填写客户名称',
+        link: '必填，请填写联系方式',
+        sex: '必填，请选择性别',
+        concactLink: '可选，请填写备用手机',
+        address: '可填，请填写地址',
+        idCard: '可选，请填写身份证',
+        remark: '可填，请填写备注'
+      },
+      role: {
+        tenant: '租客',
+        family: '家庭成员',
+        staff: '公司员工',
+        other: '其他'
+      },
+      validate: {
+        nameLength: '姓名长度必须在2位至64位',
+        phoneFormat: '手机号格式错误',
+        idCardFormat: '身份证格式不对',
+        remarkLength: '备注长度不能超过200位',
+        photoSize: '图片大小不能超过2MB'
+      },
+      uploadFailed: '照片上传失败'
     }
   }
 }
\ No newline at end of file
diff --git a/src/views/room/addRoomViewList.vue b/src/views/room/addRoomViewList.vue
index 7c33f31..141a200 100644
--- a/src/views/room/addRoomViewList.vue
+++ b/src/views/room/addRoomViewList.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="add-room-view-container">
     <el-card class="box-card">
-      <div slot="header" class="clearfix">
-        <h5>{{ $t('addRoomView.title') }}</h5>
+      <div slot="header" class="flex justify-between ">
+        <div>{{ $t('addRoomView.title') }}</div>
         <div class="ibox-tools">
           <el-button type="primary" size="small" @click="_goBack">
             <i class="el-icon-close"></i>{{ $t('common.back') }}
diff --git a/src/views/room/shopsList.vue b/src/views/room/shopsList.vue
index 1e7ac9d..a1e905b 100644
--- a/src/views/room/shopsList.vue
+++ b/src/views/room/shopsList.vue
@@ -129,7 +129,7 @@
     <add-shops ref="addDialog" @success="loadData"></add-shops>
     <bind-owner-shops ref="bindDialog" @success="loadData"></bind-owner-shops>
     <edit-shops ref="editDialog" @success="loadData"></edit-shops>
-    <delete-room ref="deleteDialog" @success="loadData"></delete-room>
+    <delete-room ref="deleteDialog" @handleRefreshRoom="loadData"></delete-room>
   </div>
 </template>
 
diff --git a/src/views/store/propertyCompanyManageList.vue b/src/views/store/propertyCompanyManageList.vue
index 39d5aa7..93eef0f 100644
--- a/src/views/store/propertyCompanyManageList.vue
+++ b/src/views/store/propertyCompanyManageList.vue
@@ -7,25 +7,13 @@
       </div>
       <el-row :gutter="20">
         <el-col :span="6">
-          <el-input
-            v-model="searchForm.storeId"
-            :placeholder="$t('propertyCompanyManage.enterStoreId')"
-            clearable
-          />
+          <el-input v-model="searchForm.storeId" :placeholder="$t('propertyCompanyManage.enterStoreId')" clearable />
         </el-col>
         <el-col :span="6">
-          <el-input
-            v-model="searchForm.name"
-            :placeholder="$t('propertyCompanyManage.enterName')"
-            clearable
-          />
+          <el-input v-model="searchForm.name" :placeholder="$t('propertyCompanyManage.enterName')" clearable />
         </el-col>
         <el-col :span="6">
-          <el-input
-            v-model="searchForm.tel"
-            :placeholder="$t('propertyCompanyManage.enterTel')"
-            clearable
-          />
+          <el-input v-model="searchForm.tel" :placeholder="$t('propertyCompanyManage.enterTel')" clearable />
         </el-col>
         <el-col :span="6">
           <el-button type="primary" @click="handleSearch">
@@ -63,7 +51,7 @@
               <el-button size="mini" @click="handleEdit(scope.row)">
                 {{ $t('propertyCompanyManage.edit') }}
               </el-button>
-              <el-button size="mini"  @click="handleDelete(scope.row)">
+              <el-button size="mini" @click="handleDelete(scope.row)">
                 {{ $t('propertyCompanyManage.delete') }}
               </el-button>
               <el-button size="mini" @click="handleManageCommunity(scope.row)">
@@ -74,18 +62,10 @@
               <el-button size="mini" @click="handleAdminLogin(scope.row)">
                 {{ $t('propertyCompanyManage.login') }}
               </el-button>
-              <el-button 
-                size="mini" 
-                v-if="scope.row.state !== '48002'" 
-                @click="handleUpdateState(scope.row, '48002')"
-              >
+              <el-button size="mini" v-if="scope.row.state !== '48002'" @click="handleUpdateState(scope.row, '48002')">
                 {{ $t('propertyCompanyManage.restrictLogin') }}
               </el-button>
-              <el-button 
-                size="mini" 
-                v-else 
-                @click="handleUpdateState(scope.row, '48001')"
-              >
+              <el-button size="mini" v-else @click="handleUpdateState(scope.row, '48001')">
                 {{ $t('propertyCompanyManage.restoreLogin') }}
               </el-button>
               <el-button size="mini" @click="handleResetPwd(scope.row)">
@@ -101,15 +81,9 @@
           <div class="tip">{{ $t('propertyCompanyManage.tip') }}</div>
         </el-col>
         <el-col :span="12">
-          <el-pagination
-            :current-page="pagination.current"
-            :page-sizes="[10, 20, 30, 50]"
-            :page-size="pagination.size"
-            :total="pagination.total"
-            layout="total, sizes, prev, pager, next, jumper"
-            @size-change="handleSizeChange"
-            @current-change="handlePageChange"
-          />
+          <el-pagination :current-page="pagination.current" :page-sizes="[10, 20, 30, 50]" :page-size="pagination.size"
+            :total="pagination.total" layout="total, sizes, prev, pager, next, jumper" @size-change="handleSizeChange"
+            @current-change="handlePageChange" />
         </el-col>
       </el-row>
     </el-card>
--
libgit2 0.21.4