dk96
/
QuotationMaker
2
1
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: dk96:0dac1e7402bbd83a2b4bee7b2f63980b2b6903f8
Branches Tags
dk96:master
dk96:main
..
compare: dk96:f0b20e8c587f0f3de6c3443aa18708c6d90eca96
Branches Tags
dk96:master
dk96:main

No commits in common. "0dac1e7402bbd83a2b4bee7b2f63980b2b6903f8" and "f0b20e8c587f0f3de6c3443aa18708c6d90eca96" have entirely different histories.
0dac1e7402 ... f0b20e8c58

6 changed files with 14 additions and 44 deletions
Show Stats Expand all files Collapse all files

9
Controllers/AuthApiController.cs
View File

@ -903,7 +903,6 @@ namespace QuotationMaker.Controllers
string dept_uid = obj["dept_uid"].ToString(); string dept_uid = obj["dept_uid"].ToString();
string mainItem_uid = obj["mainItem_uid"].ToString(); string mainItem_uid = obj["mainItem_uid"].ToString();
string mainItem_name = obj["mainItem_name"].ToString(); string mainItem_name = obj["mainItem_name"].ToString();
string method = obj["method"].ToString(); string method = obj["method"].ToString();
if (method == "") { if (method == "") {
@ -925,13 +924,10 @@ namespace QuotationMaker.Controllers
if (method == "add") if (method == "add")
{ {
int mainItem_order = int.Parse(obj["mainItem_order"].ToString());
mainItem_uid = GlobalClass.CreateRandomCode(12); mainItem_uid = GlobalClass.CreateRandomCode(12);
mainItem newItem = new mainItem(); mainItem newItem = new mainItem();
newItem.mainItem_name = mainItem_name; newItem.mainItem_name = mainItem_name;
newItem.mainItem_uid = mainItem_uid; newItem.mainItem_uid = mainItem_uid;
newItem.mainItem_order = mainItem_order;
newItem.dept_uid = dept_uid; newItem.dept_uid = dept_uid;
newItem.mainItem_lastmodify_uid = token.user_uid; newItem.mainItem_lastmodify_uid = token.user_uid;
newItem.mainItem_createdate = DateTime.Now; newItem.mainItem_createdate = DateTime.Now;
@ -972,10 +968,7 @@ namespace QuotationMaker.Controllers
return Content(JsonConvert.SerializeObject(ret), "application/json;charset=utf-8"); return Content(JsonConvert.SerializeObject(ret), "application/json;charset=utf-8");
} }
int mainItem_order = int.Parse(obj["mainItem_order"].ToString());
editItem.mainItem_name = mainItem_name; editItem.mainItem_name = mainItem_name;
editItem.mainItem_order = mainItem_order;
editItem.mainItem_lastmodify_uid = token.user_uid; editItem.mainItem_lastmodify_uid = token.user_uid;
editItem.mainItem_modifydate= DateTime.Now; editItem.mainItem_modifydate= DateTime.Now;
@ -1027,7 +1020,7 @@ namespace QuotationMaker.Controllers
string dept_uid = obj["dept_uid"].ToString(); string dept_uid = obj["dept_uid"].ToString();
ret.mainItems = conn.Query<mainItem>("select * from mainItem where dept_uid = @dept_uid order by mainItem_order, mainItem_name", new { dept_uid = dept_uid }).ToList(); ret.mainItems = conn.Query<mainItem>("select * from mainItem where dept_uid = @dept_uid", new { dept_uid = dept_uid }).ToList();
ret.ret = "yes"; ret.ret = "yes";
return Content(JsonConvert.SerializeObject(ret), "application/json;charset=utf-8"); return Content(JsonConvert.SerializeObject(ret), "application/json;charset=utf-8");

1
Modals/DbTableClass.cs
View File

@ -359,7 +359,6 @@ public class DbTableClass
public string mainItem_uid { get; set; } = ""; public string mainItem_uid { get; set; } = "";
public string dept_uid { get; set; } = ""; public string dept_uid { get; set; } = "";
public string mainItem_name { get; set; } = ""; public string mainItem_name { get; set; } = "";
public int mainItem_order { get; set; } = 99;
public DateTime mainItem_createdate { get; set; } = DateTime.Now; public DateTime mainItem_createdate { get; set; } = DateTime.Now;
public DateTime mainItem_modifydate { get; set; } = DateTime.Now; public DateTime mainItem_modifydate { get; set; } = DateTime.Now;
public string mainItem_lastmodify_uid { get; set; } = ""; public string mainItem_lastmodify_uid { get; set; } = "";

6
Views/Home/ProjectList.cshtml
View File

@ -85,12 +85,12 @@
<!-- #accordion2 --> <!-- #accordion2 -->
<div id="accordion1" class="card-expansion"> <div id="accordion1" class="card-expansion">
<!-- .card --> <!-- .card -->
<div class="card card-expansion-item"> <div class="card card-expansion-item expanded">
<div class="card-header border-0" id="headingOne1"> <div class="card-header border-0" id="headingOne1">
<button id="adv-search-btn" class="btn btn-reset d-flex justify-content-between w-100" data-toggle="collapse" data-target="#collapseOne1" aria-expanded="true" aria-controls="collapseOne1"><span>進階搜尋</span> <span class="collapse-indicator"><i class="fa fa-fw fa-chevron-down"></i></span></button> <button id="adv-search-btn" class="btn btn-reset d-flex justify-content-between w-100" data-toggle="collapse" data-target="#collapseOne1" aria-expanded="false" aria-controls="collapseOne1"><span>進階搜尋</span> <span class="collapse-indicator"><i class="fa fa-fw fa-chevron-down"></i></span></button>
</div> </div>
<div> <div>
<div id="collapseOne1" class="collapse show" aria-labelledby="headingOne1" data-parent="#accordion1"> <div id="collapseOne1" class="collapse" aria-labelledby="headingOne1" data-parent="#accordion1">
<div class="card-body pt-0"> <div class="card-body pt-0">
<div class="row"> <div class="row">

11
Views/Home/RateList.cshtml
View File

@ -64,8 +64,8 @@
<table id="dt-responsive" class="table dt-responsive nowrap w-100"> <table id="dt-responsive" class="table dt-responsive nowrap w-100">
<thead> <thead>
<tr> <tr>
<th style="width: 65%;"> 主項目名稱 </th> <th style="width: 75%;"> 主項目名稱 </th>
<th style="width: 10%;"> 順序 </th>
<th> 功能 </th> <th> 功能 </th>
</tr> </tr>
</thead> </thead>
@ -102,12 +102,7 @@
<input type="text" id="modal_mainItem_name" class="form-control" value="" placeholder="主項目名稱" maxlength="36" required=""> <label for="modal_mainItem_name">主項目名稱</label> <input type="text" id="modal_mainItem_name" class="form-control" value="" placeholder="主項目名稱" maxlength="36" required=""> <label for="modal_mainItem_name">主項目名稱</label>
</div> </div>
</div><!-- /.form-group --> </div><!-- /.form-group -->
<!-- .form-group -->
<div class="form-group">
<div class="form-label-group">
<input type="number" id="modal_mainItem_order" class="form-control" value="" placeholder="順序" required=""> <label for="modal_mainItem_order">順序</label>
</div>
</div><!-- /.form-group -->
</div><!-- /.modal-body --> </div><!-- /.modal-body -->
<!-- .modal-footer --> <!-- .modal-footer -->
<div class="modal-footer"> <div class="modal-footer">

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

@ -2982,8 +2982,7 @@ function loadSubItemTypeahead(mainItem_uid) {
highlight: false highlight: false
}, },
{ {
source: nflTeamsWithDefaults, source: nflTeamsWithDefaults
limit: 20
} }
); );
@ -3097,8 +3096,7 @@ function loadMainItemTypeahead() {
highlight: false highlight: false
}, },
{ {
source: nflTeamsWithDefaults, source: nflTeamsWithDefaults
limit: 20
} }
); );
@ -3414,8 +3412,7 @@ function initInvoiceSelectItem() {
highlight: false highlight: false
}, },
{ {
source: nflTeamsWithDefaults, source: nflTeamsWithDefaults
limit: 20
} }
); );
} }

