From 79588d52e8dc09ded6020c161b9c20e8de1d82ee Mon Sep 17 00:00:00 2001 From: chenzhi Date: Tue, 22 Dec 2020 13:47:47 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B4=A2=E5=8A=A1?= =?UTF-8?q?=E6=B1=87=E6=80=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompanyStatementPoolController.class.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php index faec62a22..c389f9d8a 100644 --- a/Application/Admin/Controller/CompanyStatementPoolController.class.php +++ b/Application/Admin/Controller/CompanyStatementPoolController.class.php @@ -498,7 +498,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){ @@ -523,13 +522,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']; } } @@ -547,6 +542,12 @@ class CompanyStatementPoolController extends ThinkController } $count['week_money'] += $va['week_amount']; $count['sum_money'] += $va['week_amount']; + if(!$is_statement){ + $count['pool_lack_count'] += $va['week_amount']; + $count['st_lack_count'] += $va['week_amount']; + }else{ + $count['st_count'] += $va['week_amount']; + } } $v['row'] = $row; From fc75b7d81da71aef4e06c6e2216932d02fffcf88 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Tue, 22 Dec 2020 15:23:56 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompanyStatementPoolController.class.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php index c389f9d8a..031290dda 100644 --- a/Application/Admin/Controller/CompanyStatementPoolController.class.php +++ b/Application/Admin/Controller/CompanyStatementPoolController.class.php @@ -522,6 +522,7 @@ class CompanyStatementPoolController extends ThinkController } //本周未结算流水合计 if(!$is_statement){ + $count['pool_lack_count'] += $val['pay_amount']; if($is_export){ $this->setlackCount($line); } @@ -542,12 +543,12 @@ class CompanyStatementPoolController extends ThinkController } $count['week_money'] += $va['week_amount']; $count['sum_money'] += $va['week_amount']; - if(!$is_statement){ - $count['pool_lack_count'] += $va['week_amount']; - $count['st_lack_count'] += $va['week_amount']; - }else{ - $count['st_count'] += $va['week_amount']; - } + } + + if(!$is_statement){ + $count['st_lack_count'] += $v['statement_money']; + }else{ + $count['st_count'] += $v['statement_money']; } $v['row'] = $row; From 08df25eab3a4d0c03857402b3d3e807976357f64 Mon Sep 17 00:00:00 2001 From: tping Date: Thu, 24 Dec 2020 10:24:09 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=B1=95=E7=A4=BA=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/Partner/edit.html | 36 ++++++++++++++--- .../Admin/View/PromoteCompany/edit.html | 40 ++++++++++++++----- 2 files changed, 61 insertions(+), 15 deletions(-) diff --git a/Application/Admin/View/Partner/edit.html b/Application/Admin/View/Partner/edit.html index 9b7736b4c..0049c5b8d 100644 --- a/Application/Admin/View/Partner/edit.html +++ b/Application/Admin/View/Partner/edit.html @@ -152,16 +152,16 @@ *甲方公司类型: *乙方公司类型: @@ -179,11 +179,33 @@ --> + *甲方公司: + + + *乙方公司: + + + + + + + + + *甲方公司: + + @@ -197,6 +219,7 @@ + *结算周期: @@ -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/PromoteCompany/edit.html b/Application/Admin/View/PromoteCompany/edit.html index 42ce732e4..27b85fae2 100644 --- a/Application/Admin/View/PromoteCompany/edit.html +++ b/Application/Admin/View/PromoteCompany/edit.html @@ -500,20 +500,21 @@ *甲方公司类型: *乙方公司类型: + - + *甲方公司: @@ -545,6 +546,27 @@ + + + + *甲方公司: + + + + + *乙方公司: + + + + + + *结算周期: @@ -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; }); From 304c59be106fefb72feaaf23c5c02dd760ef5777 Mon Sep 17 00:00:00 2001 From: tping Date: Thu, 24 Dec 2020 13:58:41 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E7=94=B2=E4=B9=99=E6=96=B9=E5=85=AC?= =?UTF-8?q?=E5=8F=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/PartnerController.class.php | 4 +- .../PromoteCompanyController.class.php | 4 +- Application/Admin/View/Partner/edit.html | 12 +++--- Application/Admin/View/Partner/show.html | 42 ++++++++++++------- .../Admin/View/PromoteCompany/edit.html | 12 +++--- .../Admin/View/PromoteCompany/view.html | 41 ++++++++++++------ 6 files changed, 72 insertions(+), 43 deletions(-) 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 0049c5b8d..b198d8e1f 100644 --- a/Application/Admin/View/Partner/edit.html +++ b/Application/Admin/View/Partner/edit.html @@ -152,16 +152,16 @@ *甲方公司类型: *乙方公司类型: @@ -179,7 +179,7 @@ --> - + *甲方公司: @@ -200,7 +200,7 @@ - + *甲方公司: diff --git a/Application/Admin/View/Partner/show.html b/Application/Admin/View/Partner/show.html index 72d65cda1..4e8b10add 100644 --- a/Application/Admin/View/Partner/show.html +++ b/Application/Admin/View/Partner/show.html @@ -149,16 +149,16 @@ *甲方公司类型: *乙方公司类型: @@ -176,11 +176,32 @@ --> + *甲方公司: + + + + *乙方公司: + + + + + + + + *甲方公司: + + @@ -194,6 +215,7 @@ + *结算周期: @@ -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 27b85fae2..c33a8ab55 100644 --- a/Application/Admin/View/PromoteCompany/edit.html +++ b/Application/Admin/View/PromoteCompany/edit.html @@ -500,16 +500,16 @@ *甲方公司类型: *乙方公司类型: @@ -527,7 +527,7 @@ --> - + *甲方公司: @@ -547,7 +547,7 @@ - + *甲方公司: diff --git a/Application/Admin/View/PromoteCompany/view.html b/Application/Admin/View/PromoteCompany/view.html index 301ece91c..9c0d5dff7 100644 --- a/Application/Admin/View/PromoteCompany/view.html +++ b/Application/Admin/View/PromoteCompany/view.html @@ -486,16 +486,16 @@ *甲方公司类型: *乙方公司类型: @@ -513,11 +513,32 @@ --> + *甲方公司: + + + *乙方公司: + + + + + + + + + *甲方公司: + + @@ -531,6 +552,7 @@ + *结算周期: @@ -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; }); From 858e92919998b9b7dd4520bb203d5da9733e4d20 Mon Sep 17 00:00:00 2001 From: tping Date: Thu, 24 Dec 2020 14:49:16 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E7=94=B2=E4=B9=99=E6=96=B9=E5=85=AC?= =?UTF-8?q?=E5=8F=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/Partner/edit.html | 12 +++++----- Application/Admin/View/Partner/show.html | 16 ++++++------- .../Admin/View/PromoteCompany/edit.html | 24 +++++++++---------- .../Admin/View/PromoteCompany/view.html | 12 +++++----- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/Application/Admin/View/Partner/edit.html b/Application/Admin/View/Partner/edit.html index b198d8e1f..34eddca3e 100644 --- a/Application/Admin/View/Partner/edit.html +++ b/Application/Admin/View/Partner/edit.html @@ -184,9 +184,9 @@ *甲方公司: @@ -212,9 +212,9 @@ *乙方公司: diff --git a/Application/Admin/View/Partner/show.html b/Application/Admin/View/Partner/show.html index 4e8b10add..5e6445583 100644 --- a/Application/Admin/View/Partner/show.html +++ b/Application/Admin/View/Partner/show.html @@ -180,16 +180,16 @@ *甲方公司: - + + + *乙方公司: - @@ -208,9 +208,9 @@ *乙方公司: diff --git a/Application/Admin/View/PromoteCompany/edit.html b/Application/Admin/View/PromoteCompany/edit.html index c33a8ab55..b00066973 100644 --- a/Application/Admin/View/PromoteCompany/edit.html +++ b/Application/Admin/View/PromoteCompany/edit.html @@ -527,41 +527,41 @@ --> - + + *甲方公司: - + + + *乙方公司: - + + *甲方公司: *乙方公司: diff --git a/Application/Admin/View/PromoteCompany/view.html b/Application/Admin/View/PromoteCompany/view.html index 9c0d5dff7..3dc1981c7 100644 --- a/Application/Admin/View/PromoteCompany/view.html +++ b/Application/Admin/View/PromoteCompany/view.html @@ -518,9 +518,9 @@ *甲方公司: @@ -545,9 +545,9 @@ *乙方公司: