diff --git a/application/admin/behavior/OrderDispatchLog.php b/application/admin/behavior/OrderDispatchLog.php index 946d8ba..faf84c8 100644 --- a/application/admin/behavior/OrderDispatchLog.php +++ b/application/admin/behavior/OrderDispatchLog.php @@ -16,7 +16,6 @@ class OrderDispatchLog $statusList = $Model->getStatusList(); $dispatch = $response['dispatch']; //订单对象 $remark = $response['remark'] ?? ''; //备注 - $data = [ 'dispatch_id' => $dispatch->id, 'order_id' => $dispatch->order_id, diff --git a/application/admin/controller/Order.php b/application/admin/controller/Order.php index 978ac81..627814f 100644 --- a/application/admin/controller/Order.php +++ b/application/admin/controller/Order.php @@ -227,7 +227,8 @@ class Order extends Backend $this->autoDispatch($this->model); } //日志 - $hookparams['order'] = $this->model->get($this->model->id); + + $hookparams['order'] = $this->model; $hookparams['role'] = 1; $hookparams['auth'] = $this->auth; $hookparams['remark'] = $params['remark']??''; @@ -374,7 +375,7 @@ class Order extends Backend $insert ['worker_name'] = $worker['name']; $insert ['worker_tel'] = $worker['tel']; $orderDispatch = new OrderDispatch(); - $orderDispatch->allowField(true)->save($insert); + $res = $orderDispatch->allowField(true)->save($insert); $order->status = \app\admin\model\Order::STATUS_DISPATCHED; $order->dispatch_time = date('Y-m-d H:i:s'); // $order->dispatch_admin_id = $this->auth->id; @@ -383,7 +384,7 @@ class Order extends Backend //日志 $hookParams = [ - 'dispatch' => $orderDispatch, + 'dispatch' => (new OrderDispatch())->where('id', $res)->find(), 'remark' => '自动派单,操作人:'.$this->auth->nickname, ]; Hook::listen('order_dispatch_change', $hookParams); diff --git a/application/admin/view/order/add.html b/application/admin/view/order/add.html index 61232f1..cc297f1 100644 --- a/application/admin/view/order/add.html +++ b/application/admin/view/order/add.html @@ -95,7 +95,7 @@ readonly name="row[address]" type="text"> -
地图查找
@@ -176,7 +176,7 @@
- +
diff --git a/application/admin/view/order/copy.html b/application/admin/view/order/copy.html index f3f57f7..e36a991 100644 --- a/application/admin/view/order/copy.html +++ b/application/admin/view/order/copy.html @@ -97,7 +97,7 @@ name="row[address]" readonly type="text"> -
地图查找
diff --git a/application/admin/view/order/edit.html b/application/admin/view/order/edit.html index 808e3b8..db6d259 100644 --- a/application/admin/view/order/edit.html +++ b/application/admin/view/order/edit.html @@ -97,7 +97,7 @@ readonly name="row[address]" type="text"> -
地图查找
diff --git a/application/admin/view/orders/dispatch/add.html b/application/admin/view/orders/dispatch/add.html index 0bb919f..df88ac0 100644 --- a/application/admin/view/orders/dispatch/add.html +++ b/application/admin/view/orders/dispatch/add.html @@ -1,23 +1,58 @@
-
+

订单详情

-

订单编号: {$row.order_no}

-

顾客信息: {$row.customer} 电话：{$row.tel}

-

订单来源: {$row.source_shop} 单号：{$row.source_uid}

-

区域: {$row.area_name}

-

地址: {$row.address}

-

订单类型: {$row.item_title}

-

订单详情: {$row.detail}

-

订单备注: {$row.remark}

- - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
订单编号{$row.order_no}顾客信息{$row.customer}
电话{$row.tel}订单来源{$row.source_shop}
来源单号{$row.source_uid}区域{$row.area_name}
地址{$row.address}
订单类型{$row.item_title}订单详情{$row.detail}
订单备注{$row.remark}
+
- +
@@ -25,7 +60,7 @@
- +
@@ -41,18 +76,18 @@
-
+
-

师傅选择

+

师傅选择

