From 2da6a3b064cd531279fc93aed038927fcd53e5b3 Mon Sep 17 00:00:00 2001
From: gjh <1421wake>
Date: Fri, 11 Apr 2025 11:21:14 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=8C=87=E5=AE=9A?=
 =?UTF-8?q?=E9=98=B6=E6=AE=B5=E9=87=8D=E6=96=B0=E4=B8=8A=E4=BC=A0,?=
 =?UTF-8?q?=E4=BC=9A=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectLib/projectPlan/viewPlanDetail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/projectLib/projectPlan/viewPlanDetail.vue b/src/views/projectLib/projectPlan/viewPlanDetail.vue
index 54fb162..c3c0be4 100644
--- a/src/views/projectLib/projectPlan/viewPlanDetail.vue
+++ b/src/views/projectLib/projectPlan/viewPlanDetail.vue
@@ -268,7 +268,7 @@
           if (
             record.isfinish == 2 &&
             record.taskFile?.length > 0 &&
-            (record.taskName == '可研报告初稿编制' || record.taskName == '可研报告送审稿编制'||  record.taskName == '造价评估报告确认'|| record.taskName == '联合技术审查'|| record.taskName == '招标文件编制')
+            (record.taskName == '可研报告初稿编制' || record.taskName == '可研报告送审稿编制'||  record.taskName == '造价评估报告确认'|| record.taskName == '联合技术审查')
           ) {
             if (isShowByRoles('projectContact')) {
               return true;

From ce64d942065510ce5f20019892a52a2c23ae65c2 Mon Sep 17 00:00:00 2001
From: gjh <1421wake>
Date: Mon, 14 Apr 2025 17:02:10 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=8D=95=E8=8E=B7?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/common/api.ts                         | 7 ++++++-
 src/views/projectBoard/unfinishNode/index.vue | 5 ++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/api/common/api.ts b/src/api/common/api.ts
index da434a9..bd30436 100644
--- a/src/api/common/api.ts
+++ b/src/api/common/api.ts
@@ -15,7 +15,9 @@ import axios from 'axios';
  * @returns {*}
  */
 export const downloadFile = (url, fileName?, parameter?) => {
+
   return getFileblob(url, parameter).then((data) => {
+
     if (!data || data.size === 0) {
       message.warning('文件下载失败');
       return;
@@ -33,7 +35,10 @@ export const downloadFile = (url, fileName?, parameter?) => {
       document.body.removeChild(link); //下载完成移除元素
       window.URL.revokeObjectURL(url); //释放掉blob对象window.btoa(unescape(encodeURIComponent('我是一段需要处理的字符')))
     }
-  });
+  })
+  .catch(error=>{
+    message.error(error.message)
+  })
 };
 
 export const downloadonlinePreview = async (url, fileName,parameter) =>{
diff --git a/src/views/projectBoard/unfinishNode/index.vue b/src/views/projectBoard/unfinishNode/index.vue
index caf41ea..4451e95 100644
--- a/src/views/projectBoard/unfinishNode/index.vue
+++ b/src/views/projectBoard/unfinishNode/index.vue
@@ -35,6 +35,7 @@
   import { onMounted, ref, nextTick, computed } from 'vue';
   import { downloadFile } from '@/api/common/api';
   import dayjs from 'dayjs';
+import { message } from 'ant-design-vue';
   const tableLoading = ref(false);
   const btnLoading1 = ref(false);
   const btnLoading2 = ref(false);
@@ -109,7 +110,9 @@
     btnLoading2.value = true;
     downloadFile('/export/timeOutInfo', `评分表${nowTime.value}.xlsx`, {}).then((_) => {
       btnLoading2.value = false;
-    });
+    }).catch(err=>{
+      message.error(err.message);
+    })
   }
   function handleProjectResult() {
     btnLoading3.value = true;

From fa573438e97a7039e61bc83819536002812e897f Mon Sep 17 00:00:00 2001
From: gjh <1421wake>
Date: Wed, 23 Apr 2025 09:30:23 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=AD=90=E9=A1=B9=E7=9B=AE=E5=90=88?=
 =?UTF-8?q?=E5=90=8C=E7=AD=BE=E8=AE=A2=E9=87=8D=E6=96=B0=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectLib/projectPlan/childViewPlanDetail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/projectLib/projectPlan/childViewPlanDetail.vue b/src/views/projectLib/projectPlan/childViewPlanDetail.vue
index 374900f..4faa59b 100644
--- a/src/views/projectLib/projectPlan/childViewPlanDetail.vue
+++ b/src/views/projectLib/projectPlan/childViewPlanDetail.vue
@@ -206,7 +206,7 @@
             record.isfinish == 0 &&
             record.taskFile?.length > 0 &&
             record.taskName != '可研技术审查报告确认' &&
-            record.taskName != '造价评估报告确认'
+            record.taskName != '造价评估报告确认'||(record.ismodify&&record.isfinish==2)
           ) {
             if (isShowByRoles('projectContact')&&record.taskLevel.charAt(0) != '1') {
               return true;