forked from dk96/QuotationMaker
updates
parent
8ffc3397af
commit
021bd019ec
|
|
@ -1944,8 +1944,11 @@ namespace QuotationMaker.Controllers
|
||||||
|
|
||||||
if (token.user_id != GlobalClass.appsettings("Admin:id"))
|
if (token.user_id != GlobalClass.appsettings("Admin:id"))
|
||||||
{
|
{
|
||||||
ret.quotationViews = conn.Query<quotationView>("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<quotationView>(testSQL).ToList();
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
ret.quotationViews = conn.Query<quotationView>("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();
|
ret.quotationViews = conn.Query<quotationView>("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();
|
||||||
|
|
|
||||||
|
|
@ -24,6 +24,8 @@ var hasBind = 'N';
|
||||||
var tmpInvoiceItem;
|
var tmpInvoiceItem;
|
||||||
var tmpPaymentItem;
|
var tmpPaymentItem;
|
||||||
|
|
||||||
|
var fpInvoiceDate;
|
||||||
|
|
||||||
$(document).ready(function () {
|
$(document).ready(function () {
|
||||||
deptList();
|
deptList();
|
||||||
companyList();
|
companyList();
|
||||||
|
|
@ -62,7 +64,7 @@ $(document).ready(function () {
|
||||||
]
|
]
|
||||||
});
|
});
|
||||||
|
|
||||||
const fpInvoiceDate = flatpickr("#invoice_date", {
|
fpInvoiceDate = flatpickr("#invoice_date", {
|
||||||
"locale": "zh_tw",
|
"locale": "zh_tw",
|
||||||
"plugins": [
|
"plugins": [
|
||||||
new monthSelectPlugin({
|
new monthSelectPlugin({
|
||||||
|
|
@ -509,6 +511,10 @@ $(document).ready(function () {
|
||||||
var modelMainItem_ac = $('#modelMainItem_ac').val();
|
var modelMainItem_ac = $('#modelMainItem_ac').val();
|
||||||
|
|
||||||
|
|
||||||
|
if (modelMainItem_ac == "") {
|
||||||
|
modelMainItem_ac = "0";
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
if (modelMainItem_ac.isNumber() == false) {
|
if (modelMainItem_ac.isNumber() == false) {
|
||||||
alert('AC必須為數字!');
|
alert('AC必須為數字!');
|
||||||
|
|
|
||||||
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue