elf
/
cf-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'hotfix/1211bug' (#35) from hotfix/1211bug into release

Browse Source 
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/35
master
张谷成 4 years ago
parent 91701cc612 858e929199
commit 0c7e4b2d30
7 changed files with 138 additions and 61 deletions
Show Stats Download Patch File Download Diff File

10
Application/Admin/Controller/CompanyStatementPoolController.class.php
Unescape Escape View File

@ -499,7 +499,6 @@ class CompanyStatementPoolController extends ThinkController
$v['statement_money'] = "=ROUND(";
}
$handle_data = $this->changeDataStruct($v['statement_info'],$is_export,$week_line);
// dump($handle_data);
$v['statement_info'] = $handle_data;
$row = 0;
foreach($v['statement_info'] as $ke=>&$va){
@ -525,12 +524,9 @@ class CompanyStatementPoolController extends ThinkController
//本周未结算流水合计
if(!$is_statement){
$count['pool_lack_count'] += $val['pay_amount'];
$count['st_lack_count'] += $val['sum_money'];
if($is_export){
$this->setlackCount($line);
}
}else{
$count['st_count'] += $val['sum_money'];
}
}
@ -550,6 +546,12 @@ class CompanyStatementPoolController extends ThinkController
$count['sum_money'] += $va['week_amount'];
}
if(!$is_statement){
$count['st_lack_count'] += $v['statement_money'];
}else{
$count['st_count'] += $v['statement_money'];
}
$v['row'] = $row;
if ($v['row'] == '0') {

4
Application/Admin/Controller/PartnerController.class.php
Unescape Escape View File

@ -475,10 +475,10 @@ class PartnerController extends ThinkController
$this->checkData($save);
$save['relation']['collaborate_way'] = $save['part_a_type'];
if ($save['part_a_type'] == 1) {
$save['relation']['self_company_id'] = $save['part_b'];
$save['relation']['self_company_id'] = $save['part_a'];
}
if ($save['part_a_type'] == 2) {
$save['relation']['self_company_id'] = $save['part_a'];
$save['relation']['self_company_id'] = $save['part_b'];
}
$res =D("PartnerVerify")->edit_db($save);

4
Application/Admin/Controller/PromoteCompanyController.class.php
Unescape Escape View File

@ -734,10 +734,10 @@ class PromoteCompanyController extends ThinkController
$save['relation']['collaborate_way'] = $save['part_a_type'];
if ($save['part_a_type'] == 1) {
$save['relation']['self_company_id'] = $save['part_b'];
$save['relation']['self_company_id'] = $save['part_a'];
}
if ($save['part_a_type'] == 2) {
$save['relation']['self_company_id'] = $save['part_a'];
$save['relation']['self_company_id'] = $save['part_b'];
}
$this->checkData($save);

42
Application/Admin/View/Partner/edit.html
Unescape Escape View File

@ -152,16 +152,16 @@
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>甲方公司类型:</td>
<td class="l" style="width: 50px;">
<select name="part_a_type" id="part_a_type" class="select_gallery">
<option value="1" selected>上游CP公司</option>
<option value="2">己方公司</option>
<option value="2" <?php if($relation['collaborate_way'] == 2):?>selected<?php endif;?>>上游CP公司</option>
<option value="1" <?php if($relation['collaborate_way'] == 1):?>selected<?php endif;?>>己方公司</option>
</select>
<span class="notice-text"></span>
</td>
<td class="l" style="width: 100px;"><i class="mustmark" >*</i>乙方公司类型:</td>
<td class="r">
<select name="part_b_type" id="part_b_type" class="select_gallery">
<option value="1" >上游CP公司</option>
<option value="2" selected>己方公司</option>
<option value="1" <?php if($relation['collaborate_way'] == 1):?>selected<?php endif;?>>上游CP公司</option>
<option value="2" <?php if($relation['collaborate_way'] == 2):?>selected<?php endif;?>>己方公司</option>
</select>
<span class="notice-text"></span>
</td>
@ -179,24 +179,47 @@
<span class="notice-text"></span>
</td>
</tr>-->
<?php if($relation['collaborate_way'] == 1):?>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>甲方公司:</td>
<td class="l" style="width: 50px;">
<select name="part_a" id="part_a" class="select_gallery">
<volist name="selfCompanies" id="vo">
<option value="{$vo['id']}" <if condition="$vo['id'] eq $relation['self_company_id']">selected</if>>{$vo['company_name']} </option>
</volist>
</select>
<span class="notice-text"></span>
</td>
<td class="l" style="width: 90px;"><i class="mustmark" >*</i>乙方公司:</td>
<td class="r">
<select name="part_b" id="part_b" class="select_gallery">
<option id="cp_company" value='1'></option>
</select>
<span class="notice-text"></span>
</td>
</tr>
<?php endif;?>
<?php if($relation['collaborate_way'] == 2):?>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>甲方公司:</td>
<td class="l" style="width: 50px;">
<select name="part_a" id="part_a" class="select_gallery">
<option id="cp_company" value='1'></option>
</select>
<span class="notice-text"></span>
</td>
<td class="l" style="width: 90px;"><i class="mustmark" >*</i>乙方公司:</td>
<td class="r">
<select name="part_b" id="part_b" class="select_gallery">
<?php foreach($selfCompanies as $selfCompany):?>
<option value="<?=$selfCompany['id']?>" <?php if($selfCompany['company_name']=='海南万盟天下科技有限公司'):?>selected<?php endif;?>><?=$selfCompany['company_name']?></option>
<?php endforeach;?>
<volist name="selfCompanies" id="vo">
<option value="{$vo['id']}" <if condition="$vo['id'] eq $relation['self_company_id']">selected</if>>{$vo['company_name']} </option>
</volist>
</select>
<span class="notice-text"></span>
</td>
</tr>
<?php endif;?>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>结算周期:</td>
@ -484,8 +507,9 @@
$("#tab_tab1").click();
}
$("#part_a").children().remove();
$("#part_a").append("<option value='1'>" + $("#partner").val() + "</option>");
$("#cp_company").text($("#partner").val());
// $("#part_a").children().remove();
// $("#part_a").append("<option value='1'>" + $("#partner").val() + "</option>");
return false;
});

