Jaymr/zszq-trs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复交易确认书上传按钮文本及下载用印文件逻辑

Browse Source
This commit is contained in:
锦麟 王
2026-04-23 11:25:38 +08:00
parent 08c51d7cbb
commit ded1086746
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
YLErpWeb/Hubs/TradeConfirmSendOAHub.cs
+10 -4
View File
@@ -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", "");
}
YLErpWeb/wwwroot/Scripts/app/trade/tradeConfirmBook.js
+4 -4
View File
@@ -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;
}