From dd6d190c71c2b0396660e587439cdb96f3ff569e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=96=B9=E6=B5=B7?= Date: Tue, 2 Sep 2025 15:56:15 +0800 Subject: [PATCH] =?UTF-8?q?OA=E8=81=94=E8=B0=83=EF=BC=8C=E9=9C=80=E8=A6=81?= =?UTF-8?q?utf8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- YLErpDAL/Modules/ApiModule/HttpClientWrap.cs | 5 +++-- YLErpDAL/Modules/TradeModule/TradeOAService.cs | 2 +- .../app/trade/tradeConfirmBookListByClient.js | 16 ++++++++-------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/YLErpDAL/Modules/ApiModule/HttpClientWrap.cs b/YLErpDAL/Modules/ApiModule/HttpClientWrap.cs index bfa45e77..6a4ebcf6 100644 --- a/YLErpDAL/Modules/ApiModule/HttpClientWrap.cs +++ b/YLErpDAL/Modules/ApiModule/HttpClientWrap.cs @@ -1,6 +1,7 @@ using System.Net; using System.Net.Http; using System.Net.Http.Headers; +using System.Text; namespace YLErp.Modules.ApiModule { @@ -83,7 +84,7 @@ namespace YLErp.Modules.ApiModule public string PostJson(string apiPath, object postData, Action requestHandle) { var str = JsonHelper.Serialize(postData) ?? string.Empty; - using (var content = new StringContent(str)) + using (var content = new StringContent(str, Encoding.UTF8, "application/json")) using (var request = new HttpRequestMessage() { Method = HttpMethod.Post, @@ -93,7 +94,7 @@ namespace YLErp.Modules.ApiModule { request.Headers.Add("Accept-Encoding", "gzip"); requestHandle?.Invoke(request); - content.Headers.ContentType = new MediaTypeHeaderValue("application/json"); + // content.Headers.ContentType = new MediaTypeHeaderValue("application/json"); LogFactory.GetLogger().Info($"url:{apiPath}\r\npostData:{str}\r\n{content.ToJson()}"); try { diff --git a/YLErpDAL/Modules/TradeModule/TradeOAService.cs b/YLErpDAL/Modules/TradeModule/TradeOAService.cs index aaca2422..df255cbd 100644 --- a/YLErpDAL/Modules/TradeModule/TradeOAService.cs +++ b/YLErpDAL/Modules/TradeModule/TradeOAService.cs @@ -216,7 +216,7 @@ namespace YLErp.Modules.TradeModule loginname = loginName, systemkey = systemKey, objectclass = objectClass, - title = $"交易确认书OA申请-{trade.ClientName}-{contractCode}", + title = $"关于场外利率债收益互换交易的审批盖章申请({trade.TradeDate.Value.ToString("yyyyMMdd")}-{trade.ClientName})", urgent = urgent, issend = issend, copyattfileid = "", diff --git a/YLErpWeb/wwwroot/Scripts/app/trade/tradeConfirmBookListByClient.js b/YLErpWeb/wwwroot/Scripts/app/trade/tradeConfirmBookListByClient.js index 4dcb8b62..b114ab5b 100644 --- a/YLErpWeb/wwwroot/Scripts/app/trade/tradeConfirmBookListByClient.js +++ b/YLErpWeb/wwwroot/Scripts/app/trade/tradeConfirmBookListByClient.js @@ -38,14 +38,14 @@ const colModelGrid = (new function () { } }, { label: 'OA状态', name: 'OAStatus', width: 100, align: 'center' }, - { label: 'OA-URL', name: 'OAURL', width: 150, align: 'center', - formatter: function (cellValue, options, rowObject) { - if (cellValue && cellValue.length > 0) { - return '查看'; - } - return ''; - } - }, + //{ label: 'OA-URL', name: 'OAURL', width: 150, align: 'center', + // formatter: function (cellValue, options, rowObject) { + // if (cellValue && cellValue.length > 0) { + // return '查看'; + // } + // return ''; + // } + //}, { label: 'OA消息', name: 'OAMessage', width: 150, align: 'left' }, { label: '交易数量', name: 'tradeCount', width: 80, align: 'center' }, { label: 'tradeIds', name: 'tradeIds', hidden: true, optionHide: true }];