diff --git a/application/admin/controller/orders/Movelog.php b/application/admin/controller/orders/Movelog.php new file mode 100644 index 0000000..56db624 --- /dev/null +++ b/application/admin/controller/orders/Movelog.php @@ -0,0 +1,71 @@ +model = new \app\admin\model\OrderMovelog; + + } + + + + /** + * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法 + * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑 + * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改 + */ + + + /** + * 查看 + */ + public function index() + { + //当前是否为关联查询 + $this->relationSearch = true; + //设置过滤方法 + $this->request->filter(['strip_tags', 'trim']); + if ($this->request->isAjax()) { + //如果发送的来源是Selectpage，则转发到Selectpage + if ($this->request->request('keyField')) { + return $this->selectpage(); + } + list($where, $sort, $order, $offset, $limit) = $this->buildparams(); + + $list = $this->model + ->with(['order']) + ->where($where) + ->order($sort, $order) + ->paginate($limit); + + foreach ($list as $row) { + + + } + + $result = array("total" => $list->total(), "rows" => $list->items()); + + return json($result); + } + return $this->view->fetch(); + } + +} diff --git a/application/admin/lang/zh-cn/orders/movelog.php b/application/admin/lang/zh-cn/orders/movelog.php new file mode 100644 index 0000000..57c5f60 --- /dev/null +++ b/application/admin/lang/zh-cn/orders/movelog.php @@ -0,0 +1,65 @@ + 'ID', + 'Order_id' => '订单ID', + 'From_admin_id' => '转出人ID', + 'From_admin_user' => '转出人', + 'To_admin_id' => '转给人ID', + 'To_admin_user' => '转给人', + 'Create_admin_id' => '创建人ID', + 'Create_admin_user' => '创建人', + 'Remark' => '备注', + 'Create_time' => '创建时间', + 'Order.id' => 'ID', + 'Order.order_no' => '订单号', + 'Order.customer' => '客户姓名', + 'Order.tel' => '客户电话', + 'Order.status' => '订单状态', + 'Order.status 10' => '未派单', + 'Order.status 20' => '已派单', + 'Order.status 30' => '已接单', + 'Order.status 40' => '处理中', + 'Order.status 50' => '已完成', + 'Order.status -10' => '取消', + 'Order.status -20' => '作废', + 'Order.status -30' => '已拒接', + 'Order.area_id' => '地域', + 'Order.address' => '详细地址', + 'Order.work_tel_id' => '工作机', + 'Order.worker_id' => '师傅ID', + 'Order.worker_name' => '师傅姓名', + 'Order.worker_tel' => '师傅手机', + 'Order.source' => '订单来源', + 'Order.source_uid' => '来源UID', + 'Order.service_id' => '服务ID', + 'Order.service_title' => '服务名称', + 'Order.detail' => '订单详情', + 'Order.remark' => '订单备注', + 'Order.images' => '图片', + 'Order.collect' => '是否收藏', + 'Order.collect 0' => '否', + 'Order.collect 1' => '是', + 'Order.collect_remark' => '收藏备注', + 'Order.enter_admin_id' => '录单员ID', + 'Order.dispatch_admin_id' => '派单员ID', + 'Order.dispatch_type' => '派单方式', + 'Order.dispatch_type 10' => '线上手动', + 'Order.dispatch_type 11' => '线上自动', + 'Order.dispatch_type 20' => '线下', + 'Order.total' => '总收款', + 'Order.cost' => '成本', + 'Order.performance' => '绩效', + 'Order.sb_amount' => '垫付', + 'Order.real_amount' => '实付', + 'Order.cancel_reason_id' => '取消原因', + 'Order.cancel_detail' => '取消详情', + 'Order.abolish_reason_id' => '作废原因', + 'Order.abolish_detail' => '作废详情', + 'Order.create_time' => '录单时间', + 'Order.update_time' => '更新时间', + 'Order.payment_time' => '付款时间', + 'Order.finishe_time' => '完成时间', + 'Order.dispatch_time' => '派单时间', + 'Order.delete_time' => '删除时间' +]; diff --git a/application/admin/validate/orders/Movelog.php b/application/admin/validate/orders/Movelog.php new file mode 100644 index 0000000..b34e3f9 --- /dev/null +++ b/application/admin/validate/orders/Movelog.php @@ -0,0 +1,27 @@ + [], + 'edit' => [], + ]; + +} diff --git a/application/admin/view/orders/movelog/add.html b/application/admin/view/orders/movelog/add.html new file mode 100644 index 0000000..28fbced --- /dev/null +++ b/application/admin/view/orders/movelog/add.html @@ -0,0 +1,63 @@ +
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
diff --git a/application/admin/view/orders/movelog/edit.html b/application/admin/view/orders/movelog/edit.html new file mode 100644 index 0000000..221c7c5 --- /dev/null +++ b/application/admin/view/orders/movelog/edit.html @@ -0,0 +1,63 @@ +
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
diff --git a/application/admin/view/orders/movelog/index.html b/application/admin/view/orders/movelog/index.html new file mode 100644 index 0000000..ce1839f --- /dev/null +++ b/application/admin/view/orders/movelog/index.html @@ -0,0 +1,29 @@ +
+ {:build_heading()} + +
+
+
+
+
+ + + + + + +
+ +
+
+
+ +
+
+
diff --git a/public/assets/js/backend/orders/movelog.js b/public/assets/js/backend/orders/movelog.js new file mode 100644 index 0000000..c55a4b9 --- /dev/null +++ b/public/assets/js/backend/orders/movelog.js @@ -0,0 +1,63 @@ +define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) { + + var Controller = { + index: function () { + // 初始化表格参数配置 + Table.api.init({ + extend: { + index_url: 'orders/movelog/index' + location.search, + // add_url: 'orders/movelog/add', + // edit_url: 'orders/movelog/edit', + // del_url: 'orders/movelog/del', + // multi_url: 'orders/movelog/multi', + import_url: 'orders/movelog/import', + table: 'order_move_log', + } + }); + + var table = $("#table"); + + // 初始化表格 + table.bootstrapTable({ + url: $.fn.bootstrapTable.defaults.extend.index_url, + pk: 'id', + sortName: 'id', + fixedColumns: true, + fixedRightNumber: 1, + search:false, + columns: [ + [ + {field: 'id', title: __('Id'),operate: false}, + {field: 'order.order_no', title: __('Order.order_no'), operate: 'LIKE'}, + {field: 'order.tel', title: __('Order.tel'), operate: false}, + {field: 'order.customer', title: __('Order.customer'), operate: false}, + //{field: 'order_id', title: __('Order_id')}, + //{field: 'from_admin_id', title: __('From_admin_id')}, + {field: 'from_admin_user', title: __('From_admin_user'), operate: 'LIKE'}, + // {field: 'to_admin_id', title: __('To_admin_id')}, + {field: 'to_admin_user', title: __('To_admin_user'), operate: 'LIKE'}, + //{field: 'create_admin_id', title: __('Create_admin_id')}, + {field: 'create_admin_user', title: __('Create_admin_user'), operate: 'LIKE'}, + {field: 'remark', title: __('Remark'), operate: false, table: table, class: 'autocontent', formatter: Table.api.formatter.content}, + {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, + ] + ] + }); + + // 为表格绑定事件 + Table.api.bindevent(table); + }, + add: function () { + Controller.api.bindevent(); + }, + edit: function () { + Controller.api.bindevent(); + }, + api: { + bindevent: function () { + Form.api.bindevent($("form[role=form]")); + } + } + }; + return Controller; +});