From b550a0c64b51cb8b7931ade7a8115408c075772a Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Thu, 21 Aug 2025 11:36:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=88=BF=E4=BA=A7=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5,=E9=94=99=E8=AF=AF=E4=B8=8D=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/org/orgApi.js                         |  4 +-
 src/api/room/importOwnerRoomApi.js            |  2 +-
 src/components/org/DeleteOrg.vue              |  3 +
 src/components/org/DeleteOrgRelStaff.vue      | 79 +++++++++----------
 src/components/room/importOwnerRoom.vue       |  2 +-
 src/views/machine/addEquipmentAccountList.vue | 14 ++--
 src/views/org/orgList.vue                     |  2 +-
 7 files changed, 55 insertions(+), 51 deletions(-)

diff --git a/src/api/org/orgApi.js b/src/api/org/orgApi.js
index 5fe96e919..c01f19928 100644
--- a/src/api/org/orgApi.js
+++ b/src/api/org/orgApi.js
@@ -103,7 +103,7 @@ export function deleteOrg(data) {
       if (res.code == 0) {
         resolve(res)
       } else {
-        reject(new Error(res.msg || '删除组织失败'))
+        reject(res.msg)
       }
     }).catch(error => {
       reject(error)
@@ -180,7 +180,7 @@ export function deleteOrgRelStaff(data) {
       if (res.code == 0) {
         resolve(res)
       } else {
-        reject(new Error(res.msg || '删除员工与组织关系失败'))
+        reject(res.msg)
       }
     }).catch(error => {
       reject(error)
diff --git a/src/api/room/importOwnerRoomApi.js b/src/api/room/importOwnerRoomApi.js
index bd486a2f3..641e38330 100644
--- a/src/api/room/importOwnerRoomApi.js
+++ b/src/api/room/importOwnerRoomApi.js
@@ -12,7 +12,7 @@ export function importOwnerRoom(formData) {
     }).then(response => {
       resolve(response)
     }).catch(error => {
-      reject(error)
+      reject(error.response.data)
     })
   })
 }
\ No newline at end of file
diff --git a/src/components/org/DeleteOrg.vue b/src/components/org/DeleteOrg.vue
index b1292b36c..140733cb5 100644
--- a/src/components/org/DeleteOrg.vue
+++ b/src/components/org/DeleteOrg.vue
@@ -36,6 +36,9 @@
           this.$message.success(this.$t('org.deleteSuccess'))
           this.visible = false
           this.$emit('refresh')
+        },error => {
+          console.log(error)
+          this.$message.error(error)
         })
       }
     }
diff --git a/src/components/org/DeleteOrgRelStaff.vue b/src/components/org/DeleteOrgRelStaff.vue
index 1514323d7..a7cf9a154 100644
--- a/src/components/org/DeleteOrgRelStaff.vue
+++ b/src/components/org/DeleteOrgRelStaff.vue
@@ -1,44 +1,43 @@
 <template>
