修改

Application/Admin/Controller/PresidentDepositController.class.php

@@ -10,8 +10,45 @@ use Base\Service\PresidentDepositService;
  */
 class PresidentDepositController extends ThinkController
 {
-    public function records() {
+    public function records()
-        $promotes = M('promote', 'tab_')->where(['company_belong' => 1, 'level' => 1])->select();
+    {
+        $companyType = I('company_type');
+        $payType = I('pay_type');
+        $status = I('status');
+        $promoteId = I('promote_id');
+
+        $query = M('promote', 'tab_')->where(['level' => 1])->where(['company_belong' => ['in', [1, 2]]]);
+
+        $idStrWhere = [];
+        if ($promoteId !== '') {
+            $idStrWhere[] = 'id = ' . $promoteId;
+        }
+        if ($companyType !== '') {
+            $query->where(['company_belong' => $companyType]);
+        }
+
+        $promoteIds = [];
+        if ($status !== '') {
+            $tempPromoteIds = M('president_deposit', 'tab_')->where(['status' => $status])->getField('promote_id', true);
+            if (count($tempPromoteIds) > 0) {
+                $idStrWhere[] = 'id in (' . implode(',', $tempPromoteIds) . ')';
+            } else {
+                $idStrWhere[] = '1<>1';
+            }
+        }
+        if ($payType !== '') {
+            $tempPromoteIds = M('president_deposit', 'tab_')->where(['pay_type' => $payType])->getField('promote_id', true);
+            if (count($tempPromoteIds) > 0) {
+                $idStrWhere[] = 'id in (' . implode(',', $tempPromoteIds) . ')';
+            } else {
+                $idStrWhere[] = '1<>1';
+            }
+        }
+        if (count($idStrWhere) > 0) {
+            $query->where(['_string' => implode(' and ', $idStrWhere)]);
+        }
+
+        $promotes = $query->select();
         $relationQuery = M('promote_company', 'tab_')->field(['id', 'company_name']);
         $promotes = $this->mergeOneReletions('company', $promotes, $relationQuery, 'company_id', 'id');
         $relationQuery = M('president_deposit', 'tab_');
@@ -20,8 +57,13 @@ class PresidentDepositController extends ThinkController
         var_dump($promotes);
         echo '</pre>';
         die();*/
+        $companyTypes = [
+            1 => '外团',
+            2 => '外团-分发联盟',
+        ];
         $this->assign('payWays', PresidentDepositService::$payWays);
         $this->assign('payTypes', PresidentDepositService::$payTypes);
+        $this->assign('companyTypes', $companyTypes);
         $this->assign('statusList', PresidentDepositService::$statusList);
         $this->assign('promotes', $promotes);
         $this->display();
@@ -30,6 +72,9 @@ class PresidentDepositController extends ThinkController
     private function mergeOneReletions($name, $records, $relationQuery, $selfColumn, $relationColumn = 'id')
     {
         $values = array_column($records, $selfColumn);
+        if (count($values) == 0) {
+            return [];
+        }
         $rows = $relationQuery->where([$relationColumn => ['in', $values]])->select();
         foreach ($records as &$record) {
             $record[$name] = null;
@@ -46,11 +91,14 @@ class PresidentDepositController extends ThinkController
 
     public function edit()
     {
+        $this->meta_title = '编辑/查看会长押金';
         $id = I('id', 0);
         $promote = M('promote', 'tab_')->field(['account', 'id'])->where(['id' => $id])->find();
+        $record = M('president_deposit', 'tab_')->where(['promote_id' => $id])->find();
         $this->assign('payWays', PresidentDepositService::$payWays);
         $this->assign('payTypes', PresidentDepositService::$payTypes);
         $this->assign('promote', $promote);
+        $this->assign('record', $record);
         $this->display('form');
     }
 
@@ -59,13 +107,21 @@ class PresidentDepositController extends ThinkController
         $payWay = I('pay_way', 0);
         $payType = I('pay_type', 0);
         $promoteId = I('id', 0);
-        $payAccount = I('pay_account', 0);
+        $payAccount = I('pay_account', '');
-        $amount = I('amount', 0);
+        $amount = floatval(I('amount', 0));
-        $payer = I('payer', 0);
+        $payer = I('payer', '');
 
         $record = M('president_deposit', 'tab_')->where(['promote_id' => $promoteId])->find();
         
         if (!$record) {
+
+            if ($payType == 0) {
+                return $this->error('请选择押金付款方式');
+            }
+            if ($payWay == 0) {
+                return $this->error('请选择付款方式');
+            }
+
             $data = [];
             $data['pay_way'] = $payWay;
             $data['pay_type'] = $payType;
@@ -73,8 +129,33 @@ class PresidentDepositController extends ThinkController
             $data['pay_account'] = $payAccount;
             $data['amount'] = $amount;
             $data['payer'] = $payer;
+            $data['create_time'] = time();
+            $data['update_time'] = time();
             M('president_deposit', 'tab_')->add($data);
+            return $this->success('保存成功',  U('PresidentDeposit/records'));
+        }
+
+        if ($record['status'] != 0) {
+            return $this->error('该状态下不可编辑/修改');
+        }
+        
+        if ($amount == 0) {
+            return $this->error('请输入金额');
+        }
+        if ($payer == '') {
+            return $this->error('请输入付款人');
         }
+        if ($payAccount == '') {
+            return $this->error('请输入付款账号');
+        }
+
+        $data = [];
+        $data['pay_account'] = $payAccount;
+        $data['amount'] = $amount;
+        $data['payer'] = $payer;
+        $data['update_time'] = time();
+        M('president_deposit', 'tab_')->where(['promote_id' => $promoteId])->save($data);
+        return $this->success('保存成功');
     }
 
     public function delete()
@@ -119,9 +200,27 @@ class PresidentDepositController extends ThinkController
                 'message' => '无选中项'
             ]);
         }
-        M('president_deposit', 'tab_')->where(['promote_id' => ['in', $promoteIds]])->update([
+
-            'status' => $payType,
+        $checkStatus = true;
-            'refund_time' => time()
+        $records = M('president_deposit', 'tab_')->field(['id', 'status'])->where(['promote_id' => ['in', $promoteIds]])->select();
+        foreach ($records as $record) {
+            if ($record['status'] != 1) {
+                $checkStatus = false;
+                break;
+            }
+        }
+        if (!$checkStatus) {
+            $this->ajaxReturn([
+                'status' => 0,
+                'message' => '含有非已到账状态记录，不可批量操作'
+            ]);
+        }
+
+
+        M('president_deposit', 'tab_')->where(['promote_id' => ['in', $promoteIds]])->save([
+            'status' => 2,
+            'refund_time' => time(),
+            'update_time' => time()
         ]);
         $this->ajaxReturn([
             'status' => 1,
@@ -138,9 +237,24 @@ class PresidentDepositController extends ThinkController
                 'message' => '无选中项'
             ]);
         }
-        M('president_deposit', 'tab_')->where(['promote_id' => ['in', $promoteIds]])->update([
+        $checkStatus = true;
-            'status' => $payType,
+        $records = M('president_deposit', 'tab_')->field(['id', 'status'])->where(['promote_id' => ['in', $promoteIds]])->select();
-            'pay_confirm_time' => time()
+        foreach ($records as $record) {
+            if ($record['status'] != 0) {
+                $checkStatus = false;
+                break;
+            }
+        }
+        if (!$checkStatus) {
+            $this->ajaxReturn([
+                'status' => 0,
+                'message' => '含有非待确认状态记录，不可批量操作'
+            ]);
+        }
+        M('president_deposit', 'tab_')->where(['promote_id' => ['in', $promoteIds]])->save([
+            'status' => 1,
+            'pay_confirm_time' => time(),
+            'update_time' => time()
         ]);
         $this->ajaxReturn([
             'status' => 1,

Application/Admin/View/PresidentDeposit/form.html

@@ -90,10 +90,10 @@
             <tr>
               <td class="l"><i class="mustmark">*</i>押金付款方式：</td>
               <td class="r">
-                <select name="pay_type" id="pay_type" class="select_gallery">
+                <select name="pay_type" id="pay_type" class="select_gallery" <?php if($record):?>disabled<?php endif;?>>
                   <option value="">押金付款方式</option>
                   <?php foreach($payTypes as $key => $name):?>
-                  <option value="<?=$key?>"><?=$name?></option>
+                  <option value="<?=$key?>" <?php if($record && $record['pay_type'] == $key):?>selected<?php endif;?>><?=$name?></option>
                   <?php endforeach;?>
                 </select>
                 <span class="notice-text"></span>
@@ -102,33 +102,33 @@
             <tr>
               <td class="l"><i class="mustmark">*</i>付款方式：</td>
               <td class="r">
-                <select name="pay_way" id="pay_way" class="select_gallery">
+                <select name="pay_way" id="pay_way" class="select_gallery" <?php if($record):?>disabled<?php endif;?>>
                   <option value="">付款方式</option>
                   <?php foreach($payWays as $key => $name):?>
-                  <option value="<?=$key?>"><?=$name?></option>
+                  <option value="<?=$key?>" <?php if($record && $record['pay_way'] == $key):?>selected<?php endif;?>><?=$name?></option>
                   <?php endforeach;?>
                 </select>
                 <span class="notice-text"></span>
               </td>
             </tr>
             <tr>
-              <td class="l"><i class="mustmark">*</i>金额：</td>
+              <td class="l"><?php if($record):?><i class="mustmark">*</i><?php endif?>金额：</td>
               <td class="r table_radio">
-                <input type="text" class="txt ratio" name="amount" id="amount" value="" placeholder="请输入金额" onKeyUp="value=value.replace(/[^\w\.\/]/ig,'')">
+                <input type="text" class="txt ratio" name="amount" id="amount" value="<?=$record?$record['amount']:''?>" <?php if($record && $record['status']!=0):?>disabled<?php endif;?> placeholder="请输入金额">
                 <span class="notice-text"></span>
               </td>
             </tr>
             <tr>
-              <td class="l"><i class="mustmark">*</i>付款人：</td>
+              <td class="l"><?php if($record):?><i class="mustmark">*</i><?php endif?>付款人：</td>
               <td class="r table_radio">
-                <input type="text" class="txt ratio" name="payer" id="payer" value="" placeholder="请输入付款人" onKeyUp="value=value.replace(/[^\w\.\/]/ig,'')">
+                <input type="text" class="txt ratio" name="payer" id="payer" value="<?=$record?$record['payer']:''?>" <?php if($record && $record['status']!=0):?>disabled<?php endif;?> placeholder="请输入付款人">
                 <span class="notice-text"></span>
               </td>
             </tr>
             <tr>
-              <td class="l"><i class="mustmark">*</i>付款账号：</td>
+              <td class="l"><?php if($record):?><i class="mustmark">*</i><?php endif?>付款账号：</td>
               <td class="r table_radio">
-                <input type="text" class="txt ratio" name="pay_account" id="pay_account" value="" placeholder="请输入付款账号" onKeyUp="value=value.replace(/[^\w\.\/]/ig,'')">
+                <input type="text" class="txt ratio" name="pay_account" id="pay_account" value="<?=$record?$record['pay_account']:''?>" <?php if($record && $record['status']!=0):?>disabled<?php endif;?> placeholder="请输入付款账号">
                 <span class="notice-text"></span>
               </td>
             </tr>
@@ -137,9 +137,11 @@
         </div>
         <input type="hidden" name="id" id="id" value="{$promote.id}" />
         <div class="form-item cf">
+          <?php if(!$record || $record['status']==0):?>
           <button class="submit_btn mlspacing" id="submit" type="submit" target-form="form-horizontal">
             确认
           </button>
+          <?php endif;?>
           <a class="submit_btn " alt="返回上一页" title="返回上一页" href="javascript:window.history.back();" >
             返回
           </a>
@@ -167,7 +169,7 @@
   <script type="text/javascript" src="__STATIC__/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js" charset="UTF-8"></script>
 <script type="text/javascript">
 //导航高亮
-highlight_subnav('{:U('PresidentDeposit/edit')}');
+highlight_subnav('{:U('PresidentDeposit/records')}');
 $(".select_gallery").select2();
 
 $(function(){

Application/Admin/View/PresidentDeposit/records.html

@@ -48,16 +48,14 @@
     <script src="__STATIC__/layer/layer.js" type="text/javascript"></script>
     <script type="text/javascript" src="__STATIC__/layer/extend/layer.ext.js"></script>
     <div class="cf main-place top_nav_list navtab_list">
-        <h3 class="page_title">推广提现</h3>
+        <h3 class="page_title">会长押金记录</h3>
-        <p class="description_text">说明：推广员后台申请提现的记录，后台审批操作</p>
-
     </div>
     <div class="cf top_nav_list">
         <empty name="model.extend">
             <div class="fl button_list">
                 <div class="tools">
-                    <a class="ajax-post" target-form="ids" url="{:U('set_withdraw_status')}"><span class="button_icon button_icon12"></span>确认押金已到账</a>
+                    <a id="pay-confirm-btn"><span class="button_icon button_icon12"></span>确认押金已到账</a>
-                    <a class="agree" data-id="ids"><span class="button_icon button_icon13"></span>押金已退款</a>
+                    <a id="refund-btn"><span class="button_icon button_icon13"></span>押金已退款</a>
                 </div>
             </div>
         </empty>
@@ -67,15 +65,15 @@
                 <label>搜索：</label>
             </div>
             <div class="input-list input-list-promote search_label_rehab">
-                <select id="promote_id" name="promote_account" class="select_gallery" style="width:120px;">
+                <select id="promote_id" name="promote_id" class="select_gallery" style="width:120px;">
                     <option value="">会长账号</option>
                     <volist name=":get_promote_list_by_id()" id="vo">
-                        <option promote-id="{$vo.id}" value="{$vo.account}">{$vo.account}</option>
+                        <option value="{$vo.id}">{$vo.account}</option>
                     </volist>
                 </select>
             </div>
             <div class="input-list input-list-promote search_label_rehab">
-                <select id="promote_id" name="promote_account" class="select_gallery" style="width:120px;">
+                <select id="pay_type" name="pay_type" class="select_gallery" style="width:120px;">
                     <option value="">押金类型</option>
                     <?php foreach($payTypes as $key => $name):?>
                     <option value="<?=$key?>"><?=$name?></option>
@@ -83,15 +81,23 @@
                 </select>
             </div>
             <div class="input-list input-list-promote search_label_rehab">
-                <select id="promote_id" name="promote_account" class="select_gallery" style="width:120px;">
+                <select id="status" name="status" class="select_gallery" style="width:120px;">
                     <option value="">押金状态</option>
                     <?php foreach($statusList as $key => $name):?>
                     <option value="<?=$key?>"><?=$name?></option>
                     <?php endforeach;?>
                 </select>
             </div>
+            <div class="input-list input-list-promote search_label_rehab">
+                <select id="company_type" name="company_type" class="select_gallery" style="width:120px;">
+                    <option value="">工会类型</option>
+                    <?php foreach($companyTypes as $key => $name):?>
+                    <option value="<?=$key?>"><?=$name?></option>
+                    <?php endforeach;?>
+                </select>
+            </div>
             <div class="input-list">
-                <a class="sch-btn" href="javascript:;" id="search" url="{:U('PresidentDeposit/records','model='.$model['name'] .'&row='.I('row'),false)}">搜索</a>
+                <a class="sch-btn" href="javascript:;" id="search" url="{:U('PresidentDeposit/records')}">搜索</a>
             </div>
             <!-- <div class="input-list">
                 <a class="sch-btn" href="{:U('Export/expUser',array_merge(array('id'=>12,),I('get.')))}">导出</a>
@@ -128,26 +134,26 @@
                 <!-- 列表 -->
                 <tbody>
                 <empty name ="promotes">
-                    <td colspan="11" class="text-center">aOh! 暂时还没有内容!</td>
+                    <td colspan="14" class="text-center">aOh! 暂时还没有内容!</td>
                     <else />
                     <volist name="promotes" id="data">
                         <tr data-id="<?=$data['id']?>">
                             <td>
-                                <eq name="data.status" value="0">
+                                <?php if($data['presidentDeposit'] && in_array($data['presidentDeposit']['payer'], [0, 1])):?>
                                 <input class="ids" type="checkbox" value="{$data['id']}" name="ids[]">
-                                    <else />
+                                <?php else:?>
                                 <input class="ids disabled" disabled="disabled" type="checkbox" value="{$data['id']}" name="ids[]">
-                                </eq>
+                                <?php endif;?>
                             </td>
                             <td>{$data.company.company_name}</td>
                             <td>{$data.account}</td>
-                            <td>{$data.company_belong}</td>
+                            <td><?=$companyTypes[$data['company_belong']]?></td>
                             <?php if($data['presidentDeposit']):?>
                             <td><?=$data['presidentDeposit']['payer']?></td>
                             <td><?=$payWays[$data['presidentDeposit']['pay_way']] ?? '--'?></td>
                             <td><?=$data['presidentDeposit']['pay_account']?></td>
                             <td><?=$payTypes[$data['presidentDeposit']['pay_type']] ?? '--'?></td>
-                            <td><?=date('Y-m-d H:i:s', $data['presidentDeposit']['verify_time'])?></td>
+                            <td><?=date('Y-m-d H:i:s', $data['presidentDeposit']['create_time'])?></td>
                             <td><?=$data['presidentDeposit']['amount']?></td>
                             <td><?=date('Y-m-d H:i:s', $data['presidentDeposit']['verify_time'])?></td>
                             <td><?=$statusList[$data['presidentDeposit']['status']]?></td>
@@ -202,42 +208,6 @@
         </form>
         <a class="ajax-post add-butn <notempty name='commonset'>addSIsetted</notempty>" href="javascript:;" target-form="addShortcutIcon" url="{:U('Think/addShortcutIcon')}"><img src="__IMG__/zwmimages/icon_jia.png"><span><notempty name='commonset'>已添加<else />添加至常用设置</notempty></span></a>
     </div>
-    <!--打款弹出层-->
-    <div class="promote-layer mb20">
-        <form id="ajaxForm" action="{:U('set_withdraw')}" method="post">
-            <input type="hidden" name="ids" id="hd_ids" value="" />
-            <input type="hidden" name="case" id="case" value="deny" />
-
-            <ol class="promote-con">
-                <li class="promote-con-con " id="deny">
-                    <div class="mb20">
-                        <span class="promote-name"><i class="mustmark">*</i>说明:</span>
-                        <textarea class="textarea-style" name="respond"></textarea>
-                    </div>
-                    <a href="javascript:;" id="agree_btn"><div class="promote-btn">驳回</div></a>
-                </li>
-                <li class="promote-con-con" id="upload">
-                    <div class="mb20" style="display: flex;">
-                        <span class="promote-name"><i class="mustmark">*</i>汇款证明:</span>
-                        <div id="uploader" class="wu-example">
-                            <!--用来存放文件信息-->
-                            <div class="btns">
-                                <div id="picker">选择文件</div>
-                            </div>
-                            <div style="display: flex;">
-                                <div id="thelist" class="uploader-list"></div>
-                                <div class="uploader-list" style="margin-left: 20px;">
-                                    <img id="imgList">
-                                </div>
-                            </div>
-                            <input type="hidden" name="transfer_proof" id="transfer_proof">
-                        </div>
-                    </div>
-                    <a href="javascript:;" id="save"><div class="promote-btn">保存</div></a>
-                </li>
-            </ol>
-        </form>
-    </div>
 </block>
 
 <block name="script">
@@ -254,23 +224,6 @@
         //导航高亮
         highlight_subnav('{:U('PresidentDeposit/records')}');
         $(function(){
-            $(".paixu").click(function(){
-                var that=$(this);
-                $data_order=that.attr('data-order');
-                $order_type='{$userarpu_order}';
-                console.log($order_type);
-                if($order_type==''||$order_type=='4'){
-                    $(".sortBy").attr('name','data_order');
-                    val='3,'+$data_order;
-                    $(".sortBy").attr('value',val);
-                    $("#search").click();
-                }else if($order_type=='3'){
-                    $(".sortBy").attr('name','data_order');
-                    val='4,'+$data_order;
-                    $(".sortBy").attr('value',val);
-                    $("#search").click();
-                }
-            });
             //搜索功能
             $("#search").click(function(){
                 var url = $(this).attr('url');
@@ -312,6 +265,55 @@
                     })
                 }
             })
+            $('#refund-btn').on({
+                click: function() {
+                    var ids = getIds();
+                    $.ajax({
+                        url: '{:U("refund")}',
+                        type: 'post',
+                        dataType: 'json',
+                        data: {ids: ids},
+                        success: function(result) {
+                            if (result.status == 1) {
+                                layer.msg(result.message)
+                                setTimeout(function() {
+                                    window.location.href = window.location.href
+                                }, 200)
+                            } else {
+                                layer.msg(result.message)
+                            }
+                        }
+                    })
+                }
+            })
+            $('#pay-confirm-btn').on({
+                click: function() {
+                    var ids = getIds();
+                    $.ajax({
+                        url: '{:U("payConfirm")}',
+                        type: 'post',
+                        dataType: 'json',
+                        data: {ids: ids},
+                        success: function(result) {
+                            if (result.status == 1) {
+                                layer.msg(result.message)
+                                setTimeout(function() {
+                                    window.location.href = window.location.href
+                                }, 200)
+                            } else {
+                                layer.msg(result.message)
+                            }
+                        }
+                    })
+                }
+            })
+            function getIds() {
+                var ids = [];
+                $('.ids:checked').each(function() {
+                    ids.push($(this).val());
+                })
+                return ids;
+            }
             $('.delete-btn').on({
                 click: function() {
                     var id = $(this).parents('tr').eq(0).attr('data-id');
@@ -334,18 +336,6 @@
                 }
             })
         });
-
-        function details(id){
-            layer.open({
-                type: 2,
-                title: '结算详情',
-                shadeClose: true,
-                shade: 0.8,
-                area: ['80%', '70%'],
-                content: '/admin.php?s=/Query/withdrawDetails/id/'+id+'' //iframe的url
-            });
-        }
-
         $(".export-btn").on("click",function(e){
             e.preventDefault();
             window.location.href=$(this).attr("href")