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

app/Http/Controllers/PackageLogisticController.php

@@ -11,6 +11,7 @@ use App\Owner;
 use App\Services\common\ExportService;
 use App\Services\UserService;
 use Illuminate\Http\Request;
+use Illuminate\Support\Carbon;
 use Oursdreams\Export\Export;
 
 class PackageLogisticController extends Controller
@@ -152,9 +153,9 @@ class PackageLogisticController extends Controller
             '快递公司',
             '货主',
             '省份',
-            '发出日期',
-            '收货日期',
-            '称重日期',
+            '复核时间',
+            '收货时间',
+            '称重时间',
             '快递路由',
             '退件状态',
             '订单备注',
@@ -203,9 +204,9 @@ class PackageLogisticController extends Controller
                 $orderPackage->order->logistic->name ?? '',//快递公司
                 $orderPackage->order->owner->name ?? '',//货主
                 $orderPackage->order->province ?? '',//省份
-                $orderPackage->sent_at ?? '',//发出日期
-                $orderPackage->received_at ?? '',//收货日期
-                $orderPackage->weighed_at ?? '',//称重日期
+                $orderPackage->sent_at ? $orderPackage->sent_at->toDateTimeString() : '',//复核时间
+                $orderPackage->received_at ? $orderPackage->received_at->toDateTimeString() : '',//收货时间
+                $orderPackage->weighed_at ? $orderPackage->weighed_at->toDateTimeString() : '',//称重时间
                 $transfer_status ?? '',//快递路由
                 empty($orderPackage->rejectedBill) ? '无' : '有',//退件状态
                 $orderPackage->order->OracleDOCOrderHeader->notes ?? '',//订单备注

resources/views/control/panel.blade.php

@@ -646,11 +646,11 @@
                 let _this = this;
                 this.warehousesOrders.forEach(function (item) {
                     _this.totalOrders.total += parseInt(item.total);
-                    _this.totalOrders.createOrder += item.createOrder;
-                    _this.totalOrders.assignedComplete += item.assignedComplete;
-                    _this.totalOrders.partialAllocation += item.partialAllocation;
-                    _this.totalOrders.partPacking += item.partPacking;
-                    _this.totalOrders.sowComplete += item.sowComplete;
+                    _this.totalOrders.createOrder += parseInt(item.createOrder);
+                    _this.totalOrders.assignedComplete += parseInt(item.assignedComplete);
+                    _this.totalOrders.partialAllocation += parseInt(item.partialAllocation);
+                    _this.totalOrders.partPacking += parseInt(item.partPacking);
+                    _this.totalOrders.sowComplete += parseInt(item.sowComplete);
                 });
                 //订单量趋势
                 this.orderCountingRecordsChart = echarts.init(document.getElementById('orderCountingRecords'));
@@ -1059,7 +1059,7 @@
                                 });
                             }
                         });
-                        myechart.setOption(option,1,0);
+                        myechart.setOption(option, 1, 0);
                     });
                 },
                 loadOrderPackageReceivedSyncRecordInfo() {