Merge branch 'feature/admin_optimize' into release

Application/Admin/Controller/StatementMangementController.class.php

@@ -609,7 +609,7 @@ class StatementMangementController extends ThinkController
 
             $statement = M('statement','tab_')
                 ->field('ext_field')
-                ->where(['ext_field'=>['like','%,%']])
+                ->where(['statement_type'=>2])
                 ->select();
 
             $withdrawData = [];
@@ -624,7 +624,10 @@ class StatementMangementController extends ThinkController
 
             }
 
-            $thisWithdraw = explode(',',$_REQUEST['withdraw']);
+//            $thisWithdraw = explode(',',$_REQUEST['withdraw']);
+            $thisWithdraw = explode(',',M('statement','tab_')->where(['id'=>$_REQUEST['id']])->find()['ext_field']);
+//            dump($thisWithdraw);die();
+
 
             foreach ($data as $key => $value) {
 //                $data[$key]['settlement_begin_time'] = date("Y-m-d H:i:s", $data[$key]['settlement_begin_time']);
@@ -795,6 +798,8 @@ class StatementMangementController extends ThinkController
 
         $is_save = M('statement','tab_')->where(['id'=>$_REQUEST['withdraw_id']])->save($data);
 
+//        echo M('statement','tab_')->_sql();die();
+
         if ($is_save) {
             $this->ajaxReturn(['status'=>1,'msg'=>'修改成功']);
         } else {

Application/Admin/View/StatementMangement/PersonOrderEdit.html

@@ -80,6 +80,7 @@
         <div class="jssearch fl cf search_list">
             <div class="input-list">
                 <input type="text" id="withdraw_id" style="display: none" value="{:I('id')}"/>
+                <input type="text" id="withdraw" name="withdraw" style="display: none" value="{:I('withdraw')}"/>
                 <input type="text" readonly id="time_start" name="time_start" class="" value="{:I('time_start')}" placeholder="结算开始时间" />
                 &nbsp;-&nbsp;
                 <div class="input-append date" id="datetimepicker"  style="display:inline-block">
@@ -277,6 +278,7 @@
                 return $(elem).val();
             }).get().join(",");
             var id =$("#withdraw_id").val();
+            var withdraw =$("#withdraw").val();
             var url = "/admin.php?s=/statementMangement/PersonOrderEdit/withdraw/" + text + "/time_start/" + $("#time_start").val() + "/time_end/" + $("#time_end").val() + "/id/" + id;
 
             console.log(url)