From 911b5549950c1735829de32d9ac201352164c40d Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Sat, 19 Jul 2025 11:32:26 +0800
Subject: [PATCH] 修改平凉客户 反馈的bug 修复

---
 src/components/account/prestoreAccount.vue        | 47 +++++++++++++++++++----------------------------
 src/components/fee/prestoreAccount.vue            | 86 ++++++++++++++++++++++++++++++++++++++++++++------------------------------------------
 src/components/owner/addOwner.vue                 |  6 ++----
 src/components/owner/editOwner.vue                | 16 +++++++---------
 src/i18n/commonLang.js                            |  2 ++
 src/views/community/addCommunityPublicityLang.js  |  6 ++++--
 src/views/community/addCommunityPublicityList.vue | 52 ++++++++++++++--------------------------------------
 src/views/owner/listOwnerLang.js                  |  4 ++--
 8 files changed, 94 insertions(+), 125 deletions(-)

diff --git a/src/components/account/prestoreAccount.vue b/src/components/account/prestoreAccount.vue
index ee3004f..92d0c66 100644
--- a/src/components/account/prestoreAccount.vue
+++ b/src/components/account/prestoreAccount.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog :title="$t('prestoreAccount.title')" :visible.sync="visible" width="800px" @close="handleClose">
-    <el-form ref="form" :model="formData" label-width="120px">
+    <el-form ref="form" :model="formData" :rules="rules" label-width="120px">
       <el-form-item :label="$t('prestoreAccount.accountType')" prop="acctType" required>
         <el-select v-model="formData.acctType" class="w-full" :placeholder="$t('prestoreAccount.accountType')">
           <el-option v-for="(type, index) in acctTypes" :key="index" :label="type.name" :value="type.statusCd" />
@@ -8,8 +8,7 @@
       </el-form-item>
 
       <el-form-item :label="$t('prestoreAccount.ownerPhone')" prop="tel" required>
-        <el-input v-model="formData.tel" :placeholder="$t('prestoreAccount.ownerPhone')"
-          @blur="handleTelChange" />
+        <el-input v-model="formData.tel" :placeholder="$t('prestoreAccount.ownerPhone')" @blur="handleTelChange" />
       </el-form-item>
 
       <el-form-item :label="$t('prestoreAccount.ownerName')" prop="ownerId" required>
@@ -40,8 +39,7 @@
       </el-form-item>
 
       <el-form-item :label="$t('prestoreAccount.remark')" prop="remark">
-        <el-input v-model="formData.remark" type="textarea" :placeholder="$t('prestoreAccount.remark')"
-          :rows="3" />
+        <el-input v-model="formData.remark" type="textarea" :placeholder="$t('prestoreAccount.remark')" :rows="3" />
       </el-form-item>
     </el-form>
 