- +
@@ -60,7 +95,7 @@
- +
diff --git a/application/admin/view/workers/worker/add.html b/application/admin/view/workers/worker/add.html index c872d5f..78550a9 100644 --- a/application/admin/view/workers/worker/add.html +++ b/application/admin/view/workers/worker/add.html @@ -23,9 +23,10 @@
- + +
diff --git a/application/admin/view/workers/worker/edit.html b/application/admin/view/workers/worker/edit.html index a0a7966..d2b658c 100644 --- a/application/admin/view/workers/worker/edit.html +++ b/application/admin/view/workers/worker/edit.html @@ -43,6 +43,7 @@
diff --git a/public/assets/js/backend/order.js b/public/assets/js/backend/order.js index d1a9594..6f71516 100644 --- a/public/assets/js/backend/order.js +++ b/public/assets/js/backend/order.js @@ -124,8 +124,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'cascader'], function field: 'receive_type', title: '收款方式', searchList: { - "1": '已收全款', - "2": '已收定金', + "1": '已收定金', + "2": '已收全款', }, formatter: Table.api.formatter.label }, @@ -367,15 +367,23 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'cascader'], function }, add: function () { $("#mybuttom").on("click", function () { - Form.api.submit($("form[role=form]")); - Toastr.success('录入成功'); + const res = $("form[role=form]").isValid(); + if (res){ + Form.api.submit($("form[role=form]")); + // Toastr.success('录入成功'); + } return false; }); - Form.api.bindevent($("form[role=form]"), function (success, ret) { - clearInfo(); - Toastr.success('操作成功'); + $("#mysubmit").on("click", function () { + const res = $("form[role=form]").isValid(); + if (res){ + Form.api.submit($("form[role=form]")); + clearInfo(); + // Toastr.success('录入成功'); + } return false; - },); + }); + Form.api.bindevent($("form[role=form]")); $("#smart").on("click", function () { $.ajax({ url: "order/smart", // 你的 API 地址 diff --git a/public/assets/js/backend/orders/dispatch.js b/public/assets/js/backend/orders/dispatch.js index a44baeb..6731975 100644 --- a/public/assets/js/backend/orders/dispatch.js +++ b/public/assets/js/backend/orders/dispatch.js @@ -329,14 +329,20 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'layer', 'cascader'], }); }); Form.events.citypicker($("#select-form")); - $(document).on('click', '.tab_chose', function () { var dataId = $(this).data('id'); // 获取 data-id 的值 const worker = Table.api.getrowbyid(table, dataId); $('#c-worker_name').val(worker.name + '--' + worker.tel).trigger('input').trigger('change'); $('#c-worker_id').val(worker.id).trigger('input').trigger('change'); }); - + $('#add_worker').on('click',function (){ + console.log(1); + Fast.api.open('workers/worker/add?type=3', '添加工人',{ + callback: function (value) { + console.log(2222,value); + } + }); + }); diff --git a/public/assets/js/backend/workers/worker.js b/public/assets/js/backend/workers/worker.js index c0cd15b..98bde9f 100644 --- a/public/assets/js/backend/workers/worker.js +++ b/public/assets/js/backend/workers/worker.js @@ -45,15 +45,14 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','jstree'], {field: 'id', title: __('Id')}, {field: 'admin.username', title:'创建人'}, {field: 'name', title: __('Name'), operate: 'LIKE'}, - {field: 'type', title: '师傅归属', formatter: function (val){ - return val === 1 ? '自营':'非自营'; - }}, + {field: 'type', title: '师傅归属', searchList: {"1":'自营',"2":'非自营','3':'新师傅'}, + formatter: Table.api.formatter.status,}, {field: 'tel', title: __('Tel'), operate: 'LIKE'}, {field: 'status', title: __('Status'), searchList: {"1":__('Status 1'),"0":__('Status 0')}, formatter: Table.api.formatter.status}, //{field: 'area_id', title: __('Area_id')}, //{field: 'lng', title: __('Lng'), operate:'BETWEEN'}, //{field: 'lat', title: __('Lat'), operate:'BETWEEN'}, - {field: 'area.short_merge_name', title: __('Area.short_merge_name'), operate: 'LIKE'}, + {field: 'area.short_merge_name', title: __('Area.short_merge_name'), searchable:false}, {field: 'deposit_amount', title: __('Deposit_amount'), operate:'BETWEEN'}, {field: 'star', title: __('Star'), operate:'BETWEEN'}, {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, @@ -96,6 +95,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','jstree'], function getQueryData(){ return $('#select-form').serialize(); } + + + $("#reset_btn").on("click", function() { $("#c-city-search").citypicker('reset'); $("#area_id").val(''); @@ -118,7 +120,14 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','jstree'], var code = citypicker.getCode("district") || citypicker.getCode("city") || citypicker.getCode("province"); $("#area_id").val(code); }); - + const urlParams = new URLSearchParams(window.location.search); + const type = urlParams.get('type'); + if (type) { + const select = document.getElementById('worker_type'); + if (select) { + select.value = type; + } + } Controller.api.bindevent(); }, edit: function () {