From 063ba2cb054503fca10e976bcf26e1146a25df74 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Mon, 2 Mar 2026 17:39:52 +0800
Subject: [PATCH] =?UTF-8?q?1.0.77=20=E5=90=88=E5=90=8C=E6=BF=80=E6=B4=BB?=
 =?UTF-8?q?=E4=B8=8D=E5=8C=BA=E5=88=86=E5=90=88=E5=90=8C=E5=A4=A7=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/oa/erp/contractInfo/index.vue | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/views/oa/erp/contractInfo/index.vue b/src/views/oa/erp/contractInfo/index.vue
index 795694e..8744431 100644
--- a/src/views/oa/erp/contractInfo/index.vue
+++ b/src/views/oa/erp/contractInfo/index.vue
@@ -201,15 +201,15 @@
             <el-tooltip content="合同模板" placement="top" v-if="scope.row.templateId != null">
               <el-button link type="info" icon="Download" @click="contractView(scope.row)"></el-button>
             </el-tooltip>
-            <el-tooltip content="合同激活" placement="top" v-if="showUploadButton(scope.row)">
-              <el-button
-                link
-                type="success"
-                icon="Upload"
-                @click="openUploadFinalDialog(scope.row)"
-                v-hasPermi="['oa/erp:contractInfo:edit']"
-              ></el-button>
-            </el-tooltip>
+<!--            <el-tooltip content="合同激活" placement="top" v-if="showUploadButton(scope.row)">-->
+<!--              <el-button-->
+<!--                link-->
+<!--                type="success"-->
+<!--                icon="Upload"-->
+<!--                @click="openUploadFinalDialog(scope.row)"-->
+<!--                v-hasPermi="['oa/erp:contractInfo:edit']"-->
+<!--              ></el-button>-->
+<!--            </el-tooltip>-->
             <el-tooltip content="合同订单激活" placement="top" v-if="canActivateOrder(scope.row)">
               <el-button
                 link
@@ -640,8 +640,9 @@ const canActivateOrder = (row: ContractInfoVO) => {
   if (row.contractStatus !== '3') {
     return false;
   }
+  return true;
   // "合同大类(1市场实施 2产品销售）
-  return row.contractCategory === '2';
+  // return row.contractCategory === '2';
 };
 
 /** 判断是否可以激活合同订单上传终版合同附件 */