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

#EQD-5843 国联民生-交易确认书编号规则, 客户编号规则, 以及确认书相关的一些调整

Browse Source
This commit is contained in:
吴方海
2026-05-21 17:16:57 +08:00
parent 220ca7eba9
commit 2031b6f0ba
7 changed files with 298 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
YLErpWeb/wwwroot/Scripts/app/trade/tradeConfirmBook.js
+6 -6
View File
@@ -1,4 +1,4 @@
var valuedate = page.valuedate;
var valuedate = page.valuedate;
var ContractTypeCtrl;
var ReportId;
@@ -354,8 +354,8 @@ const colModelGrid = (new function () {
end: function () { SearchClick(true) }
});
}
this.uploadNew = function (encryptId) {
var srcurl = "/TradeConfirmBook/confirmBookUploadNew/?Id=" + encryptId;
this.uploadNew = function (tradeId) {
var srcurl = "/TradeConfirmBook/confirmBookUploadNew/?tradeId=" + tradeId;
main.open("上传确认书", srcurl, {
area: ['500px', '420px'],
end: function () { SearchClick(true) }
@@ -935,8 +935,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 ? "" : "disabled";
html += "<input type=\"button\" class=\"wentiEdit\" value=\"上传确认书\" onclick=\"colModelGrid.uploadNew('{0}')\" {1} />".template(rowObject.MetaDic.ContractEncryptId, canUpload);
html += "<input type=\"button\" class=\"wentiEdit\" value=\"上传确认书\" onclick=\"colModelGrid.uploadNew({0})\" />"
.template(rowObject.id);
html += "<input type=\"button\" class=\"wentiEdit\" title='发送交易确认书到OA系统' onclick=\"sendOA({0})\" value=\"发送OA\" />".template(rowObject.id);
return html;
}
@@ -1321,4 +1321,4 @@ function submitOA(id) {
}).fail(function (xhr, status, error) {
SearchClick(true);
});
}
}
YLErpWeb/wwwroot/Scripts/app/trade/tradeConfirmBookListByClient.js
+4 -3
View File
@@ -56,8 +56,8 @@ const colModelGrid = (new function () {
end: function () { SearchClick(true) }
});
}
this.uploadNew = function (encryptId) {
var srcurl = "/TradeConfirmBook/confirmBookUploadNew/?Id=" + encryptId;
this.uploadNew = function (tradeId) {
var srcurl = "/TradeConfirmBook/confirmBookUploadNew/?tradeId=" + tradeId;
main.open("上传确认书", srcurl, {
area: ['500px', '420px'],
end: function () { SearchClick(true) }
@@ -256,7 +256,8 @@ function showToolName(cellValue, options, rowObject) {
.template(rowObject.EncryptId, "发送Email");
}
var canUpload = page.canGenerate == true && rowObject.ContractDocUrl ? "" : "disabled";
html += "<input type=\"button\" class=\"wentiEdit\" value=\"上传\" onclick=\"colModelGrid.uploadNew('{0}')\" {1} />".template(rowObject.ContractCode, canUpload);
html += "<input type=\"button\" class=\"wentiEdit\" value=\"上传\" onclick=\"colModelGrid.uploadNew({0})\" {1} />"
.template(rowObject.tradeIds && rowObject.tradeIds.length > 0 ? rowObject.tradeIds[0] : 0, canUpload);
return html;
}