From 990c62b06a5dfd39ae23e386e52a41573ede3b97 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Fri, 24 Apr 2020 19:45:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E6=B3=A8=E5=A2=9E=E5=88=A0=E6=94=B9?=
 =?UTF-8?q?=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...regateFinanceStatementController.class.php |  11 +
 .../View/AggregateFinanceStatement/lists.html | 388 +++++-------------
 Data/update.sql                               |   1 +
 3 files changed, 118 insertions(+), 282 deletions(-)

diff --git a/Application/Admin/Controller/AggregateFinanceStatementController.class.php b/Application/Admin/Controller/AggregateFinanceStatementController.class.php
index 8051c0c2a..144089765 100644
--- a/Application/Admin/Controller/AggregateFinanceStatementController.class.php
+++ b/Application/Admin/Controller/AggregateFinanceStatementController.class.php
@@ -335,6 +335,17 @@ class AggregateFinanceStatementController extends ThinkController
             'info' => "删除成功"
         ));
     }
+    //新增备注
+    public function saveRemark(){
+        if(!isset($_REQUEST['id'])) $this->error("参数错误");
+        $id = $_REQUEST['id'];
+        $remark = $_REQUEST['remark'];
+        M("aggregate_statement","tab_")->where("id = '{$id}'")->save(['remark'=>$remark]);
+        $this->ajaxReturn(array(
+            'status' => 1,
+            'info' => "操作成功"
+        ));
+    }
 
     //导出
     public function export()
diff --git a/Application/Admin/View/AggregateFinanceStatement/lists.html b/Application/Admin/View/AggregateFinanceStatement/lists.html
index 8b60e1004..bf2813157 100644
--- a/Application/Admin/View/AggregateFinanceStatement/lists.html
+++ b/Application/Admin/View/AggregateFinanceStatement/lists.html
@@ -51,9 +51,6 @@
         <h3 class="page_title">聚合渠道结算单管理</h3>
        <p class="description_text">流程说明：结算自动生成对账单--->发起人申请开票--->财务审核开票--->寄发票--->发起人上传收款凭证--->财务确认到账</p>
     </div>
-
-
-
     <div class="cf top_nav_list" style="height: 38px;">
         <!-- 高级搜索 -->
         <div class="jssearch fl cf search_list" style="margin-bottom: 0">
@@ -107,10 +104,6 @@
                     <span class="add-on"><i class="icon-th"></i></span>
                 </div>
             </div>
-
-
-            <!-- <input type="hidden" name="" value="" class="sortBy">
-            <input type="hidden" name="type" value="{$_GET['type']}"> -->
             <div class="input-list">
                 <a class="sch-btn" href="javascript:;" id="search" url="{:U('AggregateFinanceStatement/lists','model='.$model['name'] .'&row='.I('row'),false)}">搜索</a>
             </div>
@@ -120,19 +113,14 @@
 
     <div class="butnbox" >
         <div class="butnlist jscheckbutn" style="margin-left: 2px">
-            <!-- <a class="butn" id="upstream">申请开票</a>
-            <a class="butn" id="upstream">审批通过</a>
-            <a class="butn" id="upstream" style="background-color: red;">审批拒绝</a> -->
+            <a class="butn" id="agreeApply">审批通过</a>
+            <a class="butn" id="refuseApply" style="background-color: red;">审批拒绝</a>
+
             <a class="butn" id="upstream">已开票</a>
             <a class="butn" id="upstream">已到账</a>
             <a class="butn" id="upstream" style="width: 150px;background-color:green;">重算对账金额</a>
-            <a class="butn" id="export">批量导出</a>
 
-            <!-- <a class="butn" id="upstream">生成上游对账单</a>
-            <a class="butn" id="downstream">生成下游对账单</a>
-            <a class="butn" id="persondownstream" style="width: 150px">生成下游个人结算单</a>
-            <a class="butn" id="shenhe" >审核通过</a>
-            <a class="butn" id="reject" >审核拒绝</a> -->
+            <a class="butn" id="export">批量导出</a>
         </div>
     </div>
 