48
Application/Admin/View/Partner/show.html
Unescape Escape View File

@ -149,16 +149,16 @@
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>甲方公司类型:</td>
<td class="l" style="width: 50px;">
<select name="part_a_type" id="part_a_type" class="select_gallery" disabled>
<option value="1" selected>上游CP公司</option>
<option value="2">己方公司</option>
<option value="2" <?php if($relation['collaborate_way'] == 2):?>selected<?php endif;?>>上游CP公司</option>
<option value="1" <?php if($relation['collaborate_way'] == 1):?>selected<?php endif;?>>己方公司</option>
</select>
<span class="notice-text"></span>
</td>
<td class="l" style="width: 100px;"><i class="mustmark" >*</i>乙方公司类型:</td>
<td class="r">
<select name="part_b_type" id="part_b_type" class="select_gallery" disabled>
<option value="1" >上游CP公司</option>
<option value="2" selected>己方公司</option>
<option value="1" <?php if($relation['collaborate_way'] == 1):?>selected<?php endif;?>>上游CP公司</option>
<option value="2" <?php if($relation['collaborate_way'] == 2):?>selected<?php endif;?>>己方公司</option>
</select>
<span class="notice-text"></span>
</td>
@ -176,24 +176,46 @@
<span class="notice-text"></span>
</td>
</tr>-->
<?php if($relation['collaborate_way'] == 1):?>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>甲方公司:</td>
<td class="l" style="width: 50px;">
<select name="part_a" id="part_a" class="select_gallery" disabled>
<volist name="selfCompanies" id="vo">
<option value="{$vo['id']}" <if condition="$vo['id'] eq $relation['self_company_id']">selected</if>>{$vo['company_name']} </option>
</volist>
</select>
<span class="notice-text"></span>
</td>
<td class="l" style="width: 90px;"><i class="mustmark" >*</i>乙方公司:</td>
<td class="r">
<select name="part_b" id="part_b" class="select_gallery" disabled>
<?php foreach($selfCompanies as $selfCompany):?>
<option value="<?=$selfCompany['id']?>" <?php if($selfCompany['company_name']=='海南万盟天下科技有限公司'):?>selected<?php endif;?>><?=$selfCompany['company_name']?></option>
<?php endforeach;?>
<option id="cp_company" value='1'></option>
</select>
<span class="notice-text"></span>
</td>
</tr>
<?php endif;?>
<?php if($relation['collaborate_way'] == 2):?>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>甲方公司:</td>
<td class="l" style="width: 50px;">
<select name="part_a" id="part_a" class="select_gallery" disabled>
<option id="cp_company" value='1'></option>
</select>
<span class="notice-text"></span>
</td>
<td class="l" style="width: 90px;"><i class="mustmark" >*</i>乙方公司:</td>
<td class="r">
<select name="part_b" id="part_b" class="select_gallery" disabled>
<volist name="selfCompanies" id="vo">
<option value="{$vo['id']}" <if condition="$vo['id'] eq $relation['self_company_id']">selected</if>>{$vo['company_name']} </option>
</volist>
</select>
<span class="notice-text"></span>
</td>
</tr>
<?php endif;?>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>结算周期:</td>
@ -467,21 +489,13 @@
}
}
$(function() {
if (!$("#partner").val()) {
$("#tab_tab1").click();
} else {
$("#part_a").children().remove();
$("#part_a").append("<option value='1'>" + $("#partner").val() + "</option>");
}
$("#cp_company").text($("#partner").val());
$("#tab_tab2").click(function() {
if (!$("#partner").val()) {
alert('请填写合作方名称');
$("#tab_tab1").click();
}
$("#part_a").children().remove();
$("#part_a").append("<option value='1'>" + $("#partner").val() + "</option>");
return false;
});

44
Application/Admin/View/PromoteCompany/edit.html
Unescape Escape View File

@ -500,20 +500,21 @@
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>甲方公司类型:</td>
<td class="r" style="width: 50px;">
<select name="part_a_type" id="part_a_type" class="select_gallery">
<option value="1" selected>下游推广公司</option>
<option value="2">己方公司</option>
<option value="2" <?php if($relation['collaborate_way'] == 2):?>selected<?php endif;?>>下游推广公司</option>
<option value="1" <?php if($relation['collaborate_way'] == 1):?>selected<?php endif;?>>己方公司</option>
</select>
<span class="notice-text"></span>
</td>
<td class="l" style="width: 100px;"><i class="mustmark" >*</i>乙方公司类型:</td>
<td class="r">
<select name="part_b_type" id="part_b_type" class="select_gallery" >
<option value="1" >下游推广公司</option>
<option value="2" selected>己方公司</option>
<option value="1" <?php if($relation['collaborate_way'] == 1):?>selected<?php endif;?>>下游推广公司</option>
<option value="2" <?php if($relation['collaborate_way'] == 2):?>selected<?php endif;?>>己方公司</option>
</select>
<span class="notice-text"></span>
</td>
</tr>
<!--<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>己方公司:</td>
<td class="r">
@ -527,24 +528,45 @@
</td>
</tr>-->
<?php if($relation['collaborate_way'] == 1):?>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>甲方公司:</td>
<td class="r" style="width: 50px;">
<select name="part_a" id="part_a" class="select_gallery">
<volist name="selfCompanies" id="vo">
<option value="{$vo['id']}" <if condition="$vo['id'] eq $relation['self_company_id']">selected</if>>{$vo['company_name']} </option>
</volist>
<span class="notice-text"></span>
</td>
<td class="l" style="width: 90px"><i class="mustmark" >*</i>乙方公司:</td>
<td class="r">
<select name="part_b" id="part_b" class="select_gallery">
<option id="cp_company" value='1'></option>
</select>
<span class="notice-text"></span>
</td>
</tr>
<?php endif;?>
<?php if($relation['collaborate_way'] == 2):?>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>甲方公司:</td>
<td class="r" style="width: 50px;">
<select name="part_a" id="part_a" class="select_gallery">
<option id="cp_company" value='1'></option>
</select>
<span class="notice-text"></span>
</td>
<td class="l" style="width: 90px"><i class="mustmark" >*</i>乙方公司:</td>
<td class="r">
<select name="part_b" id="part_b" class="select_gallery">
<?php foreach($selfCompanies as $selfCompany):?>
<option value="<?=$selfCompany['id']?>" <?php if($selfCompany['company_name']=='海南万盟天下科技有限公司'):?>selected<?php endif;?>><?=$selfCompany['company_name']?></option>
<?php endforeach;?>
<volist name="selfCompanies" id="vo">
<option value="{$vo['id']}" <if condition="$vo['id'] eq $relation['self_company_id']">selected</if>>{$vo['company_name']} </option>
</volist>
</select>
<span class="notice-text"></span>
</td>
</tr>
<?php endif;?>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>结算周期:</td>
@ -837,15 +859,15 @@
if (!$("#partner").val()) {
$("#tab_tab1").click();
}
$("#cp_company").text($("#partner").val());
$("#tab_tab2").click(function() {
if (!$("#partner").val()) {
alert('请填写合作方名称');
$("#tab_tab1").click();
}
$("#part_a").children().remove();
$("#part_a").append("<option value='1'>" + $("#partner").val() + "</option>");
//$("#part_a").children().remove();
//$("#part_a").append("<option value='1'>" + $("#partner").val() + "</option>");
return false;
});

47
Application/Admin/View/PromoteCompany/view.html
Unescape Escape View File

@ -486,16 +486,16 @@
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>甲方公司类型:</td>
<td class="r" style="width: 50px;">
<select name="part_a_type" id="part_a_type" class="select_gallery" disabled>
<option value="1" selected>下游推广公司</option>
<option value="2">己方公司</option>
<option value="2" <?php if($relation['collaborate_way'] == 2):?>selected<?php endif;?>>下游推广公司</option>
<option value="1" <?php if($relation['collaborate_way'] == 1):?>selected<?php endif;?>>己方公司</option>
</select>
<span class="notice-text"></span>
</td>
<td class="l" style="width: 100px;"><i class="mustmark" >*</i>乙方公司类型:</td>
<td class="r">
<select name="part_b_type" id="part_b_type" class="select_gallery" disabled>
<option value="1" >下游推广公司</option>
<option value="2" selected>己方公司</option>
<option value="1" <?php if($relation['collaborate_way'] == 1):?>selected<?php endif;?>>下游推广公司</option>
<option value="2" <?php if($relation['collaborate_way'] == 2):?>selected<?php endif;?>>己方公司</option>
</select>
<span class="notice-text"></span>
</td>
@ -513,24 +513,46 @@
<span class="notice-text"></span>
</td>
</tr>-->
<?php if($relation['collaborate_way'] == 1):?>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>甲方公司:</td>
<td class="r" style="width: 50px;">
<select name="part_a" id="part_a" class="select_gallery" disabled>
<volist name="selfCompanies" id="vo">
<option value="{$vo['id']}" <if condition="$vo['id'] eq $relation['self_company_id']">selected</if>>{$vo['company_name']} </option>
</volist>
</select>
<span class="notice-text"></span>
</td>
<td class="l" style="width: 90px"><i class="mustmark" >*</i>乙方公司:</td>
<td class="r">
<select name="part_b" id="part_b" class="select_gallery" disabled>
<?php foreach($selfCompanies as $selfCompany):?>
<option value="<?=$selfCompany['id']?>" <?php if($selfCompany['company_name']=='海南万盟天下科技有限公司'):?>selected<?php endif;?>><?=$selfCompany['company_name']?></option>
<?php endforeach;?>
<option id="cp_company" value='1'></option>
</select>
<span class="notice-text"></span>
</td>
</tr>
<?php endif;?>
<?php if($relation['collaborate_way'] == 2):?>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>甲方公司:</td>
<td class="r" style="width: 50px;">
<select name="part_a" id="part_a" class="select_gallery" disabled>
<option id="cp_company" value='1'></option>
</select>
<span class="notice-text"></span>
</td>
<td class="l" style="width: 90px"><i class="mustmark" >*</i>乙方公司:</td>
<td class="r">
<select name="part_b" id="part_b" class="select_gallery" disabled>
<volist name="selfCompanies" id="vo">
<option value="{$vo['id']}" <if condition="$vo['id'] eq $relation['self_company_id']">selected</if>>{$vo['company_name']} </option>
</volist>
</select>
<span class="notice-text"></span>
</td>
</tr>
<?php endif;?>
<tr>
<td class="l"><i class="mustmark" style="margin-left:-7px">*</i>结算周期:</td>
@ -821,12 +843,7 @@
}
}
$(function() {
if (!$("#partner").val()) {
$("#tab_tab1").click();
} else {
$("#part_a").children().remove();
$("#part_a").append("<option value='1'>" + $("#partner").val() + "</option>");
}
$("#cp_company").text($("#partner").val());
$("#tab_tab2").click(function() {
if (!$("#partner").val()) {
@ -834,8 +851,6 @@
$("#tab_tab1").click();
}
$("#part_a").children().remove();
$("#part_a").append("<option value='1'>" + $("#partner").val() + "</option>");
return false;
});

Write Preview
Loading…
Cancel
Save