hokky 4 maanden geleden
bovenliggende
commit
76de018dd2

+ 3 - 3
dabory/para/erp/ko_KR/form/form-b/purch/porder.json

@@ -193,7 +193,7 @@
     "// ListVars": "ListVars[0]-Caption, ListVars[1]-Size(%), ListVars[2]-align",
     "ListVars": [
         {
-            "$Radio": "$Radio",
+            "$Radio": "",
             "$Check": "$Check",
             "ItemCode": "품목코드*",
             "ItemName": "품명*",
@@ -212,7 +212,7 @@
             "PorderMemo": "품목설명(M)"
         },
         {
-            "$Radio": "3",
+            "$Radio": "",
             "$Check": "3",
             "ItemCode": "10",
             "ItemName": "30",
@@ -231,7 +231,7 @@
             "PorderMemo": "10"
         },
         {
-            "$Radio": "center",
+            "$Radio": "",
             "$Check": "center",
             "ItemCode": "left",
             "ItemName": "left",

+ 0 - 5
dabory/para/pro/ko_KR/popup/popup-form1/form-a/ssh-app.json--

@@ -48,13 +48,8 @@
             "Keypair": "Keypair",
 
             "SecondCardTitle": "Information to create .env.dabory",
-<<<<<<< HEAD:dabory/para/pro/ko_KR/popup/popup-form1/form-a/ssh-app.json
-            "ApiHost": "API Host:Port* ex:34.56.78.99:18080",
-            "DbHost": "DB Host:Port* ex:34.56.78.99:3360 ㅋㅋㅋ",
-=======
             "ApiHost": "API Host:Port* ex)34.56.78.99:18080",
             "DbHost": "DB Host:Port* ex)34.56.78.99:3306",
->>>>>>> 6bc0fdc1685984cde84aab46da3a5a255491a645:public/para/dabory/pro/ko_KR/popup/popup-form1/form-a/ssh-app.json
             "DbUser": "DB User*",
             "DbPassword": "DB Password*",
             "DbName": "DB Name*",

+ 2 - 14
index.html

@@ -1,11 +1,7 @@
 <html>
 
 <head>
-<<<<<<< HEAD
-<title>Kloxo-MR : Default Page for newerp.daboryhost.com</title>
-=======
 <title>KloxoNG : Default Page for solution.dabory.com</title>
->>>>>>> 6b84ce84b666ed214c1f13b31200465c9e512481
 </head>
 
 <style>
@@ -75,11 +71,7 @@ table.content_title td {
 		<td>
 			<table class="content">
 				<tr>
-<<<<<<< HEAD
-					<td><a href="http://mratwork.com/" title="Go to Kloxo-MR website"><img style="margin:5px; padding:5px; height:50px" class="logo" src="./images/kloxo-mr.png" alt="kloxo-mr-logo"></a></td>
-=======
 					<td><a href="http://kloxong.org" title="Go to Kloxo Next Generation website"><img style="margin:5px; padding:5px; height:50px" class="logo" src="./images/kloxong.png" alt="kloxong-logo"></a></td>
->>>>>>> 6b84ce84b666ed214c1f13b31200465c9e512481
 				</tr>
 
 			</table>
@@ -95,18 +87,14 @@ table.content_title td {
 			<tr>
 				<td><br>
 				<br>
-<<<<<<< HEAD
-				<b>Kloxo-MR Default Page for newerp.daboryhost.com</b> </td>
-=======
 				<b>Kloxo Next Generation Default Page for solution.dabory.com</b> </td>
->>>>>>> 6b84ce84b666ed214c1f13b31200465c9e512481
 			</tr>
 		</table>
 		<br>
 		<table  class="content_body" width="640">
 			<tr>
 				<td width="100%" bgcolor="#eeeeee">
-				If you are seeing this page, it means that the Domain has been successfully 
+				If you are seeing this page, it means that the Domain has been successfully
 				configured on the machine, but the files has not been uploaded yet.
 				<br>
 				<br>
@@ -121,4 +109,4 @@ table.content_title td {
 
 </body>
 
-</html>
+</html>

+ 5 - 8
public/js/modals-controller/b-type/common.js

@@ -174,11 +174,11 @@
             }
         })
         // 현재 선택된 input요소의 tr에서 첫번째 td의 input 요소의 name
-        // let cursor = $(tr).find('td:eq(0) input').attr('name')
-        let cursor = $(tr).find('td:eq(0) input');
-        if(cursor.is(':hidden')){
-            cursor = $(tr).find('td:eq(1) input').attr('name')
-        }
+        let cursor = $(tr).find('td:eq(0) input').attr('name')
+        // let cursor = $(tr).find('td:eq(0) input');
+        // if(cursor.is(':hidden')){
+        //     cursor = $(tr).find('td:eq(1) input').attr('name')
+        // }
 
         $(table).find(`input[name='${cursor}']`).each(function (i) {
             if (! $(this).is(':checked')) {
@@ -515,9 +515,6 @@
 
         let up_or_down_val = (move == 'up' ? -1 : 1);
         let temp_bd_page = Btype.change_array_order(eval(namespace).bd_page, index, up_or_down_val);
-        console.log(eval(namespace).bd_page,)
-        console.log(index)
-        console.log(up_or_down_val)
         if (! temp_bd_page) {
             iziToast.error({
                 title: 'Error',

+ 44 - 29
resources/views/front/dabory/erp/purchase/porder.blade.php

@@ -53,10 +53,10 @@
                                     <div class="form-group d-flex flex-column mb-2">
                                         <label class="m-0 overflow-hidden text-nowrap">{{ $formB['FormVars']['Title']['AutoSlipNo'] }}</label>
                                         <div class="col-12 d-flex p-0">
-                                            <button id="auto-slip-no-btn" class="btn-dark border-white rounded overflow-hidden col-3 text-center text-white text-nowrap radius-r0"
-                                                onclick="get_last_slip_no(this)">
-                                                <span class="icon-cogs"></span>
-                                            </button>
+                                        {{-- <button id="auto-slip-no-btn" class="btn-dark border-white rounded overflow-hidden col-3 text-center text-white text-nowrap radius-r0" --}}
+                                        {{--         onclick="get_last_slip_no(this)"> --}}
+                                        {{--         <span class="icon-cogs"></span> --}}
+                                        {{--     </button> --}}
                                             <input type="text" id="auto-slip-no-txt" class="rounded w-100 radius-l0" autocomplete="off" disabled
                                                    maxlength="{{ $formB['FormVars']['MaxLength']['AutoSlipNo'] }}"
                                                 {{ $formB['FormVars']['Required']['AutoSlipNo'] }}>
@@ -370,6 +370,16 @@
                 }
             }
 
+            $('#porder-table-body').on('click', 'tr', function() {
+                // Find the input element with name="bd-cursor-state" within the clicked row
+                const $bdCursorStateInput = $(this).find('input[name="bd-cursor-state"]');
+                console.log('bdCursorStateInput : ', $bdCursorStateInput)
+                if ($bdCursorStateInput.length) {
+                    $($bdCursorStateInput).prop('checked', true)
+                    Btype.bd_cursor_click($bdCursorStateInput)
+                }
+            });
+
             $('.porder-act').on('click', function () {
                 // console.log($(this).data('value'))
                 switch( $(this).data('value') ) {
@@ -537,7 +547,9 @@
                     Btype.body_act_success_callback($this, tr);
                     Btype.check_the_checkbox_when_changing($this, false)
                 });
+                console.log('필수데이터 노누락');
             } else {
+                console.log('필수데이터 누락');
                 iziToast.error({
                     title: 'Error',
                     message: @json(_e('(*)Required item(s) omitted')),
@@ -547,8 +559,11 @@
 
         // start body act btn
         async function btn_bd_act_add() {
-            if (parseInt($(`#frm`).find(`input[name="Id"]`).val()) == 0 && formB['SlipCommonSetup']['IsAutoSaveHdByItemButton']) {
+            // if (parseInt($(`#frm`).find(`input[name="Id"]`).val()) == 0 && formB['SlipCommonSetup']['IsAutoSaveHdByItemButton']) {
+            if (parseInt($(`#frm`).find(`input[name="Id"]`).val()) == 0) {
                 if (! await Btype.btn_act_add_chain('#porder-form #frm')) { return }
+            }else{
+                console.log('formb.SlipCommonSetup : ', formB['SlipCommonSetup']);
             }
 
             if (! Btype.last_item_added_check('#porder-table-body')) {
@@ -800,7 +815,7 @@
                 // 품목코드, 수량, 단가, 공급가액, 세액, 합계금액
                 html.push (
                 `<tr>
-                    <td class="text-${formB.ListVars['Align'].$Radio} px-import-0">
+                    <td class="text-${formB.ListVars['Align'].$Radio} px-import-0" ${formB.ListVars['Hidden'].$Radio}>
                         <input name="bd-cursor-state" type="radio" value="1" tabindex="-1"
                         class="text-${formB.ListVars['Align'].$Radio}"
                         onclick="Btype.bd_cursor_click(this)">
@@ -812,13 +827,13 @@
                     <td onkeydown="Btype.enterPressedinCell(event)"
                         class="text-${formB.ListVars['Align'].ItemCode}" ${formB.ListVars['Hidden'].ItemCode}
                         >
-                        <input type="text" class="text-${formB.ListVars['Align'].ItemCode} border-0 bg-white" value="${bd.ItemCode}" disabled
+                        <input type="text" class="text-${formB.ListVars['Align'].ItemCode} border-0 bg-white" value="${bd.ItemCode}" readonly
                         onchange="Btype.check_the_checkbox_when_changing(this)" required>
                     </td>
                     <td onkeydown="Btype.enterPressedinCell(event, 2)"
                         class="text-${formB.ListVars['Align'].ItemName}" ${formB.ListVars['Hidden'].ItemName}
                         >
-                        <input type="text" class="text-${formB.ListVars['Align'].ItemName} border-0 bg-white" value="${bd.ItemName}" disabled
+                        <input type="text" class="text-${formB.ListVars['Align'].ItemName} border-0 bg-white" value="${bd.ItemName}" readonly
                         onchange="Btype.check_the_checkbox_when_changing(this)" required>
                     </td>
                     <td
@@ -830,7 +845,7 @@
                     <td onkeydown="Btype.handleEnterPressedinTabCell(event)"
                         class="text-${formB.ListVars['Align'].PorderQty}" ${formB.ListVars['Hidden'].PorderQty}
                         >
-                        <input type="text" class="text-${formB.ListVars['Align'].PorderQty} border-0 bg-white" value="${format_conver_for(bd.PorderQty, formB.ListVars['Format'].PorderQty)}" disabled
+                        <input type="text" class="text-${formB.ListVars['Align'].PorderQty} border-0 bg-white" value="${format_conver_for(bd.PorderQty, formB.ListVars['Format'].PorderQty)}" readonly
                         onchange="Btype.check_the_checkbox_when_changing(this)"
                         onfocusout="override_amt_calc_txt_is_changed()"
                         required>
@@ -838,7 +853,7 @@
                     <td onkeydown="Btype.handleEnterPressedinTabCell(event)"
                         class="text-${formB.ListVars['Align'].PorderPrc}" ${formB.ListVars['Hidden'].PorderPrc}
                         >
-                        <input type="text" class="text-${formB.ListVars['Align'].PorderPrc} border-0 bg-white" value="${format_conver_for(bd.PorderPrc, formB.ListVars['Format'].PorderPrc)}" disabled
+                        <input type="text" class="text-${formB.ListVars['Align'].PorderPrc} border-0 bg-white" value="${format_conver_for(bd.PorderPrc, formB.ListVars['Format'].PorderPrc)}" readonly
                         onchange="Btype.check_the_checkbox_when_changing(this)"
                         onfocusout="override_amt_calc_txt_is_changed()"
                         required>
@@ -846,7 +861,7 @@
                     <td onkeydown="Btype.handleEnterPressedinTabCell(event)"
                         class="text-${formB.ListVars['Align'].SupplyAmt}" ${formB.ListVars['Hidden'].SupplyAmt}
                         >
-                        <input type="text" class="text-${formB.ListVars['Align'].SupplyAmt} border-0 bg-white" value="${format_conver_for(bd.PorderSupply, formB.ListVars['Format'].SupplyAmt)}" disabled
+                        <input type="text" class="text-${formB.ListVars['Align'].SupplyAmt} border-0 bg-white" value="${format_conver_for(bd.PorderSupply, formB.ListVars['Format'].SupplyAmt)}" readonly
                         onchange="Btype.check_the_checkbox_when_changing(this)"
                         onfocusout="override_custom_supply_amt_or_vat_amt()"
                         required>
@@ -854,7 +869,7 @@
                     <td onkeydown="Btype.handleEnterPressedinTabCell(event)"
                         class="text-${formB.ListVars['Align'].VatAmt}" ${formB.ListVars['Hidden'].VatAmt}
                         >
-                        <input type="text" class="text-${formB.ListVars['Align'].VatAmt} border-0 bg-white" value="${format_conver_for(bd.PorderVat, formB.ListVars['Format'].VatAmt)}" disabled
+                        <input type="text" class="text-${formB.ListVars['Align'].VatAmt} border-0 bg-white" value="${format_conver_for(bd.PorderVat, formB.ListVars['Format'].VatAmt)}" readonly
                         onchange="Btype.check_the_checkbox_when_changing(this)"
                         onfocusout="override_custom_supply_amt_or_vat_amt()"
                         required>
@@ -862,7 +877,7 @@
                     <td onkeydown="Btype.handleEnterPressedinTabCell(event)"
                         class="text-${formB.ListVars['Align'].SumAmt}" ${formB.ListVars['Hidden'].SumAmt}
                         >
-                        <input type="text" class="text-${formB.ListVars['Align'].SumAmt} border-0 bg-white" value="${format_conver_for(bd.PorderSum, formB.ListVars['Format'].SumAmt)}" disabled
+                        <input type="text" class="text-${formB.ListVars['Align'].SumAmt} border-0 bg-white" value="${format_conver_for(bd.PorderSum, formB.ListVars['Format'].SumAmt)}" readonly
                         onchange="Btype.check_the_checkbox_when_changing(this)"
                         onfocusout="override_custom_sum_amt()"
                         required>
@@ -873,7 +888,7 @@
                     <td onkeydown="Btype.handleEnterPressedinTabCell(event)"
                         class="text-${formB.ListVars['Align'].ConfirmDate}" ${formB.ListVars['Hidden'].ConfirmDate}
                         >
-                        <input type="date" class="text-${formB.ListVars['Align'].ConfirmDate} border-0 bg-white" value="${isEmpty(bd.ConfirmDate) ? '' : moment(bd.ConfirmDate).format('YYYY-MM-DD')}" disabled
+                        <input type="date" class="text-${formB.ListVars['Align'].ConfirmDate} border-0 bg-white" value="${isEmpty(bd.ConfirmDate) ? '' : moment(bd.ConfirmDate).format('YYYY-MM-DD')}" readonly
                         onchange="Btype.check_the_checkbox_when_changing(this)"
                         onfocusout="save_data_when_entering_text()">
                     </td>
@@ -881,7 +896,7 @@
                     <td onkeydown="Btype.handleEnterPressedinTabCell(event)"
                         class="text-${formB.ListVars['Align'].DeliDate}" ${formB.ListVars['Hidden'].DeliDate}
                         >
-                        <input type="date" class="text-${formB.ListVars['Align'].DeliDate} border-0 bg-white" value="${isEmpty(bd.DeliDate) ? '' : moment(bd.DeliDate).format('YYYY-MM-DD')}" disabled
+                        <input type="date" class="text-${formB.ListVars['Align'].DeliDate} border-0 bg-white" value="${isEmpty(bd.DeliDate) ? '' : moment(bd.DeliDate).format('YYYY-MM-DD')}" readonly
                         onchange="Btype.check_the_checkbox_when_changing(this)"
                         onfocusout="save_data_when_entering_text()"
                         required>
@@ -889,7 +904,7 @@
                     <td onkeydown="Btype.handleEnterPressedinTabCell(event)"
                         class="text-${formB.ListVars['Align'].Ref1}" ${formB.ListVars['Hidden'].Ref1}
                         >
-                        <input type="text" class="text-${formB.ListVars['Align'].Ref1} border-0 bg-white" value="${bd.Ref1}" disabled
+                        <input type="text" class="text-${formB.ListVars['Align'].Ref1} border-0 bg-white" value="${bd.Ref1}" readonly
                         onchange="Btype.check_the_checkbox_when_changing(this)"
                         onfocusout="save_data_when_entering_text()">
                     </td>
@@ -897,7 +912,7 @@
                         onfocusout="add_td_last_tap_out(this, ${bd.Id})"
                         class="text-${formB.ListVars['Align'].Ref2}" ${formB.ListVars['Hidden'].Ref2}
                         >
-                        <input type="text" class="text-${formB.ListVars['Align'].Ref2} border-0 bg-white" value="${bd.Ref2}" disabled
+                        <input type="text" class="text-${formB.ListVars['Align'].Ref2} border-0 bg-white" value="${bd.Ref2}" readonly
                         onchange="Btype.check_the_checkbox_when_changing(this)"
                         onfocusout="save_data_when_entering_text()">
                     </td>
@@ -926,7 +941,7 @@
 
             let html =
             `<tr>
-                <td class="text-${formB.ListVars['Align'].$Radio} px-import-0">
+                <td class="text-${formB.ListVars['Align'].$Radio} px-import-0" ${formB.ListVars['Hidden'].$Radio}>
                     <input name="bd-cursor-state" type="radio" value="1" tabindex="-1"
                     class="text-${formB.ListVars['Align'].$Radio}"
                     id="bd-cursor-state-${last_bd_id_inc}"
@@ -939,14 +954,14 @@
                 <td onkeydown="Btype.enterPressedinCell(event)"
                     class="text-${formB.ListVars['Align'].ItemCode}" ${formB.ListVars['Hidden'].ItemCode}
                     >
-                    <input type="text" class="text-${formB.ListVars['Align'].ItemCode} border-0 bg-white"
+                    <input type="text" class="text-${formB.ListVars['Align'].ItemCode} border-0 bg-white" readonly
                     onchange="Btype.check_the_checkbox_when_changing(this)"
                     id="item-code-${last_bd_id_inc}" required>
                 </td>
                 <td onkeydown="Btype.enterPressedinCell(event, 2)"
                     class="text-${formB.ListVars['Align'].ItemName}" ${formB.ListVars['Hidden'].ItemName}
                     >
-                    <input type="text" class="text-${formB.ListVars['Align'].ItemName} border-0 bg-white"
+                    <input type="text" class="text-${formB.ListVars['Align'].ItemName} border-0 bg-white" readonly
                     onchange="Btype.check_the_checkbox_when_changing(this)" required>
                 </td>
                 <td
@@ -958,7 +973,7 @@
                 <td onkeydown="Btype.handleEnterPressedinTabCell(event)"
                     class="text-${formB.ListVars['Align'].PorderQty}" ${formB.ListVars['Hidden'].PorderQty}
                     >
-                    <input type="text" class="text-${formB.ListVars['Align'].PorderQty} border-0 bg-white"
+                    <input type="text" class="text-${formB.ListVars['Align'].PorderQty} border-0 bg-white" readonly
                     onchange="Btype.check_the_checkbox_when_changing(this)"
                     onfocusout="override_amt_calc_txt_is_changed()"
                     required>
@@ -966,7 +981,7 @@
                 <td onkeydown="Btype.handleEnterPressedinTabCell(event)"
                     class="text-${formB.ListVars['Align'].PorderPrc}" ${formB.ListVars['Hidden'].PorderPrc}
                     >
-                    <input type="text" class="text-${formB.ListVars['Align'].PorderPrc} border-0 bg-white"
+                    <input type="text" class="text-${formB.ListVars['Align'].PorderPrc} border-0 bg-white" readonly
                     onchange="Btype.check_the_checkbox_when_changing(this)"
                     onfocusout="override_amt_calc_txt_is_changed()"
                     required>
@@ -974,7 +989,7 @@
                 <td onkeydown="Btype.handleEnterPressedinTabCell(event)"
                     class="text-${formB.ListVars['Align'].SupplyAmt}" ${formB.ListVars['Hidden'].SupplyAmt}
                     >
-                    <input type="text" class="text-${formB.ListVars['Align'].SupplyAmt} border-0 bg-white"
+                    <input type="text" class="text-${formB.ListVars['Align'].SupplyAmt} border-0 bg-white" readonly
                     onchange="Btype.check_the_checkbox_when_changing(this)"
                     onfocusout="override_custom_supply_amt_or_vat_amt()"
                     required>
@@ -982,13 +997,13 @@
                 <td onkeydown="Btype.handleEnterPressedinTabCell(event)"
                     class="text-${formB.ListVars['Align'].VatAmt}" ${formB.ListVars['Hidden'].VatAmt}
                     >
-                    <input type="text" class="text-${formB.ListVars['Align'].VatAmt} border-0 bg-white"
+                    <input type="text" class="text-${formB.ListVars['Align'].VatAmt} border-0 bg-white" readonly
                     onchange="Btype.check_the_checkbox_when_changing(this)"
                     onfocusout="override_custom_supply_amt_or_vat_amt()"
                     required>
                 </td>
                 <td onkeydown="Btype.handleEnterPressedinTabCell(event)"
-                    class="text-${formB.ListVars['Align'].SumAmt}" ${formB.ListVars['Hidden'].SumAmt}
+                    class="text-${formB.ListVars['Align'].SumAmt}" ${formB.ListVars['Hidden'].SumAmt} readonly
                     >
                     <input type="text" class="text-${formB.ListVars['Align'].SumAmt} border-0 bg-white"
                     onchange="Btype.check_the_checkbox_when_changing(this)"
@@ -1001,7 +1016,7 @@
                 <td onkeydown="Btype.handleEnterPressedinTabCell(event)"
                     class="text-${formB.ListVars['Align'].ConfirmDate}" ${formB.ListVars['Hidden'].ConfirmDate}
                     >
-                    <input type="date" class="text-${formB.ListVars['Align'].ConfirmDate} border-0 bg-white"
+                    <input type="date" class="text-${formB.ListVars['Align'].ConfirmDate} border-0 bg-white" readonly
                     value="${moment().format('YYYY-MM-DD')}"
                     onchange="Btype.check_the_checkbox_when_changing(this)"
                     onfocusout="save_data_when_entering_text()">
@@ -1010,7 +1025,7 @@
                 <td onkeydown="Btype.handleEnterPressedinTabCell(event)"
                     class="text-${formB.ListVars['Align'].DeliDate}" ${formB.ListVars['Hidden'].DeliDate}
                     >
-                    <input type="date" class="text-${formB.ListVars['Align'].DeliDate} border-0 bg-white"
+                    <input type="date" class="text-${formB.ListVars['Align'].DeliDate} border-0 bg-white" readonly
                     value="${moment().format('YYYY-MM-DD')}"
                     onchange="Btype.check_the_checkbox_when_changing(this)"
                     onfocusout="save_data_when_entering_text()"
@@ -1019,7 +1034,7 @@
                 <td onkeydown="Btype.handleEnterPressedinTabCell(event)"
                     class="text-${formB.ListVars['Align'].Ref1}" ${formB.ListVars['Hidden'].Ref1}
                     >
-                    <input type="text" class="text-${formB.ListVars['Align'].Ref1} border-0 bg-white"
+                    <input type="text" class="text-${formB.ListVars['Align'].Ref1} border-0 bg-white" readonly
                     onchange="Btype.check_the_checkbox_when_changing(this)"
                     onfocusout="save_data_when_entering_text()">
                 </td>
@@ -1027,7 +1042,7 @@
                     data-last=true onfocusout="add_td_last_tap_out(this, ${last_bd_id_inc})"
                     class="text-${formB.ListVars['Align'].Ref2}" ${formB.ListVars['Hidden'].Ref2}
                     >
-                    <input type="text" class="text-${formB.ListVars['Align'].Ref2} border-0 bg-white"
+                    <input type="text" class="text-${formB.ListVars['Align'].Ref2} border-0 bg-white"readonly
                     onchange="Btype.check_the_checkbox_when_changing(this)"
                     onfocusout="save_data_when_entering_text()">
                 </td>