240722-1804-Kim

dabory/para/erp/ko_KR/form/form-b/sales/sales.json

@@ -80,11 +80,7 @@
             "Status": "상황",
             "Supplier": "매출업체*",
             "Contact": "업체담당자",
-<<<<<<< HEAD
             "DealType": "거래구분*",
-=======
-            "DealType": "거래구분",
->>>>>>> 79e2e07b19fcabaccbe8bd7b4812a3a803613323
             "VatType": "부가세*",
             "VatTypeRate": "부가세율",
             "Delivery": "납품기한",
@@ -94,13 +90,8 @@
             "Column2": "컬럼2#",
             "Remarks": "비고",
             "IsClosed": "수주종결",
-<<<<<<< HEAD
             "SgroupName": "영업부서*",
             "UserName": "사용자명*"
-=======
-            "SgroupName": "영업부서#",
-            "UserName": "사용자명#"
->>>>>>> 79e2e07b19fcabaccbe8bd7b4812a3a803613323
         },
         {
             "SaveButton": "left",
@@ -158,11 +149,7 @@
             "Status": "",
             "Supplier": "required",
             "Contact": "",
-<<<<<<< HEAD
             "DealType": "required",
-=======
-            "DealType": "",
->>>>>>> 79e2e07b19fcabaccbe8bd7b4812a3a803613323
             "VatType": "required",
             "VatTypeRate": "",
             "Delivery": "",
@@ -192,10 +179,6 @@
             "VatAmt": "세액*",
             "SumAmt": "합계금액*",
             "StdSalesPrc": "표준매출가#",
-<<<<<<< HEAD
-=======
-            "DeliDate": "확정납기일*",
->>>>>>> 79e2e07b19fcabaccbe8bd7b4812a3a803613323
             "Ref1": "참고1",
             "Ref2": "참고2",
             "SorderMemo": "품목설명(M)"

resources/views/front/dabory/erp/purchase/porder.blade.php

@@ -536,11 +536,7 @@
         }
 
         async function add_td_last_tap_out($this, id) {
-<<<<<<< HEAD
             Btype.btn_act_save('#porder-form #frm', async function () {
-=======
-            Btype.btn_act_save('#squote-form #frm', async function () {
->>>>>>> 79e2e07b19fcabaccbe8bd7b4812a3a803613323
                 let tr = $(`input[name='bd-cursor-state']:checked`).closest('tr')
                 let index = $(tr).prevAll().length
 
@@ -725,16 +721,11 @@
                 VatRate: vat_rate,
                 VatName: vat_name,
                 SgroupName: window.User['SgroupName'],
-<<<<<<< HEAD
                 TotalQty : String(Number(total_qty) - 0)
             }
 
             if (typeof first_thumb !== 'undefined') {
                 parameter.FirstThumb = first_thumb;
-=======
-                TotalQty : String(Number(total_qty) - 0),
-                FirstThumb : first_thumb
->>>>>>> 79e2e07b19fcabaccbe8bd7b4812a3a803613323
             }
 
             if (id < 0) {
@@ -1155,13 +1146,10 @@
             bd_page[index].PorderPrc = item.PurchPrc
             bd_page[index].StdPurchPrc = item.PurchPrc// override_amt_calc_txt_is_changed();
             bd_page[index].TurboThumb = item.TurboThumb
-<<<<<<< HEAD
 
             if (!ThumbArr) { // item 받아왔을 때만 bd_page에 TurboThumb 저장
                 bd_page[index].TurboThumb = item.TurboThumb
             }
-=======
->>>>>>> 79e2e07b19fcabaccbe8bd7b4812a3a803613323
 
             if (bd_page[index].Id === 0) {
                 $(tr).children('td:eq(16)').find('textarea').val(item.ItemMemo)

resources/views/front/dabory/erp/revenue/sales.blade.php

@@ -206,12 +206,7 @@
                                 <div class="card-body">
                                     <div class="form-group d-flex flex-column mb-2">
                                         <label class="m-0">{{ $formB['FormVars']['Title']['SgroupName'] }}</label>
-<<<<<<< HEAD
                                         <select class="rounded w-100" data-closed="0" id="sgroup-id-select"
-=======
-                                            {{ $formB['FormVars']['Required']['SgroupName'] }}
-                                            <select class="rounded w-100" data-closed="0" id="sgroup-id-select"
->>>>>>> 79e2e07b19fcabaccbe8bd7b4812a3a803613323
                                                 maxlength="{{ $formB['FormVars']['MaxLength']['SgroupName'] }}"
                                             {{ $formB['FormVars']['Required']['SgroupName'] }}>
                                         </select>
@@ -366,62 +361,12 @@
         window.onload = async function () {
             ThumbArr = [];
             make_dynamic_table_css('.sales-table', make_dynamic_table_px(formB['ListVars']['Size']))
-<<<<<<< HEAD
-=======
-
-            var test = Btype.get_storage_name_and_branch_name()
-            console.log();
-            // let sgroup_pick = await get_api_data('sgroup-pick', { Page: [ { Id:  parseInt(window.User['SgroupId']) } ] });
-            // window.User['SgroupName'] = sgroup_pick['data']['Page'][0]['SgroupName'];
-            // console.log('sgroup_pick : ', sgroup_pick);
-
-            slipInit = await Btype.get_slip_form_init()
-            // slipInit = @json($slipFormInitCacheData);
-            formB['SlipCommonSetup'] = slipInit['SlipCommonSetup']
-            await Btype.create_deal_type_select_box_options(slipInit.DealTypePage)
-            await Btype.create_vat_type_select_box_options(slipInit.VatRatePage)
-            await Btype.create_sgroup_select_box_options(slipInit.SgroupPage)
-            await create_etc_select_box_options(slipInit)
-            $('#user-txt').val(window.User['NickName'])
-
-            if (formB['SlipCommonSetup']['IsNewRecAutoSlipNo']) {
-                $('.is-new-rec-auto-slip-no').text('자동채번')
-                $('#auto-slip-no-txt').prop('disabled', true)
-                // get_last_slip_no()
-            }
-
-            // slip-search cache 사용
-            if (formB['SlipCommonSetup']['IsLastSlipGet']) {
-                console.log('여기 체크');
-                // slip-search cache 사용
-                Btype.set_slip_cache_data();
-
-                if (! isEmpty(pickCacheData['query'])) {
-                    let query = JSON.parse(pickCacheData['query'])
-                    await Btype.fetch_slip_form_book(query['QueryVars']['FilterValue']);
-                }
-            }
-            // Btype.set_slip_cache_data();
-
-
-            $('#sales-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"]');
-                if ($bdCursorStateInput.length) {
-                    $($bdCursorStateInput).prop('checked', true)
-                    Btype.bd_cursor_click($bdCursorStateInput)
-                }
-            });
-
-            Btype.set_slip_no_btn_disabled()
->>>>>>> 79e2e07b19fcabaccbe8bd7b4812a3a803613323
             $('#sales-date').val(date_to_sting(new Date()))
             $('#stock-date').val(date_to_sting(new Date()))
             Btype.get_storage_name_and_branch_name()
             let sgroup_pick = await get_api_data('sgroup-pick', { Page: [ { Id:  parseInt(window.User['SgroupId']) } ] });
             window.User['SgroupName'] = sgroup_pick['data']['Page'][0]['SgroupName'];
 
-<<<<<<< HEAD
             slipInit = await Btype.get_slip_form_init()
             // slipInit = @json($slipFormInitCacheData);
             formB['SlipCommonSetup'] = slipInit['SlipCommonSetup']
@@ -457,8 +402,6 @@
             });
             Btype.set_slip_no_btn_disabled()
 
-=======
->>>>>>> 79e2e07b19fcabaccbe8bd7b4812a3a803613323
             $('.sales-act').on('click', function () {
                 switch( $(this).data('value') ) {
                     case 'save': Btype.btn_act_save('#sales-form #frm'); break;

resources/views/front/dabory/erp/sales/squote.blade.php

@@ -860,11 +860,7 @@
             $(tr).children('td:eq(3)').find('input').val(item.ItemName)
             $(tr).children('td:eq(4)').text(item.SubName)
             $(tr).children('td:eq(5)').text(item.CountUnit)
-<<<<<<< HEAD
             $(tr).children('td:eq(6)').find('input').val()
-=======
-            $(tr).children('td:eq(6)').find('input').val(0)
->>>>>>> 79e2e07b19fcabaccbe8bd7b4812a3a803613323
             $(tr).children('td:eq(7)').find('input').val(parseFloat(item.PurchPrc).toFixed(window.User['PurchPrcPoint']))
             $(tr).children('td:eq(11)').text(parseFloat(item.SalesPrc).toFixed(window.User['PurchPrcPoint']))