Merge branch 'hcy_pcb_20181221-r' into development

app/Model/Pcb/PcbPublicModel.php

@@ -42,7 +42,7 @@ class PcbPublicModel
         return $result['name'];
     }
     /*
-   * 插入后台客服审核结果
+   * 后台填写发货信息
    */
     public function orderShipping($user_id,$data){
 
@@ -68,10 +68,15 @@ class PcbPublicModel
             if (!$in){
                 throw  new Exception("插入发货信息失败");
             }
-            //修改发货时间
-            $updete = (new PcbOrderModel())->where("order_id",$data['order_id'])->update(['shipping_time'=>time()]);
+            //修改订单发货时间和状态
+            $updete = (new PcbOrderModel())->where("order_id",$data['order_id'])->update(['shipping_time'=>time(),'status'=>15,'purchase_status'=>15]);
             if (!$updete){
-                throw  new Exception("更新订单发货时间失败");
+                throw  new Exception("更新订单发货时间、状态失败");
+            }
+            //修改采购发货时间和状态
+            $updete = (new PcbPurchaseModel())->where("order_id",$data['order_id'])->update(['shipping_time'=>time(),'status'=>15]);
+            if (!$updete){
+                throw  new Exception("更新采购发货时间、状态失败");
             }
             //日志
             PcbActionLogModel::log(1,'admin_add_shipping',"后台填写发货信息","",$data['order_id'],$user_id);

public/js/PcbOrderList.js

@@ -156,6 +156,10 @@ layui.use(['table','form','element','layer', 'laydate'], function() {
 
 //确定发货
 function SendStock() {
+    if($("#shipping_no").val() == ""){
+        alert_err("请填写发货物流单号")
+        return false;
+    }
     layer.msg('加载中', {
         icon: 16
         ,shade: 0.01