From 9d5ed595ac28bb0208668a1e2fe0d31ac4da38fe Mon Sep 17 00:00:00 2001 From: chenzhi Date: Wed, 22 Sep 2021 13:55:56 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StatementMangementController.class.php | 11 +- .../View/StatementMangement/rewardExport.html | 158 ++--- .../rewardManageList copy.html | 593 ------------------ 3 files changed, 57 insertions(+), 705 deletions(-) delete mode 100644 Application/Admin/View/StatementMangement/rewardManageList copy.html diff --git a/Application/Admin/Controller/StatementMangementController.class.php b/Application/Admin/Controller/StatementMangementController.class.php index cf11b1165..cd937292b 100644 --- a/Application/Admin/Controller/StatementMangementController.class.php +++ b/Application/Admin/Controller/StatementMangementController.class.php @@ -258,6 +258,7 @@ class StatementMangementController extends ThinkController $map = ' 1=1 '; $params = $_GET; + $isExport = I('is_export', false); if (!empty(I('reward_type'))) { $map .= " and reward_type = {$params['reward_type']}"; @@ -424,13 +425,17 @@ class StatementMangementController extends ThinkController ]; } if (!empty($item['rid'])) { - + if($isExport){ + $linkStr = ''; + }else{ + $linkStr = '
'; + } if($item["is_check"] == 0) { $verify_detail = "未审核"; } elseif($item["is_check"] == 1) { - $verify_detail="审核通过"."(".$item["check_detail"]["user"].")
".$item["check_detail"]["time"]; + $verify_detail="审核通过"."(".$item["check_detail"]["user"]."){$linkStr}".$item["check_detail"]["time"]; } else{ - $verify_detail="审核拒绝"."(".$item["check_detail"]["user"].")
".$item["check_detail"]["time"]; + $verify_detail="审核拒绝"."(".$item["check_detail"]["user"]."){$linkStr}".$item["check_detail"]["time"]; } $record[$item['id']]['detail'][] = [ diff --git a/Application/Admin/View/StatementMangement/rewardExport.html b/Application/Admin/View/StatementMangement/rewardExport.html index ef35ba461..70ba6a078 100644 --- a/Application/Admin/View/StatementMangement/rewardExport.html +++ b/Application/Admin/View/StatementMangement/rewardExport.html @@ -34,30 +34,23 @@ 游戏名 游戏合作方 - 结算时间 + 结算时间 奖惩确认时间 - 事件说明 + 事件说明 奖惩性质 - - 奖惩类型 - 结算公司类型 - 结算公司归属 - 结算方 - 会长账号 - 奖惩金额 - 结算方式 + 添加人 + 审核状态 + + - - 奖惩类型 + 奖惩类别 + 结算方 结算公司类型 结算公司归属 - 结算方 + 会长账号 奖惩金额 结算方式 - - 添加人 - 审核状态 @@ -70,103 +63,50 @@ - - - - {$data['relation_game_name']} - {$data['relation_game_partner']} - {$data['settlement_time']} - {$data['confirm_time']} - {$data['content']} - {$data['reward_type_text']} - 惩罚方 - 无 - 无 - 无 - 无 - 无 - - 奖励方 - 无 - 无 - 无 - 无 - 无 - - {:get_admin_name($data['creater_id'])} - - {$data.verify} - - {$data.verify} - - -- - - - - - - - - {$data['relation_game_name']} - {$data['relation_game_partner']} - {$data['settlement_time']} - {$data['confirm_time']} - {$data['content']} - {$data['reward_type_text']} - 惩罚方 - - - - - - + + {$data['relation_game_name']} + {$data['relation_game_partner']} + {$data['settlement_time']} + {$data['confirm_time']} + {$data['content']} + {$data['reward_type_text']} + {:get_admin_name($data['creater_id'])} + + {$data.verify} + + {$data.verify} + + -- + + + 1):?> + + + + + + + + + + + + + {$data['detail'][$i].check_detail} + + {$data['detail'][$i].check_detail} + + -- + - 奖励方 - - - - - - + + + - {:get_admin_name($data['creater_id'])} - - - {$data.verify} - - {$data.verify} - - -- - - - - - - - - - - - - - - - - - - - - - - - - 合计 - -{:array_sum(array_column($list, 'totalPunish'))} - 合计 - {:array_sum(array_column($list, 'totalReward'))} - + + 罚款合计：-{:array_sum(array_column($list, 'totalPunish'))} / 奖励合计:{:array_sum(array_column($list, 'totalReward'))} diff --git a/Application/Admin/View/StatementMangement/rewardManageList copy.html b/Application/Admin/View/StatementMangement/rewardManageList copy.html deleted file mode 100644 index be47163c6..000000000 --- a/Application/Admin/View/StatementMangement/rewardManageList copy.html +++ /dev/null @@ -1,593 +0,0 @@ - - - - - - - - - - - - - - -
-

奖惩记录管理

-

上下游奖惩记录管理

-
- - -
- - -
- -
- -
- -
- -
-
- -
-
- -
- -
- -
- -
- -
- -
- -
- - - -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- - -
- 搜索 - 新增 - -
- - - -
-
- -
-
- - 审核通过 - 审核拒绝 - - 审核撤回 - - 奖惩导入 - -
-
- - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
游戏名游戏合作方结算时间奖惩确认时间事件说明奖惩性质奖惩类别结算公司类型结算公司归属结算方会长账号奖惩金额结算方式奖惩类别结算公司类型结算公司归属结算方会长账号奖惩金额结算方式添加人审核状态操作
aOh! 暂时还没有内容!
{$data['relation_game_name']}{$data['relation_game_partner']}{$data['settlement_time']}{$data['confirm_time']}{$data['content']}{$data['reward_type_text']}惩罚方无无无无无奖励方无无无无无{:get_admin_name($data['creater_id'])}{$data.verify}{$data.verify}-- - 查看 - - 编辑 - 删除 - -
{$data['relation_game_name']}{$data['relation_game_partner']}{$data['settlement_time']}{$data['confirm_time']}{$data['content']}{$data['reward_type_text']}惩罚方奖励方{:get_admin_name($data['creater_id'])}{$data.verify}{$data.verify}-- - 查看 - - 编辑 - 删除 - -
合计-{:array_sum(array_column($list, 'totalPunish'))}合计{:array_sum(array_column($list, 'totalReward'))}
-
- -
-
- - 导出 - - {$_page|default=''} -
-
- -
- - -
- 已添加添加至常用设置 -
- - - - - - if(C('COLOR_STYLE')=='blue_color') echo ' - - '; - - - - - - - - From d36d81370b20d06638092a19aeb7d9deef402656 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Wed, 22 Sep 2021 13:57:45 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/StatementMangement/rewardManageList.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/View/StatementMangement/rewardManageList.html b/Application/Admin/View/StatementMangement/rewardManageList.html index fca909435..b2fee1e11 100644 --- a/Application/Admin/View/StatementMangement/rewardManageList.html +++ b/Application/Admin/View/StatementMangement/rewardManageList.html @@ -289,7 +289,7 @@
- 导出 + 导出 {$_page|default=''}
From 9704f9139f7ac9f3d4bb059d88eed34b6eac1fa2 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Wed, 22 Sep 2021 14:01:34 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/StatementMangement/rewardExport.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Application/Admin/View/StatementMangement/rewardExport.html b/Application/Admin/View/StatementMangement/rewardExport.html index 70ba6a078..26a2eb89a 100644 --- a/Application/Admin/View/StatementMangement/rewardExport.html +++ b/Application/Admin/View/StatementMangement/rewardExport.html @@ -32,6 +32,7 @@ + 序号 游戏名 游戏合作方 结算时间 @@ -64,6 +65,7 @@ + {$i} {$data['relation_game_name']} {$data['relation_game_partner']} {$data['settlement_time']}