diff --git a/Controllers/ApiController.cs b/Controllers/ApiController.cs index dd12a107..9d19fd77 100644 --- a/Controllers/ApiController.cs +++ b/Controllers/ApiController.cs @@ -1944,8 +1944,11 @@ namespace QuotationMaker.Controllers if (token.user_id != GlobalClass.appsettings("Admin:id")) { - ret.quotationViews = conn.Query("select * from quotationView where quotation_isdel = 'N' and quotation_revoke = 'N' and project_uid = @project_uid and quotation_create_uid in (@user_list) order by quotation_modifydate desc", new { project_uid = project_uid, user_list = user_uid_list }).ToList(); + + string testSQL = "select * from quotationView where quotation_isdel = 'N' and quotation_revoke = 'N' and project_uid = '" + project_uid + "' and quotation_create_uid in (" + user_uid_list + ") order by quotation_modifydate desc"; + + ret.quotationViews = conn.Query(testSQL).ToList(); } else { ret.quotationViews = conn.Query("select * from quotationView where quotation_isdel = 'N' and quotation_revoke = 'N' and project_uid = @project_uid order by quotation_modifydate desc", new { project_uid = project_uid }).ToList(); diff --git a/wwwroot/assets/javascript/custom/projectlist.js b/wwwroot/assets/javascript/custom/projectlist.js index 5d20a3d9..717f95ef 100644 --- a/wwwroot/assets/javascript/custom/projectlist.js +++ b/wwwroot/assets/javascript/custom/projectlist.js @@ -24,6 +24,8 @@ var hasBind = 'N'; var tmpInvoiceItem; var tmpPaymentItem; +var fpInvoiceDate; + $(document).ready(function () { deptList(); companyList(); @@ -62,7 +64,7 @@ $(document).ready(function () { ] }); - const fpInvoiceDate = flatpickr("#invoice_date", { + fpInvoiceDate = flatpickr("#invoice_date", { "locale": "zh_tw", "plugins": [ new monthSelectPlugin({ @@ -509,6 +511,10 @@ $(document).ready(function () { var modelMainItem_ac = $('#modelMainItem_ac').val(); + if (modelMainItem_ac == "") { + modelMainItem_ac = "0"; + } + if (modelMainItem_ac.isNumber() == false) { alert('AC必須為數字!'); diff --git a/wwwroot/logo/bremen_temp.xlsx b/wwwroot/logo/bremen_temp.xlsx index 37f1d7c8..1476eee7 100644 Binary files a/wwwroot/logo/bremen_temp.xlsx and b/wwwroot/logo/bremen_temp.xlsx differ diff --git a/wwwroot/logo/journeys_temp.xlsx b/wwwroot/logo/journeys_temp.xlsx index 0f7315d7..341d86ee 100644 Binary files a/wwwroot/logo/journeys_temp.xlsx and b/wwwroot/logo/journeys_temp.xlsx differ