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

app/Http/Controllers/OrderIssueController.php

@@ -24,7 +24,6 @@ use App\Services\OrderRejectedBillRelationService;
 use App\Services\OrderService;
 use App\Services\OwnerService;
 use App\Services\OrderRejectingStatusService;
-use App\Services\RejectedService;
 use App\Shop;
 use App\UserOwnerGroup;
 use App\UserWorkgroup;
@@ -580,7 +579,7 @@ class OrderIssueController extends Controller
     {
         $json = [];
         $row = [
-            '登记日期', '创建日期', '客户', '客户订单号', '原始承运商', '收货人', '收货电话', '省', '市', '区', '收货人地址',
+            '登记日期', '创建日期', '客户','商铺' ,'客户订单号', '原始承运商', '收货人', '收货电话', '省', '市', '区', '收货人地址',
             '原始运单号', '原始商品', '原始商品名称', '原始商品数量',
             '退回单号', '退单商品名', '退单商品条码', '退单商品数量', '是否正品', '退单状态', '退单备注',
             '操作类型', '说明', '操作者', '情况说明', '问题类别',
@@ -660,7 +659,8 @@ class OrderIssueController extends Controller
                 isset($order_issue->created_at) ? str_split($order_issue->created_at, 10)[0] : '',       // 登记日期
                 isset($order->created_at) ? str_split($order->created_at, 10)[0] : '',             // 创建日期
                 $order->owner->name ?? '',      // 客户
-                $order->client_code,              // 客户订单号
+                $order->shop->name ?? '',       // 商铺
+                $order->client_code,            // 客户订单号
                 $order->logistic->name ?? '',   // 原始承运商
                 $order->consignee_name,         // 收货人
                 $order->consignee_phone,        // 收货电话

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

@@ -30,11 +30,13 @@
                                 class="ml-1 btn btn-outline-primary btn-sm"
                                 @click="baoShiBatchHandler">宝时批量处理
                         </button>
+                    @endcan
+                    @if(\Illuminate\Support\Facades\Gate::check('订单管理-工单处理-宝时编辑') || \Illuminate\Support\Facades\Gate::check('订单管理-工单处理-承运商编辑'))
                         <button type="button"
                                 class="ml-1 btn btn-outline-primary btn-sm"
                                 @click="showBatchStoreProcessLogs">批量处理日志
                         </button>
-                    @endcan
+                    @endif
                     @can('订单管理-问题件-编辑')
                         <button type="button"
                                 class="ml-1 btn btn-outline-dark btn-sm"
@@ -1826,7 +1828,6 @@
                 },
                 logisticCheckDamage() {
                     let {commodities} = this.logisticEditWorkOrder;
-                    commodities.forEach(e => console.log(Number(e.price) === 0));
                     return commodities.filter(e => Number(e.price) === 0).length === 0;
                 },
                 logisticEdit() {
@@ -3307,7 +3308,6 @@
                 showOrderCommoditiesInfo(item) {
                     this.dialogOrderCommoditiesVisible = true;
                     this.orderInfo.commodities = item.order_commodities
-                    console.log(this.orderInfo.commodities);
                 },
 
                 displayDelBtn(bool, e) {
@@ -3321,7 +3321,6 @@
 
                 joinLogisticNumberReturn(item,e,index){
                     let logistic_number_return = $(e.target).prev().val();
-                    console.log(logistic_number_return);
                     if (logistic_number_return.trim().length === 0){
                         this.errorTempTip('请输入退回单号进行添加');
                         return;