阶段性提交5 by 'zengjun'

app/Order.php

@@ -22,7 +22,7 @@ class Order extends Model
     ];
 
     public function logistic(){
-        return $this->belongsTo('App\logistic','logistic_id','id');
+        return $this->belongsTo('App\Logistic','logistic_id','id');
     }
 
     public function issue(){

public/js/app.js

@@ -2330,7 +2330,7 @@ function fromByteArray (uint8) {
 var BlobBuilder = typeof BlobBuilder !== 'undefined' ? BlobBuilder :
   typeof WebKitBlobBuilder !== 'undefined' ? WebKitBlobBuilder :
   typeof MSBlobBuilder !== 'undefined' ? MSBlobBuilder :
-  typeof MozBlobBuilder !== 'undefined' ? MozBlobBuilder :
+  typeof MozBlobBuilder !== 'undefined' ? MozBlobBuilder : 
   false;
 
 /**
@@ -61991,4 +61991,4 @@ module.exports = __webpack_require__(/*! D:\phpstudy_pro\WWW\bswas\resources\sas
 
 /***/ })
 
-/******/ });
+/******/ });

resources/views/order/issue/create.blade.php

@@ -40,18 +40,6 @@
                                 @enderror
                             </div>
                         </div>
-                        <div class="form-group row">
-                            <label for="logistic_number" class="col-2 col-form-label text-right ">退回快递单号</label>
-                            <div class="col-8">
-                                <input type="text" name="second_logistic_number" id="second_logistic_number"
-                                       class="form-control col-lg-5 @error('second_logistic_number') is-invalid @enderror"
-                                       value="@if(old('second_logistic_number')){{old('second_logistic_number')}}@endif"
-                                       @blur="">
-                                @error('second_logistic_number')
-                                <span class="invalid-feedback" role="alert"><strong>{{ $message }}</strong></span>
-                                @enderror
-                            </div>
-                        </div>
                         <div class="form-group row">
                             <label for="order_issue_type_id"
                                    class="col-2 col-form-label text-right text-primary"><span
@@ -341,8 +329,6 @@
                 @else''@endif,
                 secondOrderNo: @if(old('secondOrderNo'))"{{old('secondOrderNo')}}"
                 @else''@endif,
-                second_logistic_number: @if(old('second_logistic_number'))"{{old('second_logistic_number')}}"
-                @else''@endif,
                 order_issue_type_id: @if(old('order_issue_type_id'))"{{old('order_issue_type_id')}}"
                 @else''@endif,
                 owners:{!! $owners !!},
@@ -410,7 +396,6 @@
                 logistic_number_return: {
                     handler: function (value) {
                         $("#wms_order_no").attr('disabled', !(value === ''));
-                        $("#second_logistic_number").attr('disabled', !(value === ''));
                         $("#logistic_number").attr('disabled', !(value === ''));
                     },
                     immediate: true
@@ -418,7 +403,6 @@
                 wms_order_no: {
                     handler: function (value) {
                         $("#logistic_number_return").attr('disabled', !(value === ''));
-                        $("#second_logistic_number").attr('disabled', !(value === ''));
                         $("#logistic_number").attr('disabled', !(value === ''));
                     },
                     immediate: true

resources/views/order/issue/index.blade.php

@@ -407,8 +407,8 @@
         }
 
     </style>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/export.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200813b.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/export200813b.js')}}"></script>
     <script>
         let listVue = new Vue({
             el: '#issue_div ',