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

Merge branch 'feature/promote_company_merge' of wmtx/platform into release

Browse Source 
优化
master
廖金灵 4 years ago committed by Gogs
parent 6a78824b10 1fb2fa7e81
commit 4994e9182d
7 changed files with 59 additions and 19 deletions
Show Stats Download Patch File Download Diff File

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

@ -116,7 +116,7 @@ class PromoteCompanyController extends ThinkController
if(!empty($companyres)){
$companyIds = array_column($companyres, 'id') ;
$depositList = M('president_deposit', 'tab_')->field(['company_id', 'pay_type'])->where(['company_id' => ['in', $companyIds]])->select();
$depositList = M('president_deposit', 'tab_')->field(['company_id', 'pay_type', 'amount', 'status'])->where(['company_id' => ['in', $companyIds]])->select();
$depositList = index_by_column('company_id', $depositList);
foreach($companyres as $k=>&$v){
@ -125,6 +125,8 @@ class PromoteCompanyController extends ThinkController
$v["settlement_type"] = $tmpr['settlement_type'];
$v["deposit_pay_type"] = $deposit ? $payTypes[$deposit['pay_type']] : '--';
$v["deposit_status"] = $deposit ? $statusList[$deposit['status']] : '--';
$v["deposit_amount"] = $deposit ? $deposit['amount'] : '--';
$v["collection"] = $tmpr['collection'];
$v["invoice_type"] = $tmpr['invoice_type'];
$v["invoice_content"] = $tmpr['invoice_content'];

10
Application/Admin/View/Partner/add.html
Unescape Escape View File

@ -182,7 +182,7 @@
<tr>
<td class="l">开票内容：</td>
<td class="r table_radio">
<input type="text" name="relation[invoice_content]" id="invoice_content" class="input" value="信息服务费"></textarea>
<input type="text" name="relation[invoice_content]" id="invoice_content" class="input" value=""></textarea>
</td>
</tr>
<tr>
@ -543,6 +543,14 @@
});
})
$('#invoice_type').change(function () {
var val = $(this).val()
if (val == 0) {
$('#invoice_content').val('')
} else {
$('#invoice_content').val('信息服务费')
}
})
var PROMOTE = {
juicerFun(){
var tpl =$("#doctpl").html();

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

@ -545,6 +545,14 @@
});
})
$('#invoice_type').change(function () {
var val = $(this).val()
if (val == 0) {
$('#invoice_content').val('')
} else {
$('#invoice_content').val('信息服务费')
}
})
var PROMOTE = {
juicerFun(){
var tpl =$("#doctpl").html();

23
Application/Admin/View/PromoteCompany/add.html
Unescape Escape View File

@ -171,7 +171,7 @@
<select id="company_belong" name="company_belong" class="select_gallery" style="width: 215px;">
<!-- <option value="">请选择团体归属</option> -->
<volist name=":getCompanyBlong()" id="vo">
<option value="{$vo.id}" <php> if($vo['id'] == 3)echo selected;</php>>{$vo.name}</option>
<option value="{$vo.id}" <php> if($vo['id'] == 1)echo selected;</php>>{$vo.name}</option>
</volist>
</select>
</div>
@ -183,7 +183,7 @@
<td class="r" >
<select id="develop_type" name="develop_type" class="select_gallery" style="width: 215px;">
<option value="0">无</option>
<option value="1">自主开发</option>
<option value="1" selected>自主开发</option>
<option value="2">自主开发及维护</option>
<option value="3">只维护</option>
</select>
@ -196,8 +196,8 @@
<div class="input-list input-list-server search_label_rehab" style="margin:0;">
<select id="company_type" name="company_type" class="select_gallery" style="width: 215px;">
<!-- <option value="">请选择公司性质</option> -->
<option value="1" selected>公司</option>
<option value="2">个人</option>
<option value="1">公司</option>
<option value="2" selected>个人</option>
</select>
</div>
</td>
@ -378,7 +378,9 @@
<select name="relation[self_company_id]" id="self_company" class="select_gallery">
<option value="0">无</option>
<?php foreach($selfCompanies as $selfCompany):?>
<option value="<?=$selfCompany['id']?>"><?=$selfCompany['company_name']?></option>
<option value="<?=$selfCompany['id']?>" <?php if($selfCompany['company_name'] == '福建金菠菜网络科技有限公司'):?>selected<?php endif;?>>
<?=$selfCompany['company_name']?>
</option>
<?php endforeach;?>
</select>
<span class="notice-text"></span>
@ -409,7 +411,7 @@
<tr>
<td class="l">开票内容：</td>
<td class="r table_radio">
<input type="text" name="relation[invoice_content]" id="invoice_content" class="input" value="信息服务费"></textarea>
<input type="text" name="relation[invoice_content]" id="invoice_content" class="input" value=""></textarea>
</td>
</tr>
<tr>
@ -1161,6 +1163,15 @@
}
})
$('#invoice_type').change(function () {
var val = $(this).val()
if (val == 0) {
$('#invoice_content').val('')
} else {
$('#invoice_content').val('信息服务费')
}
})
$('#deposit-pay-type').change(function() {
var val = $(this).val()
if (val == 2) {

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

@ -1029,6 +1029,16 @@
$('#deposit-pay-way').val('')
}
})
$('#invoice_type').change(function () {
var val = $(this).val()
if (val == 0) {
$('#invoice_content').val('')
} else {
$('#invoice_content').val('信息服务费')
}
})
if ($('#deposit-pay-type').val() == 3) {
$('.need-amount').hide();
}

