Merge branch 'feature/finance_statement723' of wmtx/platform into release

Application/Admin/Controller/CompanyStatementController.class.php

@@ -19,7 +19,7 @@ class CompanyStatementController extends ThinkController
         "9"=>"上游"
     ];
     public $VerifyStatus=[
-        "-3"=>"汇总撤销",
+        "-3"=>"撤销汇总",
         "-2"=>"审核拒绝",
         "-1"=>"管理员审批拒绝",
         "0"=>"未审批",

Application/Admin/View/CompanyGameRatio/index.html

@@ -30,7 +30,6 @@
             height:26px;line-height:26px;font-size:12px;
         }
         .select2-results__option[aria-selected] {font-size:12px;}
-        .layui-layer-dialog .layui-layer-content{color:red}
         .butnbox {padding:10px 0 10px;}
         .butnbox .butnlist {overflow:hidden;clear:both;}
         .butnbox .butnlist .butn,.butnbox .butnlist .butn:hover {text-decoration:none;border:none;}
@@ -240,6 +239,15 @@ highlight_subnav("{:U('index')}");
 $(function(){
     //搜索功能
     $("#search").click(function(){
+        var start = $("#time_start").val();
+        var end =   $("#time_end").val();
+        if(start !='' && end != ''){
+            if (Date.parse(start) > Date.parse(end)){
+                layer.msg('开始时间必须小于等于结束时间');
+                return false;
+            }
+        }
+
         var url = $(this).attr('url');
         var query  = $('.jssearch').find('input').serialize();
         query  += "&"+$('.jssearch').find('select').serialize();

Application/Admin/View/CompanyGameRatio/lists.html

@@ -30,7 +30,7 @@
             height:26px;line-height:26px;font-size:12px;
         }
         .select2-results__option[aria-selected] {font-size:12px;}
-        .layui-layer-dialog .layui-layer-content{color:red}
+        /* .layui-layer-dialog .layui-layer-content{color:red} */
         .butnbox {padding:10px 0 10px;}
         .butnbox .butnlist {overflow:hidden;clear:both;}
         .butnbox .butnlist .butn,.butnbox .butnlist .butn:hover {text-decoration:none;border:none;}
@@ -283,6 +283,14 @@ highlight_subnav("{:U('index')}");
 $(function(){
     //搜索功能
     $("#search").click(function(){
+        var start = $("#time_start").val();
+        var end =   $("#time_end").val();
+        if(start !='' && end != ''){
+            if (Date.parse(start) > Date.parse(end)){
+                layer.msg('开始时间必须小于等于结束时间');
+                return false;
+            }
+        }
         var url = $(this).attr('url');
         var query  = $('.jssearch').find('input').serialize();
         query  += "&"+$('.jssearch').find('select').serialize();

Application/Admin/View/CompanyStatement/lists.html

@@ -30,7 +30,6 @@
             height:26px;line-height:26px;font-size:12px;
         }
         .select2-results__option[aria-selected] {font-size:12px;}
-        .layui-layer-dialog .layui-layer-content{color:red}
         .butnbox {padding:10px 0 10px;}
         .butnbox .butnlist {overflow:hidden;clear:both;}
         .butnbox .butnlist .butn,.butnbox .butnlist .butn:hover {text-decoration:none;border:none;}
@@ -694,7 +693,15 @@
                 var end =   $("#time_end").val();
                 if(start !='' && end != ''){
                     if (Date.parse(start) > Date.parse(end)){
-                        layer.msg('开始时间必须小于等于结束时间');
+                        layer.msg('结算开始时间必须小于等于结束时间');
+                        return false;
+                    }
+                }
+                var start2 = $("#time_start2").val();
+                var end2 =   $("#time_end2").val();
+                if(start2 !='' && end2 != ''){
+                    if (Date.parse(start2) > Date.parse(end2)){
+                        layer.msg('操作开始时间必须小于等于结束时间');
                         return false;
                     }
                 }

Application/Admin/View/CompanyStatementLack/lists.html

@@ -30,7 +30,6 @@
             height:26px;line-height:26px;font-size:12px;
         }
         .select2-results__option[aria-selected] {font-size:12px;}
-        .layui-layer-dialog .layui-layer-content{color:red}
         .butnbox {padding:10px 0 10px;}
         .butnbox .butnlist {overflow:hidden;clear:both;}
         .butnbox .butnlist .butn,.butnbox .butnlist .butn:hover {text-decoration:none;border:none;}
@@ -108,7 +107,7 @@
 
             <div class="input-list input-list-promote search_label_rehab">
                 <select id="company_type" name="company_type" class="select_gallery" >
-                    <option value="">结算单类型</option>
+                    <option value="">公司类型</option>
                     <volist name="CompanyType" id="vo">
                         <option value="{$key}" <if condition="isset($_GET['company_type']) && $key eq I('company_type')">selected</if> >{$vo}</option>
                     </volist>

Application/Admin/View/CompanyStatementPool/lists.html

@@ -30,7 +30,6 @@
             height:26px;line-height:26px;font-size:12px;
         }
         .select2-results__option[aria-selected] {font-size:12px;}
-        .layui-layer-dialog .layui-layer-content{color:red}
         .butnbox {padding:10px 0 10px;}
         .butnbox .butnlist {overflow:hidden;clear:both;}
         .butnbox .butnlist .butn,.butnbox .butnlist .butn:hover {text-decoration:none;border:none;}
@@ -592,7 +591,16 @@
                 var end =   $("#time_end").val();
                 if(start !='' && end != ''){
                     if (Date.parse(start) > Date.parse(end)){
-                        layer.msg('开始时间必须小于等于结束时间');
+                        layer.msg('结算开始时间必须小于等于结束时间');
+                        return false;
+                    }
+                }
+
+                var start2 = $("#time_start2").val();
+                var end2 =   $("#time_end2").val();
+                if(start2 !='' && end2 != ''){
+                    if (Date.parse(start2) > Date.parse(end2)){
+                        layer.msg('操作开始时间必须小于等于结束时间');
                         return false;
                     }
                 }