Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS
This commit is contained in:
commit
a8293c6798
@ -89,7 +89,7 @@
|
||||
<span aria-hidden="true"><i class="fal fa-times"></i></span>
|
||||
</button>
|
||||
</div>
|
||||
<form id="opeRecForm">
|
||||
<form id="alr_opeRecForm">
|
||||
<div class="modal-body">
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
@ -200,8 +200,8 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-secondary" id="OpeRecCanBtn" data-dismiss="modal">關閉</button>
|
||||
<button type="button" class="btn btn-primary" id="OpeRecSendBtn" e-prevent>儲存</button>
|
||||
<button type="button" class="btn btn-secondary" id="alr_OpeRecCanBtn" data-dismiss="modal">關閉</button>
|
||||
<button type="button" class="btn btn-primary" id="alr_OpeRecSendBtn" e-prevent>儲存</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
@ -218,7 +218,7 @@
|
||||
pageAct.alrSelSysSub = [];
|
||||
pageAct.selAllSysSub = false;
|
||||
first = true;
|
||||
let dataAlarm = [];
|
||||
// let dataAlarm = [];
|
||||
var historyTable = null;
|
||||
var elemIndex = 0;
|
||||
var index = 0;
|
||||
@ -386,8 +386,8 @@
|
||||
$('#inpFixDoCode').val(alr_fixDoCode);
|
||||
});
|
||||
|
||||
onEvent('click', '#OpeRecSendBtn', function () {
|
||||
let form = $("#opeRecForm");
|
||||
onEvent('click', '#alr_OpeRecSendBtn', function () {
|
||||
let form = $("#alr_opeRecForm");
|
||||
$(form).validate({
|
||||
rules: {
|
||||
inpWorTyp: { required: true },
|
||||
@ -441,7 +441,7 @@
|
||||
} else {
|
||||
//toast_ok(common.AddSuc);
|
||||
//$("#opeFirmModal").modal("hide");
|
||||
$("#OpeRecCanBtn").click();
|
||||
$("#alr_OpeRecCanBtn").click();
|
||||
getData();
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user