From 5851e5d5202868550c5dfcdd9097c4b46a67c7b7 Mon Sep 17 00:00:00 2001 From: dengbw Date: Thu, 29 Jul 2021 11:46:32 +0800 Subject: [PATCH] admin_goods-execl_729 --- admin/controllers/items/goods/Goods.php | 5 +- admin/views/items/goods/lists.php | 109 +++++++++++++++--------- www/admin/temp/goods.xlsx | Bin 0 -> 8971 bytes 3 files changed, 71 insertions(+), 43 deletions(-) create mode 100644 www/admin/temp/goods.xlsx diff --git a/admin/controllers/items/goods/Goods.php b/admin/controllers/items/goods/Goods.php index 0d96473a..a4eb933d 100644 --- a/admin/controllers/items/goods/Goods.php +++ b/admin/controllers/items/goods/Goods.php @@ -277,7 +277,7 @@ class Goods extends HD_Controller } - public function edit_excel() + public function add_excel() { require_once COMMPATH . '/third_party/PHPExcel/IOFactory.php'; $res = $this->upload(); @@ -322,6 +322,7 @@ class Goods extends HD_Controller $cor_id = $re_a0 ? $re_a0['id'] : 0; $re_a2 = $this->mdAutoAttr->get(array('s_id' => $s_id, 'type' => 2, 'title' => $incor_id)); $incor_id = $re_a2 ? $re_a2['id'] : 0; + $pro_time = $pro_time ? gmdate("Y/m/d H:i:s", PHPExcel_Shared_Date::ExcelToPHP($pro_time)) : ''; $addData = array('brand_id' => $brand_id, 's_id' => $s_id, 'v_id' => $v_id, 'cor_id' => $cor_id, 'incor_id' => $incor_id , 'ori_price' => $ori_price, 'vin' => $vin, 'frame_num' => $frame_num, 'stdard_num' => $stdard_num, 'pro_time' => $pro_time, 'c_time' => time()); $id = $this->mdItems->add($addData); @@ -345,7 +346,7 @@ class Goods extends HD_Controller { $config['upload_path'] = $_SERVER['DOCUMENT_ROOT'] . '/temp/'; $config['allowed_types'] = '*';//xls|xlsx - $config['max_size'] = 2 * 1024; + $config['max_size'] = 5 * 1024; $config['file_name'] = 'items_' . time() . rand(1, 99999); $this->load->library('upload', $config); if (!$this->upload->do_upload('file')) { diff --git a/admin/views/items/goods/lists.php b/admin/views/items/goods/lists.php index 375cdd17..006b01c4 100644 --- a/admin/views/items/goods/lists.php +++ b/admin/views/items/goods/lists.php @@ -55,11 +55,8 @@ class="am-btn am-btn-success am-btn-sm w100">新增 -
- - +
+
@@ -124,6 +121,24 @@ + diff --git a/www/admin/temp/goods.xlsx b/www/admin/temp/goods.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..50eb3e0a84128427445ab6618f7b2881f9190495 GIT binary patch literal 8971 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