From 69e184721c0d038ad5b11083b5ee505c5a0789d6 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Thu, 7 Aug 2025 19:12:48 +0800
Subject: [PATCH] =?UTF-8?q?v1.9=20=E5=91=98=E5=B7=A5=E5=A4=B4=E5=83=8F?=
 =?UTF-8?q?=E4=B8=8D=E5=AF=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/owner/addOwner.vue   |  4 +-
 src/components/owner/editOwner.vue  |  4 +-
 src/components/staff/editStaff.vue  | 67 +++++++++++++++++------------
 src/i18n/commonLang.js              |  6 ++-
 src/views/org/orgList.vue           |  2 +-
 src/views/staff/staffDetailList.vue |  6 +--
 6 files changed, 51 insertions(+), 38 deletions(-)

diff --git a/src/components/owner/addOwner.vue b/src/components/owner/addOwner.vue
index 7cd58ba38..27fe21014 100644
--- a/src/components/owner/addOwner.vue
+++ b/src/components/owner/addOwner.vue
@@ -197,10 +197,10 @@ export default {
       const isLt2M = file.size / 1024 / 1024 < 2
 
       if (!isJPG) {
-        this.$message.error(this.$t('listOwner.upload.jpgOnly'))
+        this.$message.error(this.$t('common.jpgOnly'))
       }
       if (!isLt2M) {
-        this.$message.error(this.$t('listOwner.upload.sizeLimit'))
+        this.$message.error(this.$t('common.sizeLimit'))
       }
       return isJPG && isLt2M
     },
diff --git a/src/components/owner/editOwner.vue b/src/components/owner/editOwner.vue
index 787c5f126..85a244e86 100644
--- a/src/components/owner/editOwner.vue
+++ b/src/components/owner/editOwner.vue
@@ -208,10 +208,10 @@ export default {
       const isLt2M = file.size / 1024 / 1024 < 2
 
       if (!isJPG) {
-        this.$message.error(this.$t('listOwner.upload.jpgOnly'))
+        this.$message.error(this.$t('common.jpgOnly'))
       }
       if (!isLt2M) {
-        this.$message.error(this.$t('listOwner.upload.sizeLimit'))
+        this.$message.error(this.$t('common.sizeLimit'))
       }
       return isJPG && isLt2M
     },
diff --git a/src/components/staff/editStaff.vue b/src/components/staff/editStaff.vue
index 24478000f..0663058bc 100644
--- a/src/components/staff/editStaff.vue
+++ b/src/components/staff/editStaff.vue
@@ -30,16 +30,13 @@
           </el-form-item>
         </el-col>
         <el-col :span="12" style="text-align: center">
-          <el-image style="width: 200px; height: 200px" :src="editStaffInfo.photoUrl" fit="cover">
-            <div slot="error" class="image-slot">
-              <i class="el-icon-picture-outline"></i>
-            </div>
-          </el-image>
-          <div style="margin-top: 20px">
-            <el-upload action="" :auto-upload="false" :show-file-list="false" :on-change="handlePhotoChange">
-              <el-button type="primary">{{ $t('staff.uploadPhoto') }}</el-button>
-            </el-upload>
-          </div>
+          <el-image style="width: 200px; height: 150px; border: 1px dashed #ccc;"
+            :src="editStaffInfo.photoUrl || '/img/noPhoto.jpg'" fit="cover" />
+          <el-upload class="mt-10" :show-file-list="false" :before-upload="beforeUpload" :http-request="uploadImage" action="">
+            <el-button size="small" type="primary">
+              {{ $t('common.upload') }}
+            </el-button>
+          </el-upload>
         </el-col>
       </el-row>
     </el-form>
@@ -53,6 +50,8 @@
 <script>
 import { modifyStaff } from '@/api/staff/staffApi'
 import { getDict } from '../../api/community/communityApi'
+import { uploadImage } from '@/api/owner/ownerApi'
+
 
 export default {
   name: 'EditStaff',
@@ -95,7 +94,6 @@ export default {
           this.editStaffInfo = {
             ...val,
             username: val.name,
-            photoUrl: val.faceUrl || '/img/noPhoto.jpg'
           }
         }
       }
