From d3d63f4872c608fbb5c2bb0c8ee5b83aef5fec49 Mon Sep 17 00:00:00 2001 From: xman <1946321327@qq.com> Date: Sat, 29 Mar 2025 20:54:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B4=BE=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/orders/Dispatch2.php | 19 +++- application/admin/lang/en/orders/income.php | 2 +- .../admin/lang/zh-cn/aftersales/aftersale.php | 2 +- application/admin/lang/zh-cn/order.php | 2 +- .../admin/lang/zh-cn/orders/abnormal.php | 2 +- .../admin/lang/zh-cn/orders/auditorder.php | 4 +- .../admin/lang/zh-cn/orders/configorder.php | 4 +- .../admin/lang/zh-cn/orders/dispatch.php | 4 +- .../admin/lang/zh-cn/orders/dispatch2.php | 6 +- .../admin/lang/zh-cn/orders/income.php | 2 +- .../admin/lang/zh-cn/orders/movelog.php | 2 +- .../admin/lang/zh-cn/orders/revisitorder.php | 4 +- application/admin/model/OrderDispatch.php | 6 +- .../admin/view/aftersales/aftersale/edit.html | 2 +- .../admin/view/orders/dispatch2/edit.html | 105 ++++++++++-------- application/index/lang/zh-cn.php | 2 +- public/assets/js/backend/orders/abnormal.js | 24 ++-- public/assets/js/backend/orders/dispatch2.js | 22 +++- 18 files changed, 127 insertions(+), 87 deletions(-) diff --git a/application/admin/controller/orders/Dispatch2.php b/application/admin/controller/orders/Dispatch2.php index 94eb748..03eda33 100644 --- a/application/admin/controller/orders/Dispatch2.php +++ b/application/admin/controller/orders/Dispatch2.php @@ -14,8 +14,6 @@ use think\exception\DbException; use think\exception\PDOException; use think\exception\ValidateException; use think\Hook; -use think\Lang; -use think\Loader; /** * 派单列管理 @@ -188,12 +186,20 @@ class Dispatch2 extends Backend if (!$row) { $this->error(__('No Results were found')); } + + $order = Order::where('id',$row->id)->with(['area'])->find(); + + if(empty($order)){ + $this->error(__('未找到关联订单')); + } + $adminIds = $this->getDataLimitAdminIds(); if (is_array($adminIds) && !in_array($row[$this->dataLimitField], $adminIds)) { $this->error(__('You have no permission')); } if (false === $this->request->isPost()) { $this->view->assign('row', $row); + $this->view->assign('order', $order); return $this->view->fetch(); } @@ -207,6 +213,10 @@ class Dispatch2 extends Backend if (empty($params)) { $this->error(__('Parameter %s can not be empty', '')); } + + if(!in_array($row->status ,$this->model->btnActiveStatusList('btn_edit'))){ + $this->error(__('任务状态已变更，请刷新后再操作')); + } $params = $this->preExcludeFields($params); $result = false; Db::startTrans(); @@ -216,8 +226,13 @@ class Dispatch2 extends Backend $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); + } + if($row->worker_id != $params['worker_id']){ //更换了师傅 + + } $result = $row->allowField(true)->save($params); + Db::commit(); } catch (ValidateException | PDOException | Exception $e) { Db::rollback(); diff --git a/application/admin/lang/en/orders/income.php b/application/admin/lang/en/orders/income.php index c3ceab9..2b58ba9 100644 --- a/application/admin/lang/en/orders/income.php +++ b/application/admin/lang/en/orders/income.php @@ -3,7 +3,7 @@ return [ 'Id' => 'ID', 'Order_id' => '订单ID', - 'Order_no' => '订单号', + 'Order_no' => '订单编号', 'Tel' => '客户手机', 'Item_type' => '收款事项', 'Item_type 1' => '定金', diff --git a/application/admin/lang/zh-cn/aftersales/aftersale.php b/application/admin/lang/zh-cn/aftersales/aftersale.php index 140d077..5ca10f3 100644 --- a/application/admin/lang/zh-cn/aftersales/aftersale.php +++ b/application/admin/lang/zh-cn/aftersales/aftersale.php @@ -45,7 +45,7 @@ return [ 'Handle_admin_user' => '处理人', 'Star' => '评分', 'Order.id' => 'ID', - 'Order.order_no' => '订单号', + 'Order.order_no' => '订单编号', 'Order.customer' => '客户姓名', 'Order.tel' => '客户电话', 'Order.status' => '订单状态', diff --git a/application/admin/lang/zh-cn/order.php b/application/admin/lang/zh-cn/order.php index e670f8d..4232711 100644 --- a/application/admin/lang/zh-cn/order.php +++ b/application/admin/lang/zh-cn/order.php @@ -2,7 +2,7 @@ return [ 'Id' => 'ID', - 'Order_no' => '订单号', + 'Order_no' => '订单编号', 'Customer' => '客户姓名', 'Tel' => '客户电话', 'Status' => '订单状态', diff --git a/application/admin/lang/zh-cn/orders/abnormal.php b/application/admin/lang/zh-cn/orders/abnormal.php index 460cdcf..e980510 100644 --- a/application/admin/lang/zh-cn/orders/abnormal.php +++ b/application/admin/lang/zh-cn/orders/abnormal.php @@ -21,7 +21,7 @@ return [ 'Create_time' => '创建时间', 'Update_time' => '编辑时间', 'Order.id' => 'ID', - 'Order.order_no' => '订单号', + 'Order.order_no' => '订单编号', 'Order.customer' => '客户姓名', 'Order.tel' => '客户电话', 'Order.status' => '订单状态', diff --git a/application/admin/lang/zh-cn/orders/auditorder.php b/application/admin/lang/zh-cn/orders/auditorder.php index 16f856f..8cb14e3 100644 --- a/application/admin/lang/zh-cn/orders/auditorder.php +++ b/application/admin/lang/zh-cn/orders/auditorder.php @@ -3,7 +3,7 @@ return [ 'Id' => 'ID', 'User_id' => '用户ID', - 'Order_no' => '订单号', + 'Order_no' => '订单编号', 'Customer' => '客户姓名', 'Tel' => '客户电话', 'Status' => '订单状态', @@ -36,7 +36,7 @@ return [ 'Detail' => '订单详情', 'Remark' => '订单备注', 'Images' => '图片', - 'Plan_time' => '客户预约时间', + 'Plan_time' => '预约时间', 'Admin_id' => '录单员ID', 'Total' => '总收款', 'Online_amount' => '线上收款', diff --git a/application/admin/lang/zh-cn/orders/configorder.php b/application/admin/lang/zh-cn/orders/configorder.php index 1ef9259..ce888c7 100644 --- a/application/admin/lang/zh-cn/orders/configorder.php +++ b/application/admin/lang/zh-cn/orders/configorder.php @@ -2,7 +2,7 @@ return [ 'Id' => 'ID', - 'Order_no' => '订单号', + 'Order_no' => '订单编号', 'Customer' => '客户姓名', 'Tel' => '客户电话', 'Status' => '订单状态', @@ -35,7 +35,7 @@ return [ 'Detail' => '订单详情', 'Remark' => '订单备注', 'Images' => '图片', - 'Plan_time' => '客户预约时间', + 'Plan_time' => '预约时间', 'Admin_id' => '录单员ID', 'Coupon_id' => '优惠码id', 'Total' => '总收款', diff --git a/application/admin/lang/zh-cn/orders/dispatch.php b/application/admin/lang/zh-cn/orders/dispatch.php index c516811..279701f 100644 --- a/application/admin/lang/zh-cn/orders/dispatch.php +++ b/application/admin/lang/zh-cn/orders/dispatch.php @@ -36,7 +36,7 @@ return [ 'Create_time' => '派单时间', 'Update_time' => '编辑时间', 'Order.id' => 'ID', - 'Order.order_no' => '订单号', + 'Order.order_no' => '订单编号', 'Order.customer' => '客户姓名', 'Order.tel' => '客户电话', 'Order.status' => '订单状态', @@ -61,7 +61,7 @@ return [ 'Order.detail' => '订单详情', 'Order.remark' => '订单备注', 'Order.images' => '图片', - 'Order.plan_time' => '客户预约时间', + 'Order.plan_time' => '预约时间', 'Order.admin_id' => '录单员ID', 'Order.coupon_id' => '优惠码id', 'Order.total' => '总收款', diff --git a/application/admin/lang/zh-cn/orders/dispatch2.php b/application/admin/lang/zh-cn/orders/dispatch2.php index 4f886f2..23b36fb 100644 --- a/application/admin/lang/zh-cn/orders/dispatch2.php +++ b/application/admin/lang/zh-cn/orders/dispatch2.php @@ -34,9 +34,9 @@ return [ 'Admin_id' => '派单人ID', 'Admin_user' => '派单人', 'Create_time' => '派单时间', - 'Update_time' => '编辑时间', + 'Update_time' => '更新时间', 'Order.id' => 'ID', - 'Order.order_no' => '订单号', + 'Order.order_no' => '订单编号', 'Order.customer' => '客户姓名', 'Order.tel' => '客户电话', 'Order.status' => '订单状态', @@ -61,7 +61,7 @@ return [ 'Order.detail' => '订单详情', 'Order.remark' => '订单备注', 'Order.images' => '图片', - 'Order.plan_time' => '客户预约时间', + 'Order.plan_time' => '预约时间', 'Order.admin_id' => '录单员ID', 'Order.coupon_id' => '优惠码id', 'Order.total' => '总收款', diff --git a/application/admin/lang/zh-cn/orders/income.php b/application/admin/lang/zh-cn/orders/income.php index 051ddc1..ffaca18 100644 --- a/application/admin/lang/zh-cn/orders/income.php +++ b/application/admin/lang/zh-cn/orders/income.php @@ -3,7 +3,7 @@ return [ 'Id' => 'ID', 'Order_id' => '订单ID', - 'Order_no' => '订单号', + 'Order_no' => '订单编号', 'Tel' => '客户手机', 'Item_type' => '收款事项', 'Item_type 1' => '定金', diff --git a/application/admin/lang/zh-cn/orders/movelog.php b/application/admin/lang/zh-cn/orders/movelog.php index 57c5f60..6b30dd2 100644 --- a/application/admin/lang/zh-cn/orders/movelog.php +++ b/application/admin/lang/zh-cn/orders/movelog.php @@ -12,7 +12,7 @@ return [ 'Remark' => '备注', 'Create_time' => '创建时间', 'Order.id' => 'ID', - 'Order.order_no' => '订单号', + 'Order.order_no' => '订单编号', 'Order.customer' => '客户姓名', 'Order.tel' => '客户电话', 'Order.status' => '订单状态', diff --git a/application/admin/lang/zh-cn/orders/revisitorder.php b/application/admin/lang/zh-cn/orders/revisitorder.php index 428b6cf..a238d49 100644 --- a/application/admin/lang/zh-cn/orders/revisitorder.php +++ b/application/admin/lang/zh-cn/orders/revisitorder.php @@ -2,7 +2,7 @@ return [ 'Id' => 'ID', - 'Order_no' => '订单号', + 'Order_no' => '订单编号', 'Customer' => '客户姓名', 'Tel' => '客户电话', 'Status' => '订单状态', @@ -35,7 +35,7 @@ return [ 'Detail' => '订单详情', 'Remark' => '订单备注', 'Images' => '图片', - 'Plan_time' => '客户预约时间', + 'Plan_time' => '预约时间', 'Admin_id' => '录单员ID', 'Total' => '总收款', 'Cost' => '师傅成本', diff --git a/application/admin/model/OrderDispatch.php b/application/admin/model/OrderDispatch.php index 983f7e0..005252f 100644 --- a/application/admin/model/OrderDispatch.php +++ b/application/admin/model/OrderDispatch.php @@ -38,7 +38,7 @@ class OrderDispatch extends Model const STATUS_CLOCK = 30; //已打卡 const STATUS_FINISH = 60; //完成 const STATUS_REFUSED = -10; //拒绝 - const STATUS_MOVE = -20; //中转 + const STATUS_MOVE = -20; //中转(状态废弃) const STATUS_CANCEL = -30; //取消 @@ -49,7 +49,9 @@ class OrderDispatch extends Model public function getStatusList() { - return ['0' => __('Status 0'), '10' => __('Status 10'), '20' => __('Status 20'),'25' => __('Status 25'), '30' => __('Status 30'), '60' => __('Status 60'), '-10' => __('Status -10'), '-20' => __('Status -20'), '-30' => __('Status -30')]; + return ['0' => __('Status 0'), '10' => __('Status 10'), '20' => __('Status 20'),'25' => __('Status 25'), '30' => __('Status 30'), '60' => __('Status 60'), '-10' => __('Status -10'), + // '-20' => __('Status -20'), + '-30' => __('Status -30')]; } public function getIsNoticeList() diff --git a/application/admin/view/aftersales/aftersale/edit.html b/application/admin/view/aftersales/aftersale/edit.html index f56e3a4..b0afe98 100644 --- a/application/admin/view/aftersales/aftersale/edit.html +++ b/application/admin/view/aftersales/aftersale/edit.html @@ -3,7 +3,7 @@
- +
diff --git a/application/admin/view/orders/dispatch2/edit.html b/application/admin/view/orders/dispatch2/edit.html index 5dc52a5..8e5ca56 100644 --- a/application/admin/view/orders/dispatch2/edit.html +++ b/application/admin/view/orders/dispatch2/edit.html @@ -8,23 +8,13 @@ - {notempty name ='action'} - - -
- +
-
- -
- -
-
@@ -33,20 +23,37 @@
- - - - - - +
+ +
+ +
+
- - - - - - +
+ +
+ +
+
+
+ +
+ +
+
+ +
+ +
+ +
+
+ + {notempty name ='action'} + +
@@ -78,7 +85,18 @@
- {if $row['is_receipt'] } + {if $row['is_receipt']==0 } + +
+ +
+ +
+
+ + {/if} + + {if $row['is_receipt']==1 }
@@ -124,7 +142,7 @@
- +
@@ -142,43 +160,40 @@
- +
- +
+
- +
- -
-
-
- -
- +
+ +
+ + + +
- +
- -
- {foreach name="statusList" item="vo"} - - {/foreach} -
- +
+ +
@@ -187,8 +202,4 @@
{/notempty} - - - - diff --git a/application/index/lang/zh-cn.php b/application/index/lang/zh-cn.php index 0184cc4..604269e 100755 --- a/application/index/lang/zh-cn.php +++ b/application/index/lang/zh-cn.php @@ -98,7 +98,7 @@ return [ 'Home' => '首页', 'Store' => '插件市场', 'Wxapp' => '小程序', - 'Services' => '服务', + 'Services' => '服务类目', 'Download' => '下载', 'Demo' => '演示', 'Donation' => '捐赠', diff --git a/public/assets/js/backend/orders/abnormal.js b/public/assets/js/backend/orders/abnormal.js index d23e545..ab4ed9e 100644 --- a/public/assets/js/backend/orders/abnormal.js +++ b/public/assets/js/backend/orders/abnormal.js @@ -24,7 +24,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin Form.events.selectpage(form); }); - $.fn.bootstrapTable.locales[Table.defaults.locale]['formatSearch'] = function(){return "订单号/客户电话/客户姓名";}; + $.fn.bootstrapTable.locales[Table.defaults.locale]['formatSearch'] = function(){return "订单编号/客户电话/客户姓名";}; // 初始化表格 table.bootstrapTable({ @@ -56,17 +56,17 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate, - buttons:[ - { - name:"detail", - text:"", - title:"详情", - classname:"btn btn-xs btn-info btn-view btn-dialog", - icon:'fa fa-eye', - url: 'orders/abnormal/edit/' - - } - ] + // buttons:[ + // { + // name:"detail", + // text:"", + // title:"详情", + // classname:"btn btn-xs btn-info btn-view btn-dialog", + // icon:'fa fa-eye', + // url: 'orders/abnormal/edit/' + // + // } + // ] } ] ] diff --git a/public/assets/js/backend/orders/dispatch2.js b/public/assets/js/backend/orders/dispatch2.js index 9b62004..e92b561 100644 --- a/public/assets/js/backend/orders/dispatch2.js +++ b/public/assets/js/backend/orders/dispatch2.js @@ -43,19 +43,31 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','layer'], function ($, {field: 'order.order_no', title: __('Order.order_no'), operate: 'LIKE'}, - {field: 'status', title: __('Status'), searchList: {"0":__('Status 0'),"10":__('Status 10'),"20":__('Status 20'),"25":__('Status 25'),"30":__('Status 30'),"60":__('Status 60'),"-10":__('Status -10'),"-20":__('Status -20'),"-30":__('Status -30')}, formatter: Table.api.formatter.status}, // {field: 'worker_id', title: __('Worker_id')}, {field: 'worker_name', title: __('Worker_name'), operate: 'LIKE'}, {field: 'worker_tel', title: __('Worker_tel'), operate: 'LIKE'}, - {field: 'type', title: __('Type'), searchList: {"1":__('Type 1')}, formatter: Table.api.formatter.normal}, - {field: 'plan_time', title: __('Plan_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, + {field: 'status', title: __('Status'), searchList: {"0":__('Status 0'),"10":__('Status 10'),"20":__('Status 20'),"25":__('Status 25'),"30":__('Status 30'),"60":__('Status 60'),"-10":__('Status -10'), + //"-20":__('Status -20'), + "-30":__('Status -30')}, + formatter: Table.api.formatter.status, + custom:{25:"red"} + }, + + {field: 'plan_time', title: __('Plan_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, + formatter:function(value,row,index){ + if(row.status == 25){ + return' '+value+''; + }else{ + return value; + } + }}, {field: 'order.source_shop', title: __('Order.source_shop'), operate: 'LIKE'}, - {field: 'order.source', title: __('Order.source')}, + // {field: 'order.source', title: __('Order.source')}, {field: 'order.customer', title: __('Order.customer'), operate: 'LIKE'}, {field: 'order.tel', title: __('Order.tel'), operate: 'LIKE'}, {field: 'order.address', title: __('Order.address'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, @@ -68,11 +80,11 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','layer'], function ($, {field: 'remark', title: __('Remark'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, // {field: 'is_notice', title: __('Is_notice'), searchList: {"0":__('Is_notice 0'),"1":__('Is_notice 1')}, formatter: Table.api.formatter.normal}, - {field: 'finish_time', title: __('Finish_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, // {field: 'admin_id', title: __('Admin_id')}, {field: 'admin_user', title: __('Admin_user'), operate: 'LIKE'}, {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, {field: 'update_time', title: __('Update_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, + {field: 'finish_time', title: __('Finish_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate,