From a85c63c7f9270dba85ca80b5c7bdf82b170ef496 Mon Sep 17 00:00:00 2001 From: Anyon Date: Fri, 15 Apr 2022 15:02:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BF=AB=E9=80=92=E5=85=AC?= =?UTF-8?q?=E5=8F=B8=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/data/controller/base/postage/Company.php | 38 ++++-- app/data/model/BasePostageCompany.php | 10 +- app/data/view/base/postage/company/form.html | 14 +- app/data/view/base/postage/company/index.html | 126 ++++++++++-------- .../base/postage/company/index_search.html | 2 +- 5 files changed, 110 insertions(+), 80 deletions(-) diff --git a/app/data/controller/base/postage/Company.php b/app/data/controller/base/postage/Company.php index fdd7829a8..4f5431075 100644 --- a/app/data/controller/base/postage/Company.php +++ b/app/data/controller/base/postage/Company.php @@ -5,6 +5,7 @@ namespace app\data\controller\base\postage; use app\data\model\BasePostageCompany; use app\data\service\ExpressService; use think\admin\Controller; +use think\admin\helper\QueryHelper; use think\exception\HttpResponseException; /** @@ -24,18 +25,13 @@ class Company extends Controller */ public function index() { - $this->title = '快递公司管理'; - - // 加载对应数据 - $map = ['deleted' => 0]; $this->type = input('get.type', 'index'); - if ($this->type === 'index') $map['status'] = 1; - if ($this->type === 'recycle') $map['status'] = 0; - - // 列表显示分页 - $query = BasePostageCompany::mQuery(); - $query->like('name,code')->equal('status')->dateBetween('craete_at'); - $query->where($map)->order('sort desc,id desc')->page(); + BasePostageCompany::mQuery()->layTable(function () { + $this->title = '快递公司管理'; + }, function (QueryHelper $query) { + $query->where(['deleted' => 0, 'status' => intval($this->type === 'index')]); + $query->like('name,code_1|code_3#code')->equal('status')->dateBetween('create_at'); + }); } /** @@ -58,6 +54,20 @@ class Company extends Controller BasePostageCompany::mForm('form'); } + /** + * 同步字段编号 + * @param array $data + * @return void + */ + protected function _form_filter(array &$data) + { + if ($this->request->isPost()) { + if (empty($data['code_2'])) { + $data['code_2'] = $data['code_3']; + } + } + } + /** * 修改快递公司状态 * @auth true @@ -89,7 +99,11 @@ class Company extends Controller $result = ExpressService::instance()->company(); if (empty($result['code'])) $this->error($result['info']); foreach ($result['data'] as $vo) BasePostageCompany::mUpdate([ - 'code_1' => $vo['code_1'], 'code_2' => $vo['code_2'], 'code_3' => $vo['code_3'], 'name' => $vo['title'], 'deleted' => 0, + 'name' => $vo['title'], + 'code_1' => $vo['code_1'], + 'code_2' => $vo['code_2'], + 'code_3' => $vo['code_3'], + 'deleted' => 0, ], 'code_1'); $this->success('同步快递公司成功！'); } catch (HttpResponseException $exception) { diff --git a/app/data/model/BasePostageCompany.php b/app/data/model/BasePostageCompany.php index 4e57ea05a..d5298bc2b 100644 --- a/app/data/model/BasePostageCompany.php +++ b/app/data/model/BasePostageCompany.php @@ -11,5 +11,13 @@ use think\admin\Model; */ class BasePostageCompany extends Model { - + /** + * 格式化创建时间 + * @param string $value + * @return string + */ + public function getCreateAtAttr(string $value): string + { + return format_datetime($value); + } } \ No newline at end of file diff --git a/app/data/view/base/postage/company/form.html b/app/data/view/base/postage/company/form.html index 3bd190624..52e25faf7 100644 --- a/app/data/view/base/postage/company/form.html +++ b/app/data/view/base/postage/company/form.html @@ -1,29 +1,29 @@ -
+
-
+{/block} + + +{block name='script'} + + + + + + + + + + {/block} \ No newline at end of file diff --git a/app/data/view/base/postage/company/index_search.html b/app/data/view/base/postage/company/index_search.html index 10d756ec8..e226ab65d 100644 --- a/app/data/view/base/postage/company/index_search.html +++ b/app/data/view/base/postage/company/index_search.html @@ -1,6 +1,6 @@
条件搜索 - +