From 76fe6546ce0c75ada926bcdcb591f472f5a453e9 Mon Sep 17 00:00:00 2001 From: renshen <1005457301@qq.com> Date: Sun, 20 Sep 2026 11:00:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BF=90=E8=B4=B9=E5=B7=AE?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=97=A5=E6=9C=9F=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../freight-difference-import-template.xlsx | Bin 54410 -> 59600 bytes .../courier-payables/summary-table.blade.php | 2 +- .../CourierPayableSummaryPagesTest.php | 26 ++++++++++-------- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/resources/templates/courier-payables/freight-difference-import-template.xlsx b/resources/templates/courier-payables/freight-difference-import-template.xlsx index aab26937b83d3a1e064d581e180d9088c0b6b089..6e3df03b2d3af31aad03506516c2c474f95b7910 100644 GIT binary patch literal 59600 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 aTV=Nw#+p_A0U=2M43v`xtCvtEdG~)cEUAM4 literal 54410 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
;AMv?lII<-b9@;PG$2K{ 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 diff --git a/resources/views/business/pages/courier-payables/summary-table.blade.php b/resources/views/business/pages/courier-payables/summary-table.blade.php index cbd9fbc3..26d7b94c 100644 --- a/resources/views/business/pages/courier-payables/summary-table.blade.php +++ b/resources/views/business/pages/courier-payables/summary-table.blade.php @@ -108,7 +108,7 @@
运费差导入模板 - .xlsx · 10 个字段 + .xlsx · 11 个字段
diff --git a/tests/Feature/Business/CourierPayableSummaryPagesTest.php b/tests/Feature/Business/CourierPayableSummaryPagesTest.php index 4e7ebe41..4a7c6c34 100644 --- a/tests/Feature/Business/CourierPayableSummaryPagesTest.php +++ b/tests/Feature/Business/CourierPayableSummaryPagesTest.php @@ -83,6 +83,7 @@ class CourierPayableSummaryPagesTest extends FeatureTestCase $worksheet = $spreadsheet->getActiveSheet(); $this->assertSame([ + '日期', '负责人', '快递公司', '快递单号', @@ -93,12 +94,13 @@ class CourierPayableSummaryPagesTest extends FeatureTestCase '差异(结算运费-提供成本运费)', '是否配件', '配件成品条码', - ], $worksheet->rangeToArray('A1:J1', null, false, false)[0]); - $this->assertSame('FFFFC000', $worksheet->getStyle('D1')->getFill()->getStartColor()->getARGB()); + ], $worksheet->rangeToArray('A1:K1', null, false, false)[0]); $this->assertSame('FFFFC000', $worksheet->getStyle('E1')->getFill()->getStartColor()->getARGB()); - $this->assertSame('FFFFC000', $worksheet->getStyle('G1')->getFill()->getStartColor()->getARGB()); - $this->assertSame('@', $worksheet->getStyle('E2')->getNumberFormat()->getFormatCode()); - $this->assertSame('@', $worksheet->getStyle('G2')->getNumberFormat()->getFormatCode()); + $this->assertSame('FFFFC000', $worksheet->getStyle('F1')->getFill()->getStartColor()->getARGB()); + $this->assertSame('FFFFC000', $worksheet->getStyle('H1')->getFill()->getStartColor()->getARGB()); + $this->assertSame('@', $worksheet->getStyle('A2')->getNumberFormat()->getFormatCode()); + $this->assertSame('@', $worksheet->getStyle('F2')->getNumberFormat()->getFormatCode()); + $this->assertSame('@', $worksheet->getStyle('H2')->getNumberFormat()->getFormatCode()); $this->assertSame('', (string) $worksheet->getCell('A2')->getValue()); $spreadsheet->disconnectWorksheets(); @@ -120,6 +122,7 @@ class CourierPayableSummaryPagesTest extends FeatureTestCase $spreadsheet = IOFactory::load(resource_path('templates/courier-payables/freight-difference-import-template.xlsx')); $worksheet = $spreadsheet->getActiveSheet(); $worksheet->fromArray([ + '2026-07', '苏木', '测试快递', 'YT7632543323146', @@ -131,8 +134,8 @@ class CourierPayableSummaryPagesTest extends FeatureTestCase '成品', '', ], null, 'A2'); - $worksheet->getCell('E2')->setValueExplicit('855226246304', DataType::TYPE_STRING); - $worksheet->getCell('G2')->setValueExplicit('3312228147193110069', DataType::TYPE_STRING); + $worksheet->getCell('F2')->setValueExplicit('855226246304', DataType::TYPE_STRING); + $worksheet->getCell('H2')->setValueExplicit('3312228147193110069', DataType::TYPE_STRING); $path = tempnam(sys_get_temp_dir(), 'freight-template-'); $this->assertNotFalse($path); @@ -157,15 +160,16 @@ class CourierPayableSummaryPagesTest extends FeatureTestCase 'section' => 'courier-payables', 'page' => 'freight-difference', ])) - ->assertSessionHas('success', '导入完成:1 条数据,10 个字段。'); + ->assertSessionHas('success', '导入完成:1 条数据,11 个字段。'); $snapshot = app(CourierPayableSummaryStore::class)->snapshot( (int) $this->company->id, 'freight-difference', ); - $this->assertSame('855226246304', $snapshot['rows'][0][4]); - $this->assertSame('3312228147193110069', $snapshot['rows'][0][6]); - $this->assertSame('0.1827', $snapshot['rows'][0][7]); + $this->assertSame('2026-07', $snapshot['rows'][0][0]); + $this->assertSame('855226246304', $snapshot['rows'][0][5]); + $this->assertSame('3312228147193110069', $snapshot['rows'][0][7]); + $this->assertSame('0.1827', $snapshot['rows'][0][8]); } finally { if (isset($spreadsheet)) { $spreadsheet->disconnectWorksheets(); -- 2.47.2