合同期限为空时间格式,公司信息导航高亮

master
liuweiwen 5 years ago
parent 6d91ec7c60
commit f6af63ca3e

@ -155,8 +155,11 @@ class PartnerController extends ThinkController
$value['settlement_type'] = '月结';
}
$value['company_type'] = $value['company_type'] == 2 ? '个人' : '公司';
$value['contract_time'] = time_format($value['contract_start_time'], 'Y/m/d') . '-' .
time_format($value['contract_end_time'], 'Y/m/d');
$contract_start_time = $value['contract_start_time'] ?
time_format($value['contract_start_time'], 'Y/m/d') : '-';
$contract_end_time = $value['contract_end_time'] ?
time_format($value['contract_end_time'], 'Y/m/d') : '-';
$value['contract_time'] = $contract_start_time . '-' . $contract_end_time;
$row2 = array_sum(array_column($value['game'], 'row')) ;
$value['row'] = empty($row2) ? 1: $row2;
$parseData[$value['partner_id']][] = $value;

@ -157,7 +157,7 @@
</script>
<script type="text/javascript">
//导航高亮
highlight_subnav("{:U('lists')}");
highlight_subnav("{:U('Tool/company_info')}");
$(function(){
//搜索功能
$("#search").click(function(){

@ -1171,7 +1171,7 @@ CREATE TABLE `tab_reward_record` (
`creater_id` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '创建者ID',
PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
-- 2020-02-10 liuweiwen 内部公司信息
CREATE TABLE `tab_company_info` (
`id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
`partner` varchar(60) NOT NULL COMMENT '合作方名称',

Loading…
Cancel
Save