Merge branch 'master' of ssh://47.103.131.176:10022/var/git/bswas

app/Http/Controllers/PackageLogisticController.php

@@ -39,6 +39,7 @@ class PackageLogisticController extends Controller
             })
             ->with([
                 'order.logistic',
+                'workOrder',
                 'orderPackageExpressRoute',
                 'order.batch:id,wms_type',
                 'order.OracleDOCOrderHeader:orderno,notes,WaveNo',

app/OrderIssueRejectedBill.php

@@ -21,6 +21,11 @@ class OrderIssueRejectedBill extends Model
         return $this->belongsTo(Order::class);
     }
 
+    public function workOrder(): BelongsTo
+    {
+        return $this->belongsTo(WorkOrder::class,'order_id','order_id');
+    }
+
     public function orderIssue(): BelongsTo
     {
         return $this->belongsTo(OrderIssue::class,'order_issue_id','id');

app/OrderPackage.php

@@ -146,6 +146,11 @@ class OrderPackage extends Model
         return $this->hasOne('App\PaperBox', 'id', 'paper_box_id');
     }
 
+    public function workOrder(): HasOne
+    {
+        return $this->hasOne(WorkOrder::class, 'order_id', 'order_id');
+    }
+
     public function measuringMachine(): HasOne
     {
         return $this->hasOne('App\MeasuringMachine', 'id', 'measuring_machine_id');

app/Services/RejectedService.php

@@ -41,8 +41,9 @@ class RejectedService
             }
         }
         $rejectedBills = RejectedBill::query()->with('user','owner', 'logistic', 'items.quality','record:logistic_number,record_at,location_at',
-            'items.packageImages','items.commodityImages','items.uploadFiles','orderIssueRejectedBill.orderIssue.issueType')
+            'items.packageImages','items.commodityImages','items.uploadFiles','orderIssueRejectedBill.orderIssue.issueType','orderIssueRejectedBill.workOrder.issueType')
             ->orderBy('rejected_bills.id', 'desc')