@@ -167,7 +155,7 @@
                     <notemtpy name = "data">
                         <volist name="data" id="data">
                             <tr>
-                                <td ><input class="ids" type="checkbox" value="{$data['id']}" name="ids[]" >
+                                <td ><input class="ids" type="checkbox" data-status="{$data.verify_status}" value="{$data['id']}" name="ids[]" >
                                 </td>
                                 <td>{$data.channel_name}</td>
                                 <td>{$data.begintime}-{$data.endtime}</td>
@@ -182,6 +170,11 @@
                                     <a class="confirm uploadVoucher" data-id="{$data.id}">上传凭证</a>
                                     <a class="confirm viewVoucher" data-img="{$data.ext_field}" data-id="{$data.id}">查看凭证</a>
                                     <a class="confirm editVoucher" data-id="{$data.id}">编辑凭证</a>
+                                    <a class="confirm addRemark" data-id="{$data.id}">新增备注</a>
+                                    <a class="confirm editRemark" data-remark="{$data.remark}" data-id="{$data.id}">修改备注</a>
+                                    <a class="confirm viewRemark" data-remark="{$data.remark}" data-id="{$data.id}">查看备注</a>
+
+                                    
                                     <switch name="data.verify_status">
                                         <case value="-1">
                                             <!-- <a class="confirm statement_view" id="createStatement" data-id="{$data.id}">申请开票</a> -->
@@ -234,6 +227,7 @@
     <script type="text/javascript" src="__STATIC__/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js"
             charset="UTF-8"></script>
     <script src="__STATIC__/layer/layer.js" type="text/javascript"></script>
+    <script src="__STATIC__/layer/extend/layer.ext.js"></script>
     <script type="text/javascript">
     </script>
     <script>
@@ -255,7 +249,7 @@
                     return $(elem).val();
                 }).get();
 
-                if(text.length > 2){
+                if(text.length > 20){
                     layer.msg("<font style='color:white'>" + '暂不支持超过20条的批量导出' + "</font>");
                     return;
                 }
@@ -270,6 +264,32 @@
                     $("body").append(iframeExcel)
                 }
             })
