diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php
index 5a8e9f60a..9638f2444 100644
--- a/Application/Admin/Controller/CompanyStatementPoolController.class.php
+++ b/Application/Admin/Controller/CompanyStatementPoolController.class.php
@@ -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') {
diff --git a/Application/Admin/Controller/PartnerController.class.php b/Application/Admin/Controller/PartnerController.class.php
index 1a76b0ac9..6866af2b7 100644
--- a/Application/Admin/Controller/PartnerController.class.php
+++ b/Application/Admin/Controller/PartnerController.class.php
@@ -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);
diff --git a/Application/Admin/Controller/PromoteCompanyController.class.php b/Application/Admin/Controller/PromoteCompanyController.class.php
index eaf5f5484..87bb0b6ae 100644
--- a/Application/Admin/Controller/PromoteCompanyController.class.php
+++ b/Application/Admin/Controller/PromoteCompanyController.class.php
@@ -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);
diff --git a/Application/Admin/View/Partner/edit.html b/Application/Admin/View/Partner/edit.html
index 9b7736b4c..34eddca3e 100644
--- a/Application/Admin/View/Partner/edit.html
+++ b/Application/Admin/View/Partner/edit.html
@@ -152,16 +152,16 @@
| *甲方公司类型: |
|
*乙方公司类型: |
|
@@ -179,24 +179,47 @@
-->
+
| *甲方公司: |
+
+ |
+ *乙方公司: |
+
+
+
+ |
+
+
+
+
+ | *甲方公司: |
+
+
|
*乙方公司: |
|
+
| *结算周期: |
@@ -484,8 +507,9 @@
$("#tab_tab1").click();
}
- $("#part_a").children().remove();
- $("#part_a").append("");
+ $("#cp_company").text($("#partner").val());
+ // $("#part_a").children().remove();
+ // $("#part_a").append("");
return false;
});
diff --git a/Application/Admin/View/Partner/show.html b/Application/Admin/View/Partner/show.html
index 72d65cda1..5e6445583 100644
--- a/Application/Admin/View/Partner/show.html
+++ b/Application/Admin/View/Partner/show.html
@@ -149,16 +149,16 @@
*甲方公司类型: |
|
*乙方公司类型: |
|
@@ -176,24 +176,46 @@
-->
+
| *甲方公司: |
|
*乙方公司: |
|
+
+
+
+ | *甲方公司: |
+
+
+
+ |
+ *乙方公司: |
+
+
+
+ |
+
+
| *结算周期: |
@@ -467,21 +489,13 @@
}
}
$(function() {
- if (!$("#partner").val()) {
- $("#tab_tab1").click();
- } else {
- $("#part_a").children().remove();
- $("#part_a").append("");
- }
+ $("#cp_company").text($("#partner").val());
$("#tab_tab2").click(function() {
if (!$("#partner").val()) {
alert('请填写合作方名称');
$("#tab_tab1").click();
}
-
- $("#part_a").children().remove();
- $("#part_a").append("");
return false;
});
diff --git a/Application/Admin/View/PromoteCompany/edit.html b/Application/Admin/View/PromoteCompany/edit.html
index 42ce732e4..b00066973 100644
--- a/Application/Admin/View/PromoteCompany/edit.html
+++ b/Application/Admin/View/PromoteCompany/edit.html
@@ -500,20 +500,21 @@
*甲方公司类型: |
|
*乙方公司类型: |
|
+
+
| *甲方公司: |
- |
+ *乙方公司: |
+
+
+
+ |
+
+
+
+
+ | *甲方公司: |
+
+
|
*乙方公司: |
|
+
| *结算周期: |
@@ -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("");
+ //$("#part_a").children().remove();
+ //$("#part_a").append("");
return false;
});
diff --git a/Application/Admin/View/PromoteCompany/view.html b/Application/Admin/View/PromoteCompany/view.html
index 301ece91c..3dc1981c7 100644
--- a/Application/Admin/View/PromoteCompany/view.html
+++ b/Application/Admin/View/PromoteCompany/view.html
@@ -486,16 +486,16 @@
*甲方公司类型: |
|
*乙方公司类型: |
|
@@ -513,24 +513,46 @@
-->
+
| *甲方公司: |
|
*乙方公司: |
|
+
+
+
+ | *甲方公司: |
+
+
+
+ |
+ *乙方公司: |
+
+
+
+ |
+
+
| *结算周期: |
@@ -821,12 +843,7 @@
}
}
$(function() {
- if (!$("#partner").val()) {
- $("#tab_tab1").click();
- } else {
- $("#part_a").children().remove();
- $("#part_a").append("");
- }
+ $("#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("");
return false;
});