From 1ac760222c3c8ddc6446721b69b32239d73569ac Mon Sep 17 00:00:00 2001 From: hant Date: Thu, 17 Apr 2025 11:17:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/controller/Order.php | 11 +- .../controller/{order => orders}/Invoice.php | 56 +++++++++- .../lang/zh-cn/{order => orders}/invoice.php | 0 application/admin/model/order/Invoice.php | 9 +- application/admin/view/order/edit.html | 2 +- application/admin/view/order/invoice/add.html | 6 +- .../admin/view/orders/invoice/add.html | 101 ++++++++++++++++++ .../view/{order => orders}/invoice/edit.html | 26 ++--- .../view/{order => orders}/invoice/index.html | 2 +- public/assets/js/backend/order.js | 30 ++++++ .../js/backend/{order => orders}/invoice.js | 56 ++++++++-- 11 files changed, 257 insertions(+), 42 deletions(-) rename application/admin/controller/{order => orders}/Invoice.php (52%) rename application/admin/lang/zh-cn/{order => orders}/invoice.php (100%) create mode 100644 application/admin/view/orders/invoice/add.html rename application/admin/view/{order => orders}/invoice/edit.html (82%) rename application/admin/view/{order => orders}/invoice/index.html (87%) rename public/assets/js/backend/{order => orders}/invoice.js (58%) diff --git a/application/admin/controller/Order.php b/application/admin/controller/Order.php index 7917673..9333ff1 100644 --- a/application/admin/controller/Order.php +++ b/application/admin/controller/Order.php @@ -4,6 +4,7 @@ namespace app\admin\controller; use app\admin\addresmart\Address; use app\admin\model\AuthGroupAccess; +use app\admin\model\order\Invoice; use app\admin\model\OrderDispatch; use app\admin\model\Worker; use app\admin\model\WorkerItem; @@ -92,7 +93,6 @@ class Order extends Backend ->field(['id', 'nickname']) ->select(); - $this->view->assign("statusList", $this->model->getStatusList()); $this->view->assign("sources", $res); $this->view->assign("coupons", $coupons); $this->view->assign("items", $formattedTree); @@ -598,13 +598,8 @@ class Order extends Backend $result = false; Db::startTrans(); try { - //是否采用模型验证 - if ($this->modelValidate) { - $name = str_replace("\\model\\", "\\validate\\", get_class($this->model)); - $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.add' : $name) : $this->modelValidate; - $this->model->validateFailException()->validate($validate); - } - $result = $this->model->allowField(true)->save($params); + $params['invoice_method'] = 1; + $result = (new Invoice())->allowField(true)->save($params); Db::commit(); } catch (ValidateException|PDOException|Exception $e) { Db::rollback(); diff --git a/application/admin/controller/order/Invoice.php b/application/admin/controller/orders/Invoice.php similarity index 52% rename from application/admin/controller/order/Invoice.php rename to application/admin/controller/orders/Invoice.php index e84e689..b338bbd 100644 --- a/application/admin/controller/order/Invoice.php +++ b/application/admin/controller/orders/Invoice.php @@ -1,9 +1,11 @@ model = new \app\admin\model\order\Invoice; + $this->view->assign("statusList", $this->model->getStatusList()); } @@ -71,4 +73,54 @@ class Invoice extends Backend $this->success(); } + /** + * 编辑 + * + * @param $ids + * @return string + * @throws DbException + * @throws \think\Exception + */ + public function edit($ids = null) + { + $row = $this->model->get($ids); + if (!$row) { + $this->error(__('No Results were found')); + } + $adminIds = $this->getDataLimitAdminIds(); + if (is_array($adminIds) && !in_array($row[$this->dataLimitField], $adminIds)) { + $this->error(__('You have no permission')); + } + if (false === $this->request->isPost()) { + $order = model('order')->get($row['order_id']); + $this->view->assign('order', $order); + $this->view->assign('row', $row); + return $this->view->fetch(); + } + $params = $this->request->post('row/a'); + if (empty($params)) { + $this->error(__('Parameter %s can not be empty', '')); + } + $params = $this->preExcludeFields($params); + $result = false; + Db::startTrans(); + try { + //是否采用模型验证 + if ($this->modelValidate) { + $name = str_replace("\\model\\", "\\validate\\", get_class($this->model)); + $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.edit' : $name) : $this->modelValidate; + $row->validateFailException()->validate($validate); + } + $result = $row->allowField(true)->save($params); + Db::commit(); + } catch (ValidateException|PDOException|Exception $e) { + Db::rollback(); + $this->error($e->getMessage()); + } + if (false === $result) { + $this->error(__('No rows were updated')); + } + $this->success(); + } + } diff --git a/application/admin/lang/zh-cn/order/invoice.php b/application/admin/lang/zh-cn/orders/invoice.php similarity index 100% rename from application/admin/lang/zh-cn/order/invoice.php rename to application/admin/lang/zh-cn/orders/invoice.php diff --git a/application/admin/model/order/Invoice.php b/application/admin/model/order/Invoice.php index 45a367c..5c5d550 100644 --- a/application/admin/model/order/Invoice.php +++ b/application/admin/model/order/Invoice.php @@ -27,8 +27,15 @@ class Invoice extends Model protected $append = [ ]; - + public function getStatusList() + { + return [ + '0' => '代处理', + '1' => '已开票', + '2' => '已完成', + ]; + } diff --git a/application/admin/view/order/edit.html b/application/admin/view/order/edit.html index 38d5473..a211ac9 100644 --- a/application/admin/view/order/edit.html +++ b/application/admin/view/order/edit.html @@ -120,7 +120,7 @@
- +
@@ -32,7 +32,7 @@
- +
diff --git a/application/admin/view/orders/invoice/add.html b/application/admin/view/orders/invoice/add.html new file mode 100644 index 0000000..258b627 --- /dev/null +++ b/application/admin/view/orders/invoice/add.html @@ -0,0 +1,101 @@ +
+ +
+ +
+ +
+
+ + +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ + +
+ +
+ +
+
+
+ +
+ +
+
+
diff --git a/application/admin/view/order/invoice/edit.html b/application/admin/view/orders/invoice/edit.html similarity index 82% rename from application/admin/view/order/invoice/edit.html rename to application/admin/view/orders/invoice/edit.html index 92638e8..eea1cb1 100644 --- a/application/admin/view/order/invoice/edit.html +++ b/application/admin/view/orders/invoice/edit.html @@ -3,13 +3,16 @@
- +
- +
@@ -93,7 +96,11 @@
- +
@@ -102,18 +109,7 @@
-
- -
- -
-
-
- -
- -
-
+
diff --git a/application/admin/view/order/invoice/index.html b/application/admin/view/orders/invoice/index.html similarity index 87% rename from application/admin/view/order/invoice/index.html rename to application/admin/view/orders/invoice/index.html index 9bf7104..ff9f00d 100644 --- a/application/admin/view/order/invoice/index.html +++ b/application/admin/view/orders/invoice/index.html @@ -7,7 +7,7 @@
- {:__('Add')} + {:__('Edit')} {:__('Delete')} diff --git a/public/assets/js/backend/order.js b/public/assets/js/backend/order.js index 84c8744..91f1ee5 100644 --- a/public/assets/js/backend/order.js +++ b/public/assets/js/backend/order.js @@ -21,6 +21,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'cascader'], function Toastr.info('复制成功'); } + // 拼装文本 function assembleOrderMessage(data) { const message = ` @@ -407,6 +408,35 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'cascader'], function console.log('delete'); Form.api.bindevent($("form[role=form]")); }, + invoice: function () { + function toggleInvoiceFields() { + const type = $('#c-source').val(); + console.log(type); + if (type === '1') { + // 公司发票 + $('#c-tax_number').closest('.form-group').show(); + $('#c-company_address').closest('.form-group').show(); + $('#c-company_phone').closest('.form-group').show(); + $('#c-bank_name').closest('.form-group').show(); + $('#c-bank_account').closest('.form-group').show(); + } else { + // 个人发票 + $('#c-tax_number').closest('.form-group').hide(); + $('#c-company_address').closest('.form-group').hide(); + $('#c-company_phone').closest('.form-group').hide(); + $('#c-bank_name').closest('.form-group').hide(); + $('#c-bank_account').closest('.form-group').hide(); + } + } + // 初始化时执行一次 + toggleInvoiceFields(); + + // 监听 select 改变 + $('#c-source').on('change',function () { + toggleInvoiceFields(); + }); + Form.api.bindevent($("form[role=form]")); + }, api: { bindevent: function () { Form.api.bindevent($("form[role=form]")); diff --git a/public/assets/js/backend/order/invoice.js b/public/assets/js/backend/orders/invoice.js similarity index 58% rename from public/assets/js/backend/order/invoice.js rename to public/assets/js/backend/orders/invoice.js index 58211cb..2c99569 100644 --- a/public/assets/js/backend/order/invoice.js +++ b/public/assets/js/backend/orders/invoice.js @@ -5,12 +5,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin // 初始化表格参数配置 Table.api.init({ extend: { - index_url: 'order.invoice/index' + location.search, - add_url: 'order.invoice/add', - edit_url: 'order.invoice/edit', - del_url: 'order.invoice/del', - multi_url: 'order.invoice/multi', - import_url: 'order.invoice/import', + index_url: 'orders.invoice/index' + location.search, + add_url: 'orders.invoice/add', + edit_url: 'orders.invoice/edit', + del_url: 'orders.invoice/del', + multi_url: 'orders.invoice/multi', + import_url: 'orders.invoice/import', table: 'order_invoice', } }); @@ -29,11 +29,22 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin {checkbox: true}, {field: 'id', title: __('Id')}, {field: 'order_id', title: __('Order_id')}, - {field: 'invoice_type', title: __('Invoice_type')}, + {field: 'invoice_type', title: __('Invoice_type'),formatter: function (val) { + return val === 1 ? '公司发票': '个人发票'; + }}, + {field: 'status', title: __('Status'),formatter:function (val) { + let list = [ + '代处理', + '已开票', + '已完成', + ]; + return list[val] ?? ''; + }}, + {field: 'title', title: __('Title'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, {field: 'tax_number', title: __('Tax_number'), operate: 'LIKE'}, {field: 'amount', title: __('Amount'), operate:'BETWEEN'}, - {field: 'invoice_method', title: __('Invoice_method')}, + // {field: 'invoice_method', title: __('Invoice_method')}, {field: 'recipient_email', title: __('Recipient_email'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, {field: 'company_address', title: __('Company_address'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, {field: 'company_phone', title: __('Company_phone'), operate: 'LIKE'}, @@ -43,9 +54,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin {field: 'recipient_name', title: __('Recipient_name'), operate: 'LIKE'}, {field: 'recipient_phone', title: __('Recipient_phone'), operate: 'LIKE'}, {field: 'issued_at', title: __('Issued_at'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, - {field: 'status', title: __('Status')}, - {field: 'created_at', title: __('Created_at'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, - {field: 'updated_at', title: __('Updated_at'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, + {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate} ] ] @@ -58,6 +67,31 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin Controller.api.bindevent(); }, edit: function () { + function toggleInvoiceFields() { + const type = $('#c-source').val(); + if (type === '1') { + // 公司发票 + $('#c-tax_number').closest('.form-group').show(); + $('#c-company_address').closest('.form-group').show(); + $('#c-company_phone').closest('.form-group').show(); + $('#c-bank_name').closest('.form-group').show(); + $('#c-bank_account').closest('.form-group').show(); + } else { + // 个人发票 + $('#c-tax_number').closest('.form-group').hide(); + $('#c-company_address').closest('.form-group').hide(); + $('#c-company_phone').closest('.form-group').hide(); + $('#c-bank_name').closest('.form-group').hide(); + $('#c-bank_account').closest('.form-group').hide(); + } + } + // 初始化时执行一次 + toggleInvoiceFields(); + + // 监听 select 改变 + $('#c-source').on('change',function () { + toggleInvoiceFields(); + }); Controller.api.bindevent(); }, api: {