Merge branch 'master' into zzd

# Conflicts:
#	tests/webApi/test.http

app/Http/Controllers/OrderIssueController.php

@@ -428,7 +428,11 @@ class OrderIssueController extends Controller
                 return ['success' => true, 'data' => compact(['order', 'rejectedBill'])];
             }
         } else if ($request->input('type') == 'RejectedBill') {
-            $bool = OrderIssue::where('rejected_bill_id', $request->input('id'))->count() > 0;
+            $rejectedBill = RejectedBill::where('logistic_number_return',$request->input('id'))->first();
+            if(!$rejectedBill){
+                return  ['success' => false, 'fail_info' => '没有对应的问题单号'];
+            }
+            $bool = OrderIssue::where('rejected_bill_id',$rejectedBill['id'] )->count() > 0;
             if ($bool) {
                 return ['success' => false, 'fail_info' => '退回单号已有对应的问题单'];
             } else {

app/Services/OrderService.php

@@ -41,15 +41,13 @@ class OrderService
                 $shop = Shop::firstOrCreate(['name' => $shop_name, 'owner_id' => $owner_id]);
                 $shop_Id = $shop->id;
             }
-
-            $logistics = Logistic::where(['name' => $orderHeadAttr['carrierid']])->first();
-            if ($logistics == null) {
-                $oracleBasCustomer = OracleBasCustomer::where(['CustomerID' => $orderHeadAttr['carrierid'], 'Customer_Type' => 'CA'])->first();
+            $logistics = Logistic::where(['name' => $orderHeadAttr['CarrierName']])->first();
+/*            if ($logistics == null) {
+                $oracleBasCustomer = OracleBasCustomer::where(['Descr_C' => $orderHeadAttr['CarrierName'], 'Customer_Type' => 'CA'])->first();
                 if ($oracleBasCustomer) {
                     $logistics = Logistic::firstOrCreate(['code' => $oracleBasCustomer->customerid, 'name' => $oracleBasCustomer->descr_c]);
                 }
-            }
-
+            }*/
             $logistics_id = null;
             if ($logistics) {
                 $logistics_id = $logistics->id;

resources/views/maintenance/user/index.blade.php

@@ -13,7 +13,7 @@
                     <div class="alert alert-success h1">{{Session::get('successTip')}}</div>
                 @endif
                 <div id="list">
-                    <table class="table table-bordered table-sm d-none" id="headerRoll">
+                    <table class="table table-bordered table-sm d-none" id="headerRoll"></table>
                     <table class="table table-striped table-sm" id="headerParent">
                         <tr id="header"></tr>
                         <tr v-for="user in users">

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

@@ -41,9 +41,7 @@
                             </div>
                         </div>
                         <div class="form-group row">
-                            <label for="order_issue_type_id"
-                                   class="col-2 col-form-label text-right text-primary"><span
-                                    class="text-danger">*</span>问题类别</label>
+                            <label for="order_issue_type_id" class="col-2 col-form-label text-right text-primary"><span class="text-danger">*</span>问题类别</label>
                             <div class="col-8">
                                 <select name="order_issue_type_id" id="order_issue_type_id"
                                         class="form-control @error('order_issue_type_id') is-invalid @enderror" v-model="order_issue_type_id">
@@ -101,14 +99,14 @@
                                         <td>@{{ item.barcode_goods }}</td>
                                         <td>@{{ item.name_goods }}</td>
                                         <td>@{{ item.amount }}</td>
-                                        <td>@{{ item.name_goods }}</td>
+                                        <td>@{{ item.validity_at }}</td>
                                         <td>@{{ item.remark }}</td>
                                     </tr>
                                 </table>
                             </div>
                         </div>
                         <div class="form-group row">
-                            <label for="wms_order_no" class="col-2 col-form-label text-right ">货主</label>
+                            <label for="wms_order_no" class="col-2 col-form-label text-right text-primary"><span class="text-danger">*</span>货主</label>
                             <div class="col-8 row">
                                 <div class="form-group col-lg-5">
                                     <select class="form-control @error('owner_id') is-invalid @enderror" name="owner_id" v-model="order.owner_id" >
@@ -122,7 +120,7 @@
                             </div>
                         </div>
                         <div class="form-group row">
-                            <label for="wms_order_no" class="col-2 col-form-label text-right text-primary">原始承运商</label>
+                            <label for="wms_order_no" class="col-2 col-form-label text-right ">原始承运商</label>
                             <div class="col-8 row">
                                 <div class="form-group col-lg-5">
                                     <select class="form-control " name="logistic_id" v-model="order.logistic_id">

resources/views/personnel/laborReport/index.blade.php

@@ -21,7 +21,7 @@
         <label for="all" class="d-none" id="cloneCheckAll">
             <input id="all" type="checkbox" @click="checkAll($event)">全选
         </label>
-        <table class="table table-sm table-bordered d-none text-nowrap " id="headerRoll">
+        <table class="table table-sm table-bordered d-none text-nowrap " id="headerRoll"></table>
         <table class="table table-sm table-hover table-striped d-none d-xl-block p-0 text-nowrap table-bordered" id="headerParent">
             <tr class="text-center" id="header"></tr>
             <tr v-for="(laborReport,i) in laborReports"  @click="selectedColor(laborReport.id)" :style="{'font-weight': laborReport.id==selectedStyle?'bold':''}">
@@ -118,7 +118,7 @@
                             <span class="mr-3  text-nowrap"><span class="text-black">小组：</span><span class="text-black-50">@{{laborReport.userWorkGroupName  }}</span></span>
                             <span class="mr-3   text-nowrap"><span class="text-black">临时工：</span><span class="text-black-50">@{{ laborReport.name }} </span></span>
                             {{--                                    <span class="mr-3 text-nowrap"><span class="text-black">电话：</span><span style="color:#af7651" v-if="">@{{ laborReport.mobile_phone }} </span></span>--}}
-                            {{--                                    <span class="mr-3 text-nowrap"><span class="text-black">身份证号：</span><span style="color:#af7651" v-if="">@{{ laborReport.identity_number }} </span></span>--}}
+                                                                <span class="text-nowrap"><span class="text-black">身份证号：</span><span style="color:#af7651" v-if="">@{{ laborReport.identity_number }} </span></span>
                             {{--                                    <span class="mr-3 text-nowrap"><span class="text-black">劳务所：</span><span style="color:#af7651" v-if="">@{{ laborReport.labor_company }} </span></span>--}}
                             {{--                                    <span class="mr-3 text-nowrap"><span class="text-black">进组时间：</span><span style="color:#af7651" v-if="">@{{ laborReport.checkInAt }} </span></span>--}}
                             {{--                                    <span class="mr-3 text-nowrap"><span class="text-black">审核时间：</span><span style="color:#af7651" v-if="">@{{ laborReport.verifyAt }} </span></span>--}}

resources/views/waybill/index.blade.php

@@ -45,7 +45,7 @@
             <label for="all" class="d-none" id="cloneCheckAll">
                 <input id="all" type="checkbox" @click="checkAll($event)">全选
             </label>
-            <table class="table table-striped table-sm table-bordered table-hover text-nowrap d-none" id="headerRoll">
+            <table class="table table-striped table-sm table-bordered table-hover text-nowrap d-none" id="headerRoll"></table>
             <table class="table table-striped table-sm table-bordered table-hover text-nowrap waybill-table" style="background: #fff;" id="headerParent">
                 <tr>
                     <th class="table-header-layer-1" colspan="4"></th>