21
Application/Admin/View/PromoteCompany/export.html
Unescape Escape View File

@ -39,13 +39,13 @@
<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>现包名</th>
@ -95,13 +95,15 @@
<td rowspan="{$data.row}">{$data.settlement_type}</td>
<td rowspan="{$data.row}">{$data.deposit_pay_type}</td>
<td rowspan="{$data.row}">{$data.deposit_amount}</td>
<td rowspan="{$data.row}">{$data.deposit_status}</td>
<notempty name="data.list">
<td rowspan="{$data['list'][0]['row']}">{$data['list'][0]['account']|default="--"}</td>
<td rowspan="{$data['list'][0]['row']}">{$data['list'][0]['market_admin_username']|default="--"}</td>
<!-- <td rowspan="{$data['list'][0]['row']}">{$data['list'][0]['pay_type']|default="--"}</td> -->
<td rowspan="{$data['list'][0]['row']}">{$data['list'][0]['amount']|default="--"}</td>
<td rowspan="{$data['list'][0]['row']}">{$data['list'][0]['status']|default="--"}</td>
<!-- <td rowspan="{$data['list'][0]['row']}">{$data['list'][0]['amount']|default="--"}</td> -->
<!-- <td rowspan="{$data['list'][0]['row']}">{$data['list'][0]['status']|default="--"}</td> -->
<notempty name="data['list'][0]['list']">
<td rowspan="{$data['list'][0]['list'][0]['row']}">
@ -240,9 +242,8 @@
<td rowspan="{$promote['row']}">{$promote['account']|default="--"}</td>
<td rowspan="{$promote['row']}">{$promote['market_admin_username']|default="--"}</td>
<!-- <td rowspan="{$promote['row']}">{$promote['pay_type']|default="--"}</td> -->
<td rowspan="{$promote['row']}">{$promote['amount']|default="--"}</td>
<td rowspan="{$promote['row']}">{$promote['status']|default="--"}</td>
<!-- <td rowspan="{$promote['row']}">{$promote['amount']|default="--"}</td> -->
<!-- <td rowspan="{$promote['row']}">{$promote['status']|default="--"}</td> -->
<notempty name="promote['list']">
<td rowspan="{$promote['list'][0]['row']}">{$promote['list'][0]['original_package_name']|default="--"}</td>

2
Application/Admin/View/PromoteCompany/lists.html
Unescape Escape View File

@ -154,7 +154,7 @@
<th>公司性质</th>
<th width="80">是否<br>签署合同</th>
<th>结算周期</th>
<th width="100">押金</th>
<th width="100">押金类型</th>
<th>会长账号</th>
<th>市场专员</th>

Write Preview
Loading…
Cancel
Save