Bläddra i källkod

发货记录录入

dong025 1 dag sedan
förälder
incheckning
c2ed4c5f93

+ 10 - 10
app/admin/controller/shop/ShopDelivery.php

@@ -38,20 +38,20 @@ class ShopDelivery extends Backend
             return $this->selectpage();
         }
         [$where, $order, $limit, $with] = $this->buildparams();
-        // $list = $this->model
-        //     ->withJoin($with,'left')
-        //     //如果没有使用operate filter过滤的情况下,推荐使用with关联,可以提高查询效率
-        //     //->with($with)
-        //     ->where($where)
-        //     ->order($order)
-        //     ->paginate($limit);
         $list = $this->model
-            ->alias('d')
-            ->join('user u',"d.user_id = u.id", "LEFT")
-            ->field('d.*,COALESCE(u.nickname, "无") as nickname')
+            ->withJoin($with,'left')
+            //如果没有使用operate filter过滤的情况下,推荐使用with关联,可以提高查询效率
+            // ->with($with)
             ->where($where)
             ->order($order)
             ->paginate($limit);
+        // $list = $this->model
+        //     ->alias('d')
+        //     ->join('user u',"d.user_id = u.id", "LEFT")
+        //     ->field('d.*,COALESCE(u.nickname, "无") as nickname')
+        //     ->where($where)
+        //     ->order($order)
+        //     ->paginate($limit);
 
         //表格底部要有汇总:发货数量汇总  重量汇总 总价汇总
         $count = $this->model

+ 1 - 1
app/admin/view/shop/shop_delivery/index.html

@@ -76,7 +76,7 @@
                     } },
                 {field: 'insulation_money', title: __('保温加收金额'),operate: false},
                 { field: "ship_date", title: "发货时间", operate: "daterange", formatter: Yunqi.formatter.datetime },
-                {field: 'nickname', title: __('录入人'),operate: 'LIKE'},
+                {field: 'user.nickname', title: __('录入人'),operate: 'LIKE'},
                 {field: 'entry_time', title: __('录入时间'),operate: 'daterange',formatter: Yunqi.formatter.datetime},
                 {field: 'settlement_data', title: __('结算时间'),operate: 'daterange',formatter: Yunqi.formatter.datetime},
                 {field: 'status', title: __('结算状态'), operate: 'select', width:85,searchList: {1: __('待结算'),2: __('已结算')},formatter:Yunqi.formatter.tag},