From 698662101b5db137aaa481b6e00be26f9abcdbe7 Mon Sep 17 00:00:00 2001
From: ruisu <ruisu@glms.com.cn>
Date: Wed, 5 Aug 2026 14:30:42 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E2=80=9C=E4=BF=AE=E6=94=B9=E2=80=9D=E6=8C=89=E9=92=AE=E5=90=8E?=
 =?UTF-8?q?=E5=81=B6=E5=8F=91=E5=89=8D=E7=AB=AF=E6=8A=A5=E9=94=99=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 YLErpWeb/Views/SwapTrade/tradeEdit.cshtml  | 5 +++--
 YLErpWeb/Views/SwapTrade2/TradeEdit.cshtml | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/YLErpWeb/Views/SwapTrade/tradeEdit.cshtml b/YLErpWeb/Views/SwapTrade/tradeEdit.cshtml
index 14750c6d..e18f7e9b 100644
--- a/YLErpWeb/Views/SwapTrade/tradeEdit.cshtml
+++ b/YLErpWeb/Views/SwapTrade/tradeEdit.cshtml
@@ -1,10 +1,11 @@
-@using YLErp.Web.Models.JsModels;
+@using YLErp.Web.Models.JsModels;
 @model trade
 @{
     ViewBag.Title = "交易信息 | 编辑";
     Layout = "~/Views/Shared/_InfoLayout.cshtml";
 
     var isAdd = Model.id == 0;
+    var isUseApproval = ViewBag.isUseApproval ?? false;
     var canChangeClient = isAdd || Model.TradeStatus == ConsTrade.新增待确认;
     var canAddNewTrader = CurUser.交易管理_新增选择交易员;
 
@@ -594,7 +595,7 @@
                 <span class="js-li-none-tip" style="display:none;">没有可选择的标签，可按Enter键新增</span>
             </div>
             <div class="text-center">
-                @if (ViewBag.isUseApproval)
+                @if (isUseApproval)
                 {
                     <button class="btn btn-primary" type="button" v-on:click="submit('pass')">审批通过</button>
                     <button class="btn btn-primary" type="button" v-on:click="submit('reject')">拒绝</button>
diff --git a/YLErpWeb/Views/SwapTrade2/TradeEdit.cshtml b/YLErpWeb/Views/SwapTrade2/TradeEdit.cshtml
index b8c7d03f..542fa65e 100644
--- a/YLErpWeb/Views/SwapTrade2/TradeEdit.cshtml
+++ b/YLErpWeb/Views/SwapTrade2/TradeEdit.cshtml
@@ -6,6 +6,7 @@
     Layout = "~/Views/Shared/_InfoLayout.cshtml";
 
     var isAdd = Model.id == 0;
+    var isUseApproval = ViewBag.isUseApproval ?? false;
     var canChangeClient = isAdd || Model.TradeStatus == ConsTrade.新增待确认;
     var canAddNewTrader = CurUser.交易管理_新增选择交易员;
     var canEdit = Model.SwapCanEdit() && CurUser.交易管理_交易编辑;
@@ -509,7 +510,7 @@
                              <textarea v-model="trade.Comments" class='text-box text-left' rows='3' id='Comments'></textarea>
                         </div>
                         <div style="float:left;margin-top:10px;margin-left:36px;">
-                            @if (ViewBag.isUseApproval)
+                            @if (isUseApproval)
                             {
                                 <button class="btn btn-primary swapclose" type="button" v-on:click="submit('reject')">拒绝</button>
                                 <button class="btn btn-primary" type="button" v-on:click="submit('pass')">审批通过</button>