From ded10867468b6e2b7312af5add60f6928c636925 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=94=A6=E9=BA=9F=20=E7=8E=8B?= <Jinlin.Wang@cicc.com.cn>
Date: Thu, 23 Apr 2026 11:25:38 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BA=A4=E6=98=93?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E4=B9=A6=E4=B8=8A=E4=BC=A0=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E6=96=87=E6=9C=AC=E5=8F=8A=E4=B8=8B=E8=BD=BD=E7=94=A8=E5=8D=B0?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 YLErpWeb/Hubs/TradeConfirmSendOAHub.cs             | 14 ++++++++++----
 .../wwwroot/Scripts/app/trade/tradeConfirmBook.js  |  8 ++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/YLErpWeb/Hubs/TradeConfirmSendOAHub.cs b/YLErpWeb/Hubs/TradeConfirmSendOAHub.cs
index fea2f3cf..fa4f4fd7 100644
--- a/YLErpWeb/Hubs/TradeConfirmSendOAHub.cs
+++ b/YLErpWeb/Hubs/TradeConfirmSendOAHub.cs
@@ -19,15 +19,21 @@ namespace YLErp.Web.Hubs
 
         public async Task StartProcessing(string jsonString)
         {
-            var req = JsonHelper.Deserialize<dynamic>(jsonString);
+            var req = JsonHelper.Deserialize<Dictionary<string, object>>(jsonString);
             var client = Clients.Caller;
-            
+
+            if (req == null || !req.ContainsKey("ids") || req["ids"] == null)
+            {
+                await client.SendAsync("ExceptionMessage", "参数错误：缺少交易ID列表");
+                return;
+            }
+
             if (Context.User == null)
             {
                 await client.SendAsync("ExceptionMessage", "登录已失效，请重新登录");
                 return;
             }
-            
+
             var user = Server.CacheProvider.Get("loginUser^" + Context.User.GetUserId()) as UserInfo;
             if (user == null)
             {
@@ -44,7 +50,7 @@ namespace YLErp.Web.Hubs
 
             try
             {
-                await ProcessOAByIds(req.ids.ToString(), user);
+                await ProcessOAByIds(req["ids"].ToString(), user);
                 isProcessing = false;
                 await Clients.Caller.SendAsync("ProcessCompleted", "");
             }
diff --git a/YLErpWeb/wwwroot/Scripts/app/trade/tradeConfirmBook.js b/YLErpWeb/wwwroot/Scripts/app/trade/tradeConfirmBook.js
index 1ef5520e..7945f2b8 100644
--- a/YLErpWeb/wwwroot/Scripts/app/trade/tradeConfirmBook.js
+++ b/YLErpWeb/wwwroot/Scripts/app/trade/tradeConfirmBook.js
@@ -663,10 +663,10 @@ function BatchDownLoadDoc() {
         '<label class="col-sm-5 control-label">文档类型</label>' +
         '<label class="btn btn-sm btn-primary" style="border:none"><input type="checkbox" checked name="docType" value="DOC"> DOC</label>' +
         '<label class="btn btn-sm btn-primary" style="border:none"><input type="checkbox" checked name="docType" value="PDF"> PDF</label>';
-    if (page.IsZheQi) {
+    
         htmlContent += '<br/><label class="col-sm-5 control-label">下载用印文件</label>' +
             '<select id="Seal" style="margin-top:5px;"><option>是</option><option>否</option></select>';
-    }
+
 
     main.open2("批量下载交易确认书",
         htmlContent + '</div></form>',
@@ -904,8 +904,8 @@ function showToolName(cellValue, options, rowObject) {
         html += "<input type=\"button\" class=\"wentiEdit\" title='交易确认书未生成或未找到制定确认书文件' disabled  readonly=\"true\" value=\"{1}\" />"
             .template(rowObject.EncryptId, "发送Email");
     }
-    var canUpload = page.canGenerate == true && rowObject.MetaDic.ContractDocUrl ? "" : "disabled";
-    html += "<input type=\"button\" class=\"wentiEdit\"  value=\"上传\" onclick=\"colModelGrid.uploadNew('{0}')\" {1} />".template(rowObject.MetaDic.ContractEncryptId, canUpload);
+    var canUpload = page.canGenerate == true ? "" : "disabled";
+    html += "<input type=\"button\" class=\"wentiEdit\"  value=\"上传确认书\" onclick=\"colModelGrid.uploadNew('{0}')\" {1} />".template(rowObject.MetaDic.ContractEncryptId, canUpload);
     html += "<input type=\"button\" class=\"wentiEdit\" title='发送交易确认书到OA系统' onclick=\"sendOA({0})\" value=\"发送OA\" />".template(rowObject.id);
     return html;
 }