-    <el-dialog
-      :title="$t('org.confirmOperation')"
-      :visible.sync="visible"
-      width="30%"
-    >
-      <span>{{ $t('org.confirmDeleteRelStaff') }}</span>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="visible = false">{{ $t('org.cancelDelete') }}</el-button>
-        <el-button type="primary" @click="handleConfirm">{{ $t('org.confirm') }}</el-button>
-      </span>
-    </el-dialog>
-  </template>
-  
-  <script>
-  import { deleteOrgRelStaff } from '@/api/org/orgApi'
-  
-  export default {
-    name: 'DeleteOrgRelStaff',
-    data() {
-      return {
-        visible: false,
-        currentStaff: null
-      }
+  <el-dialog :title="$t('common.confirm')" :visible.sync="visible" width="30%">
+    <span>{{ $t('org.confirmDelete') }}</span>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible = false">{{ $t('common.cancel') }}</el-button>
+      <el-button type="primary" @click="handleConfirm">{{ $t('common.confirm') }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { deleteOrgRelStaff } from '@/api/org/orgApi'
+
+export default {
+  name: 'DeleteOrgRelStaff',
+  data() {
+    return {
+      visible: false,
+      currentStaff: null
+    }
+  },
+  methods: {
+    show(staff) {
+      this.currentStaff = staff
+      this.visible = true
     },
-    methods: {
-      show(staff) {
-        this.currentStaff = staff
-        this.visible = true
-      },
-      handleConfirm() {
-        deleteOrgRelStaff({
-          staffId: this.currentStaff.userId,
-          orgId: this.currentStaff.orgId
-        }).then(response => {
-            console.log(response)
-          this.$message.success(this.$t('org.deleteSuccess'))
-          this.visible = false
-          this.$emit('refresh')
-        })
-      }
+    handleConfirm() {
+      deleteOrgRelStaff({
+        staffId: this.currentStaff.userId,
+        orgId: this.currentStaff.orgId
+      }).then(response => {
+        console.log(response)
+        this.$message.success(this.$t('org.deleteSuccess'))
+        this.visible = false
+        this.$emit('refresh')
+      },error => {
+        console.log(error)
+        this.$message.error(error)
+      })
     }
   }
-  </script>
\ No newline at end of file
+}
+</script>
\ No newline at end of file
diff --git a/src/components/room/importOwnerRoom.vue b/src/components/room/importOwnerRoom.vue
index 5e52978fe..ba7c29309 100644
--- a/src/components/room/importOwnerRoom.vue
+++ b/src/components/room/importOwnerRoom.vue
@@ -102,7 +102,7 @@ export default {
           }
         })
       } catch (error) {
-        this.$message.error(this.$t('room.importOwnerRoom.importError'))
+        this.$message.error(error)
       }
     },
   }
diff --git a/src/views/machine/addEquipmentAccountList.vue b/src/views/machine/addEquipmentAccountList.vue
index 0568a9db5..2fa4ab034 100644
--- a/src/views/machine/addEquipmentAccountList.vue
+++ b/src/views/machine/addEquipmentAccountList.vue
@@ -37,8 +37,8 @@
                 <el-form-item :label="$t('addEquipmentAccount.state')" prop="state" required>
                   <el-select v-model="addEquipmentAccountInfo.state"
                     :placeholder="$t('addEquipmentAccount.statePlaceholder')" style="width:100%">
-                    <el-option v-for="(item, index) in addEquipmentAccountInfo.useStatus" :key="index" :label="item.name"
-                      :value="item.statusCd" />
+                    <el-option v-for="(item, index) in addEquipmentAccountInfo.useStatus" :key="index"
+                      :label="item.name" :value="item.statusCd" />
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -77,14 +77,16 @@
             <el-row :gutter="20">
               <el-col :span="12">
                 <el-form-item :label="$t('addEquipmentAccount.firstEnableTime')">
-                  <el-date-picker v-model="addEquipmentAccountInfo.firstEnableTime" type="date" value-format="yyyy-MM-dd"
-                    :placeholder="$t('addEquipmentAccount.firstEnableTimePlaceholder')" style="width:100%" />
+                  <el-date-picker v-model="addEquipmentAccountInfo.firstEnableTime" type="date"
+                    value-format="yyyy-MM-dd" :placeholder="$t('addEquipmentAccount.firstEnableTimePlaceholder')"
+                    style="width:100%" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item :label="$t('addEquipmentAccount.warrantyDeadline')">
-                  <el-date-picker v-model="addEquipmentAccountInfo.warrantyDeadline" type="date" value-format="yyyy-MM-dd"
-                    :placeholder="$t('addEquipmentAccount.warrantyDeadlinePlaceholder')" style="width:100%" />
+                  <el-date-picker v-model="addEquipmentAccountInfo.warrantyDeadline" type="date"
+                    value-format="yyyy-MM-dd" :placeholder="$t('addEquipmentAccount.warrantyDeadlinePlaceholder')"
+                    style="width:100%" />
                 </el-form-item>
               </el-col>
             </el-row>
diff --git a/src/views/org/orgList.vue b/src/views/org/orgList.vue
index 07553c58c..a0270d50f 100644
--- a/src/views/org/orgList.vue
+++ b/src/views/org/orgList.vue
@@ -119,7 +119,7 @@ export default {
       this.$refs.orgRelStaff.show(this.orgId);
     },
     openDeleteOrgRelStaff(staff) {
-      this.$refs.deleteOrgRelStaff.open(staff);
+      this.$refs.deleteOrgRelStaff.show(staff);
     },
     toStaffDetail(staff) {
       this.$router.push(`/views/staff/staffDetail?staffId=${staff.userId}`)