1.0.77 合同激活不区分合同大类

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';
 };
 
 /** 判断是否可以激活合同订单上传终版合同附件 */