diff --git a/Application/Admin/Controller/PromoteCompanyController.class.php b/Application/Admin/Controller/PromoteCompanyController.class.php index b57537591..2ad732419 100644 --- a/Application/Admin/Controller/PromoteCompanyController.class.php +++ b/Application/Admin/Controller/PromoteCompanyController.class.php @@ -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']; diff --git a/Application/Admin/View/Partner/add.html b/Application/Admin/View/Partner/add.html index c1e5b4ce2..9144f85ea 100644 --- a/Application/Admin/View/Partner/add.html +++ b/Application/Admin/View/Partner/add.html @@ -182,7 +182,7 @@ 开票内容: - + @@ -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(); diff --git a/Application/Admin/View/Partner/edit.html b/Application/Admin/View/Partner/edit.html index 69f69a181..15e5f56d1 100644 --- a/Application/Admin/View/Partner/edit.html +++ b/Application/Admin/View/Partner/edit.html @@ -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(); diff --git a/Application/Admin/View/PromoteCompany/add.html b/Application/Admin/View/PromoteCompany/add.html index fde262566..6ac99e0fb 100644 --- a/Application/Admin/View/PromoteCompany/add.html +++ b/Application/Admin/View/PromoteCompany/add.html @@ -171,7 +171,7 @@ @@ -183,7 +183,7 @@ @@ -196,8 +196,8 @@
@@ -378,7 +378,9 @@ @@ -409,7 +411,7 @@ 开票内容: - + @@ -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) { diff --git a/Application/Admin/View/PromoteCompany/edit.html b/Application/Admin/View/PromoteCompany/edit.html index a2afbe70d..a48a2ef28 100644 --- a/Application/Admin/View/PromoteCompany/edit.html +++ b/Application/Admin/View/PromoteCompany/edit.html @@ -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(); } diff --git a/Application/Admin/View/PromoteCompany/export.html b/Application/Admin/View/PromoteCompany/export.html index 34a82aa44..ec4baf16e 100644 --- a/Application/Admin/View/PromoteCompany/export.html +++ b/Application/Admin/View/PromoteCompany/export.html @@ -39,13 +39,13 @@ 开发类型 公司性质 结算周期 - 押金 + 押金类型 + 押金金额 + 押金状态 + 会长账号 市场专员 - - 押金金额 - 押金状态 原包名 现包名 @@ -95,13 +95,15 @@ {$data.settlement_type} {$data.deposit_pay_type} + {$data.deposit_amount} + {$data.deposit_status} + {$data['list'][0]['account']|default="--"} {$data['list'][0]['market_admin_username']|default="--"} - - {$data['list'][0]['amount']|default="--"} - {$data['list'][0]['status']|default="--"} + + @@ -240,9 +242,8 @@ {$promote['account']|default="--"} {$promote['market_admin_username']|default="--"} - - {$promote['amount']|default="--"} - {$promote['status']|default="--"} + + {$promote['list'][0]['original_package_name']|default="--"} diff --git a/Application/Admin/View/PromoteCompany/lists.html b/Application/Admin/View/PromoteCompany/lists.html index 51b1c80d0..5f77a5672 100644 --- a/Application/Admin/View/PromoteCompany/lists.html +++ b/Application/Admin/View/PromoteCompany/lists.html @@ -154,7 +154,7 @@ 公司性质 是否
签署合同 结算周期 - 押金 + 押金类型 会长账号 市场专员