From e4f7bf3d0e3d2b05e5395fde441d1236cfa1a772 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Tue, 28 Jul 2026 13:29:09 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                    |  2 +-
 .env.production                     |  8 ++++----
 src/views/contract/contractList.vue | 12 ++++++++----
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/.env.development b/.env.development
index 03976f7..ff77a92 100644
--- a/.env.development
+++ b/.env.development
@@ -19,4 +19,4 @@ VUE_APP_OUT_GPS=http://hjjc-gps.ali251.langye.net
 #VUE_APP_OLD_OA = http://192.168.0.66:16667
 VUE_APP_OLD_OA = http://hjjc-szemcold-test.ali251.langye.net
 
-VUE_APP_UPLOAD_API=/api/admin/upload-file
+#VUE_APP_UPLOAD_API=/api/admin/upload-file
diff --git a/.env.production b/.env.production
index fb7dee3..bca6caf 100644
--- a/.env.production
+++ b/.env.production
@@ -2,9 +2,9 @@
 ENV = 'production'
 
 # base api
-#VUE_APP_DOMIAN=http://192.168.0.66:9001/
-#VUE_APP_UPLOAD_API = http://192.168.00.66:9001/api/admin/upload-file
-#VUE_APP_BASE_API = ''
+VUE_APP_DOMIAN=http://192.168.0.66:9001/
+VUE_APP_UPLOAD_API = http://192.168.00.66:9001/api/admin/upload-file
+VUE_APP_BASE_API = ''
 VUE_APP_OUT_Book=http://192.168.0.66:9002/
 VUE_APP_OUT_GDZC=http://192.168.0.66:17777/admin
 VUE_APP_OUT_OLD=http://192.168.0.66
@@ -24,4 +24,4 @@ VUE_APP_OUT_GPS=http://192.168.0.66:9003/admin/#/
 VUE_APP_PUBLIC_PATH=/admin
 VUE_APP_OUTPUT_DIR=/www/szemc-budget-execution/backend/public/admin
 
-VUE_APP_UPLOAD_API=/api/admin/upload-file
+#VUE_APP_UPLOAD_API=/api/admin/upload-file
diff --git a/src/views/contract/contractList.vue b/src/views/contract/contractList.vue
index 6325a7c..b85e338 100644
--- a/src/views/contract/contractList.vue
+++ b/src/views/contract/contractList.vue
@@ -2780,12 +2780,16 @@ export default {
       }
     },
     async getContracts(is_export,noloading=false,isopenOa=false) {
+      const joinStatus = Array.isArray(this.select.join_status)
+        ? this.select.join_status.join(",")
+        : this.select.join_status
       const querySelect = {
         ...this.select,
-        join_status: Array.isArray(this.select.join_status)
-          ? this.select.join_status.join(",")
-          : this.select.join_status,
+        ...(joinStatus ? { join_status: joinStatus } : {}),
       };
+      if (!joinStatus) {
+        delete querySelect.join_status
+      }
       let tokens = getToken();
       if (is_export && this.select.is_export == 1) {
         var url = "/api/admin/contract/index?is_auth=1&token=" + tokens;
@@ -3223,7 +3227,7 @@ export default {
     }
     if (/contractList/g.test(this.$route.path)) {
       this.select.is_substitute = 0;
-      this.select.join_status = [2, 3];//is_substitute 用于是否有采购流程，1为合同台账中增加（没有流程）
+      this.select.join_status = [];
       //this.select.contract_type = 2;
     }
     if (/waitPay/g.test(this.$route.path)) {