diff --git a/YLErpWeb/Views/TradeConfirmBook/Index.cshtml b/YLErpWeb/Views/TradeConfirmBook/Index.cshtml
index f2fa30ef..5c9d099a 100644
--- a/YLErpWeb/Views/TradeConfirmBook/Index.cshtml
+++ b/YLErpWeb/Views/TradeConfirmBook/Index.cshtml
@@ -85,6 +85,7 @@
@MyControls.Btn("批量下载交易确认书", "BatchDownLoadDoc()")
+
@if (PS.GetErpConfig().IsAutoSealAndUploadFiles && !PS.GetErpConfig().IsAutoSealAfterGeneratedBook)
{
@MyControls.Btn("批量确认书用印", "BatchSealContracts()")
diff --git a/YLErpWeb/wwwroot/Scripts/app/trade/tradeConfirmBook.js b/YLErpWeb/wwwroot/Scripts/app/trade/tradeConfirmBook.js
index b7ccc5f4..62b4bf56 100644
--- a/YLErpWeb/wwwroot/Scripts/app/trade/tradeConfirmBook.js
+++ b/YLErpWeb/wwwroot/Scripts/app/trade/tradeConfirmBook.js
@@ -561,6 +561,10 @@ $(function () {
ContractTypeCtrl = new ContractTypeCtrl(document.getElementById('ContractTypeCtrl'));
SendEmailHub();
SendOAHub();
+
+ $("#batchDownloadOA").click(function () {
+ BatchDownloadOAFiles();
+ });
});
function gridComplete() {
@@ -656,6 +660,23 @@ function isExistFile(url) {
return result;
}
+//批量下载OA用印文件
+function BatchDownloadOAFiles() {
+ var jgrid = jQuery('#listGrid');
+ var tradeIdList = main.GetGridIds(jgrid);
+ if (tradeIdList.length == 0) {
+ main.alert("请至少选择一笔交易"); return;
+ }
+
+ var confirmBookPostData = {
+ tradeIds: tradeIdList,
+ docpdf: ["DOC", "PDF"],
+ IsSeal: true,
+ DocType: "交易确认书"
+ };
+ openWindowWithPost("/trade/BatchDownLoadDoc/", confirmBookPostData);
+}
+
//批量下载交易确认书
function BatchDownLoadDoc() {
var startDate = $("#DateFromTradeDate").val();
@@ -677,9 +698,6 @@ function BatchDownLoadDoc() {
'' +
'' +
'';
-
- htmlContent += '
' +
- '';
main.open2("批量下载交易确认书",
@@ -693,8 +711,7 @@ function BatchDownLoadDoc() {
docpdf.push($(this).val())
})
- var isSeal = $("#Seal").val() == '是' ? true : false;
- var confirmBookPostData = { TradeDateStart: startDate, TradeDateEnd: endDate, ClientIds: clientIds, TradeIds: tradeIdList, TradeCashIds: null, DocType: "交易确认书", docpdf: docpdf, IsSeal: isSeal };
+ var confirmBookPostData = { TradeDateStart: startDate, TradeDateEnd: endDate, ClientIds: clientIds, TradeIds: tradeIdList, TradeCashIds: null, DocType: "交易确认书", docpdf: docpdf, IsSeal: false };
if (page.IsAutoSealAndUploadFiles) {
confirmBookPostData.SealResults = $("#SealResults").val();
//confirmBookPostData.SealDateStart = $("#DateFromSealDate").val();