Explorar o código

240630-2307-Kim

hokky hai 4 meses
pai
achega
3f42b5c0ec

+ 3 - 5
dabory/para/erp/ko_KR/copy/body-copy/stock/genio-genio.json

@@ -1,6 +1,6 @@
 {
     "General": {
-        "Title": "재고조정 항목 복사",
+        "Title": "재고 항목 복사",
         "PageApi": "body-copy-page",
         "ActApi": "body-copy-mact"
     },
@@ -25,9 +25,7 @@
             "ItemCodeButton": "품목코드",
             "CompanyNameButton": "업체명",
             "AutoCreateSlipChecked": "",
-            "ShowOnlyClosedChecked": "종결처리만 표시",
             "BalanceOption": "잔량",
-            "DayFromTodayOption": "배송예정 일수",
             "SelectedItems": "선택항목",
             "SelectedQty": "선택수량"
         }
@@ -77,7 +75,7 @@
         {
             "$Check": "$Check",
             "No": "번호",
-            "SlipNo": "재고조정 번호",
+            "SlipNo": "재고 번호",
             "CompanyName": "공급업체",
             "ItemCode": "품목코드",
             "ItemName": "품명",
@@ -125,7 +123,7 @@
             "ItemCode": "item"
         },
         {
-            "SlipNo": "/search/slip-search/sales/genio",
+            "SlipNo": "/search/slip-search/stock/genio",
             "CompanyName": "/search/company-search/company",
             "ItemCode": "/search/item-search/supplier"
         }

+ 5 - 0
dabory/para/erp/ko_KR/form/form-b/genio.json

@@ -72,6 +72,11 @@
     ],
 
     "BodySelectOptions": [
+        {
+            "Value": "body-copy",
+            "Caption": "항목 복사① (재고에서)",
+            "Parameter": "stock/genio-genio"
+        },
         {
             "Value": "multi-delete",
             "Caption": "항목 삭제",

+ 1 - 1
resources/views/front/dabory/erp/sales/squote.blade.php

@@ -432,7 +432,7 @@
 
             // $(`#modal-bodycopy.${parameter_name}`).find('.slip_no-txt').val($('#auto-slip-no-txt').val())
             $(`#modal-bodycopy.${parameter_name}`).find('.company_name-txt').val($('#supplier-txt').val())
-
+            console.log('parameter_name : ', parameter_name);
             let data = formB['BodySelectOptions'].filter(selectOption => selectOption['ModalClassName'] == parameter_name)[0];
             $('.sales').find('.modal-btn').data('target', 'bodycopy')
             $('.sales').find('.modal-btn').data('variable', data['Parameter'])

+ 19 - 0
resources/views/front/dabory/erp/stock/tab/genio-correct.blade.php

@@ -177,6 +177,25 @@
                     GenioCorrect.add_tr();
                 }
             };
