lxbfYeaa
/
QuotationMaker
forked from dk96/QuotationMaker
1
0
Fork 0
Code Pull Requests Activity

fixed bugs

master
dk96 2024-10-30 15:48:40 +08:00
parent 0dac1e7402
commit b96a2682f6
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Controllers/ApiController.cs
View File

@ -273,6 +273,8 @@ namespace QuotationMaker.Controllers
paymentStr += "; " + objDetail.payments[i - 1].payment_descript; paymentStr += "; " + objDetail.payments[i - 1].payment_descript;
} }
paymentStr = paymentStr.Replace("手動輸入; ", "");
row.Cells[0].SetCellValue(paymentStr); row.Cells[0].SetCellValue(paymentStr);
} }

3
wwwroot/assets/javascript/custom/projectlist.js
View File

@ -652,6 +652,7 @@ $(document).ready(function () {
htmlCode += ' <textarea style="display:none;" data-name="payment_method">' + payment_method + '</textarea>'; htmlCode += ' <textarea style="display:none;" data-name="payment_method">' + payment_method + '</textarea>';
htmlCode += ' <textarea style="display:none;" data-name="payment_methodname">' + payment_methodname + '</textarea>'; htmlCode += ' <textarea style="display:none;" data-name="payment_methodname">' + payment_methodname + '</textarea>';
htmlCode += ' <textarea style="display:none;" data-name="payment_descript">' + payment_descript + '</textarea>'; htmlCode += ' <textarea style="display:none;" data-name="payment_descript">' + payment_descript + '</textarea>';
htmlCode += ' <span class="drag-indicator"></span>\n'; htmlCode += ' <span class="drag-indicator"></span>\n';
htmlCode += ' <div data-name="payment_display"> ' + payment_display + ' </div>\n'; htmlCode += ' <div data-name="payment_display"> ' + payment_display + ' </div>\n';
htmlCode += ' <div class="btn-group ml-auto">\n'; htmlCode += ' <div class="btn-group ml-auto">\n';
@ -2008,7 +2009,7 @@ function makePaymentHtml(obj) {
var payment_display = obj.payment_methodname; var payment_display = obj.payment_methodname;
if (obj.payment_descript != '') { if (obj.payment_descript != '') {
obj.payment_display = obj.payment_display + ': ' + obj.payment_descript; payment_display = payment_display + ': ' + obj.payment_descript;
} }
var htmlCode = ''; var htmlCode = '';