Merge pull request '测试资源-审查' (#677) from feature/testing_batch_list into master

Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/677

Application/Admin/Controller/TestingResourceController.class.php

@@ -793,4 +793,43 @@ class TestingResourceController extends ThinkController
         
         return $this->ajaxReturn(['status' => 1, 'message' => '获取成功', 'data' => ['roles' => $roles]]);
     }
+
+    public function batchList() {
+        $params = I('get.');
+        $createTimeStart = $params['create_time_start'] ?? '';
+        $createTimeEnd = $params['create_time_end'] ?? '';
+        $gameId = $params['game_id'] ?? 0;
+        $gameName = $params['gameName'] ?? 0;
+
+        $conditions = [];
+        $strCondition = '1=1';
+
+        if ($createTimeStart) {
+            $strCondition .= ' and create_time >=' . strtotime($createTimeStart .  ' 00:00:00');
+        }
+        if ($createTimeEnd) {
+            $strCondition .= ' and create_time <=' . strtotime($createTimeEnd .  ' 23:59:59');
+        }
+
+        if ($gameId) {
+            $conditions['game_id'] = $gameId;
+        }
+        if ($gameName) {
+            $conditions['gameName'] = $gameName;
+        }
+        $conditions['_string'] = $strCondition;
+
+        $query = M('testing_resource_batch_list', 'tab_')->where($conditions)->order('create_time desc');
+
+        [$records, $page, $count] = $this->paginate($query);
+
+        $gameRepository = new GameRepository();
+
+        $this->assign('statusList', TestingResourceRepository::$userStatusList);
+        $this->assign('games', $gameRepository->getChoiceGames());
+        $this->assign('count', $count);
+        $this->assign('records', $records);
+        $this->assign('_page', $page);
+        $this->display();
+    }
 }

Application/Admin/View/TestingResource/batchList.html

