v1.9 业主相关bug

wuxw
1 parent a87d01dc
Showing 4 changed files with 17 additions and 28 deletions
src/components/owner/addOwnerMember.vue
src/components/owner/editOwner.vue
src/components/owner/editOwnerMember.vue
src/components/owner/ownerDetailMember.vue
 <template>
-  <el-dialog :title="$t('addOwnerMember.title')" :visible.sync="dialogVisible" width="80%"
+  <el-dialog :title="$t('addOwnerMember.title')" :visible.sync="dialogVisible" width="60%"
     @close="_closeSaveOwnerModal">
     <el-form :model="addOwnerMemberInfo" :rules="rules" ref="form" label-width="120px">
       <el-row :gutter="20">
@@ -112,7 +112,7 @@
  
 <script>
 import { getCommunityId } from '@/api/community/communityApi'
-import { getAttrValue } from '@/api/community/communityApi'
+import { getAttrValue } from '@/api/owner/ownerApi'
 import { uploadFile } from '@/api/staff/addStaffApi'
 import { getAttrSpecList } from '@/api/dev/attrSpecApi'
 import { saveOwnerMember } from '@/api/owner/addOwnerMemberApi'
@@ -194,7 +194,7 @@ export default {
               if (res.code === 0) {
                 this.$message.success(this.$t('common.saveSuccess'))
                 this.dialogVisible = false
-                this.$emit('save-success')
+                this.$emit('success')
               } else {
                 this.$message.error(res.data.msg || this.$t('common.saveFailed'))
               }
@@ -207,28 +207,17 @@ export default {
       })
     },
  
-    _loadOwnerAttrSpec() {
+    async _loadOwnerAttrSpec() {
       this.addOwnerMemberInfo.attrs = []
-      getAttrSpecList({ page: 1, row: 100, tableName: 'building_owner_attr' }).then(data => {
-        data.forEach(item => {
-          if (item.specShow === 'Y') {
-            item.value = ''
-            item.values = []
-            this._loadAttrValue(item.specCd, item.values)
-            this.addOwnerMemberInfo.attrs.push(item)
-          }
-        })
-      })
-    },
+      const { data } = await getAttrSpecList({ page: 1, row: 100, tableName: 'building_owner_attr' })
+      for (const attr of data) {
+        if (attr.specType === '3344') {
+          attr.values = await getAttrValue(attr.specCd)
+          attr.value = ''
+        }
+        this.addOwnerMemberInfo.attrs.push(attr)
  
-    _loadAttrValue(specCd, values) {
-      getAttrValue(specCd).then(data => {
-        data.forEach(item => {
-          if (item.valueShow === 'Y') {
-            values.push(item)
-          }
-        })
-      })
+      }
     },
  
     _uploadPhoto() {
@@ -243,7 +232,6 @@ export default {
           this.$message.error(this.$t('addOwnerMember.validate.photoSize'))
           return
         }
-
         this._doUploadImage(file)
       }
     },
@@ -173,6 +173,7 @@ export default {
   methods: {
     open(owner) {
       this.form = { ...owner }
+      this.form.ownerPhotoUrl = owner.faceUrl || '/img/noPhoto.jpg'
       this.visible = true
       this.loadAttributes()
     },
 <template>
-  <el-dialog :title="$t('editOwnerMember.title')" :visible.sync="dialogVisible" width="80%"
+  <el-dialog :title="$t('editOwnerMember.title')" :visible.sync="dialogVisible" width="60%"
     @close="_closeEditOwnerMemberModal">
     <el-form :model="editOwnerMemberInfo" :rules="rules" ref="form" label-width="120px">
       <el-row :gutter="20">
@@ -216,7 +216,7 @@ export default {
               if (res.code === 0) {
                 this.$message.success(this.$t('common.saveSuccess'))
                 this.dialogVisible = false
-                this.$emit('save-success')
+                this.$emit('success')
               } else {
                 this.$message.error(res.msg || this.$t('common.saveFailed'))
               }
@@ -55,8 +55,8 @@
       </el-pagination>
     </div>
  
-    <add-owner-member ref="addOwnerMember" @refresh="_loadOwnerDetailMemberData"></add-owner-member>
-    <edit-owner-member ref="editOwnerMember" @refresh="_loadOwnerDetailMemberData"></edit-owner-member>
+    <add-owner-member ref="addOwnerMember" @success="_loadOwnerDetailMemberData"></add-owner-member>
+    <edit-owner-member ref="editOwnerMember" @success="_loadOwnerDetailMemberData"></edit-owner-member>
     <delete-owner ref="deleteOwner" @refresh="_loadOwnerDetailMemberData" @success="_loadOwnerDetailMemberData"></delete-owner>
   </div>
 </template>