diff --git a/application/admin/behavior/OrderDispatchLog.php b/application/admin/behavior/OrderDispatchLog.php index 87e815b..946d8ba 100644 --- a/application/admin/behavior/OrderDispatchLog.php +++ b/application/admin/behavior/OrderDispatchLog.php @@ -21,8 +21,8 @@ class OrderDispatchLog 'dispatch_id' => $dispatch->id, 'order_id' => $dispatch->order_id, 'worker_id' => $dispatch->worker_id, - 'order_status' => $dispatch->status, - 'order_status_text' => $statusList[$dispatch->status], + 'status' => $dispatch->status, + 'status_text' => $statusList[$dispatch->status], 'remark' => $remark, ]; \app\admin\model\OrderDispatchLog::create($data); diff --git a/application/admin/controller/orders/Auditorder.php b/application/admin/controller/orders/Auditorder.php index 022f970..f8403dc 100644 --- a/application/admin/controller/orders/Auditorder.php +++ b/application/admin/controller/orders/Auditorder.php @@ -92,7 +92,7 @@ class Auditorder extends Backend */ public function edit($ids = null) { - $row = $this->model->get($ids); + $row = $this->model->get($ids,['dispatch']); if (!$row) { $this->error(__('No Results were found')); } diff --git a/application/admin/controller/orders/Configorder.php b/application/admin/controller/orders/Configorder.php index 5a14389..0636f10 100644 --- a/application/admin/controller/orders/Configorder.php +++ b/application/admin/controller/orders/Configorder.php @@ -91,7 +91,7 @@ class Configorder extends Backend */ public function edit($ids = null) { - $row = $this->model->get($ids); + $row = $this->model->get($ids,['dispatch']); if (!$row) { $this->error(__('No Results were found')); } @@ -128,6 +128,7 @@ class Configorder extends Backend 'offline_amount' => $params['offline_amount'], 'refund_amount' => $params['refund_amount'], 'cost' => $params['cost'], + 'offline_amount_type'=> $params['offline_amount_type'] ]; $last_amount = bcadd($params['online_amount_last'],$params['offline_amount'],2); diff --git a/application/admin/controller/orders/Dispatch2.php b/application/admin/controller/orders/Dispatch2.php index 3ac2732..8f8ac64 100644 --- a/application/admin/controller/orders/Dispatch2.php +++ b/application/admin/controller/orders/Dispatch2.php @@ -202,7 +202,7 @@ class Dispatch2 extends Backend $this->error(__('You have no permission')); } - $order = Order::where('id',$row->id)->find(); + $order = Order::where('id',$row->order_id)->find(); if(empty($order)){ $this->error(__('未找到关联订单')); diff --git a/application/admin/lang/zh-cn/orders/dispatch2.php b/application/admin/lang/zh-cn/orders/dispatch2.php index e95ea7d..92ec0ca 100644 --- a/application/admin/lang/zh-cn/orders/dispatch2.php +++ b/application/admin/lang/zh-cn/orders/dispatch2.php @@ -85,5 +85,6 @@ return [ 'Order.audit_admin_id' => '审核员', 'Order.create_time' => '录单时间', 'Order.update_time' => '更新时间', - 'Order.delete_time' => '删除时间' + 'Order.delete_time' => '删除时间', + ]; diff --git a/application/admin/model/Order.php b/application/admin/model/Order.php index 411d49a..6ad1f93 100644 --- a/application/admin/model/Order.php +++ b/application/admin/model/Order.php @@ -221,4 +221,5 @@ class Order extends Model return $query; } + } diff --git a/application/admin/model/OrderDispatch.php b/application/admin/model/OrderDispatch.php index d133f6e..9ca957d 100644 --- a/application/admin/model/OrderDispatch.php +++ b/application/admin/model/OrderDispatch.php @@ -29,7 +29,8 @@ class OrderDispatch extends Model protected $append = [ 'type_text', 'status_text', - 'is_notice_text' + 'is_notice_text', + 'offline_total_type_text' ]; const STATUS_TOGET = 0; //待接 @@ -62,7 +63,7 @@ class OrderDispatch extends Model public function getOfflineTotalTypeList() { - return ['0' => __('Offline_total_type 0'), '1'=> __('Offline_total_type 1'),'2' => __('Offline_total_type 2')]; + return ['0' => __('无'), '1'=> __('师傅收'),'2' => __('公司收')]; } @@ -89,6 +90,12 @@ class OrderDispatch extends Model return $list[$value] ?? ''; } + public function getOfflineTotalTypeTextAttr($value,$data){ + $value = $value ?: ($data['offline_total_type'] ?? ''); + $list = $this->getOfflineTotalTypeList(); + return $list[$value] ?? ''; + } + public function deleteStatusList(){ return [ diff --git a/application/admin/view/orders/auditorder/edit.html b/application/admin/view/orders/auditorder/edit.html index a1085aa..6be57b1 100644 --- a/application/admin/view/orders/auditorder/edit.html +++ b/application/admin/view/orders/auditorder/edit.html @@ -1,123 +1,85 @@
- - - - - +
+ +
+ +
+
- - - - +
+ +
+ +
+
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- {:__('Order_no')} - - {$row.order_no|htmlentities} -
- {:__('Customer')} - - {$row.customer|htmlentities} -
- {:__('Tel')} - - {$row.tel|htmlentities} -
- {:__('Address')} - - {$row.address|htmlentities} -
- {:__('Order_item')} - - {$row.order_item|htmlentities} -
- {:__('Detail')} - - {$row.detail|htmlentities} -
- {:__('Remark')} - - {$row.remark|htmlentities} -
- {:__('Remark')} - - {$row.remark|htmlentities} -
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+ +
+ +
+
+ + + -
- -
- -
-
- +
- +
- +
@@ -125,22 +87,33 @@
- {:build_select('offline_amount_type',$offlineTotalTypeList,$row['dispatch']['offline_total_type'],['class'=>'form-control','data-rule'=>'required'])} + +
+ + +
+ + +
+ +
+
+
- +
- +
@@ -148,13 +121,13 @@
- +
- +
@@ -164,7 +137,7 @@
-
+
@@ -177,7 +150,7 @@
- +
diff --git a/application/admin/view/orders/auditorder/index.html b/application/admin/view/orders/auditorder/index.html index 79afc6e..97ccaf3 100644 --- a/application/admin/view/orders/auditorder/index.html +++ b/application/admin/view/orders/auditorder/index.html @@ -18,7 +18,7 @@
diff --git a/application/admin/view/orders/configorder/edit.html b/application/admin/view/orders/configorder/edit.html index 36d8d19..e4d8576 100644 --- a/application/admin/view/orders/configorder/edit.html +++ b/application/admin/view/orders/configorder/edit.html @@ -5,7 +5,7 @@
-
{$row.audit_remark|htmlentities}
+
{$row.audit_remark|htmlentities}
(审核未通过，请重新配置)
{/notempty} @@ -14,14 +14,14 @@
- +
- +
@@ -52,7 +52,7 @@
- +
@@ -66,7 +66,7 @@
- {:build_select('offline_amount_type',$offlineTotalTypeList,$row['dispatch']['offline_total_type'],['class'=>'form-control','data-rule'=>'required'])} + {:build_select('row[offline_amount_type]',$offlineTotalTypeList,$row['dispatch']['offline_total_type'],['class'=>'form-control','data-rule'=>'required'])}
@@ -85,6 +85,7 @@
+