+            $("#agreeApply").on("click",function(){
+                var flag = false;
+                var text = $("input:checkbox[name='ids[]']:checked").map(function(index,elem) {
+                    if($(elem).data("status") != 1){
+                        flag = true;
+                    }else{
+                        return $(elem).val();
+                    }
+                }).get().join(",");
+                if(text == ''){
+                    layer.msg("<font style='color:white'>" + '无需要审核通过的结算单' + "</font>");
+                    return;
+                }
+                if(flag){
+                    layer.confirm("审批成功仅会对 已申请发票结算单处理，选择中包含其他的状态的结算单将被忽略，点击取消停止操作",{title:false}, function(index){    
+                        _doAgreeApply();                
+                        layer.close(index);
+                    });  
+                }else{
+                    _doAgreeApply();
+                }
+                function _doAgreeApply(){
+                    //执行
+                    
+                }
+            })
 
             $("#shenhe").click(function () {
                 var text = $("input:checkbox[name='ids[]']:checked").map(function(index,elem) {
@@ -344,7 +364,6 @@
             })
 
             //查看开票信息
-            
             $(".viewStatement").click(function () {
                 var id = $(this).data("id");
                 layer.open({
@@ -419,72 +438,77 @@
                     }
                 });
             });
-            //
-            
-
-            
-            // $("#downstream").click(function () {
-            //     layer.open({
-            //         type: 2,
-            //         title: "海南万盟天下科技有限公司",
-            //         shadeClose: true,
-            //         shade: 0.8,
-            //         area: ['70%', '80%'],
-            //         content: '/admin.php?s=/statementMangement/createDownstreamOrder/'
-            //     });
-            // });
-
-            // $("#persondownstream").click(function () {
-            //     layer.open({
-            //         type: 2,
-            //         title: "海南万盟天下科技有限公司",
-            //         shadeClose: true,
-            //         shade: 0.8,
-            //         area: ['70%', '80%'],
-            //         content: '/admin.php?s=/statementMangement/PersonOrderList/'
-            //     });
-            // });
-
-            $(".statement_edit").click(function () {
-
-                var edit = $(this).data();
-                var ext_field = $(this).attr('ext_field');
-                if(edit.type == 0){
-                    var url = "/admin.php?s=/Statement/editCpStatement/id/"+edit.id;
-                }else if(edit.type == 1){
-                    var url = "/admin.php?s=/StatementMangement/editDownstreamOrder/id/"+edit.id+"/ext_field/"+ext_field;
-                }else if(edit.type == 2){
-                    var url = "/admin.php?s=/StatementMangement/PersonOrderEdit/id/"+edit.id+"/withdraw/"+ext_field+"/time_start/"+edit.start+"/time_end/"+edit.end;
-                }
-
+            //新增批注
+            $(".addRemark").click(function(){
+                var id = $(this).data("id");
+                layer.prompt({
+                    formType: 2,
+                    value: '',
+                    title: '输入备注',
+                    area: ['360px', '300px'] //自定义文本域宽高
+                    }, function(value, index, elem){
+                        if(value != ''){
+                            $.ajax({
+                                type: "POST",
+                                url: "{:U('saveRemark')}",
+                                dataType: 'json',
+                                async: false,
+                                data: {id:id,remark:value},
+                                success:function(data){
+                                    if(data.status==1){
+                                        layer.msg("<font style='color:white'>" + data.info + "</font>");
+                                        setTimeout(function(){
+                                            window.location.reload();
+                                        },1500);
+                                    }
+                                }
+                            });
+                        }else{
+                            layer.closeAll();
+                        }
+                    });
+            })
+            //编辑批注
+            $(".editRemark").click(function(){
+                var id = $(this).data("id");
+                var remark = $(this).data("remark");
+                layer.prompt({
+                    formType: 2,
+                    value: remark,
+                    title: '修改备注',
+                    area: ['360px', '300px'] //自定义文本域宽高
+                    }, function(value, index, elem){
+                        if(value != ''){
+                            $.ajax({
+                                type: "POST",
+                                url: "{:U('saveRemark')}",
+                                dataType: 'json',
+                                async: false,
+                                data: {id:id,remark:value},
+                                success:function(data){
+                                    if(data.status==1){
+                                        layer.msg("<font style='color:white'>" + data.info + "</font>");
+                                        setTimeout(function(){
+                                            window.location.reload();
+                                        },1500);
+                                    }
+                                }
+                            });
+                        }else{
+                            layer.closeAll();
+                        }
+                    });
+            })
+            //查看批注
+            $(".viewRemark").click(function () {
+                var remark = $(this).data("remark");
                 layer.open({
-                    type: 2,
-                    title: "海南万盟天下科技有限公司",
-                    shadeClose: true,
-                    shade: 0.8,
-                    area: ['70%', '80%'],
-                    content: url
+                    type: 1,
+                    title:false,
+                    content:"<div style='width: 300;height:auto;margin: auto;padding:20px;'>"+remark+"</div>"
                 });
             });
-            // $(".statement_view").click(function () {
-            //     var id = $(this).data("id");
-
-            //     var type = $(this).data("type");
-            //     if (type == 2) {
-            //         var url = "/admin.php?s=/StatementMangement/personOrderDetail/id/"+id;
-            //     } else {
-            //         var url = "/admin.php?s=/VerifyBill/show/id/"+id+"/from/pc";
-            //     }
-
-            //     layer.open({
-            //         type: 2,
-            //         title: "海南万盟天下科技有限公司",
-            //         shadeClose: true,
-            //         shade: 0.8,
-            //         area: ['70%', '80%'],
-            //         content: url
-            //     });
-            // });
+
             $(".statement_del").click(function () {
                 var del = $(this).data();
                 layer.confirm('【警告】撤销后将不可回退，如需继续请点击确认', {
@@ -575,214 +599,14 @@
                 autoclose: true,
                 pickerPosition: 'bottom-left'
             })
-
-
-
-            $(".paixu").click(function(){
-                var that=$(this);
-                $data_order=that.attr('data-order');
-                $order_type='{$userarpu_order}';
-                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();
-                }
-            });
             //回车自动提交
             $('.jssearch').find('input').keyup(function(event){
                 if(event.keyCode===13){
                     $("#search").click();
                 }
             });
-            $("#admin").on('click',function(event) {
-                var navlist = $(this).find('.i_list_li');
-                if (navlist.hasClass('hidden')) {
-                    navlist.removeClass('hidden');
-                    $(this).find('#i_list_id').focus().val('');
-                } else {
-                    navlist.addClass('hidden');
-                }
-                $(document).one("click", function(){
-                    navlist.addClass('hidden');
-                });
-                event.stopPropagation();
-            });
-
-            $('#admin #i_list_id').on('keyup',function(event) {
-                var val  = $.trim($(this).val()).toLowerCase();
-                $(this).closest('.drop-down').find('#i_list_idh').val(val);
-            });
-
-            $("#admin #i_list_li").find("a").each(function(){
-                $(this).click(function(){
-                    var text = $.trim($(this).text()).toLowerCase();
-                    $(this).closest('.drop-down').find("#i_list_id").val(text);
-                    $(this).closest('.drop-down').find('#i_list_idh').val(text);
-                })
-            });
-
-            //下拉内容框
-            $(".drop-down2").on('click',function(event) {
-                var navlist = $(this).find('.i_list_li');
-                if (navlist.hasClass('hidden')) {
-                    navlist.removeClass('hidden');
-                    $('#i_list_id').focus().val('');
-                } else {
-                    navlist.addClass('hidden');
-                }
-                $(document).one("click", function(){
-                    navlist.addClass('hidden');
-                });
-                event.stopPropagation();
-            });
-            /* 状态搜索子菜单 */
-            /*渠道删除*/
-            $('.delete').click(function(){
-                var id = $(this).attr('data-id');
-                layer.confirm('渠道删除后，下级渠道同时被删除，所属数据归属于自然渠道！', {
-                    title:'确定要删除该渠道?',
-                    icon:0,
-                    btn: ['删除','取消'] //按钮
-                }, function(){
-                    $.ajax({
-                        type: "POST",
-                        url: "{:U('del_promote')}",
-                        dataType: 'json',
-                        async: false,
-                        data: {id:id},
-                        success:function(data){
-                            if(data.status==1){
-                                layer.msg(data.msg);
-                                setTimeout(function(){
-                                    window.location.reload();
-                                },1500);
-                            }
-                        }
-                    });
-                }, function(){
-                    layer.close();
-                });
-
-            })
         })
 
 
     </script>
-    <script type="text/javascript">
-
-        //点击字母按照条件按钮筛选
-        $(".pro_promot_select_list_con").click(function(){
-            //选中高亮样式
-            $(this).addClass('active');
-            $(this).siblings().removeClass('active');
-
-            var that = $(this);
-            var index = $(this).attr("data-index");
-
-            $("#game_list li").each(function(index,ele){
-                var short = $(this).attr('data-short');
-                $(this).show();
-                if(that.attr('data-index')){
-                    if(that.attr('data-index')!=short.charAt(0)){
-                        $(this).hide();
-                    }
-                }
-            })
-        });
-
-        //打开弹窗
-        $(".ajax-view").click(function(){
-            //获取游戏列表
-            var url = "{:U('Promote/getPromoteGame')}";
-            var id = $(this).attr('data-id');
-            $.post(url,{id:id},function(res){
-                if(res.code==1){
-
-                    $(".pro_promot_select_list a").eq(0).addClass('active');
-                    $(".pro_promot_select_list a").eq(0).siblings().removeClass('active');
-
-                    var game_list = res.data.game_list;
-                    var promote_info = res.data.promote_info;
-                    var lis = [];
-
-                    $.each(game_list,function(index,ele){
-                        if(ele.game_name.length>6){
-                            ele.game_name = ele.game_name .substring(0,6)+"..."
-                        }
-                        lis.push('<li class="fl pro_promot_game_con" data-short="'+ele.short+'">');
-
-
-                        if(promote_info['game_ids']==''){
-                            lis.push('<input type="checkbox" value="'+ele.id+'" name="game_ids[]" class="fl pro_promot_game_check jsgameid" checked="checked" id="gameCheck'+index+'" />');
-                        }else{
-                            if(promote_info['game_ids'].indexOf(ele.id)>-1){
-                                lis.push('<input type="checkbox" value="'+ele.id+'" name="game_ids[]" class="fl pro_promot_game_check jsgameid" checked="checked" id="gameCheck'+index+'" />');
-                            }else{
-                                lis.push('<input type="checkbox" value="'+ele.id+'" name="game_ids[]" class="fl pro_promot_game_check jsgameid" id="gameCheck'+index+'" />');
-                            }
-                        }
-                        lis.push('<label for="gameCheck'+index+'" class="fl"></label>');
-                        lis.push('<span class="fl pro_promot_game_name">'+ele.game_name+'</span>');
-                        lis.push('</li>');
-                    });
-
-                    $("#game_list").html(lis.join(''));
-                    $(".pro_promot_number").text(res.data.promote_info.account);
-                    $("#se_promote_id").val(res.data.promote_info.id);
-                    $(".pro_promot").css("display","block");
-
-                    jsgameid();
-
-                }else{
-                    var tip_msg = res.info ? res.info : '操作失败';
-                    layer.msg(tip_msg);
-                }
-            });
-        });
-
-        //保存修改
-        $(".pro_promot_btn_confirm").click(function(){
-            $("#ajaxForm").ajaxSubmit(function(res){
-                layer.msg(res.msg);
-                $(".pro_promot").hide();
-            });
-            return false;
-        });
-
-        //关闭弹窗
-        $(".pro_promot_close").click(function(){
-            $(".pro_promot").css("display","none");
-        });
-        //取消修改
-        $(".pro_promot_btn_cancel").click(function(){
-            $(".pro_promot").css("display","none");
-            layer.msg('修改已取消');
-        });
-
-        $(".jsgamecheckall").click(function(){
-            $(this).closest('.jsgamecheckallbox').siblings("#game_list").find(".jsgameid").prop("checked", this.checked);
-        });
-
-        //可申请游戏 全选及全选反选 功能  @author  zwm  date 20180604
-        function jsgameid(){
-            $(".jsgameid").click(function(){
-                var option = $(this).closest('ul').find(".jsgameid"),
-                    checkall = $(this).closest('ul').siblings('.jsgamecheckallbox').find('.jsgamecheckall');
-                option.each(function(i){
-                    if(!this.checked){
-                        checkall.prop("checked", false);
-                        return false;
-                    }else{
-                        checkall.prop("checked", true);
-                    }
-                });
-            });
-        }
-    </script>
 </block>
diff --git a/Data/update.sql b/Data/update.sql
index add5e181e..5a36ceed2 100644
--- a/Data/update.sql
+++ b/Data/update.sql
@@ -1639,6 +1639,7 @@ CREATE TABLE `tab_aggregate_statement` (
   `admin_name` varchar(60) NOT NULL COMMENT '操作人名称',
   `admin_id`int(11) DEFAULT '0' COMMENT '操作人id',
   `verify_status` tinyint(2) DEFAULT '0' COMMENT '审核状态 -1审核拒绝 0:系统生成结算单 1:申请开票 2:审核同意 3:已开票 4:上传收款凭证 5已到账',
+  `remark` longtext DEFAULT NULL COMMENT '备注信息',
   PRIMARY KEY (`id`),
   KEY `withdraw_type` (`withdraw_type`) USING BTREE,
   KEY `channel_id` (`channel_id`) USING BTREE,