@@ -103,11 +101,17 @@ export default {
   },
   methods: {
     open(row) {
+      let _url =  '/img/noPhoto.jpg'
+      if(row.urls && row.urls.length > 0){
+        _url = row.urls[0]
+      }
       this.editStaffInfo = {
         ...row,
         username: row.name,
-        photoUrl: row.faceUrl || '/img/noPhoto.jpg'
+        photo: _url
       }
+      this.editStaffInfo.photoUrl = row.photoUrl || '/img/noPhoto.jpg'
+      console.log(this.editStaffInfo.photoUrl)
       this.getRelCd()
       this.visible = true
       
@@ -120,21 +124,6 @@ export default {
     handleClose() {
       this.visible = false
     },
-    handlePhotoChange(file) {
-      if (file.size > 2 * 1024 * 1024) {
-        this.$message.error(this.$t('staff.photoSizeLimit'))
-        return false
-      }
-
-      const reader = new FileReader()
-      reader.onload = (e) => {
-        this.editStaffInfo.photoUrl = e.target.result
-        // Here you would typically upload the file to server
-        // and set editStaffInfo.photo to the returned file ID
-        this.editStaffInfo.photo = file.uid // Temporary, replace with actual file ID
-      }
-      reader.readAsDataURL(file.raw)
-    },
     validateForm() {
       if (!this.editStaffInfo.username) {
         this.$message.error(this.$t('staff.requiredName'))
@@ -175,7 +164,29 @@ export default {
       } finally {
         this.loading = false
       }
-    }
+    },
+    beforeUpload(file) {
+      const isJPG = file.type === 'image/jpeg'
+      const isLt2M = file.size / 1024 / 1024 < 2
+
+      if (!isJPG) {
+        this.$message.error(this.$t('common.jpgOnly'))
+      }
+      if (!isLt2M) {
+        this.$message.error(this.$t('common.sizeLimit'))
+      }
+      return isJPG && isLt2M
+    },
+    async uploadImage({ file }) {
+      try {
+        const res = await uploadImage({ file })
+        this.editStaffInfo.photo = res.fileId
+        this.editStaffInfo.photoUrl = res.url
+        this.$forceUpdate()
+      } catch (error) {
+        this.$message.error(this.$t('listOwner.upload.failed'))
+      }
+    },
   }
 }
 </script>
diff --git a/src/i18n/commonLang.js b/src/i18n/commonLang.js
index 4fadddf12..1971e741c 100644
--- a/src/i18n/commonLang.js
+++ b/src/i18n/commonLang.js
@@ -65,7 +65,8 @@ export const messages = {
         viewDetail:'View Detail',
         yuan:'yuan',
         process:'Process',
-
+        jpgOnly:'Only JPG files are allowed',
+        sizeLimit:'File size must be less than 2MB',
       }
     },
     zh: {
@@ -134,7 +135,8 @@ export const messages = {
         viewDetail:'查看详情',
         yuan:'元',
         process:'处理',
-
+        jpgOnly:'只允许上传JPG文件',
+        sizeLimit:'文件大小必须小于2MB',
       }
     }
   } 
\ No newline at end of file
diff --git a/src/views/org/orgList.vue b/src/views/org/orgList.vue
index 06340e043..07553c58c 100644
--- a/src/views/org/orgList.vue
+++ b/src/views/org/orgList.vue
@@ -29,7 +29,7 @@
             <el-table-column prop="address" :label="$t('org.address')" align="center" />
             <el-table-column prop="sex" :label="$t('org.gender')" align="center">
               <template #default="{ row }">
-                {{ row.sex === 0 ? '男' : '女' }}
+                {{ row.sex == 0 ? '男' : '女' }}
               </template>
             </el-table-column>
             <el-table-column :label="$t('org.operation')" align="center">
diff --git a/src/views/staff/staffDetailList.vue b/src/views/staff/staffDetailList.vue
index ff6055e64..1827cd1a9 100644
--- a/src/views/staff/staffDetailList.vue
+++ b/src/views/staff/staffDetailList.vue
@@ -12,7 +12,7 @@
           <div class="staff-info">
             <el-row :gutter="20">
               <el-col :span="4">
-                <el-image style="width: 120px; height: 140px; border-radius: 4px;" :src="staffDetailInfo.photo"
+                <el-image style="width: 120px; height: 140px; border-radius: 4px;" :src="staffDetailInfo.photoUrl"
                   fit="cover" @error="errorLoadImg">
                 </el-image>
               </el-col>
@@ -143,7 +143,7 @@ export default {
       this.$router.go(-1)
     },
     errorLoadImg() {
-      this.staffDetailInfo.photo = "/img/noPhoto.jpg"
+      this.staffDetailInfo.photoUrl = "/img/noPhoto.jpg"
     },
     async loadStaffDetail() {
       try {
@@ -155,7 +155,7 @@ export default {
         const res = await getStaffDetail(params)
         if ( res.staffs.length > 0) {
           Object.assign(this.staffDetailInfo, res.staffs[0])
-          this.staffDetailInfo.photo = res.staffs[0].faceUrl
+          this.staffDetailInfo.photoUrl = res.staffs[0].photoUrl
         }
       } catch (error) {
         this.$message.error(this.$t('staffDetailInfo.fetchError'))