+            ->where("id_operator",'!=','3754')
             ->where(function ($query)use ($owners, $logistics){
                 /** @var Builder $query */
                 $query->whereIn('rejected_bills.id_owner', $owners)

resources/views/package/logistic/index.blade.php

@@ -150,6 +150,9 @@
                                 :style="package.sync_routes_flag?'background-color:#4ed32d':'background-color:#e83939'"></span>
                             <!--               是否为问题件         -->
                             <span class="badge badge-danger" v-if="package.order.issue">?</span>
+                            <!--               是否关联工单         -->
+                            <span class="badge badge-info text-white" v-if="package.work_order">工</span>
+
 
                             <!--       是否手动修改                     -->
                             <span v-if="package.is_manual_update">

resources/views/rejected/search/general.blade.php

@@ -7,7 +7,8 @@
             <div class="d-none" id="list">
                 @if(Session::has('successTip'))
                     <div class="alert alert-success h1">{{Session::get('successTip')}}</div>
-                @endif                <div id="form_div"></div>
+                @endif
+                <div id="form_div"></div>
                 <span class="dropdown">
                     <button class="btn btn-outline-dark btn-sm form-control-sm dropdown-toggle tooltipTarget"
                             data-toggle="dropdown" title="导出所有页将会以搜索条件得到的筛选结果，将其全部记录（每一页）导出">
@@ -46,37 +47,54 @@
                 @endcan
 
                 @can('退货管理-编辑')
-                    <a class="btn btn-sm btn-outline-dark" href="{{url('rejected/importRejectedNumber')}}" style="cursor: pointer">批量填充订单号</a>
+                    <a class="btn btn-sm btn-outline-dark" href="{{url('rejected/importRejectedNumber')}}"
+                       style="cursor: pointer">批量填充订单号</a>
                 @endcan
 
                 <button class="btn btn-sm ml-2 btn-primary" @click="copyLogisticNumber()">复制快递单号</button>
-                <button class="btn btn-sm btn-outline-dark" @click="cancelCheck">取消审核 </button>
+                <button class="btn btn-sm btn-outline-dark" @click="cancelCheck">取消审核</button>
 
-                    <table class="table table-striped table-sm table-bordered table-hover text-nowrap table-body td-min-width-80"  style="background: #fff;" id="table">
-                    <tr v-for="(rejectedBill,i) in rejectedBills" :data-id="rejectedBill.id"  @click="selectTr===i+1?selectTr=0:selectTr=i+1" :class="selectTr===i+1?'focusing' : ''">
+                <table
+                    class="table table-striped table-sm table-bordered table-hover text-nowrap table-body td-min-width-80"
+                    style="background: #fff;" id="table">
+                    <tr v-for="(rejectedBill,i) in rejectedBills" :data-id="rejectedBill.id"
+                        @click="selectTr===i+1?selectTr=0:selectTr=i+1" :class="selectTr===i+1?'focusing' : ''">
                         <td>
                             <label><input type="checkbox" :value="rejectedBill.id"/></label>
                         </td>
                         <td class="text-nowrap">
                             <span class="text-muted" style="opacity:0.7">@{{ i+1 }}</span>
-                            <span v-if="rejectedBill.order_issue_rejected_bill" class="badge badge-pill badge-danger"
-                                  >@{{rejectedBill.order_issue_rejected_bill.order_issue ? rejectedBill.order_issue_rejected_bill.order_issue.issue_type.name : '问题件'}}</span>
+                            <template v-if="rejectedBill.order_issue_rejected_bill">
+                                <br v-if="rejectedBill.order_issue_rejected_bill.order_issue"/>
+                                <span v-if="rejectedBill.order_issue_rejected_bill.order_issue"
+                                      class="badge badge-pill badge-danger"
+                                      v-text="rejectedBill.order_issue_rejected_bill.order_issue.issue_type.name">
+                                </span>
+                                <br v-if="rejectedBill.order_issue_rejected_bill.work_order"/>
+                                <span v-if="rejectedBill.order_issue_rejected_bill.work_order"
+                                      class="badge badge-pill badge-info text-white"
+                                      v-text="rejectedBill.order_issue_rejected_bill.work_order.issue_type.name">
+                                </span>
+                            </template>
                         </td>
                         <td class="text-muted text-center">
                             <span v-if="rejectedBill.is_checked==1">
-                                <span  class="text-success">
-                                    <span class="fa fa-check-square" ></span> @{{ rejectedBill.checked_numbers }}
+                                <span class="text-success">
+                                    <span class="fa fa-check-square"></span> @{{ rejectedBill.checked_numbers }}
                                 </span>
                             </span>
                             <span v-else>未审核</span>
                         </td>
                         <td class="text-muted text-center">@{{ rejectedBill.delivery_status }}</td>
-                        <td class="" :class="[rejectedBill.is_finished==1?'text-success':'text-muted']">@{{rejectedBill.is_finished | yesNo}}</td>
+                        <td class="" :class="[rejectedBill.is_finished==1?'text-success':'text-muted']">
+                            @{{rejectedBill.is_finished | yesNo}}
+                        </td>
                         <td class="" :class="[rejectedBill.is_loaded==1?'text-success':'text-muted']">
                             <span>
                             <span v-if="rejectedBill.is_loaded==4">
                             @can('退货管理-查询-一般-修改入库')
-                                    <button class="btn btn-sm btn-info" @click="confirmBeStored($event,rejectedBill.id)">确定入库</button>
+                                    <button class="btn btn-sm btn-info"
+                                            @click="confirmBeStored($event,rejectedBill.id)">确定入库</button>
                                 @endcan
                             </span>
                             <span v-else>@{{rejectedBill.is_loaded | yesNoIsLoaded}}</span>
@@ -149,7 +167,8 @@
                                         </div>
                                     </div>
                                     <div class="col-1 border border-1">
-                                        <div align="center" @mouseleave="removeCommonImg('common_img_'+item.id)" @mouseenter="commonImg('img_'+item.id,item.upload_files)">
+                                        <div align="center" @mouseleave="removeCommonImg('common_img_'+item.id)"
+                                             @mouseenter="commonImg('img_'+item.id,item.upload_files)">
                                             <div :id="'img_'+item.id">
                                                 <img v-for="uploadFile in item.upload_files"
                                                      :src="imgPrefix+uploadFile.url+'-thumbnail.'+uploadFile.type">
@@ -194,7 +213,7 @@
                         @endcan
                     </tr>
                 </table>
-                <!--<div class="text-info h5 btn btn">{{--{{$rejectedBills->count()}}--}}/{{--{{$rejectedBills->total()}}--}}</div>-->
+            <!--<div class="text-info h5 btn btn">{{--{{$rejectedBills->count()}}--}}/{{--{{$rejectedBills->total()}}--}}</div>-->
                 {{$rejectedBills->appends($paginateParams)->links()}}
             </div>
             <label><textarea id="clipboardDiv" style="opacity:0"></textarea></label>
@@ -227,7 +246,7 @@
         @if(isset($paginateParams))
         let paginateParams = {!! json_encode($paginateParams) !!};
         @endif
-        let total=500000;
+        let total = 500000;
         let editUrl = "{{url('rejectedBill')}}/";
         let destroyUrl = "{{url('rejectedBill')}}/";
         let ajaxConfirmBeStoredUrl = '{{url("apiLocal/rejectedBill/apiConfirmBeStored")}}';
@@ -332,8 +351,8 @@
                     condition: data
                 });
                 this.form.init();
-                setTimeout(()=>{
-                    if (this.form.isRender()){
+                setTimeout(() => {
+                    if (this.form.isRender()) {
                         this.getTotal();
                     }
                 }, 300);
@@ -395,19 +414,19 @@
                     rejectedBill.isShowCancelBtn = false;
                 });
             },
-            methods:{
-                renderingTotal(){
-                    $("#paginate").after('<div class="position-relative font-weight-bold" style="left:160px;top:0;margin-top: -25px">共 <b style="color:#0000FF!important;">'+
-                        this.sum+'</b> 条数据</div>');
+            methods: {
+                renderingTotal() {
+                    $("#paginate").after('<div class="position-relative font-weight-bold" style="left:160px;top:0;margin-top: -25px">共 <b style="color:#0000FF!important;">' +
+                        this.sum + '</b> 条数据</div>');
                 },
-                getTotal(){
-                    window.axios.post(decodeURIComponent(decodeURIComponent(window.location.href))).then(res=>{
+                getTotal() {
+                    window.axios.post(decodeURIComponent(decodeURIComponent(window.location.href))).then(res => {
                         this.sum = res.data;
                         this.renderingTotal();
                     });
                 },
-                removeCommonImg(id){
-                    $('#'+id).remove();
+                removeCommonImg(id) {
+                    $('#' + id).remove();
                 },
                 commonImg(id, uploadFiles) {
                     let div = "";