@@ -0,0 +1,266 @@
+<extend name="Public/base"/>
+<block name="css">
+    <link rel="stylesheet" href="__CSS__/select2.min.css" type="text/css" />
+    <link rel="stylesheet" href="__CSS__/promote.css" type="text/css"/>
+    <script src="__STATIC__/laydate/laydate.js"></script>
+    <link rel="stylesheet" type="text/css" href="__STATIC__/webuploader/webuploader.css" media="all">
+    <style>
+        .select2-container--open {
+            z-index: 1001;
+        }
+        .select2-container--default .select2-selection--single {
+            color: #000;
+            resize: none;
+            border-width: 1px;
+            border-style: solid;
+            border-color: #a7b5bc #ced9df #ced9df #a7b5bc;
+            box-shadow: 0px 3px 3px #F7F8F9 inset;height:35px;
+            height:28px;border-radius:3px;font-size:12px;
+        }
+        .select2-container--default .select2-selection--single .select2-selection__rendered {
+            line-height:35px;
+            line-height:28px;
+        }
+        .select2-container--default .select2-selection--single .select2-selection__arrow {
+            height:26px;
+        }
+        .select2-container--default .select2-search--dropdown .select2-search__field {
+            height:26px;line-height:26px;font-size:12px;
+        }
+        .select2-results__option[aria-selected] {font-size:12px;}
+        .textarea-style {
+            width: 200px;
+            height: 80px;
+            border-radius: 5px;
+            padding: 5px;
+        }
+        .mustmark {
+            color: #FF0000;
+            font-style: normal;
+            margin: 0 3px;
+        }
+        .clearfix:after {
+            content: "\20";
+            display: block;
+            height: 0;
+            clear: both;
+        }
+        .clearfix {
+            *zoom: 1;
+        }
+        .butnbox {
+            padding: 10px 0 10px;
+        }
+        .butnbox .butnlist .butn {
+            display: inline-block;
+            width: 120px;
+            height: 28px;
+            line-height: 28px;
+            text-align: center;
+            color: #FFF;
+            background: #3C95C8;
+            border-radius: 3px;
+            cursor: pointer;
+        }
+        .data_list table td .status-0 {
+            color: #e6a23c;
+        }
+        .data_list table td .status-1 {
+            color: #67c23a;
+        }
+        .data_list table td .status-2 {
+            color: #f56c6c;
+        }
+    </style>
+</block>
+<block name="body">
+    <script type="text/javascript" src="__JS__/bootstrap.min.js"></script>
+    <script type="text/javascript" src="__JS__/select2.min.js"></script>
+    <script type="text/javascript" src="__JS__/jquery.form.js"></script>
+    <script type="text/javascript" src="__STATIC__/uploadify/jquery.uploadify.min.js"></script>
+
+    <script src="__STATIC__/md5.js" type="text/javascript" charset="utf-8"></script>
+    <script type="text/javascript" src="__STATIC__/webuploader/webuploader.js"></script>
+    <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>
+    </div>
+    <div class="cf top_nav_list" style="height: 38px;">
+        <!-- 高级搜索 -->
+        <div class="jssearch cf search_list">
+            <div class="input-list search-title-box">
+                <label>搜索：</label>
+            </div>
+            <div class="input-list input-list-promote search_label_rehab">
+                <select id="game_name" name="game_name" class="select_gallery" style="width:120px;">
+                    <option value="0">请选游戏</option>
+                    <?php foreach($games as $game):?>
+                    <option game-id="<?=$game['game_name']?>" value="<?=$game['game_name']?>"><?=$game['game_name']?></option>
+                    <?php endforeach;?>
+                </select>
+            </div>
+            <div class="input-list input-list-promote search_label_rehab">
+                <input type="text" readonly name="create_time_start" class="time-select" value="{:I('create_time_start')}"
+                       placeholder="申请开始时间"/>
+                -
+                <div class="input-append date" id="datetimepicker" style="display:inline-block">
+                    <input type="text" readonly name="create_time_end" class="time-select" value="{:I('create_time_end')}"
+                           placeholder="申请结束时间"/>
+                    <span class="add-on"><i class="icon-th"></i></span>
+                </div>
+            </div>
+            <div class="input-list">
+                <a class="sch-btn" href="javascript:;" id="search" url="{:U('TestingResource/batchList')}">搜索</a>
+            </div>
+            <!-- <div class="input-list">
+                <a class="sch-btn" href="{:U('Export/expUser',array_merge(array('id'=>12,),I('get.')))}">导出</a>
+            </div> -->
+        </div>
+    </div>
+    <!-- 数据列表 -->
+    <div class="data_list">
+        <div class="">
+            <table>
+                <!-- 表头 -->
+                <thead>
+                <tr>
+                    <th>
+                        <input class="check-all" type="checkbox">
+                    </th>
+                    <th width="125px">批次号</th>
+                    <th>申请时间</th>
+                    <th>游戏名称</th>
+                    <th>区服名称</th>
+                    <th>角色名称</th>
+                    <th>测试账号</th>
+                    <th>申请人</th>
+                    <th>审核人</th>
+                    <th>申请金额</th>
+                    <th>发放金额</th>
+                    <th>审核状态</th>
+                    <th>审核时间</th>
+                    <th>发放状态</th>
+                    <th>发放时间</th>
+                </tr>
+                </thead>
+
+                <!-- 列表 -->
+                <tbody>
+                <empty name ="records">
+                    <td colspan="99" class="text-center">aOh! 暂时还没有内容!</td>
+                <else />
+                    <volist name="records" id="record" mod="2">
+                    <tr data-id="{$record.id}" class="<eq name='mod' value='1'>odd</eq>">
+                        <td><input class="ids" type="checkbox" value="{$record['id']}" name="ids[]"></td>
+                        <td style="word-wrap:break-word;">{$record.batch_no}</td>
+                        <td>
+                            <?=substr($record['create_time'], 0, 10)?>
+                            <br>
+                            <?=substr($record['create_time'], 10)?>
+                        </td>
+                        <td>{$record.game_name}</td>
+                        <td>{$record.server_name}</td>
+                        <td>{$record.role_name}</td>
+                        <td>{$record.user_account}</td>
+                        <td>{$record.apply_account}</td>
+                        <td>{$record.verify_account}</td>
+                        <td>{$record.apply_amount}</td>
+                        <td>{$record.provide_amount}</td>
+                        <td>
+                            <span class="status-1">已审核</span>
+                        </td>
+                        <td>
+                            <?=substr($record['verify_time'], 0, 10)?>
+                            <br>
+                            <?=substr($record['verify_time'], 10)?>
+                        </td>
+                        <td>
+                            <span class="status-1">已发放</span>
+                        </td>
+                        <td>
+                            <?=substr($record['provide_time'], 0, 10)?>
+                            <br>
+                            <?=substr($record['provide_time'], 10)?>
+                        </td>
+                    </tr>
+                    </volist>
+                </empty>
+                </tbody>
+            </table>
+        </div>
+    </div>
+    <div class="page">
+        
+            <a class="sch-btn export-btn"
+               href="{:U(CONTROLLER_NAME.'/'.ACTION_NAME,array_merge(['export'=>1],I('get.')))}" target="_blank">导出</a>
+        
+        {$_page|default=''}
+    </div>
+
+    <div class="common_settings">
+        <span class="plus_icon"><span><img src="__IMG__/zwmimages/icon_jia.png"></span></span>
+        <form class="addShortcutIcon">
+            <input type="hidden" name="title" value="{$m_title}">
+            <input type="hidden" name="url" value="Query/withdraw">
+        </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>
+</block>
+
+<block name="script">
+    <script src="__STATIC__/layer/layer.js" type="text/javascript"></script>
+    <script type="text/javascript" src="__STATIC__/layer/extend/layer.ext.js" ></script>
+    <script src="__STATIC__/jquery.cookie.js" charset="utf-8"></script>
+    <script>
+        <volist name=":I('get.')" id="vo">
+            Think.setValue('{$key}',"{$vo}");
+        </volist>
+        $(".select_gallery").select2();
+    </script>
+    <script type="text/javascript">
+        //导航高亮
+        highlight_subnav("{:U('TestingResource/batchList')}");
+        $(function(){
+            // 五分钟定时刷新页面
+            setInterval(function(){
+                console.log('刷新5分钟')
+                location.reload();
+            }, 300000);
+            // 添加全部选项
+            if ('all' == "{:I('row', 0)}") {
+                $("#pagechange").prepend("<option value='all' selected>全部</option>");
+            } else {
+                $("#pagechange").prepend("<option value='all'>全部</option>");
+            }
+
+            $('.time-select').each(function(){
+                laydate.render({
+                elem: this,
+                type: 'date'
+                });
+            });
+            //搜索功能
+            $("#search").click(function(){
+
+                var url = $(this).attr('url');
+                var query  = $('.jssearch').find('input').serialize();
+                query  += "&"+$('.jssearch').find('select').serialize();
+                //query = query.replace(/(&|^)(\w*?\d*?\-*?_*?)*?=?((?=&)|(?=$))/g,'');
+                query = query.replace(/^&/g,'');
+                if( url.indexOf('?')>0 ){
+                    url += '&' + query;
+                }else{
+                    url += '?' + query;
+                }
+                window.location.href = url;
+            });
+            //回车自动提交
+            $('.jssearch').find('input').keyup(function(event){
+                if(event.keyCode===13){
+                    $("#search").click();
+                }
+            });
+        });
+    </script>
+</block>