forked from dk96/QuotationMaker
updates
parent
cf70d4d5cd
commit
b4a18c78e7
|
|
@ -339,7 +339,7 @@
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<div class="form-label-group">
|
<div class="form-label-group">
|
||||||
<input id="quotation_date" type="text" class="form-control flatpickr-input" data-toggle="flatpickr" data-date-format="Y/m/d" readonly="readonly" placeholder="報價日期"><label for="quotation_date">報價日期</label>
|
<input id="quotation_date" type="text" class="form-control flatpickr-input" data-toggle="flatpickr" data-date-format="Y/m/d" readonly="readonly" placeholder="報價日期"><label for="quotation_date">報價日期</label>
|
||||||
<input type="hidden" id="quotation_date" />
|
<input type="hidden" id="quotation_date_old" />
|
||||||
</div>
|
</div>
|
||||||
</div><!-- /.form-group -->
|
</div><!-- /.form-group -->
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
|
|
|
||||||
|
|
@ -508,8 +508,11 @@ $(document).ready(function () {
|
||||||
htmlCode += ' <div class="card-header border-bottom-0 btn-group">';
|
htmlCode += ' <div class="card-header border-bottom-0 btn-group">';
|
||||||
htmlCode += ' <input type="hidden" data-name="quotationMainItem_name" value="' + modelMainItem_name + '" />';
|
htmlCode += ' <input type="hidden" data-name="quotationMainItem_name" value="' + modelMainItem_name + '" />';
|
||||||
htmlCode += ' <input type="hidden" data-name="quotationMainItem_ac" value="' + modelMainItem_ac + '" />';
|
htmlCode += ' <input type="hidden" data-name="quotationMainItem_ac" value="' + modelMainItem_ac + '" />';
|
||||||
|
htmlCode += ' <input type="hidden" data-name="quotationMainItem_subTotal" value="0" />';
|
||||||
htmlCode += ' <input type="hidden" data-name="quotationMainItem_name_old" value="" />';
|
htmlCode += ' <input type="hidden" data-name="quotationMainItem_name_old" value="" />';
|
||||||
htmlCode += ' <input type="hidden" data-name="quotationMainItem_ac_old" value="" />';
|
htmlCode += ' <input type="hidden" data-name="quotationMainItem_ac_old" value="" />';
|
||||||
|
htmlCode += ' <input type="hidden" data-name="quotationMainItem_subTotal_old" value="" />';
|
||||||
|
htmlCode += ' <input type="hidden" data-name="mainItem_uid_old" value="" />';
|
||||||
htmlCode += ' <span data-span="quotationMainItem_name" style="width: 60%;">' + modelMainItem_name + '</span>';
|
htmlCode += ' <span data-span="quotationMainItem_name" style="width: 60%;">' + modelMainItem_name + '</span>';
|
||||||
htmlCode += ' <span data-span="quotationMainItem_ac" style="width: 10%;">AC: ' + ac_string + ' </span>';
|
htmlCode += ' <span data-span="quotationMainItem_ac" style="width: 10%;">AC: ' + ac_string + ' </span>';
|
||||||
htmlCode += ' <span data-span="quotationMainItem_subTotal" style="text-align: right;">項目合計: 0</span>';
|
htmlCode += ' <span data-span="quotationMainItem_subTotal" style="text-align: right;">項目合計: 0</span>';
|
||||||
|
|
@ -667,6 +670,50 @@ $(document).ready(function () {
|
||||||
|
|
||||||
$('#invoiceModal').modal('toggle');
|
$('#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() {
|
function loadContactPersion() {
|
||||||
|
|
@ -1250,8 +1297,11 @@ function mainItemHtml(obj) {
|
||||||
htmlCode += ' <div class="card-header border-bottom-0 btn-group">';
|
htmlCode += ' <div class="card-header border-bottom-0 btn-group">';
|
||||||
htmlCode += ' <input type="hidden" data-name="quotationMainItem_name" value="' + obj.modelMainItem_name + '" />';
|
htmlCode += ' <input type="hidden" data-name="quotationMainItem_name" value="' + obj.modelMainItem_name + '" />';
|
||||||
htmlCode += ' <input type="hidden" data-name="quotationMainItem_ac" value="' + obj.modelMainItem_ac + '" />';
|
htmlCode += ' <input type="hidden" data-name="quotationMainItem_ac" value="' + obj.modelMainItem_ac + '" />';
|
||||||
|
htmlCode += ' <input type="hidden" data-name="quotationMainItem_subTotal" value="' + mainItem_totalac + '" />';
|
||||||
htmlCode += ' <input type="hidden" data-name="quotationMainItem_name_old" value="" />';
|
htmlCode += ' <input type="hidden" data-name="quotationMainItem_name_old" value="" />';
|
||||||
htmlCode += ' <input type="hidden" data-name="quotationMainItem_ac_old" value="" />';
|
htmlCode += ' <input type="hidden" data-name="quotationMainItem_ac_old" value="" />';
|
||||||
|
htmlCode += ' <input type="hidden" data-name="quotationMainItem_subTotal_old" value="" />';
|
||||||
|
htmlCode += ' <input type="hidden" data-name="mainItem_uid_old" value="" />';
|
||||||
htmlCode += ' <span data-span="quotationMainItem_name" style="width: 60%;">' + obj.modelMainItem_name + ' </span>';
|
htmlCode += ' <span data-span="quotationMainItem_name" style="width: 60%;">' + obj.modelMainItem_name + ' </span>';
|
||||||
htmlCode += ' <span data-span="quotationMainItem_ac" style="width: 10%;">AC: ' + ac_string + ' </span>';
|
htmlCode += ' <span data-span="quotationMainItem_ac" style="width: 10%;">AC: ' + ac_string + ' </span>';
|
||||||
htmlCode += ' <span data-span="quotationMainItem_subTotal" style="text-align: right;">項目合計: ' + AppendComma(mainItem_totalac) + '</span>';
|
htmlCode += ' <span data-span="quotationMainItem_subTotal" style="text-align: right;">項目合計: ' + AppendComma(mainItem_totalac) + '</span>';
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue