From 97bd43c4d9f4df55365e4634de347f2ac13145af Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 26 十二月 2024 14:33:10 +0800
Subject: [PATCH] 修改人员bug

---
 src/components/do/a6-personnel/personnel-capacity.vue |   34 +++++++++++++++++++++++++++-------
 1 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/src/components/do/a6-personnel/personnel-capacity.vue b/src/components/do/a6-personnel/personnel-capacity.vue
index cde9fe9..58c9435 100644
--- a/src/components/do/a6-personnel/personnel-capacity.vue
+++ b/src/components/do/a6-personnel/personnel-capacity.vue
@@ -297,7 +297,7 @@
           }
         }, {
           label: '纭浜�',
-          prop: 'confirmOperatingPersonnelId',
+          prop: 'confirmOperatingPersonnelName',
           minWidth: '100'
         }, {
           label: '纭鏃ユ湡',
@@ -394,13 +394,33 @@
     downLoadPost(row) {
       this.$axios.get(this.$api.personnel.exportPersonnelCapacity + '?id=' + row.id,{responseType: "blob"}).then(res => {
         this.outLoading = false
-        this.$message.success('瀵煎嚭鎴愬姛')
         const blob = new Blob([res],{ type: 'application/msword' });
-        const url = URL.createObjectURL(blob);
-        const link = document.createElement('a');
-        link.href = url;
-        link.download = "浜哄憳鑳藉姏瀵煎嚭" + '.docx';
-        link.click();
+        //灏咮lob 瀵硅薄杞崲鎴愬瓧绗︿覆
+        let reader = new FileReader();
+        reader.readAsText(blob, 'utf-8');
+        reader.onload = () => {
+          try {
+            let result = JSON.parse(reader.result);
+            if (result.message) {
+              this.$message.error(result.message);
+            } else {
+              const url = URL.createObjectURL(blob);
+              const link = document.createElement('a');
+              link.href = url;
+              link.download = "浜哄憳鑳藉姏瀵煎嚭" + '.docx';
+              link.click();
+              this.$message.success('瀵煎嚭鎴愬姛')
+            }
+          } catch (err) {
+            console.log(err);
+            const url = URL.createObjectURL(blob);
+            const link = document.createElement('a');
+            link.href = url;
+            link.download = "浜哄憳鑳藉姏瀵煎嚭" + '.docx';
+            link.click();
+            this.$message.success('瀵煎嚭鎴愬姛')
+          }
+        }
       })
     },
     // 鏌ヨ

--
Gitblit v1.9.3