From 09cb9d8f888511c5c49db70f0263b53726344512 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=98=89=E7=A5=A5=20=E8=A9=B9?= Date: Sun, 18 Aug 2024 01:12:48 +0800 Subject: [PATCH] updates --- Modals/DbTableClass.cs | 5 + Views/Home/ModalList.cshtml | 129 ++++++++++++++++++ wwwroot/assets/javascript/custom/modallist.js | 5 + 3 files changed, 139 insertions(+) diff --git a/Modals/DbTableClass.cs b/Modals/DbTableClass.cs index 8196e901..c5ed37cc 100644 --- a/Modals/DbTableClass.cs +++ b/Modals/DbTableClass.cs @@ -22,6 +22,9 @@ public class DbTableClass public string modelSubItem_descript { get; set; } = ""; public double modelSubItem_price { get; set; } = 0.0; public string modelSubItem_unitType { get; set; } = ""; + public double modelSubItem_number { get; set; } = 0.0; + public double modelSubItem_subTotal { get; set; } = 0.0; + public string modelSubItem_hasAC { get; set; } = "N"; public DateTime modelSubItem_createdate { get; set; } = DateTime.Now; public DateTime modelSubItem_modifydate { get; set; } = DateTime.Now; public string modelSubItem_lastModify_uid { get; set; } = ""; @@ -39,6 +42,8 @@ public class DbTableClass public string modelQuotation_uid { get; set; } = ""; public string mainItem_uid { get; set; } = ""; public string modelMainItem_name { get; set; } = ""; + public double modelMainItem_ac { get; set; } = 0.0; + public double modelMainItem_subTotal { get; set; } = 0.0; public DateTime modelMainItem_createdate { get; set; } = DateTime.Now; public DateTime modelMainItem_modifydate { get; set; } = DateTime.Now; public string modelMainItem_lastModify_uid { get; set; } = ""; diff --git a/Views/Home/ModalList.cshtml b/Views/Home/ModalList.cshtml index 4d717178..a3b1cb3c 100644 --- a/Views/Home/ModalList.cshtml +++ b/Views/Home/ModalList.cshtml @@ -162,4 +162,133 @@ + + + +
+
\ No newline at end of file diff --git a/wwwroot/assets/javascript/custom/modallist.js b/wwwroot/assets/javascript/custom/modallist.js index eeaf434c..8a38840c 100644 --- a/wwwroot/assets/javascript/custom/modallist.js +++ b/wwwroot/assets/javascript/custom/modallist.js @@ -9,6 +9,11 @@ $(document).ready(function () { deptList(); loadModelQuotationDataTable(); + //新增報價單範本視窗 + $('#modelQuotationListNewBtn').on('click', function () { + $('#clientModelQuotationPreviewModal').modal('toggle'); + }); + $('#modelProjNewBtn').on('click', function () { $("#modelProj_method").val('add'); $("#dept_uid").val($("#dept_select").val()).trigger('change');