From b4a18c78e7f7ebcd250333749cf9478d37196021 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=98=89=E7=A5=A5=20=E8=A9=B9?= Date: Tue, 10 Sep 2024 18:51:02 +0800 Subject: [PATCH] updates --- Views/Home/ProjectList.cshtml | 2 +- .../assets/javascript/custom/projectlist.js | 50 +++++++++++++++++++ 2 files changed, 51 insertions(+), 1 deletion(-) diff --git a/Views/Home/ProjectList.cshtml b/Views/Home/ProjectList.cshtml index c78efee3..f3dab6fa 100644 --- a/Views/Home/ProjectList.cshtml +++ b/Views/Home/ProjectList.cshtml @@ -339,7 +339,7 @@
- +
diff --git a/wwwroot/assets/javascript/custom/projectlist.js b/wwwroot/assets/javascript/custom/projectlist.js index 7f66d1ea..309582bf 100644 --- a/wwwroot/assets/javascript/custom/projectlist.js +++ b/wwwroot/assets/javascript/custom/projectlist.js @@ -508,8 +508,11 @@ $(document).ready(function () { htmlCode += '
'; htmlCode += ' '; htmlCode += ' '; + htmlCode += ' '; htmlCode += ' '; htmlCode += ' '; + htmlCode += ' '; + htmlCode += ' '; htmlCode += ' ' + modelMainItem_name + ''; htmlCode += ' AC: ' + ac_string + ' '; htmlCode += ' 項目合計: 0'; @@ -667,6 +670,50 @@ $(document).ready(function () { $('#invoiceModal').modal('toggle'); }); + + //報價單儲存 + $('#modelQuotationDialogSaveBtn').on('click', function () { + var quotation_method = $('#quotation_method').val(); + var quotation_uid = $('#quotation_uid').val(); + var quotation_version = $('#quotation_version').val(); + var quotation_prodMethod = ''; + var quotation_date = $('#quotation_date').val(); + var quotation_date_old = $('#quotation_date_old').val(); + var quotation_expStart = $('#quotation_expStart').val(); + var quotation_expEnd = $('#quotation_expEnd').val(); + var quotation_expStart_old = $('#quotation_expStart_old').val(); + var quotation_expEnd_old = $('#quotation_expEnd_old').val(); + var quotation_name = $('#quotation_name').val(); + var quotation_name_old = $('#quotation_name_old').val(); + var contactPerson_uid = $('#contactPerson_uid').val(); + var contactPerson_uid_old = $('#contactPerson_uid_old').val(); + var company_uid = $('#quotation_company_uid').val(); + var mainItems = []; + + if ($('#quotation_custom').prop('checked') == true) { + quotation_prodMethod = 'custom'; + } + + if ($('#quotation_temp').prop('checked') == true) { + quotation_prodMethod = 'template'; + } + + //報價單項目 + $('#modelItem_div .card').each(function (index, obj) { + var data_type = $(obj).prop('data-type'); + var mainItem_uid = $(obj).prop('data-main-uid'); + var mainItem_uid_old = $(obj).find('[data-name="mainItem_uid_old"]').val(); + var quotationMainItem_uid = $(obj).prop('data-uid'); + var quotationMainItem_name = $(obj).find('[data-name="quotationMainItem_name"]').val(); + var quotationMainItem_name_old = $(obj).find('[data-name="quotationMainItem_name_old"]').val(); + var quotationMainItem_ac = $(obj).find('[data-name="quotationMainItem_ac"]').val(); + var quotationMainItem_ac_old = $(obj).find('[data-name="quotationMainItem_ac_old"]').val(); + var quotationMainItem_subTotal = $(obj).find('[data-name="quotationMainItem_subTotal"]').val(); + var quotationMainItem_subTotal_old = $(obj).find('[data-name="quotationMainItem_subTotal_old"]').val(); + + }); + + }); }); function loadContactPersion() { @@ -1250,8 +1297,11 @@ function mainItemHtml(obj) { htmlCode += '
'; htmlCode += ' '; htmlCode += ' '; + htmlCode += ' '; htmlCode += ' '; htmlCode += ' '; + htmlCode += ' '; + htmlCode += ' '; htmlCode += ' ' + obj.modelMainItem_name + ' '; htmlCode += ' AC: ' + ac_string + ' '; htmlCode += ' 項目合計: ' + AppendComma(mainItem_totalac) + '';