From e628a8209fa5098d7438571ff38a5e4e64e9a61e Mon Sep 17 00:00:00 2001
From: Yq <990442024@qq.com>
Date: Wed, 9 Apr 2025 14:03:52 +0800
Subject: [PATCH] '1'

---
 src/views/pages/jh/gjxzbylb.vue |  3 +++
 src/views/pages/jj/prjMan.vue   | 26 ++++++++++++++++++++------
 src/views/pages/jj/prjapro.vue  | 16 +++++++++++-----
 vite.config.js                  |  4 ++--
 4 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/src/views/pages/jh/gjxzbylb.vue b/src/views/pages/jh/gjxzbylb.vue
index 34796e1..6d3dd07 100644
--- a/src/views/pages/jh/gjxzbylb.vue
+++ b/src/views/pages/jh/gjxzbylb.vue
@@ -449,6 +449,9 @@ const submitUpload = () => {
     console.log(response)
     if(response.code==200){
       ElMessage.success(response.msg)
+    }else {
+      ElMessage.error(response.msg)
+  
     }
     // 清空文件输入框
     upload.value.clearFiles();
diff --git a/src/views/pages/jj/prjMan.vue b/src/views/pages/jj/prjMan.vue
index 3c8ca05..4f06485 100644
--- a/src/views/pages/jj/prjMan.vue
+++ b/src/views/pages/jj/prjMan.vue
@@ -400,28 +400,42 @@ text-decoration: underline;
               <el-button
                   type="primary"
                   link
-                  v-show="(scope.row.drawingPlanUpdateTime!==null)&&(scope.row.firstUploadDrawing==false)"
+                  v-show="(scope.row.drawingPlanUpdateTime!==null)
+                  &&(scope.row.firstUploadDrawing==false)
+&&scope.row.drawingApprovalStatus!='待审批'
+"
                   @click="editFun(scope.row,0,1)"
               >重新上传图纸
               </el-button>
               <el-button
                   type="primary"
                   link
-                  v-show="(scope.row.budgetDrawingPlanUpdateTime!==null)&&(scope.row.budgetDrawingPlanUpdateTime==false)"
+                  v-show="(scope.row.budgetDrawingPlanUpdateTime!==null)
+                  &&(scope.row.budgetDrawingPlanUpdateTime==false)
+&&scope.row.budgetDrawingPlanUpdateTime!='待审批'
+"
                   @click="editFun(scope.row,1,1)"
               >重新上传施工图预算
               </el-button>
               <el-button
                   type="primary"
                   link
-                  v-show="(scope.row.drawingPlanUpdateTime!='')&&(scope.row.drawingPlanUpdateTime!==null)&&(scope.row.firstUploadDrawing==true)"
+                  v-show="(scope.row.drawingPlanUpdateTime!='')
+                  &&(scope.row.drawingPlanUpdateTime!==null)
+                  &&(scope.row.firstUploadDrawing==true)
+&&scope.row.drawingApprovalStatus!='待审批'
+"
                   @click="editFun(scope.row,0,0)"
               >上传图纸
               </el-button>
               <el-button
                   type="primary"
                   link
-                  v-show="(scope.row.budgetDrawingPlanUpdateTime!='')&&(scope.row.budgetDrawingPlanUpdateTime!==null)&&(scope.row.firstUploadBudgetDrawing==true)"
+                  v-show="(scope.row.budgetDrawingPlanUpdateTime!='')
+                  &&(scope.row.budgetDrawingPlanUpdateTime!==null)
+                  &&(scope.row.firstUploadBudgetDrawing==true)
+&&scope.row.budgetDrawingPlanUpdateTime!='待审批'
+"
                   @click="editFun(scope.row,1,0)"
               >上传施工图预算
               </el-button>
@@ -778,7 +792,7 @@ const downmloadFile = (row, num) => {
         upreason: item.drawingApprovalUpdateReason,
         approvereason: item.drawingApprovalReason,
         
-      })).reverse()
+      }))
     })
   } else {
     historyList(
@@ -795,7 +809,7 @@ const downmloadFile = (row, num) => {
         fileId: item.budgetDrawingFileId,
         upreason: item.budgetDrawingApprovalUpdateReason,
         approvereason: item.budgetDrawingApprovalReason,
-      })).reverse()
+      }))
     })
   }
   //打开弹窗
diff --git a/src/views/pages/jj/prjapro.vue b/src/views/pages/jj/prjapro.vue
index 914cb85..6b0b9c6 100644
--- a/src/views/pages/jj/prjapro.vue
+++ b/src/views/pages/jj/prjapro.vue
@@ -337,7 +337,10 @@ text-decoration: underline;
                   type="primary"
                   link
                   v-hasPermi="['engineering:ea.approval']"
-                  v-show="scope.row.drawingUpdateTime!=null&&scope.row.userEaDrawing==true"
+                  v-show="scope.row.drawingUpdateTime!=null
+                  &&scope.row.userEaDrawing==true
+&&scope.row.drawingApprovalStatus!='已审批'
+"
                   @click="editFun(scope.row,0,'审批图纸')"
               >审批图纸
               </el-button>
@@ -345,7 +348,10 @@ text-decoration: underline;
                   type="primary"
                   link
                   v-hasPermi="['engineering:ea:approval']"
-                  v-show="scope.row.budgetDrawingUpdateTime!=null&&scope.row.userEaBudgetDrawing==true"
+                  v-show="scope.row.budgetDrawingUpdateTime!=null
+                  &&scope.row.userEaBudgetDrawing==true
+&&scope.row.budgetDrawingApprovalStatus!='已审批'
+"
                   @click="editFun(scope.row,1,'审批施工图预算')"
               >审批施工图预算
               </el-button>
@@ -686,7 +692,7 @@ const downmloadFile = (row, num) => {
   if (num == 0) {
     historyList(
         {
-          "historyList": row.historyList,
+          "drawingId": row.drawingId,
         }
     ).then(res => {
       console.log(res)
@@ -712,7 +718,7 @@ const downmloadFile = (row, num) => {
           fileId: item.drawingFileId,
           upreason: item.drawingApprovalUpdateReason,
           approvereason: item.drawingApprovalReason,
-        })).reverse()
+        }))
       }
       
     })
@@ -746,7 +752,7 @@ const downmloadFile = (row, num) => {
           fileId: item.budgetDrawingFileId,
           upreason: item.budgetDrawingApprovalUpdateReason,
           approvereason: item.budgetDrawingApprovalReason,
-        })).reverse()
+        }))
       }
       
     })
diff --git a/vite.config.js b/vite.config.js
index 37a0e77..f9346c8 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -64,9 +64,9 @@ export default defineConfig(({ mode, command }) => {
           // target: "http://192.168.3.210:20241",
           //测试
           // target: "http://192.168.133.127:20241",
-          target: "http://192.168.133.127:20241",
+          // target: "http://192.168.133.127:20241",
           // 相斌
-          // target: "http://192.168.3.33:20241",
+          target: "http://192.168.3.33:20241",
           changeOrigin: true,
           // target: 'http://192.168.3.114:20241',//广瑞
           rewrite: (p) => p.replace(/^\/sgtjzhzxsp-api/, '')