@@ -72,7 +70,15 @@ export default {
       acctTypes: [],
       primeRates: [],
       owners: [],
-      rooms: []
+      rooms: [],
+      rules: {
+        acctType: [{ required: true, message: this.$t('prestoreAccount.accountType'), trigger: 'change' }],
+        tel: [{ required: true, message: this.$t('prestoreAccount.ownerPhone'), trigger: 'blur' }],
+        ownerId: [{ required: true, message: this.$t('prestoreAccount.ownerName'), trigger: 'change' }],
+        roomId: [{ required: true, message: this.$t('prestoreAccount.deductionRoom'), trigger: 'change' }],
+        amount: [{ required: true, message: this.$t('prestoreAccount.prestoreAmount'), trigger: 'blur' }],
+        primeRate: [{ required: true, message: this.$t('prestoreAccount.paymentMethod'), trigger: 'change' }]
+      }
     }
   },
   methods: {
@@ -154,31 +160,16 @@ export default {
     },
 
     validateForm() {
-      const requiredFields = [
-        'ownerId', 'amount', 'acctType', 'primeRate'
-      ]
-
-      if (this.formData.acctType === '2004' || this.formData.acctType === '2005') {
-        requiredFields.push('roomId')
-      }
-
-      for (const field of requiredFields) {
-        if (!this.formData[field]) {
-          this.$message.warning(this.$t('prestoreAccount.placeholder' + field.charAt(0).toUpperCase() + field.slice(1)))
-          return false
-        }
-      }
-
-      if (!this.formData.amount) {
-        this.$message.warning(this.$t('prestoreAccount.placeholderAmount'))
-        return false
-      }
-
-      return true
+      return new Promise((resolve) => {
+        this.$refs.form.validate((valid) => {
+          resolve(valid)
+        })
+      })
     },
 
     async handleSave() {
-      if (!this.validateForm()) return
+      const valid = await this.validateForm()
+      if (!valid) return
 
       try {
         await ownerPrestoreAccount(this.formData)
diff --git a/src/components/fee/prestoreAccount.vue b/src/components/fee/prestoreAccount.vue
index c0bcbd9..2d44c74 100644
--- a/src/components/fee/prestoreAccount.vue
+++ b/src/components/fee/prestoreAccount.vue
@@ -4,8 +4,8 @@
     :visible.sync="dialogVisible"
     width="50%"
   >
-    <el-form :model="prestoreAccountInfo" label-width="120px">
-      <el-form-item :label="$t('prestoreAccount.accountType')" required>
+    <el-form :model="prestoreAccountInfo" :rules="rules" ref="form" label-width="120px">
+      <el-form-item :label="$t('prestoreAccount.accountType')" prop="acctType" required>
         <el-select
           v-model="prestoreAccountInfo.acctType"
           style="width: 100%"
@@ -24,7 +24,7 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item :label="$t('prestoreAccount.ownerPhone')" required>
+      <el-form-item :label="$t('prestoreAccount.ownerPhone')" prop="tel" required>
         <el-input
           v-model="prestoreAccountInfo.tel"
           :placeholder="$t('prestoreAccount.ownerPhonePlaceholder')"
@@ -32,7 +32,7 @@
         ></el-input>
       </el-form-item>
 
-      <el-form-item :label="$t('prestoreAccount.ownerName')" required>
+      <el-form-item :label="$t('prestoreAccount.ownerName')" prop="ownerId" required>
         <el-select
           v-model="prestoreAccountInfo.ownerId"
           style="width: 100%"
@@ -55,6 +55,7 @@
       <el-form-item
         v-if="prestoreAccountInfo.acctType == '2004' || prestoreAccountInfo.acctType == '2005'"
         :label="$t('prestoreAccount.deductionRoom')"
+        prop="roomId"
         required
       >
         <el-select v-model="prestoreAccountInfo.roomId" style="width: 100%">
@@ -72,14 +73,14 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item :label="$t('prestoreAccount.prestoreAmount')" required>
+      <el-form-item :label="$t('prestoreAccount.prestoreAmount')" prop="amount" required>
         <el-input
           v-model="prestoreAccountInfo.amount"
           :placeholder="$t('prestoreAccount.prestoreAmountPlaceholder')"
         ></el-input>
       </el-form-item>
 
-      <el-form-item :label="$t('prestoreAccount.paymentMethod')" required>
+      <el-form-item :label="$t('prestoreAccount.paymentMethod')" prop="primeRate" required>
         <el-select v-model="prestoreAccountInfo.primeRate" style="width: 100%">
           <el-option
             :label="$t('prestoreAccount.selectPaymentMethod')"
@@ -96,7 +97,7 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item :label="$t('prestoreAccount.remark')">
+      <el-form-item :label="$t('prestoreAccount.remark')" prop="remark">
         <el-input
           type="textarea"
           :rows="3"
@@ -136,7 +137,16 @@ export default {
         rooms: [],
         roomId: '',
       },
-      communityId: ''
+      communityId: '',
+      rules: {
+        acctType: [{ required: true, message: this.$t('prestoreAccount.selectAccountType'), trigger: 'change' }],
+        tel: [{ required: true, message: this.$t('prestoreAccount.ownerPhonePlaceholder'), trigger: 'blur' }],
+        ownerId: [{ required: true, message: this.$t('prestoreAccount.selectOwner'), trigger: 'change' }],
+        roomId: [{ required: true, message: this.$t('prestoreAccount.selectRoom'), trigger: 'change' }],
+        amount: [{ required: true, message: this.$t('prestoreAccount.prestoreAmountPlaceholder'), trigger: 'blur' }],
+        primeRate: [{ required: true, message: this.$t('prestoreAccount.selectPaymentMethod'), trigger: 'change' }],
+        remark: [{ max: 200, message: this.$t('prestoreAccount.validateRemark'), trigger: 'blur' }]
+      }
     }
   },
   created() {
@@ -171,44 +181,34 @@ export default {
       })
     },
     prestoreAccountValidate() {
-      if (!this.prestoreAccountInfo.ownerId) {
-        this.$message.error(this.$t('prestoreAccount.validateOwner'))
-        return false
-      }
-      if (!this.prestoreAccountInfo.amount) {
-        this.$message.error(this.$t('prestoreAccount.validateAmount'))
-        return false
-      }
-      if (!this.prestoreAccountInfo.acctType) {
-        this.$message.error(this.$t('prestoreAccount.validateAccountType'))
-        return false
-      }
-      if (this.prestoreAccountInfo.remark && this.prestoreAccountInfo.remark.length > 200) {
-        this.$message.error(this.$t('prestoreAccount.validateRemark'))
-        return false
-      }
-      return true
+      return new Promise((resolve) => {
+        this.$refs.form.validate((valid) => {
+          resolve(valid)
+        })
+      })
     },
     savePrestoreAccountInfo() {
-      if (!this.prestoreAccountValidate()) return
+      this.prestoreAccountValidate().then(valid => {
+        if (valid) {
+          const params = {
+            ...this.prestoreAccountInfo,
+            communityId: this.communityId
+          }
 
-      const params = {
-        ...this.prestoreAccountInfo,
-        communityId: this.communityId
-      }
-
-      ownerPrestoreAccount(params).then(response => {
-        if (response.code === 0) {
-          this.$message.success(this.$t('prestoreAccount.saveSuccess'))
-          this.dialogVisible = false
-          this.clearPrestoreAccountInfo()
-          this.$emit('save-success')
-        } else {
-          this.$message.error(response.msg)
+          ownerPrestoreAccount(params).then(response => {
+            if (response.code === 0) {
+              this.$message.success(this.$t('prestoreAccount.saveSuccess'))
+              this.dialogVisible = false
+              this.clearPrestoreAccountInfo()
+              this.$emit('save-success')
+            } else {
+              this.$message.error(response.msg)
+            }
+          }).catch(error => {
+            console.error('请求失败:', error)
+            this.$message.error(this.$t('prestoreAccount.saveFailed'))
+          })
         }
-      }).catch(error => {
-        console.error('请求失败:', error)
-        this.$message.error(this.$t('prestoreAccount.saveFailed'))
       })
     },
     clearPrestoreAccountInfo() {
@@ -226,6 +226,8 @@ export default {
         rooms: [],
         roomId: '',
       }
+      // 重置表单验证状态
+      this.$refs.form && this.$refs.form.resetFields()
     },
     _changeTel() {
       if (!this.prestoreAccountInfo.tel) return
diff --git a/src/components/owner/addOwner.vue b/src/components/owner/addOwner.vue
index 09a90e3..90e613e 100644
--- a/src/components/owner/addOwner.vue
+++ b/src/components/owner/addOwner.vue
@@ -152,8 +152,7 @@ export default {
       ],
       rules: {
         name: [
-          { required: true, message: this.$t('listOwner.rules.nameRequired'), trigger: 'blur' },
-          { min: 2, max: 64, message: this.$t('listOwner.rules.nameLength'), trigger: 'blur' }
+          { required: true, message: this.$t('listOwner.placeholders.name'), trigger: 'blur' },
         ],
         personType: [
           { required: true, message: this.$t('listOwner.rules.typeRequired'), trigger: 'change' }
@@ -162,8 +161,7 @@ export default {
           { required: true, message: this.$t('listOwner.rules.roleRequired'), trigger: 'change' }
         ],
         link: [
-          { required: true, message: this.$t('listOwner.rules.phoneRequired'), trigger: 'blur' },
-          { pattern: /^1[3-9]\d{9}$/, message: this.$t('listOwner.rules.phoneFormat'), trigger: 'blur' }
+          { required: true, message: this.$t('listOwner.placeholders.name'), trigger: 'blur' },
         ],
         sex: [
           { required: true, message: this.$t('listOwner.rules.genderRequired'), trigger: 'change' }
diff --git a/src/components/owner/editOwner.vue b/src/components/owner/editOwner.vue
index 08093e7..454deb9 100644
--- a/src/components/owner/editOwner.vue
+++ b/src/components/owner/editOwner.vue
@@ -5,7 +5,7 @@
         <el-col :span="12">
           <el-form-item :label="$t('listOwner.columns.type')" prop="personType">
             <el-select v-model="form.personType" style="width:100%">
-              <el-option v-for="(type,index) in personTypes" :key="index" :label="type.label" :value="type.value" />
+              <el-option v-for="(type, index) in personTypes" :key="index" :label="type.label" :value="type.value" />
             </el-select>
           </el-form-item>
 
@@ -153,21 +153,19 @@ export default {
       ],
       rules: {
         name: [
-          { required: true, message: this.$t('listOwner.rules.nameRequired'), trigger: 'blur' },
-          { min: 2, max: 64, message: this.$t('listOwner.rules.nameLength'), trigger: 'blur' }
+          { required: true, message: this.$t('listOwner.placeholders.name'), trigger: 'blur' },
         ],
         personType: [
-          { required: true, message: this.$t('listOwner.rules.typeRequired'), trigger: 'change' }
+          { required: true, message: this.$t('listOwner.placeholders.typeRequired'), trigger: 'change' }
         ],
         personRole: [
-          { required: true, message: this.$t('listOwner.rules.roleRequired'), trigger: 'change' }
+          { required: true, message: this.$t('listOwner.placeholders.roleRequired'), trigger: 'change' }
         ],
         link: [
-          { required: true, message: this.$t('listOwner.rules.phoneRequired'), trigger: 'blur' },
-          { pattern: /^1[3-9]\d{9}$/, message: this.$t('listOwner.rules.phoneFormat'), trigger: 'blur' }
+          { required: true, message: this.$t('listOwner.placeholders.phoneRequired'), trigger: 'blur' },
         ],
         sex: [
-          { required: true, message: this.$t('listOwner.rules.genderRequired'), trigger: 'change' }
+          { required: true, message: this.$t('listOwner.placeholders.genderRequired'), trigger: 'change' }
         ]
       }
     }
@@ -181,7 +179,7 @@ export default {
 
     async loadAttributes() {
       try {
-        const data = await getAttrSpecList({ page: 1, row: 100, tableName: 'building_owner_attr'})
+        const data = await getAttrSpecList({ page: 1, row: 100, tableName: 'building_owner_attr' })
         this.attrs = data.filter(item => item.specShow === 'Y')
 
         for (const attr of this.attrs) {
diff --git a/src/i18n/commonLang.js b/src/i18n/commonLang.js
index c298c56..b342f33 100644
--- a/src/i18n/commonLang.js
+++ b/src/i18n/commonLang.js
@@ -11,6 +11,7 @@ export const messages = {
         delete: 'Delete',
         confirm: 'Confirm',
         cancel: 'Cancel',
+        none: 'None',
         close: 'Close',
         back: 'Back',
         warning: 'Warning',
@@ -74,6 +75,7 @@ export const messages = {
         delete: '删除',
         confirm: '确定',
         cancel: '取消',
+        none: '无',
         close: '关闭',
         back: '返回',
         warning: '警告',
diff --git a/src/views/community/addCommunityPublicityLang.js b/src/views/community/addCommunityPublicityLang.js
index d1166ca..10cf36d 100644
--- a/src/views/community/addCommunityPublicityLang.js
+++ b/src/views/community/addCommunityPublicityLang.js
@@ -10,7 +10,8 @@ export const messages = {
       submit: 'Submit',
       requiredTitle: 'Required, please fill in the publicity title',
       requiredType: 'Required, please select publicity type',
-      requiredContent: 'Required, please enter announcement content'
+      requiredContent: 'Required, please enter announcement content',
+      requiredHeaderPhoto: 'Required, please upload header photo'
     }
   },
   zh: {
@@ -24,7 +25,8 @@ export const messages = {
       submit: '提交',
       requiredTitle: '必填，请填写公示标题',
       requiredType: '必填，请选择公示类型',
-      requiredContent: '必填，请输入公告内容'
+      requiredContent: '必填，请输入公告内容',
+      requiredHeaderPhoto: '必填，请上传头部照片'
     }
   }
 }
\ No newline at end of file
diff --git a/src/views/community/addCommunityPublicityList.vue b/src/views/community/addCommunityPublicityList.vue
index 37f166a..d9f7101 100644
--- a/src/views/community/addCommunityPublicityList.vue
+++ b/src/views/community/addCommunityPublicityList.vue
@@ -2,10 +2,7 @@
   <el-card class="add-publicity-container">
     <div slot="header" class="flex justify-between">
       <span>{{ $t('addCommunityPublicity.title') }}</span>
-      <el-button 
-        style="float: right; padding: 3px 0" 
-        type="text"
-        @click="goBack">
+      <el-button style="float: right; padding: 3px 0" type="text" @click="goBack">
         <i class="el-icon-close"></i>{{ $t('addCommunityPublicity.back') }}
       </el-button>
     </div>
@@ -13,55 +10,33 @@
     <el-form ref="form" :model="formData" label-width="120px">
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item 
-            :label="$t('addCommunityPublicity.pubTitle')" 
-            prop="title"
+          <el-form-item :label="$t('addCommunityPublicity.pubTitle')" prop="title"
             :rules="[{ required: true, message: $t('addCommunityPublicity.requiredTitle'), trigger: 'blur' }]">
-            <el-input 
-              v-model="formData.title" 
-              :placeholder="$t('addCommunityPublicity.requiredTitle')"
-              clearable>
+            <el-input v-model="formData.title" :placeholder="$t('addCommunityPublicity.requiredTitle')" clearable>
             </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item 
-            :label="$t('addCommunityPublicity.pubType')" 
-            prop="pubType"
+          <el-form-item :label="$t('addCommunityPublicity.pubType')" prop="pubType"
             :rules="[{ required: true, message: $t('addCommunityPublicity.requiredType'), trigger: 'change' }]">
-            <el-select 
-              v-model="formData.pubType" 
-              :placeholder="$t('addCommunityPublicity.requiredType')"
+            <el-select v-model="formData.pubType" :placeholder="$t('addCommunityPublicity.requiredType')"
               style="width: 100%">
-              <el-option 
-                v-for="item in pubTypes" 
-                :key="item.statusCd"
-                :label="item.name" 
-                :value="item.statusCd">
+              <el-option v-for="item in pubTypes" :key="item.statusCd" :label="item.name" :value="item.statusCd">
               </el-option>
             </el-select>
           </el-form-item>
         </el-col>
       </el-row>
 
-      <el-form-item 
-        :label="$t('addCommunityPublicity.headerPhoto')" 
-        prop="headerImg"
+      <el-form-item :label="$t('addCommunityPublicity.headerPhoto')" prop="headerImg"
         :rules="[{ required: true, message: $t('addCommunityPublicity.requiredHeaderPhoto'), trigger: 'change' }]">
-        <upload-image-url 
-          ref="uploadImage"
-          :image-count="1"
-          @notifyUploadCoverImage="handleImageUpload">
+        <upload-image-url ref="uploadImage" :image-count="1" @notifyUploadCoverImage="handleImageUpload">
         </upload-image-url>
       </el-form-item>
 
-      <el-form-item 
-        :label="$t('addCommunityPublicity.activityContent')" 
-        prop="context"
+      <el-form-item :label="$t('addCommunityPublicity.activityContent')" prop="context"
         :rules="[{ required: true, message: $t('addCommunityPublicity.requiredContent'), trigger: 'blur' }]">
-        <rich-text-editor
-          v-model="formData.context"
-          :height="300"
+        <rich-text-editor v-model="formData.context" :height="300"
           :placeholder="$t('addCommunityPublicity.requiredContent')">
         </rich-text-editor>
       </el-form-item>
@@ -76,8 +51,8 @@
 
 <script>
 import UploadImageUrl from '@/components/upload/UploadImageUrl'
-import {  saveCommunityPublicity } from '@/api/community/addCommunityPublicityApi'
-import { getCommunityId ,getDict} from '@/api/community/communityApi'
+import { saveCommunityPublicity } from '@/api/community/addCommunityPublicityApi'
+import { getCommunityId, getDict } from '@/api/community/communityApi'
 import richTextEditor from '@/components/editor/RichTextEditor'
 
 export default {
@@ -112,7 +87,7 @@ export default {
     },
     handleImageUpload(images) {
       if (images.length > 0) {
-        this.formData.headerImg = images[0]|| images[0]
+        this.formData.headerImg = images[0] || images[0]
       } else {
         this.formData.headerImg = ''
       }
@@ -152,6 +127,7 @@ export default {
 .add-publicity-container {
   margin: 20px;
 }
+
 .text-right {
   text-align: right;
 }
diff --git a/src/views/owner/listOwnerLang.js b/src/views/owner/listOwnerLang.js
index 128a7c3..0a98b97 100644
--- a/src/views/owner/listOwnerLang.js
+++ b/src/views/owner/listOwnerLang.js
@@ -14,7 +14,7 @@ export const messages = {
         personal: 'Personal',
         company: 'Company'
       },
-      personTypeName:'Person Type',
+      personTypeName: 'Person Type',
       gender: {
         male: 'Male',
         female: 'Female'
@@ -77,7 +77,7 @@ export const messages = {
         personal: '个人',
         company: '公司'
       },
-      personTypeName:'人员类型',
+      personTypeName: '人员类型',
       gender: {
         male: '男',
         female: '女'
--
libgit2 0.21.4