diff --git a/Modals/authToken.cs b/Modals/authToken.cs index f47eddca..a81e5231 100644 --- a/Modals/authToken.cs +++ b/Modals/authToken.cs @@ -78,7 +78,7 @@ public class authToken user_perm = GlobalClass.appsettings("Admin:perm"); user_isLogin = true; - int intMin = 180; + int intMin = 240; if (tokenItem.token_isremember == "Y") { diff --git a/wwwroot/assets/javascript/custom/modallist.js b/wwwroot/assets/javascript/custom/modallist.js index d1e76cf6..686185a4 100644 --- a/wwwroot/assets/javascript/custom/modallist.js +++ b/wwwroot/assets/javascript/custom/modallist.js @@ -139,9 +139,9 @@ $(document).ready(function () { var modelSubItem_uid = $('#parent_Item_uid').val(); var modelSubItem_name = $('#modelSubItem_name').val(); var modelSubItem_descript = $('#modelSubItem_descript').val(); - var modelSubItem_price = $('#modelSubItem_price').val(); + var modelSubItem_price = $('#modelSubItem_price').val().replace(/,/g, ""); var modelSubItem_unitType = $('#modelSubItem_unitType').val(); - var modelSubItem_number = $('#modelSubItem_number').val(); + var modelSubItem_number = $('#modelSubItem_number').val().replace(/,/g, ""); var modelSubItem_hasAC = 'N'; var parent_data_uid = $('#model_parent_data_uid').val(); @@ -174,6 +174,8 @@ $(document).ready(function () { return; } + + var modelSubItem_subTotal = modelSubItem_price * modelSubItem_number; if (method == 'edit') {