+
+            GenioCorrect.btn_bd_act_body_copy = async function (parameter_name) {
+            if (parseInt($('#frm').find('#Id').val()) == 0) {
+                return iziToast.error({
+                    title: 'Error',
+                    message: @json(_e('Can NOT copy in the status')),
+                });
+            }
+
+            // $(`#modal-bodycopy.${parameter_name}`).find('.slip_no-txt').val($('#auto-slip-no-txt').val())
+            $(`#modal-bodycopy.${parameter_name}`).find('.company_name-txt').val($('#supplier-txt').val())
+            console.log('parameter_name : ', parameter_name);
+            let data = formB['BodySelectOptions'].filter(selectOption => selectOption['ModalClassName'] == parameter_name)[0];
+            $('.stock').find('.modal-btn').data('target', 'bodycopy')
+            $('.stock').find('.modal-btn').data('variable', data['Parameter'])
+            $('.stock').find('.modal-btn').data('class', parameter_name)
+            $('.stock').find('.modal-btn').trigger('click')
+            $(`#modal-bodycopy.${parameter_name}`).find('.body-copy-act').data('slip_no', $('#auto-slip-no-txt').val() )
+        }
             // end body act btn
 
             GenioCorrect.add_tr = async function () {

+ 30 - 22
resources/views/front/outline/static/body-copy.blade.php

@@ -1,5 +1,8 @@
 <!--- body-copy-search --->
-@php $modalClassName = $modalClassName ?? ''; @endphp
+@php $modalClassName = $modalClassName ?? '';
+    //var_dump($moealSetFile['BodyCopyPageVars'])
+@endphp
+
 <div class="modal fade modal-red {{ $modalClassName }}" id="modal-bodycopy" aria-hidden="true" data-backdrop="static" style="display: none; z-index: 1050;">
     <div class="modal-dialog m-auto pt-4" style="max-width: 1250px;">
         <button type="button" hidden
@@ -75,23 +78,25 @@
                 <div class="jumbotron jumbotron-fluid w-100 mb-2 py-2">
                     <div class="col-12 d-flex flex-row flex-wrap  align-items-md-center py-2">
 						<!--날짜-->
-						<div class="d-flex flex-column mb-2 sel-date">
-                            <label class="m-0">{{ $moealSetFile['FormVars']['Title']['DayFromTodayOption'] }}</label>
-                            <select class="rounded w-100 day-from-today-select">
-                                <option value="10">10</option>
-                                <option value="20">20</option>
-                                <option value="30" selected>30</option>
-                                <option value="40">40</option>
-                                <option value="50">50</option>
-                                <option value="60">60</option>
-                                <option value="70">70</option>
-                                <option value="80">80</option>
-                                <option value="90">90</option>
-                                <option value="150">150</option>
-                                <option value="300">300</option>
-                                <option value="10000">10000</option>
-                            </select>
-                        </div>
+                        @if(isset($moealSetFile['FormVars']['Title']['DayFromTodayOption']) && !empty($moealSetFile['FormVars']['Title']['DayFromTodayOption']))
+                            <div class="d-flex flex-column mb-2 sel-date">
+                                <label class="m-0">{{ $moealSetFile['FormVars']['Title']['DayFromTodayOption'] }}</label>
+                                <select class="rounded w-100 day-from-today-select">
+                                    <option value="10">10</option>
+                                    <option value="20">20</option>
+                                    <option value="30" selected>30</option>
+                                    <option value="40">40</option>
+                                    <option value="50">50</option>
+                                    <option value="60">60</option>
+                                    <option value="70">70</option>
+                                    <option value="80">80</option>
+                                    <option value="90">90</option>
+                                    <option value="150">150</option>
+                                    <option value="300">300</option>
+                                    <option value="10000">10000</option>
+                                </select>
+                            </div>
+                        @endif
                         <!--//날짜 -->
 
                         <div class="d-flex align-items-stretch align-items-md-center flex-column flex-md-row mb-2 mb-md-0 px-0 px-md-1">
@@ -104,10 +109,12 @@
                                 @endforeach
                             </select>
                         </div>
-                        <div class="d-flex align-items-stretch align-items-md-center flex-column flex-md-row mb-2 mb-md-0 px-0 px-md-1 pl-3">
-                            <input type="checkbox" value="1" class="text-md-center w-100 overflow-hidden text-nowrap" name="ShowOnlyClosedChecked" id="{{ $modalClassName }}-ShowOnlyClosedChecked">
-                            <label class="m-0 text-nowrap" for="{{ $modalClassName }}-ShowOnlyClosedChecked">{{ $moealSetFile['FormVars']['Title']['ShowOnlyClosedChecked'] }}</label>
-                        </div>
+                        @if(isset($moealSetFile['FormVars']['Title']['ShowOnlyClosedChecked']) && !empty($moealSetFile['FormVars']['Title']['ShowOnlyClosedChecked']))
+                            <div class="d-flex align-items-stretch align-items-md-center flex-column flex-md-row mb-2 mb-md-0 px-0 px-md-1 pl-3">
+                                <input type="checkbox" value="1" class="text-md-center w-100 overflow-hidden text-nowrap" name="ShowOnlyClosedChecked" id="{{ $modalClassName }}-ShowOnlyClosedChecked">
+                                <label class="m-0 text-nowrap" for="{{ $modalClassName }}-ShowOnlyClosedChecked">{{ $moealSetFile['FormVars']['Title']['ShowOnlyClosedChecked'] }}</label>
+                            </div>
+                        @endif
                     </div>
                 </div>
 
@@ -151,6 +158,7 @@
     function body_copy_show_modal(modal_class_name, key) {
         let func_name = `get_${bodyCopy[modal_class_name]['BodyCopyPopupVars']['Filter'][key]}`;
 
+        console.log('func_name : ',  func_name);
         // 첫 번째 show 했을 때만 호출
         if (! $(`#modal-bodycopy.${modal_class_name}`).find('.modal-btn').data('first')) {
             first_slip_date_rang(`#${modal_class_name}slip-date-navi-div`)

+ 2 - 2
resources/views/front/outline/static/copy-to-another.blade.php

@@ -1,6 +1,6 @@
 <!--- copy-to-anther --->
 @php $modalClassName = $modalClassName ?? '';
-var_dump($moealSetFile['General']['Title']);
+//var_dump($moealSetFile['General']['Title']);
 @endphp
 <div class="modal fade {{ $modalClassName }}" id="modal-copy-to-another" aria-hidden="true" data-backdrop="static" style="display: none; z-index: 1050; overflow: auto;">
     <div class="modal-dialog m-auto pt-4" style="width: 480px;">
@@ -69,7 +69,7 @@ var_dump($moealSetFile['General']['Title']);
 </script>
 
 @php
- var_dump($moealSetFile['CopyToAnotherPopupVars']['Display']);
+ //var_dump($moealSetFile['CopyToAnotherPopupVars']['Display']);
 @endphp
 
 @foreach ($moealSetFile['CopyToAnotherPopupVars']['Display'] as $key => $i)

+ 1 - 2
resources/views/front/outline/static/slip.blade.php

@@ -1,6 +1,5 @@
 <!--- slip-search --->
-@php $modalClassName = $modalClassName ?? '';
-@endphp
+@php $modalClassName = $modalClassName ?? '';@endphp
 
 <div class="modal fade modal-brown {{ $modalClassName }}" id="modal-slip" aria-hidden="true" data-backdrop="static" style="display: none; z-index: 1060;">
     <div class="modal-dialog m-auto pt-4" style="max-width: 1250px !important;">