Merge pull request 'feature/promote_company_export_change' (#662) from feature/promote_company_export_change into master

Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/662
master
廖金灵 2 years ago
commit 3d031452e9

@ -36,7 +36,7 @@ class PromoteCompanyController extends ThinkController
$model = M($this->modelName, 'tab_'); $model = M($this->modelName, 'tab_');
$is_export= false; $is_export= false;
if (isset($_REQUEST['export']) && $_REQUEST['export']==1){ if (isset($_REQUEST['export']) && ($_REQUEST['export']==1 || $_REQUEST['export']==2)){
$is_export = true; $is_export = true;
$this->getAggregatePackage(); $this->getAggregatePackage();
} }
@ -139,6 +139,22 @@ class PromoteCompanyController extends ThinkController
->order("last_up_time desc"); ->order("last_up_time desc");
if($is_export){ if($is_export){
$companyres = $companyres->select(); $companyres = $companyres->select();
if ($_REQUEST['export']==2){
foreach ($companyres as $key => &$v) {
$v['bank_card'] = "`".$v['bank_card'];
$v['ali_account'] = "`".$v['ali_account'];
}
//基础信息导出
data2csv($companyres,'下游推广公司基础信息导出',array(
"company_name"=>"推广公司名称",
"bank_name"=>"银行名称",
"bank_address"=>"账户名",
"bank_card"=>"银行卡号",
"ali_user"=>"支付宝真实名称",
"ali_account"=>"支付宝登陆账号",
"wx_account"=>"微信账号"
));
}
}else{ }else{
$companyres = $companyres->page($page,$row)->select(); $companyres = $companyres->page($page,$row)->select();
} }

@ -635,6 +635,13 @@
</td> </td>
</tr> </tr>
<tr>
<td class="l">微信账号</td>
<td class="r" >
<input type="text" class="txt " name="wx_account" value="" placeholder="微信账号仅作为资料保存,无其他作用">
</td>
</tr>
<tr> <tr>
<td class="l">对应平台(简称):</td> <td class="l">对应平台(简称):</td>
<td class="r" > <td class="r" >

@ -675,6 +675,13 @@
</td> </td>
</tr> </tr>
<tr>
<td class="l">微信账号</td>
<td class="r" >
<input type="text" class="txt " name="wx_account" value="{$data.wx_account}" placeholder="微信账号仅作为资料保存,无其他作用">
</td>
</tr>
<tr> <tr>
<td class="l">对应平台(简称):</td> <td class="l">对应平台(简称):</td>
<td class="r" > <td class="r" >

@ -162,6 +162,9 @@
<div class="input-list"> <div class="input-list">
<a class="sch-btn" href="javascript:;" id="downloadexcel" url="{:U(CONTROLLER_NAME.'/'.ACTION_NAME,array_merge(['export'=>1],I('get.')))}">导出excel</a> <a class="sch-btn" href="javascript:;" id="downloadexcel" url="{:U(CONTROLLER_NAME.'/'.ACTION_NAME,array_merge(['export'=>1],I('get.')))}">导出excel</a>
</div> </div>
<div class="input-list">
<a class="sch-btn" href="{:U(CONTROLLER_NAME.'/'.ACTION_NAME,array_merge(['export'=>2],I('get.')))}" style="width: auto;padding-left: 10px;padding-right: 10px;" url="">银行信息导出</a>
</div>
</div> </div>
</div> </div>
</div> </div>

@ -659,7 +659,12 @@
</td> </td>
</tr> </tr>
<tr>
<td class="l">微信账号</td>
<td class="r" >
<input type="text" class="txt" readonly name="wx_account" value="{$data.wx_account}" placeholder="微信账号仅作为资料保存,无其他作用">
</td>
</tr>
<tr> <tr>
<td class="l">对应平台(简称):</td> <td class="l">对应平台(简称):</td>

Loading…
Cancel
Save