Browse Source

Merge branch 'dev_wf' of wugg/phpstock into version1.5

wufeng 2 years ago
parent
commit
dd3e2205b3
1 changed files with 2 additions and 2 deletions
  1. 2 2
      app/admin/controller/Sale.php

+ 2 - 2
app/admin/controller/Sale.php

@@ -3761,7 +3761,7 @@ class Sale extends Base
         $status = [0 => '待发货', 1 => '待库管发货', 2 => '已发货待收货', 3 => '已收货', 4 => '已全部退货'];
         $list = Db::name("order_out")
             ->alias('a')
-            ->field('"" as 序号,a.addtime as 创建时间,po.cgdNo as 采购单编号,po.status as 采购单状态,po.cgder as 采购员,b.orderCode as 确认单号,b.addtime as 确认单时间,b.good_code as 产品编号,b.good_name as 产品名称,"" as 规格,"" as 单位,wi.name as 供应商名称,s.code as 供应商编号,po.nake_fee as 裸价,a.post_fee as 物流费,b.send_type as 发货方式,po.good_price as 采购单价,b.remark as 确认单备注,po.good_num as 采购数量,po.total_fee as 采购货款,a.send_num 发货数量,oa.contactor as 收货人,oa.mobile as 联系方式,oa.addr as 收货地址,oa.arrive_time as 到货时间,a.outCode as 发货申请单号,po.order_type,"" 发货申请单物流单号,"" 发货申请单物流费用,"" 发货申请单备注')
+            ->field('"" as 序号,a.addtime as 创建时间,po.cgdNo as 采购单编号,po.status as 采购单状态,po.cgder as 采购员,b.orderCode as 确认单号,b.addtime as 确认单时间,b.good_code as 产品编号,b.good_name as 产品名称,"" as 规格,"" as 单位,wi.name as 供应商名称,s.code as 供应商编号,po.nake_fee as 裸价,a.post_fee as 物流费,b.send_type as 发货方式,po.good_price as 采购单价,b.remark as 确认单备注,po.good_num as 采购数量,po.total_fee as 采购货款,a.send_num 发货数量,oa.contactor as 收货人,oa.mobile as 联系方式,oa.addr as 收货地址,oa.arrive_time as 到货时间,a.outCode as 发货申请单号,po.order_type,b.platform_order 平台订单号,a.post_name 发货申请单物流公司,a.post_code 发货申请单物流单号,a.post_fee 发货申请单物流费用,a.remark 发货申请单备注')
             ->whereIn('a.outCode', $outCodes)
             ->order("a.addtime desc")
             ->withAttr('序号', function () use (&$i) {
@@ -3816,7 +3816,7 @@ class Sale extends Base
             unset($value['order_type']);
         }
 
-        if(empty($list)) $list[]='没有可供导出的数据';
+        if (empty($list)) $list[] = '没有可供导出的数据';
 
         $headerArr = array_keys($list[0]);
         excelSave('发货申请单导出' . date('YmdHis'), $headerArr, $list);