Merge remote-tracking branch 'origin/1210-v3.0.2' into 1210-v3.0.2

application/index/controller/Finance.php

@@ -3021,22 +3021,20 @@ class Finance extends Basic
             }
 
             if (!empty($this->params['march_id'])) {
-                $where['c.id'] = $this->params['march_id'];
+                $where['b.order_id'] = $this->params['march_id'];
             }
 
-            $field = 'a.create_time,a.id,c.id as march_id,a.paylog_id,a.money,b.income_time,a.type,a.new_paylog_id,a.operation_id,b.order_id';
+            $field = 'a.create_time,a.id,b.order_id,a.paylog_id,a.money,b.income_time,a.type,a.new_paylog_id,a.operation_id,b.order_id,e.house_id';
             $list = $m_paylog->getAdjustmentListLimit($pageNo, $pageSize, $order_ = 'a.id desc', $field, $where);
 
             $data['total'] = $m_paylog->getAdjustmentListTotal($where);
 
             $m_agent = new AAgents();
             $m_house = new GHouses();
-            $m_order = new OrderModel();
             foreach ($list as $k => $v) {
                 $list[$k]['name'] = $m_agent->getAgentsById($v['operation_id'], 'name');
-                $house_id = $m_order->getFieldValue('house_id', ['id'=>$v['order_id']]);
-                if ($house_id) {
-                    $house_data = $m_house->getHouseDetail('id,internal_address', ['id'=>$house_id]);
+                if ($v['house_id']) {
+                    $house_data = $m_house->getHouseDetail('id,internal_address', ['id'=>$v['house_id']]);
                     $list[$k]['house_id'] = $house_data['id'];
                     $list[$k]['address'] = $house_data['internal_address'];
                 } else {

application/index/view/finance/adjustment.html

@@ -308,7 +308,7 @@
 												<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="comit_phone" placeholder="提交人手机号" type="text" value="">
 												<span class="btn btn-info btn3 ld-Marheight" id="search" style="float:left">搜索</span>
 												<span class="btn btn-info btn3 ld-Marheight" id="reset" style="float:left">重置</span>
-												<span class="btn btn-info btn3 ld-Marheight" id="export" style="float:left">导出excel</span>
+												<!--<span class="btn btn-info btn3 ld-Marheight" id="export" style="float:left">导出excel</span>-->
 												<span class="btn btn-info btn3 ld-Marheight" id="count" style="float:left">统计</span>
 												<span class="money_total_two  ld-Marheight " style="float:left">调整统计：</span><span style="float:left" id="money_total" class="money_total_two_shifu  fore-span ld-Marheight">1268元</span>
 											</form>

application/model/OPayLogAdjustment.php

@@ -115,7 +115,6 @@ class OPayLogAdjustment extends BaseModel{
         return $this->db_->field($field)
             ->alias("a")
             ->join("o_paylog b", "a.paylog_id = b.id", "left")
-            ->join("o_march_in c", "b.order_id = c.id", "left")
             ->join("a_agents d", "a.operation_id = d.id", "left")
             ->join("o_order e", "b.order_id = e.id")
             ->limit($pageSize)
@@ -132,7 +131,6 @@ class OPayLogAdjustment extends BaseModel{
     public function getAdjustmentListTotal($params) {
         return $this->db_->alias('a')
             ->join("o_paylog b", "a.paylog_id = b.id", "left")
-            ->join("o_march_in c", "b.order_id = c.id", "left")
             ->join("a_agents d", "a.operation_id = d.id", "left")
             ->join("o_order e", "b.order_id = e.id")
             ->where($params)
@@ -148,7 +146,6 @@ class OPayLogAdjustment extends BaseModel{
     public function getMoneyTotal($params) {
         return $this->db_->alias('a')
             ->join("o_paylog b", "a.paylog_id = b.id", "left")
-            ->join("o_march_in c", "b.order_id = c.id", "left")
             ->join("a_agents d", "a.operation_id = d.id", "left")
             ->join("o_order e", "b.order_id = e.id")
             ->where($params)

public/app/dist/index.html

@@ -23,4 +23,4 @@
 				if(!doc.addEventListener) return;
 				win.addEventListener(resizeEvt, recalc, false);
 				doc.addEventListener('DOMContentLoaded', recalc, false);
-			})(document, window);</script><link href=./static/css/app.18f66e05aeedf4028dbf86453eab6b23.css rel=stylesheet></head><body><div id=app></div><script src=https://api.tonglianjituan.com/app/js/libs/vue.min.js></script><script src=https://api.tonglianjituan.com/app/js/libs/vue-router.min.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.74698e64579a16bcf167.js></script><script type=text/javascript src=./static/js/app.567a6c20050f5f09e0f5.js></script></body></html>
\ No newline at end of file
+			})(document, window);</script><link href=./static/css/app.a73181a8689d77665f3ecd7635761082.css rel=stylesheet></head><body><div id=app></div><script src=https://api.tonglianjituan.com/app/js/libs/vue.min.js></script><script src=https://api.tonglianjituan.com/app/js/libs/vue-router.min.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.74698e64579a16bcf167.js></script><script type=text/javascript src=./static/js/app.d14e5a4ffd862ad14d96.js></script></body></html>
\ No newline at end of file