diff --git a/webht/third_party/trippestOrderSync/controllers/vendor_money.php b/webht/third_party/trippestOrderSync/controllers/vendor_money.php index 72c85bdf..eb7b2164 100644 --- a/webht/third_party/trippestOrderSync/controllers/vendor_money.php +++ b/webht/third_party/trippestOrderSync/controllers/vendor_money.php @@ -16,6 +16,8 @@ class Vendor_money extends CI_Controller { { $data['default_date1'] = date('Y-m-01', strtotime("last month")); $data['default_date2'] = date('Y-m-d', mktime(0,0,0,date('m'),1,date('Y'))-1); + $vendor_sourcetype = $this->trippest->vendor_sourcetype(); + $data['default_vendor'] = array_keys($vendor_sourcetype); $this->load->view('vendor_money_sum', $data); } @@ -36,6 +38,7 @@ class Vendor_money extends CI_Controller { $result = array( "default_date1" => $start_date ,"default_date2" => $end_date + ,"default_vendor" => $vendors ,"trippest_order_vendor_money" => array() ,"transfer_sum" => 0 /** 列总计 */ diff --git a/webht/third_party/trippestOrderSync/libraries/trippest.php b/webht/third_party/trippestOrderSync/libraries/trippest.php index d52ed3dd..220f243a 100644 --- a/webht/third_party/trippestOrderSync/libraries/trippest.php +++ b/webht/third_party/trippestOrderSync/libraries/trippest.php @@ -96,11 +96,11 @@ class Trippest ,"profit_rate" => 0.4 ) // 桂林地接 - ,"628" => array( - "sourcetype" => "32122" - ,"vendor_name" => "桂林地接" - ,"profit_rate" => 0.4 - ) + // ,"628" => array( + // "sourcetype" => "32122" + // ,"vendor_name" => "桂林地接" + // ,"profit_rate" => 0.4 + // ) ); } diff --git a/webht/third_party/trippestOrderSync/views/vendor_money_sum.php b/webht/third_party/trippestOrderSync/views/vendor_money_sum.php index 651da1d7..711d1439 100644 --- a/webht/third_party/trippestOrderSync/views/vendor_money_sum.php +++ b/webht/third_party/trippestOrderSync/views/vendor_money_sum.php @@ -43,9 +43,9 @@