修改

application/admin/controller/PhOrders.php

@@ -114,7 +114,9 @@ class PhOrders extends Auth
             $totalPage = ceil($totalCount/$length);
             $totalMoney = Db::name('ph_orders')->alias('a')
                 ->where($map)->sum('a.amount');
-            $result['totalMoney'] = $totalMoney;
+            $totalService = Db::name('ph_orders')->alias('a')
+                ->where($map)->sum('a.service_money');
+            $result['totalMoney'] = $totalMoney+$totalService;
             $result['page'] = $page;
             $result['total'] = $totalPage;
             $result['records'] = $totalCount;

application/admin/controller/WasteStatistics.php

@@ -200,6 +200,7 @@ class WasteStatistics extends Auth {
         $dep = (new \app\common\model\Dep())->getList($this->orgId);
         $typeList = Db::name('waste_type')
             ->where('enable', 1)
+            ->order('create_time','asc')
             ->where('del', 0)
            // ->where('org_id', $this->orgId)
             ->select();
@@ -225,6 +226,7 @@ class WasteStatistics extends Auth {
         $typeList = Db::name('waste_type')
             ->where('enable', 1)
             ->where('del', 0)
+            ->order('create_time','asc')
             ->where($typeMap)
            // ->where('org_id', $this->orgId)
             ->select();
@@ -635,18 +637,21 @@ class WasteStatistics extends Auth {
         $typeList1 = Db::name('waste_type')
             ->where($tMap)
             ->field('id,title')
+            ->order('create_time','asc')
             ->select();
         if($type_id!=''){
             $tMap[] = ['id','in',explode(',',$type_id)];
             $typeList = Db::name('waste_type')
                 ->where($tMap)
                 ->field('id,title,type')
+                ->order('create_time','asc')
                 ->select();
 
         }else{
             $typeList = Db::name('waste_type')
                 ->where($tMap)
                 ->field('id,title,type')
+                ->order('create_time','asc')
                 ->select();
 
         }
@@ -687,6 +692,7 @@ class WasteStatistics extends Auth {
             ->where($tMap)
             ->where('enable',1)
             ->where('del',0)
+            ->order('create_time','asc')
             ->select();
 
 
@@ -967,18 +973,21 @@ class WasteStatistics extends Auth {
         $typeList1 = Db::name('waste_type')
             ->where($tMap)
             ->field('id,title')
+            ->order('create_time','asc')
             ->select();
         if($type_id!=''){
             $tMap[] = ['id','in',explode(',',$type_id)];
             $typeList = Db::name('waste_type')
                 ->where($tMap)
                 ->field('id,title,type')
+                ->order('create_time','asc')
                 ->select();
 
         }else{
             $typeList = Db::name('waste_type')
                 ->where($tMap)
                 ->field('id,title,type')
+                ->order('create_time','asc')
                 ->select();
 
         }
@@ -1016,6 +1025,7 @@ class WasteStatistics extends Auth {
             ->where($tMap)
             ->where('enable',1)
             ->where('del',0)
+            ->order('create_time','asc')
             ->select();
 
         $newTypeIds = array_column($type,'id');
@@ -1300,17 +1310,20 @@ class WasteStatistics extends Auth {
         $typeList1 = Db::name('waste_type')
             ->where($tMap)
             ->field('id,title')
+            ->order('create_time','asc')
             ->select();
         if($type_id!=''){
             $tMap[] = ['id','in',explode(',',$type_id)];
             $typeList = Db::name('waste_type')
                 ->where($tMap)
+                ->order('create_time','asc')
                 ->field('id,title,type')
                 ->select();
 
         }else{
             $typeList = Db::name('waste_type')
                 ->where($tMap)
+                ->order('create_time','asc')
                 ->field('id,title,type')
                 ->select();
 
@@ -1351,6 +1364,7 @@ class WasteStatistics extends Auth {
         $type = Db::name('waste_type')
             ->where($tMap)
             ->where('enable',1)
+            ->order('create_time','asc')
             ->where('del',0)
             ->select();
 
@@ -1552,6 +1566,7 @@ class WasteStatistics extends Auth {
         $typeList1 = Db::name('waste_type')
             ->where($tMap)
             ->field('id,title')
+            ->order('create_time','asc')
             ->select();
         if($type_id!=''){
             $tMap[] = ['id','in',explode(',',$type_id)];
@@ -1564,6 +1579,7 @@ class WasteStatistics extends Auth {
             $typeList = Db::name('waste_type')
                 ->where($tMap)
                 ->field('id,title,type')
+                ->order('create_time','asc')
                 ->select();
 
         }
@@ -1594,6 +1610,7 @@ class WasteStatistics extends Auth {
             ->where($tMap)
             ->where('enable',1)
             ->where('del',0)
+            ->order('create_time','asc')
             ->select();
 
         $records = Db::name('waste_record')
@@ -1864,17 +1881,20 @@ class WasteStatistics extends Auth {
         $typeList1 = Db::name('waste_type')
             ->where($tMap)
             ->field('id,title')
+            ->order('create_time','asc')
             ->select();
         if($type_id!=''){
             $tMap[] = ['id','in',explode(',',$type_id)];
             $typeList = Db::name('waste_type')
                 ->where($tMap)
                 ->field('id,title,type')
+                ->order('create_time','asc')
                 ->select();
         }else{
             $typeList = Db::name('waste_type')
                 ->where($tMap)
                 ->field('id,title,type')
+                ->order('create_time','asc')
                 ->select();
         }
 
@@ -1899,6 +1919,7 @@ class WasteStatistics extends Auth {
         $type = Db::name('waste_type')
             ->where('enable',1)
             ->where('del',0)
+            ->order('create_time','asc')
             //->where('org_id',$this->orgId)
             ->where($tMap)
             ->select();

application/admin/view/ph_orders/index.html

@@ -144,6 +144,7 @@
                 {label:'开始日期',name:'start',index:'start',width:50,editable: false,sortable: false},
                 {label:'结束日期',name:'end',index:'end',width:50,editable: false,sortable: false},
                 {label:'订单金额',name:'amount',index:'amount',width:30,editable: false,sortable: false},
+                {label:'服务费',name:'service_money',index:'service_money',width:30,editable: false,sortable: false},
                 {label:'状态',name:'status_text',index:'status_text',width:30,editable: false,sortable: false},
                 {label:'下单日期',name:'create_time',index:'create_time',width:50,editable: false,sortable: false},
                 {label:'操作',width:50,sortable: false,formatter: function (a, b, c) {