修改导出

Application/Payment/Controller/ExcelPaymentController.class.php

@@ -89,14 +89,15 @@ class ExcelPaymentController extends BaseController
 
             $v['company_type'] =  $this->CompanyType[$v['company_type']];
             $v["pay_status_str"] =  $this->PayStatus[$v['pay_status']];
-            $v['statement_begin_time'] = date('Y-m-d',$v['statement_begin_time']);
+            $v['create_time'] = date('Y-m-d H:i:s',$v['create_time']);
-            $v['statement_end_time'] = date('Y-m-d',$v['statement_end_time']);
+            // $v['statement_begin_time'] = date('Y-m-d',$v['statement_begin_time']);
+            // $v['statement_end_time'] = date('Y-m-d',$v['statement_end_time']);
             if(empty($v['pay_time'])){
                 $v['pay_time'] = "--";
             }else{
                 $v['pay_time'] = date('Y-m-d H:i:s',$v['pay_time']);
             }
-            $v["valid"] = "{$v['statement_begin_time']} ~ {$v['statement_end_time']}";
+            // $v["valid"] = "{$v['statement_begin_time']} ~ {$v['statement_end_time']}";
         }
 
         //统计待打款金额
@@ -126,8 +127,8 @@ class ExcelPaymentController extends BaseController
     public function loopAdd()
     {
         $p = $_REQUEST;
-        $statement_begin_time = strtotime($p['statement_begin_time']);
+        // $statement_begin_time = strtotime($p['statement_begin_time']);
-        $statement_end_time = strtotime($p['statement_end_time'])+86399;
+        // $statement_end_time = strtotime($p['statement_end_time'])+86399;
         $batch = $p['batch'];
         $checkarr = $p['checkarr'];
         //循环获取添加
@@ -137,8 +138,8 @@ class ExcelPaymentController extends BaseController
         $ExcelStatementInfo = M('ExcelStatementInfo',"tab_");
         foreach ($checkarr as $k => &$v) {
             $company_info = $v['company_info'];
-            $v['statement_begin_time'] = $statement_begin_time;
+            // $v['statement_begin_time'] = $statement_begin_time;
-            $v['statement_end_time'] = $statement_end_time;
+            // $v['statement_end_time'] = $statement_end_time;
             $v['batch_num'] = $batch;
             $v['statement_info'] = json_encode($v['statement_info'],JSON_UNESCAPED_UNICODE);
             $v['company_info'] = json_encode($v['company_info'],JSON_UNESCAPED_UNICODE);
@@ -214,12 +215,32 @@ class ExcelPaymentController extends BaseController
         foreach($infolist as $k=>&$v){
             $v['statement_info'] = json_decode($v['statement_info'],true);
             $v['company_info'] = json_decode($v['company_info'],true);
-            $v['statement_begin_time'] = date('Y-m-d',$v['statement_begin_time']);
+            // $v['statement_begin_time'] = date('Y-m-d',$v['statement_begin_time']);
-            $v['statement_end_time'] = date('Y-m-d',$v['statement_end_time']);
+            // $v['statement_end_time'] = date('Y-m-d',$v['statement_end_time']);
+
             $cline = $line+1;
             if($is_export){
                 $v['sum_money_exp'] = "=";
+                $hh = "\n";
+            }else{
+                $hh = "<br>";
+            }
+
+            $dm = json_decode($v['document_maker'],true);
+            $v['document_maker'] = $dm['mobile'].$hh."({$dm['real_name']})";
+            if(!empty($v['payment_user'])){
+                $pu = json_decode($v['payment_user'],true);
+                $v['payment_user'] = $pu['mobile'].$hh."({$pu['real_name']})";
+            }else{
+                $v['payment_user'] = "--";
             }
+            $v["pay_status_str"] =  $this->PayStatus[$v['pay_status']];
+            if(!empty($v['pay_time'])){
+                $v['pay_time'] = date('Y-m-d H:i:s',$v['pay_time']);
+            }else{
+                $v['pay_time'] = '--';
+            }
+
             $row = 0;
             foreach($v['statement_info'] as $ke=>&$va){
                 $va['row'] = count($va['game_list']);
@@ -322,7 +343,7 @@ class ExcelPaymentController extends BaseController
             $amount = 0.1; //测试金额必须去除
             $payres = $fund->transfer($company_info['ali_account'],$company_info['ali_user'],$dbres['statement_num'],$amount, $title);
             $resultCode = $payres->code;
-            
+
             $savedata = ["id"=>$dbres['id']];
             if(!empty($resultCode)&&$resultCode == 10000){
                 $savedata["pay_status"]=1;

Application/Payment/View/ExcelPayment/add.html

@@ -36,22 +36,6 @@
                                 <span class="notice-text" style="margin-left: 20px;">用于检索使用</span>
                             </td>
                         </tr>
-                        <tr>
-                            <td class="l"><i class="mustmark" style="margin-left:-7px">*</i>结算时间:</td>
-                            <td class="r">
-                                <div class="input-list" style="margin-left: 0;">
-                                    <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">
-                                        <input type="text" readonly id="time_end" name="time_end" class=""
-                                            value="{:I('time_end')}" placeholder="结束时间" />
-                                        <span class="add-on"><i class="icon-th"></i></span>
-                                    </div>
-                                </div>
-                                <span class="notice-text" style="margin-left: 0;">用于检索及唯一值检验</span>
-                            </td>
-                        </tr>
                         <tr>
                             <td class="l"><i class="mustmark" style="margin-left:-7px">*</i>文件上传:</td>
                             <td class="r">
@@ -230,8 +214,6 @@
             "check_page":0,
             "filedata":[],
             "pay_way":-1,
-            "begin_time":0,
-            "end_time":0,
             "batch":batch
         }
         $("#batch").html(batch);
@@ -241,26 +223,11 @@
 
 
             $("#submit_btn").on("click", function () {
-                var start = $("#time_start").val();
-                var end = $("#time_end").val();
-                var sdate = Date.parse(start) / 1000;
-                var edate = Date.parse(end) / 1000;
-                if (start == '' || end == '') {
-                    layer.msg('开始时间与结束时间都不允许为空');
-                    return false;
-                }
-                if (sdate > edate) {
-                    layer.msg('开始时间必须小于等于结束时间');
-                    return false;
-                }
-
                 //获取文件
                 if (!isfile) {
                     layer.msg('excel文件不能为空');
                     return false;
                 }
-                sendDefaultData.begin_time = start;
-                sendDefaultData.end_time = end;
                 //执行
                 readFileInput(function () {
                     if(sendDefaultData.filedata_count == 0){
@@ -270,8 +237,6 @@
                     }
                     //获取需要循环的次数
                     sendDefaultData.check_page = Math.ceil(sendDefaultData.filedata_count/check_size);
-                    sendDefaultData.begin_time = start;
-                    sendDefaultData.end_time = end;
                     COMPARE.checkData(function(){
                         COMPARE.loopCheck(1,function(){
                             setTimeout(function(){

Application/Payment/View/ExcelPayment/lists.html

@@ -110,14 +110,14 @@
                 <input type="text" name="company_name" placeholder="请输入公司名称模糊搜索" value="{:I('company_name')}" style="width: 180px;">
             </div>
 
-            <div class="input-list">
+            <!-- <div class="input-list">
                 <input type="text" readonly id="time_start" name="time_start" class="" value="{:I('time_start')}" placeholder="结算开始时间" />
                 &nbsp;-&nbsp;
                 <div class="input-append date"  style="display:inline-block">
                     <input type="text" readonly id="datetimepicker" name="time_end" class="" value="{:I('time_end')}" placeholder="结算结束时间" />
                     <span class="add-on"><i class="icon-th"></i></span>
                 </div>
-            </div>
+            </div> -->
 
             <div class="input-list input-list-promote search_label_rehab">
                 <select id="pay_status" name="pay_status" class="select_gallery" >
@@ -169,7 +169,7 @@
                         <th><input class="check-all" type="checkbox"></th>
                         <th>合作公司</th>
                         <th>公司类型</th>
-                        <th>结算时间</th>
+                        <th>创建时间</th>
                         <th>批次号</th>
                         <th>结算金额</th>
                         <th>结算流水</th>
@@ -193,7 +193,7 @@
                                 <td ><input class="ids" type="checkbox" value="{$data['id']}" data-pay="{$data['can_pay']}" data-paystatus="{$data.pay_status}" name="ids[]"></td>
                                 <td>{$data.company_name}</td>
                                 <td>{$data.company_type}</td>
-                                <td>{$data.valid}</td>
+                                <td>{$data.create_time}</td>
 
                                 <td>{$data.batch_num}</td>
                                 
@@ -374,7 +374,7 @@
             $("#search").click(function(){
 
                 var start = $("#time_start").val();
-                var end =   $("#time_end").val();
+                var end =   $("#datetimepicker").val();
                 if(start !='' && end != ''){
                     if (Date.parse(start) > Date.parse(end)){
                         layer.msg('开始时间必须小于等于结束时间');
@@ -382,6 +382,15 @@
                     }
                 }
 
+                var start2 = $("#time_start2").val();
+                var end2 =   $("#datetimepicker2").val();
+                if(start2 !='' && end2 != ''){
+                    if (Date.parse(start2) > Date.parse(end2)){
+                        layer.msg("<font style='color:white'>支付时间开始时间必须小于等于结束时间</font>");
+                        return false;
+                    }
+                }
+
                 var url = $(this).attr('url');
                 var query  = $('.jssearch').find('input').serialize();
                 query  += "&"+$('.jssearch').find('select').serialize();

Application/Payment/View/ExcelPayment/showPayment.html

@@ -121,7 +121,7 @@
                                 <td>{$vo.batch_num}</td>
                                 <td>{$vo.statement_money}</td>
                                 <td>{$vo.remark}</td>
-                                <td><input type="text" class="txt paymentset" data-id="{$vo.id}" data-pool="{$vo.pool_id}" name="remark" value="信息服务费" placeholder="打款备注"></td>
+                                <td><input type="text" class="txt paymentset" data-id="{$vo.id}" data-pool="{$vo.pool_id}" name="remark" value="" placeholder="打款备注"></td>
                             </tr>
                         
                     </foreach>

Application/Payment/View/ExcelPayment/viewPuPool.html

@@ -83,7 +83,10 @@
         float: left;
         margin: 0;
     }
-    
+    #statementShow td{
+        line-height: 1.5;
+        padding: 8px 0;
+    }
 </style>
 <body>
     <!-- <div style="width: 100%;line-height: 100px;font-size: 25px;font-weight: 600;text-align: center;">
@@ -113,6 +116,10 @@
                         <th>结算金额</th>
                         <th>支付宝真实姓名</th>
                         <th>支付宝账号</th>
+                        <th>制单人</th>
+                        <th>审核人员</th>
+                        <th>打款状态</th>
+                        <th>打款时间</th>
                         <th>备注</th>
                     </tr>
                 </thead>
@@ -158,6 +165,10 @@
 
                             <td rowspan="{$com.row}">{$com.company_info.ali_user}</td>
                             <td rowspan="{$com.row}">{$com.company_info.ali_account}</td>
+                            <td rowspan="{$com.row}">{$com.document_maker}</td>
+                            <td rowspan="{$com.row}">{$com.payment_user}</td>
+                            <td rowspan="{$com.row}">{$com.pay_status_str}</td>
+                            <td rowspan="{$com.row}">{$com.pay_time}</td>
                             <td rowspan="{$com.row}">{$com.remark}</td>
                         </tr>
 
@@ -244,6 +255,10 @@
                         <td></td>
                         <td></td>
                         <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
                     </tr>
                 </tbody>
             </table>