22
wwwroot/assets/javascript/custom/ratelist.js
View File

@ -27,29 +27,17 @@ $(document).ready(function () {
var dept_uid = $("#dept_uid").val(); var dept_uid = $("#dept_uid").val();
var mainItem_uid = $('#mainItem_uid').val(); var mainItem_uid = $('#mainItem_uid').val();
var mainItem_name = $('#modal_mainItem_name').val(); var mainItem_name = $('#modal_mainItem_name').val();
var mainItem_order = $('#modal_mainItem_order').val();
if (mainItem_name == "") { if (mainItem_name == "") {
alert('請輸入主項目名稱'); alert('請輸入主項目名稱');
return; retur;
}
if (mainItem_order == "") {
alert('請輸入順序，數字越小越上面!');
return;
}
if (mainItem_order.isNumber == false) {
alert('請輸入順序數字，數字越小越上面!');
return;
} }
var formData = { var formData = {
method: method, method: method,
dept_uid: dept_uid, dept_uid: dept_uid,
mainItem_uid: mainItem_uid, mainItem_uid: mainItem_uid,
mainItem_name: mainItem_name, mainItem_name: mainItem_name
mainItem_order: mainItem_order
} }
$.ajax({ $.ajax({
@ -371,13 +359,12 @@ function loadDataTable() {
}, },
order: [[1, 'asc']], order: [[1, 'desc']],
info: true, info: true,
search: "搜尋:", search: "搜尋:",
searching: true, searching: true,
columns: [ columns: [
{ data: 'mainItem_name', className: 'align-top text-left', orderable: true, searchable: true }, { data: 'mainItem_name', className: 'align-top text-left', orderable: true, searchable: true },
{ data: 'mainItem_order', className: 'align-top text-right', orderable: true, searchable: false },
{ data: 'mainItem_uid', className: 'align-top text-center', orderable: false, searchable: false } { data: 'mainItem_uid', className: 'align-top text-center', orderable: false, searchable: false }
], ],
columnDefs: [ columnDefs: [
@ -394,7 +381,7 @@ function loadDataTable() {
} }
}, },
{ {
targets: 2, targets: 1,
orderable: false, orderable: false,
searchable: false, searchable: false,
render: function render(data, type, row, meta) { render: function render(data, type, row, meta) {
@ -627,7 +614,6 @@ function buttonClick(obj) {
$("#mainItem_uid").val(obj.mainItem_uid); $("#mainItem_uid").val(obj.mainItem_uid);
$("#dept_uid").val(obj.dept_uid).trigger('change'); $("#dept_uid").val(obj.dept_uid).trigger('change');
$("#modal_mainItem_name").val(obj.mainItem_name).trigger('change'); $("#modal_mainItem_name").val(obj.mainItem_name).trigger('change');
$("#modal_mainItem_order").val(obj.mainItem_order).trigger('change');
$('#mainItemModal').modal('toggle'); $('#mainItemModal').modal('toggle');