diff --git a/addons/alioss/config.php b/addons/alioss/config.php index 0d958c2..ac6982f 100644 --- a/addons/alioss/config.php +++ b/addons/alioss/config.php @@ -2,232 +2,232 @@ return [ [ - 'name' => 'accessKeyId', - 'title' => 'AccessKey ID', - 'type' => 'string', + 'name' => 'accessKeyId', + 'title' => 'AccessKey ID', + 'type' => 'string', 'content' => [], - 'value' => '', - 'rule' => 'required', - 'msg' => '', - 'tip' => '', - 'ok' => '', - 'extend' => '', + 'value' => 'LTAI5t87F5mAkaXVKfLcmnrB', + 'rule' => 'required', + 'msg' => '', + 'tip' => '', + 'ok' => '', + 'extend' => '', ], [ - 'name' => 'accessKeySecret', - 'title' => 'AccessKey Secret', - 'type' => 'string', + 'name' => 'accessKeySecret', + 'title' => 'AccessKey Secret', + 'type' => 'string', 'content' => [], - 'value' => '', - 'rule' => 'required', - 'msg' => '', - 'tip' => '', - 'ok' => '', - 'extend' => '', + 'value' => 'fk7KgdqRdJUS6Jc99TlB6mNLKorrsD', + 'rule' => 'required', + 'msg' => '', + 'tip' => '', + 'ok' => '', + 'extend' => '', ], [ - 'name' => 'bucket', - 'title' => 'Bucket名称', - 'type' => 'string', + 'name' => 'bucket', + 'title' => 'Bucket名称', + 'type' => 'string', 'content' => [], - 'value' => 'yourbucket', - 'rule' => 'required;bucket', - 'msg' => '', - 'tip' => '阿里云OSS的空间名', - 'ok' => '', - 'extend' => 'data-rule-bucket="[/^[0-9a-z_\-]{3,63}$/, \'请输入正确的Bucket名称\']"', + 'value' => 'allocatr', + 'rule' => 'required;bucket', + 'msg' => '', + 'tip' => '阿里云OSS的空间名', + 'ok' => '', + 'extend' => 'data-rule-bucket="[/^[0-9a-z_\\-]{3,63}$/, \'请输入正确的Bucket名称\']"', ], [ - 'name' => 'endpoint', - 'title' => 'Endpoint', - 'type' => 'string', + 'name' => 'endpoint', + 'title' => 'Endpoint', + 'type' => 'string', 'content' => [], - 'value' => 'oss-cn-shenzhen.aliyuncs.com', - 'rule' => 'required;endpoint', - 'msg' => '', - 'tip' => '请填写从阿里云存储获取的Endpoint', - 'ok' => '', - 'extend' => 'data-rule-endpoint="[/^(?!http(s)?:\/\/).*$/, \'不能以http(s)://开头\']"', + 'value' => 'allocatr.oss-cn-hangzhou.aliyuncs.com', + 'rule' => 'required;endpoint', + 'msg' => '', + 'tip' => '请填写从阿里云存储获取的Endpoint', + 'ok' => '', + 'extend' => 'data-rule-endpoint="[/^(?!http(s)?:\\/\\/).*$/, \'不能以http(s)://开头\']"', ], [ - 'name' => 'cdnurl', - 'title' => 'CDN地址', - 'type' => 'string', + 'name' => 'cdnurl', + 'title' => 'CDN地址', + 'type' => 'string', 'content' => [], - 'value' => 'https://yourbucket.oss-cn-shenzhen.aliyuncs.com', - 'rule' => 'required;cdnurl', - 'msg' => '', - 'tip' => '请填写CDN地址，必须以http(s)://开头', - 'ok' => '', - 'extend' => 'data-rule-cdnurl="[/^http(s)?:\/\/.*$/, \'必需以http(s)://开头\']"', + 'value' => 'https://allocatr.oss-cn-hangzhou.aliyuncs.com', + 'rule' => 'required;cdnurl', + 'msg' => '', + 'tip' => '请填写CDN地址，必须以http(s)://开头', + 'ok' => '', + 'extend' => 'data-rule-cdnurl="[/^http(s)?:\\/\\/.*$/, \'必需以http(s)://开头\']"', ], [ - 'name' => 'uploadmode', - 'title' => '上传模式', - 'type' => 'select', + 'name' => 'uploadmode', + 'title' => '上传模式', + 'type' => 'select', 'content' => [ 'client' => '客户端直传(速度快,无备份)', 'server' => '服务器中转(占用服务器带宽,可备份)', ], - 'value' => 'server', - 'rule' => '', - 'msg' => '', - 'tip' => '', - 'ok' => '', - 'extend' => '', + 'value' => 'client', + 'rule' => '', + 'msg' => '', + 'tip' => '', + 'ok' => '', + 'extend' => '', ], [ - 'name' => 'serverbackup', - 'title' => '服务器中转模式备份', - 'type' => 'radio', + 'name' => 'serverbackup', + 'title' => '服务器中转模式备份', + 'type' => 'radio', 'content' => [ 1 => '备份(附件管理将产生2条记录)', 0 => '不备份', ], - 'value' => '1', - 'rule' => '', - 'msg' => '', - 'tip' => '服务器中转模式下是否备份文件', - 'ok' => '', - 'extend' => '', + 'value' => '1', + 'rule' => '', + 'msg' => '', + 'tip' => '服务器中转模式下是否备份文件', + 'ok' => '', + 'extend' => '', ], [ - 'name' => 'savekey', - 'title' => '保存文件名', - 'type' => 'string', + 'name' => 'savekey', + 'title' => '保存文件名', + 'type' => 'string', 'content' => [], - 'value' => '/uploads/{year}{mon}{day}/{filemd5}{.suffix}', - 'rule' => 'required', - 'msg' => '', - 'tip' => '', - 'ok' => '', - 'extend' => '', + 'value' => '/uploads/{year}{mon}{day}/{filemd5}{.suffix}', + 'rule' => 'required', + 'msg' => '', + 'tip' => '', + 'ok' => '', + 'extend' => '', ], [ - 'name' => 'expire', - 'title' => '上传有效时长', - 'type' => 'string', + 'name' => 'expire', + 'title' => '上传有效时长', + 'type' => 'string', 'content' => [], - 'value' => '600', - 'rule' => 'required', - 'msg' => '', - 'tip' => '用户停留页面上传有效时长，单位秒', - 'ok' => '', - 'extend' => '', + 'value' => '600', + 'rule' => 'required', + 'msg' => '', + 'tip' => '用户停留页面上传有效时长，单位秒', + 'ok' => '', + 'extend' => '', ], [ - 'name' => 'maxsize', - 'title' => '最大可上传', - 'type' => 'string', + 'name' => 'maxsize', + 'title' => '最大可上传', + 'type' => 'string', 'content' => [], - 'value' => '10M', - 'rule' => 'required', - 'msg' => '', - 'tip' => '', - 'ok' => '', - 'extend' => '', + 'value' => '10M', + 'rule' => 'required', + 'msg' => '', + 'tip' => '', + 'ok' => '', + 'extend' => '', ], [ - 'name' => 'mimetype', - 'title' => '可上传后缀格式', - 'type' => 'string', + 'name' => 'mimetype', + 'title' => '可上传后缀格式', + 'type' => 'string', 'content' => [], - 'value' => 'jpg,png,bmp,jpeg,gif,zip,rar,xls,xlsx', - 'rule' => 'required', - 'msg' => '', - 'tip' => '', - 'ok' => '', - 'extend' => '', + 'value' => 'jpg,png,bmp,jpeg,gif,zip,rar,xls,xlsx', + 'rule' => 'required', + 'msg' => '', + 'tip' => '', + 'ok' => '', + 'extend' => '', ], [ - 'name' => 'multiple', - 'title' => '多文件上传', - 'type' => 'bool', + 'name' => 'multiple', + 'title' => '多文件上传', + 'type' => 'bool', 'content' => [], - 'value' => '0', - 'rule' => 'required', - 'msg' => '', - 'tip' => '', - 'ok' => '', - 'extend' => '', + 'value' => '0', + 'rule' => 'required', + 'msg' => '', + 'tip' => '', + 'ok' => '', + 'extend' => '', ], [ - 'name' => 'thumbstyle', - 'title' => '缩略图样式', - 'type' => 'string', + 'name' => 'thumbstyle', + 'title' => '缩略图样式', + 'type' => 'string', 'content' => [], - 'value' => '', - 'rule' => '', - 'msg' => '', - 'tip' => '用于后台列表缩略图样式，可使用：?x-oss-process=image/resize,m_lfit,w_120,h_90', - 'ok' => '', - 'extend' => '', + 'value' => '', + 'rule' => '', + 'msg' => '', + 'tip' => '用于后台列表缩略图样式，可使用：?x-oss-process=image/resize,m_lfit,w_120,h_90', + 'ok' => '', + 'extend' => '', ], [ - 'name' => 'chunking', - 'title' => '分片上传', - 'type' => 'radio', + 'name' => 'chunking', + 'title' => '分片上传', + 'type' => 'radio', 'content' => [ 1 => '开启', 0 => '关闭', ], - 'value' => '0', - 'rule' => 'required', - 'msg' => '', - 'tip' => '', - 'ok' => '', - 'extend' => '', + 'value' => '0', + 'rule' => 'required', + 'msg' => '', + 'tip' => '', + 'ok' => '', + 'extend' => '', ], [ - 'name' => 'chunksize', - 'title' => '分片大小', - 'type' => 'number', + 'name' => 'chunksize', + 'title' => '分片大小', + 'type' => 'number', 'content' => [], - 'value' => '4194304', - 'rule' => 'required', - 'msg' => '', - 'tip' => '', - 'ok' => '', - 'extend' => '', + 'value' => '4194304', + 'rule' => 'required', + 'msg' => '', + 'tip' => '', + 'ok' => '', + 'extend' => '', ], [ - 'name' => 'syncdelete', - 'title' => '附件删除时是否同步删除云存储文件', - 'type' => 'bool', + 'name' => 'syncdelete', + 'title' => '附件删除时是否同步删除云存储文件', + 'type' => 'bool', 'content' => [], - 'value' => '0', - 'rule' => 'required', - 'msg' => '', - 'tip' => '', - 'ok' => '', - 'extend' => '', + 'value' => '1', + 'rule' => 'required', + 'msg' => '', + 'tip' => '', + 'ok' => '', + 'extend' => '', ], [ - 'name' => 'apiupload', - 'title' => 'API接口使用云存储', - 'type' => 'bool', + 'name' => 'apiupload', + 'title' => 'API接口使用云存储', + 'type' => 'bool', 'content' => [], - 'value' => '0', - 'rule' => 'required', - 'msg' => '', - 'tip' => '', - 'ok' => '', - 'extend' => '', + 'value' => '1', + 'rule' => 'required', + 'msg' => '', + 'tip' => '', + 'ok' => '', + 'extend' => '', ], [ - 'name' => 'noneedlogin', - 'title' => '免登录上传', - 'type' => 'checkbox', + 'name' => 'noneedlogin', + 'title' => '免登录上传', + 'type' => 'checkbox', 'content' => [ - 'api' => 'API', + 'api' => 'API', 'index' => '前台', 'admin' => '后台', ], - 'value' => '', - 'rule' => '', - 'msg' => '', - 'tip' => '', - 'ok' => '', - 'extend' => '', + 'value' => '', + 'rule' => '', + 'msg' => '', + 'tip' => '', + 'ok' => '', + 'extend' => '', ], ]; diff --git a/application/admin/behavior/OrderLog.php b/application/admin/behavior/OrderLog.php index aae000c..fbb0e40 100644 --- a/application/admin/behavior/OrderLog.php +++ b/application/admin/behavior/OrderLog.php @@ -2,11 +2,16 @@ namespace app\admin\behavior; +use think\Lang; + class OrderLog { //记录订单日志 public function run(&$response) { + + Lang::load(APP_PATH . 'admin/lang/zh-cn/order.php'); + $Model = new \app\admin\model\Order(); $statusList = $Model->getStatusList(); $order = $response['order']; //订单对象 diff --git a/application/admin/controller/auth/Admin.php b/application/admin/controller/auth/Admin.php index 85f8fb4..16f46ca 100755 --- a/application/admin/controller/auth/Admin.php +++ b/application/admin/controller/auth/Admin.php @@ -8,6 +8,8 @@ use app\common\controller\Backend; use fast\Random; use fast\Tree; use think\Db; +use think\exception\PDOException; +use think\exception\ValidateException; use think\Validate; /** @@ -294,4 +296,66 @@ class Admin extends Backend $this->dataLimitField = 'id'; return parent::selectpage(); } + + public function areaget(){ + $user_id = request()->get('user_id'); + $data = model('area')->getTree(); + + if ($user_id){ + $user = model('admin')->get($user_id); + $in_areas = explode(',',$user->area_ids ?? ''); + foreach ($data as &$datum){ + if (in_array($datum['id'],$in_areas)){ + $datum['state'] = [ + 'selected' => true + ]; + } + } + + } + + return $data; + } + public function area($ids = null){ + if (false === $this->request->isPost()) { + +// dd($areas); + $this->view->assign('user_id',$ids); +// dd($areas); + 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); + + if ($this->dataLimit && $this->dataLimitFieldAutoFill) { + $params[$this->dataLimitField] = $this->auth->id; + } + $result = false; + // 获取当前ID对应的订单信息 + $user = $this->model->get($ids); + if (!$user) { + $this->error('订单不存在'); + } + 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 = $user->save($params); + Db::commit(); + } catch (ValidateException|PDOException|Exception $e) { + Db::rollback(); + $this->error($e->getMessage()); + } + if ($result === false) { + $this->error(__('No rows were inserted')); + } + $this->success(); + } } diff --git a/application/admin/controller/orders/Abnormal.php b/application/admin/controller/orders/Abnormal.php index 4ec3662..724dc15 100644 --- a/application/admin/controller/orders/Abnormal.php +++ b/application/admin/controller/orders/Abnormal.php @@ -89,7 +89,7 @@ class Abnormal extends Backend { if (false === $this->request->isPost()) { - $order_id = $this->request->get('order_id'); + $order_id = $this->request->get('ids'); $this->assign('order_id',$order_id); diff --git a/application/admin/controller/orders/Auditorder.php b/application/admin/controller/orders/Auditorder.php index c09a7e3..aca5b36 100644 --- a/application/admin/controller/orders/Auditorder.php +++ b/application/admin/controller/orders/Auditorder.php @@ -62,7 +62,7 @@ class Auditorder extends Backend $list = $this->model ->scope('tab',Order::TAB_AUDIT) ->alias('order') - ->with(['auditadmin:id,username,nickname']) + ->with(['auditadmin']) ->where($where) ->order($sort, $order) ->paginate($limit); @@ -109,6 +109,9 @@ class Auditorder extends Backend return $this->view->fetch(); } $params = $this->request->post('row/a'); + + $audit_status = $params['audit_status']; + if (empty($params)) { $this->error(__('Parameter %s can not be empty', '')); } @@ -122,14 +125,22 @@ class Auditorder extends Backend $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.edit' : $name) : $this->modelValidate; $row->validateFailException()->validate($validate); } + + if($audit_status){ + $params['status'] = Order::STATUS_FINISHED; + }else{ + $params['status'] = Order::STATUS_CHECKING; + } + $params['audit_admin_id'] = $this->auth->id; - $params['status'] = Order::STATUS_FINISHED; + $result = $row->allowField(true)->save($params); - $params['order'] = $row; - $params['role'] = 1; - $params['auth'] = $this->auth; - Hook::listen('order_change',$params); + $hookParams['order'] = $row; + $hookParams['role'] = 1; + $hookParams['auth'] = $this->auth; + $hookParams['remark'] = $params['audit_remark']; + Hook::listen('order_change',$hookParams); Db::commit(); } catch (ValidateException|PDOException|Exception $e) { diff --git a/application/admin/controller/orders/Configorder.php b/application/admin/controller/orders/Configorder.php new file mode 100644 index 0000000..819592b --- /dev/null +++ b/application/admin/controller/orders/Configorder.php @@ -0,0 +1,156 @@ +model = new Order(); + $this->view->assign("statusList", $this->model->getStatusList()); + } + + + + /** + * 默认生成的控制器所继承的父类中有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 + ->tab(Order::TAB_SETTING) + ->auth($this->auth) + ->areaauth($this->auth) + ->with(['dispatch']) + ->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(); + } + + + + /** + * 编辑 + * + * @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()) { + $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); + + if($row->status != Order::STATUS_CHECKING){ + $this->error('订单不允许操作'); + } + $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); + } + + $data = [ + 'status' => Order::STATUS_AUDITING, + 'offline_amount' => $params['offline_amount'], + 'refund_amount' => $params['refund_amount'], + 'cost' => $params['cost'], + ]; + + $data['total'] = bcadd($row->online_amount,$params['offline_amount'],2); + $data['real_amount'] = bcsub($data['total'],$params['refund_amount'],2); + $data['performance'] = bcsub($data['real_amount'],$params['cost'],2); + $result = $row->allowField(true)->save($data); + + //日志 + + $params['order'] = $row; + $params['role'] = 1; + $params['auth'] = $this->auth; + $params['remark'] = ''; + + Hook::listen('order_change', $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/controller/orders/Dispatch.php b/application/admin/controller/orders/Dispatch.php index b5450e2..5881da5 100644 --- a/application/admin/controller/orders/Dispatch.php +++ b/application/admin/controller/orders/Dispatch.php @@ -52,9 +52,6 @@ class Dispatch extends Backend */ public function index() { - - $orderModel = new Order(); - //当前是否为关联查询 $this->relationSearch = true; //设置过滤方法 @@ -76,7 +73,7 @@ class Dispatch extends Backend $row->btn_edit = (in_array($row->status, $this->model->btnActiveStatusList('btn_edit'))) ? true : false; $row->btn_cancel = (in_array($row->status, $this->model->btnActiveStatusList('btn_cancel'))) ? true : false; $row->btn_abnormal = (in_array($row->status, $this->model->btnActiveStatusList('btn_abnormal'))) ? true : false; - $row->btn_income = (in_array($row->status, $this->model->btnActiveStatusList('btn_income')) && in_array($row->order->status, $orderModel->incomeBtnStatus())) ? true : false; + // $row->btn_income = (in_array($row->status, $this->model->btnActiveStatusList('btn_income')) && in_array($row->order->status, $orderModel->incomeBtnStatus())) ? true : false; } $result = array("total" => $list->total(), "rows" => $list->items()); diff --git a/application/admin/controller/orders/Dispatch2.php b/application/admin/controller/orders/Dispatch2.php new file mode 100644 index 0000000..3a61efe --- /dev/null +++ b/application/admin/controller/orders/Dispatch2.php @@ -0,0 +1,452 @@ +model = new \app\admin\model\OrderDispatch; + $this->view->assign("typeList", $this->model->getTypeList()); + $this->view->assign("statusList", $this->model->getStatusList()); + + + } + + + + /** + * 默认生成的控制器所继承的父类中有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']) + ->auth($this->auth) + ->where($where) + ->order($sort, $order) + ->paginate($limit); + + foreach ($list as &$row) { + $row->btn_edit = (in_array($row->status, $this->model->btnActiveStatusList('btn_edit'))) ? true : false; + $row->btn_cancel = (in_array($row->status, $this->model->btnActiveStatusList('btn_cancel'))) ? true : false; + $row->btn_abnormal = (in_array($row->status, $this->model->btnActiveStatusList('btn_abnormal'))) ? true : false; + $row->btn_finished = (in_array($row->status, $this->model->btnActiveStatusList('btn_finished'))) ? true : false; + $row->is_disabled = (in_array($row->status, $this->model->btnActiveStatusList('disabled_status'))) ? true : false; + // $row->btn_income = (in_array($row->status, $this->model->btnActiveStatusList('btn_income')) && in_array($row->order->status, $orderModel->incomeBtnStatus())) ? true : false; + } + $result = array("total" => $list->total(), "rows" => $list->items()); + + return json($result); + } + return $this->view->fetch(); + } + + + /** + * 添加 + * + * @return string + * @throws \think\Exception + */ + public function add() + { + if (false === $this->request->isPost()) { + $id = $this->request->param('order_id'); + $order = model('order')->where('id', $id)->find(); + if (!$order) { + $this->error(__('No results were found')); + } + + $items = Db::name('item') + ->where('status',1) + ->field(['id','title','key_word','pid']) + ->order('pid','asc') + ->order('sort','desc') + ->select(); + + $tree = $this->buildTree($items); + $formattedTree = $this->formatTree($tree); + + $area_name = model('area')->getNameByCode($order->area_id); + $order->area_name = str_replace(',','/',$area_name); + $this->view->assign('items', $formattedTree); + $this->view->assign('row', $order); + + 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); + + if ($this->dataLimit && $this->dataLimitFieldAutoFill) { + $params[$this->dataLimitField] = $this->auth->id; + } + $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); + } + $order = model('order')->where('id',$params['order_id'])->find(); + if (!$order){ + $this->error(__('No results were found')); + } + $insert = [ + 'admin_id' => $this->auth->id, + 'admin_user' => $this->auth->nickname, + 'order_id' => $params['order_id'], + 'type' => 1, + 'worker_id' => $params['worker_id'], + 'plan_time' => $order['plan_time'], + 'is_receipt' => $order['receive_type'] == 1 + ]; + + $worker = model('worker')->where('id',$params['worker_id'])->find(); + $insert ['worker_name'] = $worker->name; + $insert ['worker_tel'] = $worker->tel; + + $result = $this->model->allowField(true)->save($insert); + $order->status = Order::STATUS_DISPATCHED; + $order->save(); + Db::commit(); + } catch (ValidateException | PDOException | Exception $e) { + Db::rollback(); + $this->error($e->getMessage()); + } + if ($result === false) { + $this->error(__('No rows were inserted')); + } + $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')); + } + + $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(); + } + + $params = $this->request->post('row/a'); + + if(isset($params['action']) && $params['action'] == 'finish'){ + + return $this->finish($ids); + } + + 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(); + 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); + } + if($row->worker_id != $params['worker_id']){ //更换了师傅 + + + } + $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(); + } + + + + /** + * 编辑 + * + * @param $ids + * @return string + * @throws DbException + * @throws \think\Exception + */ + public function finish($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')); + } + + $order = Order::where('id',$row->id)->find(); + + if(empty($order)){ + $this->error(__('未找到关联订单')); + } + + if (false === $this->request->isPost()) { + $this->view->assign('row', $row); + $this->view->assign('order', $order); + $this->view->assign('action','finish'); + return $this->view->fetch('edit'); + } + + + $params = $this->request->post('row/a'); + if (empty($params)) { + $this->error(__('Parameter %s can not be empty', '')); + } + + $params = $this->preExcludeFields($params); + + if(!in_array($row->status, $this->model->btnActiveStatusList('btn_finished'))){ + $this->error('任务状态变更，请刷新后操作'); + } + + if($order->status != Order::STATUS_DISPATCHED){ + $this->error('订单状态已变更，请刷新后操作'); + } + + $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); + } + $params['status'] = OrderDispatch::STATUS_FINISH; + $params['finish_time'] = date('Y-m-d H:i:s'); + $result = $row->allowField(true)->save($params); + + //修改订单状态 + $OrderLogic = new OrderLogic(); + $OrderLogic -> dispachFinishAfter($row,['role'=>1,'auth'=>$this->auth]); + Db::commit(); + } catch (ValidateException | PDOException | Exception $e) { + Db::rollback(); + $this->error($e->getMessage()); + } + if (false === $result) { + $this->error(__('No rows were updated')); + } + $this->success(); + } + + + /** + * 取消派单 + * + * @param $ids + * @return void + * @throws DbException + * @throws DataNotFoundException + * @throws ModelNotFoundException + */ +// public function del($ids = null) +// { +// if (false === $this->request->isPost()) { +// $this->error(__("Invalid parameters")); +// } +// $ids = $ids ?: $this->request->post("ids"); +// if (empty($ids)) { +// $this->error(__('Parameter %s can not be empty', 'ids')); +// } +// $pk = $this->model->getPk(); +// $adminIds = $this->getDataLimitAdminIds(); +// if (is_array($adminIds)) { +// $this->model->where($this->dataLimitField, 'in', $adminIds); +// } +// $list = $this->model->where($pk, 'in', $ids)->whereIn('status', $this->model->deleteStatusList())->select(); +// +// $remark = $this->request->param('remark', ''); +// +// $count = 0; +// Db::startTrans(); +// try { +// foreach ($list as $item) { +// //$count += $item->delete(); +// $order = Order::where('id', $item->order_id)->where('status', Order::STATUS_DISPATCHED)->find(); +// if (!$order) { +// $this->error('订单状态已变更，请刷新后操作'); +// } +// //取消 +// $item->save(['status' => OrderDispatch::STATUS_CANCEL, 'remark' => $remark]); +// //回退订单状态 +// $order->allowField(true)->save(['status' => Order::STATUS_DISPATCHING]); +// +// $params['order'] = $order->ref; +// $params['role'] = 1; +// $params['auth'] = $this->auth; +// $params['remark'] = '派单被取消[ID：' . $item->id . ']，订单状态回退'; +// if (!empty($remark)) { +// $params['remark'] .= '，操作备注:' . $remark; +// } +// Hook::listen('order_change', $params); +// } +// Db::commit(); +// } catch (PDOException | Exception $e) { +// Db::rollback(); +// throw $e; +// $this->error($e->getMessage()); +// } +// +// $this->error(__('取消成功')); +// } + + + /** + * 取消派单 + * + * @param $ids + * @return void + * @throws DbException + * @throws DataNotFoundException + * @throws ModelNotFoundException + */ + public function del($ids=null) + { + if (false === $this->request->isPost()) { + $this->error(__("Invalid parameters")); + } + $ids = $this->request->post("ids/a"); + $reason = $this->request->post("reason"); + + if (empty($ids)) { + $this->error(__('Parameter %s can not be empty', 'ids')); + } + $pk = $this->model->getPk(); + $adminIds = $this->getDataLimitAdminIds(); + if (is_array($adminIds)) { + $this->model->where($this->dataLimitField, 'in', $adminIds); + } + $list = $this->model->where($pk, 'in', $ids)->whereIn('status', $this->model->deleteStatusList())->select(); + + if(count($list) != count($ids)){ + $this->error(__("任务状态不可操作，请刷新页面后再操作")); + } + + $remark = $reason; + $count = 0; + Db::startTrans(); + try { + foreach ($list as $item) { + //$count += $item->delete(); + $order = Order::where('id', $item->order_id)->where('status', Order::STATUS_DISPATCHED)->find(); + if (!$order) { + $this->error('订单状态已变更，请刷新后操作'); + } + //取消 + $item->save(['status' => OrderDispatch::STATUS_CANCEL, 'remark' => $remark]); + //回退订单状态 + $order->allowField(true)->save(['status' => Order::STATUS_DISPATCHING]); + $params['order'] = $order; + $params['role'] = 1; + $params['auth'] = $this->auth; + $params['remark'] = '派单被取消[ID：' . $item->id . ']，订单状态回退'; + if (!empty($remark)) { + $params['remark'] .= '，操作备注:' . $remark; + } + Hook::listen('order_change', $params); + } + Db::commit(); + } catch (PDOException | Exception $e) { + Db::rollback(); + $this->error($e->getMessage()); + } + /* if ($count) { + $this->success(); + }*/ + $this->success(__('取消成功')); + } + +} diff --git a/application/admin/controller/user/User.php b/application/admin/controller/user/User.php index 6908ad6..37d1349 100755 --- a/application/admin/controller/user/User.php +++ b/application/admin/controller/user/User.php @@ -4,6 +4,9 @@ namespace app\admin\controller\user; use app\common\controller\Backend; use app\common\library\Auth; +use think\Db; +use think\exception\PDOException; +use think\exception\ValidateException; /** * 会员管理 diff --git a/application/admin/controller/workers/Worker.php b/application/admin/controller/workers/Worker.php index 5a14ade..160b03b 100644 --- a/application/admin/controller/workers/Worker.php +++ b/application/admin/controller/workers/Worker.php @@ -49,9 +49,7 @@ class Worker extends Backend unset($v['sort']); unset($v['status']); } - $this->tree = $res; - $this->view->assign("tree", $res); } 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..47dc7a0 100644 --- a/application/admin/lang/zh-cn/aftersales/aftersale.php +++ b/application/admin/lang/zh-cn/aftersales/aftersale.php @@ -21,7 +21,7 @@ return [ 'From 1' => '师傅', 'From 2' => '顾客', 'From 3' => '平台', - 'Refund_amount' => '总退款金额', + 'Refund_amount' => '退款金额', 'Company_refund_amount' => '公司退款金额', 'Worker_refund_amount' => '师傅退款金额', 'Refund_type' => '退款方式', @@ -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 854bd17..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' => '订单状态', @@ -14,8 +14,8 @@ return [ 'Set status to 20' => '设为已派单', 'Status 30' => '进行中', 'Set status to 30' => '设为进行中', - 'Status 40' => '待验收', - 'Set status to 40' => '设为待验收', + 'Status 40' => '待配置', + 'Set status to 40' => '设为待配置', 'Status 41' => '审核驳回', 'Set status to 41' => '设为审核驳回', 'Status 50' => '待财务审核', 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 63aef60..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' => '订单状态', @@ -13,12 +13,12 @@ return [ 'Set status to 20' => '设为已派单', 'Status 30' => '进行中', 'Set status to 30' => '设为进行中', - 'Status 40' => '待验收', - 'Set status to 40' => '设为待验收', + 'Status 40' => '待配置', + 'Set status to 40' => '设为待配置', 'Status 41' => '审核驳回', 'Set status to 41' => '设为审核驳回', - 'Status 50' => '待审核', - 'Set status to 50' => '设为待审核', + 'Status 50' => '待结算', + 'Set status to 50' => '设为待结算', 'Status 60' => '已完成', 'Set status to 60' => '设为已完成', 'Status -10' => '取消', @@ -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 new file mode 100644 index 0000000..80e83dc --- /dev/null +++ b/application/admin/lang/zh-cn/orders/configorder.php @@ -0,0 +1,87 @@ + 'ID', + 'Order_no' => '订单编号', + 'Customer' => '客户姓名', + 'Tel' => '客户电话', + 'Status' => '订单状态', + 'Status 0' => '草稿', + 'Set status to 0' => '设为草稿', + 'Status 10' => '未派单', + 'Set status to 10' => '设为未派单', + 'Status 20' => '已派单', + 'Set status to 20' => '设为已派单', + 'Status 30' => '进行中', + 'Set status to 30' => '设为进行中', + 'Status 40' => '待配置', + 'Set status to 40' => '设为待配置', + 'Status 50' => '待财务审核', + 'Set status to 50' => '设为待财务审核', + 'Status 60' => '已完成', + 'Set status to 60' => '设为已完成', + 'Status -10' => '取消', + 'Set status to -10' => '设为取消', + 'Area_id' => '地域', + 'Address' => '详细地址', + 'Lng' => '经度', + 'Lat' => '纬度', + 'Work_tel_id' => '工作机', + 'Source_shop' => '来源店铺', + 'Source' => '订单来源', + 'Source_uid' => '来源UID', + 'Item_id' => '服务ID', + 'Item_title' => '服务名称', + 'Detail' => '订单详情', + 'Remark' => '订单备注', + 'Images' => '图片', + 'Plan_time' => '预约时间', + 'Admin_id' => '录单员ID', + 'Coupon_id' => '优惠码id', + 'Total' => '总收款', + 'Online_amount' => '线上收款', + 'Offline_amount' => '线下收款', + 'Discount_amount' => '优惠抵扣', + 'Refund_amount' => '退款金额', + 'Real_amount' => '实际收款', + 'Cost' => '师傅成本', + 'Performance' => '预计利润', + 'Cancel_reason_id' => '取消原因', + 'Cancel_detail' => '取消详情', + 'Audit_remark' => '审核备注', + 'Audit_admin_id' => '审核员', + 'Create_time' => '录单时间', + 'Update_time' => '更新时间', + 'Delete_time' => '删除时间', + 'Dispatch_type' => '1 手动派单 2自动排单', + 'Receive_type' => '1 定金 2全款', + 'Dispatch.id' => 'ID', + 'Dispatch.order_id' => '订单ID', + 'Dispatch.type' => '派单方式', + 'Dispatch.type 1' => '手动', + 'Dispatch.worker_id' => '师傅ID', + 'Dispatch.worker_name' => '师傅姓名', + 'Dispatch.worker_tel' => '师傅电话', + 'Dispatch.status' => '进度', + 'Dispatch.status 0' => '待接单', + 'Dispatch.status 10' => '已接单', + 'Dispatch.status 20' => '已预约', + 'Dispatch.status 25' => '已开始未打卡', + 'Dispatch.status 30' => '已打卡', + 'Dispatch.status 60' => '已完成', + 'Dispatch.status -10' => '已拒接', + 'Dispatch.status -20' => '已移交', + 'Dispatch.status -30' => '已取消', + 'Dispatch.is_receipt' => '是否收款:0否,1是', + 'Dispatch.total' => '师傅收款金额', + 'Dispatch.remark' => '备注', + 'Dispatch.notice_num' => '通知次数', + 'Dispatch.images' => '完成图片', + 'Dispatch.image' => '收款凭证', + 'Dispatch.plan_time' => '预约时间', + 'Dispatch.finish_time' => '完成时间', + 'Dispatch.admin_id' => '派单人ID', + 'Dispatch.admin_user' => '派单人', + 'Dispatch.create_time' => '派单时间', + 'Dispatch.update_time' => '编辑时间' +]; diff --git a/application/admin/lang/zh-cn/orders/dispatch.php b/application/admin/lang/zh-cn/orders/dispatch.php index 9fc67a1..17e3b46 100644 --- a/application/admin/lang/zh-cn/orders/dispatch.php +++ b/application/admin/lang/zh-cn/orders/dispatch.php @@ -36,14 +36,14 @@ return [ 'Create_time' => '派单时间', 'Update_time' => '编辑时间', 'Order.id' => 'ID', - 'Order.order_no' => '订单号', + 'Order.order_no' => '订单编号', 'Order.customer' => '客户姓名', 'Order.tel' => '客户电话', 'Order.status' => '订单状态', 'Order.status 10' => '未派单', 'Order.status 20' => '已派单', 'Order.status 30' => '进行中', - 'Order.status 40' => '待验收', + 'Order.status 40' => '待配置', 'Order.status 41' => '审核驳回', 'Order.status 50' => '待财务审核', 'Order.status 60' => '已完成', @@ -61,14 +61,14 @@ return [ 'Order.detail' => '订单详情', 'Order.remark' => '订单备注', 'Order.images' => '图片', - 'Order.plan_time' => '客户预约时间', + 'Order.plan_time' => '预约时间', 'Order.admin_id' => '录单员ID', 'Order.coupon_id' => '优惠码id', 'Order.total' => '总收款', 'Order.online_amount' => '线上收款', 'Order.offline_amount' => '线下收款', 'Order.discount_amount' => '优惠抵扣', - 'Order.refund_amount' => '总退款额', + 'Order.refund_amount' => '退款金额', 'Order.real_amount' => '实际收款', 'Order.cost' => '师傅成本', 'Order.performance' => '预计利润', diff --git a/application/admin/lang/zh-cn/orders/dispatch2.php b/application/admin/lang/zh-cn/orders/dispatch2.php new file mode 100644 index 0000000..5d96287 --- /dev/null +++ b/application/admin/lang/zh-cn/orders/dispatch2.php @@ -0,0 +1,82 @@ + 'ID', + 'Order_id' => '订单ID', + 'Type' => '派单方式', + 'Type 1' => '手动', + 'Worker_id' => '师傅ID', + 'Worker_name' => '师傅姓名', + 'Worker_tel' => '师傅电话', + 'Status' => '进度', + 'Status 0' => '待接单', + 'Set status to 0' => '设为待接单', + 'Status 10' => '已接单', + 'Set status to 10' => '设为已接单', + 'Status 25' => '任务超时', + 'Set status to 25' => '设为已开始', + 'Status 20' => '已预约', + 'Set status to 20' => '设为已预约', + 'Status 30' => '已打卡', + 'Set status to 30' => '设为已打卡', + 'Status 60' => '已完成', + 'Set status to 60' => '设为已完成', + 'Status -10' => '已拒接', + 'Set status to -10' => '设为已拒接', + 'Status -20' => '已移交', + 'Set status to -20' => '设为已移交', + 'Status -30' => '已取消', + 'Set status to -30' => '设为已取消', + 'Remark' => '备注', + 'Notice_num' => '通知次数', + 'Plan_time' => '预约时间', + 'Finish_time' => '完成时间', + 'Admin_id' => '派单人ID', + 'Admin_user' => '派单人', + 'Create_time' => '派单时间', + 'Update_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 41' => '审核驳回', + 'Order.status 50' => '待财务审核', + 'Order.status 60' => '已完成', + 'Order.status -10' => '取消', + 'Order.area_id' => '地域', + 'Order.address' => '详细地址', + 'Order.lng' => '经度', + 'Order.lat' => '纬度', + 'Order.work_tel_id' => '工作机', + 'Order.source_shop' => '来源店铺', + 'Order.source' => '订单来源', + 'Order.source_uid' => '来源UID', + 'Order.item_id' => '服务ID', + 'Order.item_title' => '服务名称', + 'Order.detail' => '订单详情', + 'Order.remark' => '订单备注', + 'Order.images' => '图片', + 'Order.plan_time' => '预约时间', + 'Order.admin_id' => '录单员ID', + 'Order.coupon_id' => '优惠码id', + 'Order.total' => '总收款', + 'Order.online_amount' => '线上收款', + 'Order.offline_amount' => '线下收款', + 'Order.discount_amount' => '优惠抵扣', + 'Order.refund_amount' => '退款金额', + 'Order.real_amount' => '实际收款', + 'Order.cost' => '师傅成本', + 'Order.performance' => '预计利润', + 'Order.cancel_reason_id' => '取消原因', + 'Order.cancel_detail' => '取消详情', + 'Order.audit_remark' => '审核备注', + 'Order.audit_admin_id' => '审核员', + 'Order.create_time' => '录单时间', + 'Order.update_time' => '更新时间', + 'Order.delete_time' => '删除时间' +]; diff --git a/application/admin/lang/zh-cn/orders/income.php b/application/admin/lang/zh-cn/orders/income.php index 83c21e4..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' => '定金', @@ -12,7 +12,7 @@ return [ 'Item_type 4' => '其它', 'Status' => '审核状态', - 'Status 0' => '待审核', + 'Status 0' => '待结算', 'Status 1' => '通过', 'Status -1' => '未通过', 'Audit_remark' => '审核备注', 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 0888265..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' => '订单状态', @@ -12,8 +12,8 @@ return [ 'Set status to 20' => '设为已派单', 'Status 30' => '进行中', 'Set status to 30' => '设为进行中', - 'Status 40' => '待验收', - 'Set status to 40' => '设为待验收', + 'Status 40' => '待配置', + 'Set status to 40' => '设为待配置', 'Status 41' => '审核驳回', 'Set status to 41' => '设为审核驳回', 'Status 50' => '待财务审核', @@ -35,7 +35,7 @@ return [ 'Detail' => '订单详情', 'Remark' => '订单备注', 'Images' => '图片', - 'Plan_time' => '客户预约时间', + 'Plan_time' => '预约时间', 'Admin_id' => '录单员ID', 'Total' => '总收款', 'Cost' => '师傅成本', diff --git a/application/admin/model/Area.php b/application/admin/model/Area.php index 89743f0..34c075f 100644 --- a/application/admin/model/Area.php +++ b/application/admin/model/Area.php @@ -2,6 +2,7 @@ namespace app\admin\model; +use fast\Tree; use think\Model; @@ -16,6 +17,41 @@ class Area extends Model return $this->where('area_code','=',$code) ->value('merge_name'); } + + public function getTree(){ + + $res = $this->field(['city_code','code','name','level','province_code']) + ->where('level','<',3) + ->select(); + + +// dd($ruleList); + + foreach ($res as &$v) { + $v = $v->toArray(); + $v['state'] = ['selected' => false]; + if ($v['level'] == 2){ + $v['pid'] = $v['province_code'] ?: 0; + $v['parent'] = $v['province_code'] ?: '#'; + }else{ + $v['pid'] = $v['city_code'] ?: 0; + $v['parent'] = $v['city_code'] ?: '#'; + } + $v['id'] = $v['code']; + $v['text'] = $v['name']; + unset($v['province_code']); + unset($v['city_code']); + unset($v['level']); + unset($v['code']); + } +// dd($res); + Tree::instance()->init($res)->icon = + ['    ', '    ', '    ']; + + $res = Tree::instance()->getTreeList(Tree::instance()->getTreeArray(0)); +// dd($res); + return $res; + } } diff --git a/application/admin/model/Order.php b/application/admin/model/Order.php index 2dba643..49e7437 100644 --- a/application/admin/model/Order.php +++ b/application/admin/model/Order.php @@ -2,6 +2,7 @@ namespace app\admin\model; +use app\admin\library\Auth; use think\Model; use traits\model\SoftDelete; @@ -37,6 +38,8 @@ class Order extends Model const TAB_PENDING = 'pending'; //跟进中 + const TAB_SETTING = 'setting'; //跟进中 + const TAB_AUDIT = 'audit'; //审核 const TAB_REVIEW = 'review'; //回访 @@ -121,10 +124,13 @@ class Order extends Model self::TAB_AUDIT => [ self::STATUS_AUDITING, self::STATUS_FINISHED - ], //待审核 + ], //待结算 self::TAB_REVIEW => [ self::STATUS_FINISHED ], + self::TAB_SETTING => [ + self::STATUS_CHECKING + ], ]; return $tabStatus[$tab] ?? []; } @@ -148,4 +154,43 @@ class Order extends Model public function auditadmin(){ return $this->belongsTo(Admin::class,'audit_admin_id',); } + + public function dispatch() + { + return $this->hasOne(OrderDispatch::class, 'order_id', 'id', [], 'LEFT')->setEagerlyType(0)->where('fa_order_dispatch.status',OrderDispatch::STATUS_FINISH); + } + + + /** + * 管理员权限 + * @param $query + * @param Auth $auth + * @param string $auth_admin_id + * @return mixed + */ + public function scopeAuth($query, Auth $auth, string $admin_id_field='admin_id'){ + + if(!$auth->isSuperAdmin()){ + $query->where('fa_order.'.$admin_id_field,$auth->id); + } + return $query; + } + + /** + * 地域权限 + * @param $query + * @param Auth $auth + * @param string $area_id_field + * @return mixed + */ + public function scopeAreaauth($query,Auth $auth,string $area_id_field='area_id'){ + if(!$auth->isSuperAdmin()){ + $areaIds = array_unique(array_filter(explode(',',trim($auth->area_ids)))); + if(!in_array('*',$areaIds)){ + $query->whereIn('fa_order.'.$area_id_field,$areaIds); + } + } + return $query; + } + } diff --git a/application/admin/model/OrderDispatch.php b/application/admin/model/OrderDispatch.php index 5c80de9..b4b073f 100644 --- a/application/admin/model/OrderDispatch.php +++ b/application/admin/model/OrderDispatch.php @@ -2,6 +2,7 @@ namespace app\admin\model; +use app\admin\library\Auth; use think\Model; @@ -34,10 +35,11 @@ class OrderDispatch extends Model const STATUS_TOGET = 0; //待接 const STATUS_GOTIT = 10; //已接 const STATUS_PLANIT = 20; //已预约 + const STATUS_OVERTIME = 25; //超时（过了预约时间） const STATUS_CLOCK = 30; //已打卡 const STATUS_FINISH = 60; //完成 const STATUS_REFUSED = -10; //拒绝 - const STATUS_MOVE = -20; //中转 + const STATUS_MOVE = -20; //中转(状态废弃) const STATUS_CANCEL = -30; //取消 @@ -48,7 +50,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() @@ -86,6 +90,7 @@ class OrderDispatch extends Model self::STATUS_TOGET, self::STATUS_GOTIT, self::STATUS_PLANIT, + self::STATUS_OVERTIME, self::STATUS_CLOCK, ]; } @@ -112,29 +117,57 @@ class OrderDispatch extends Model self::STATUS_TOGET, self::STATUS_GOTIT, self::STATUS_PLANIT, + self::STATUS_OVERTIME, self::STATUS_CLOCK, ], 'btn_cancel' => [ //取消按钮 self::STATUS_TOGET, self::STATUS_GOTIT, self::STATUS_PLANIT, + self::STATUS_OVERTIME, self::STATUS_CLOCK, ], 'btn_abnormal' => [ //添加异常按钮 self::STATUS_TOGET, self::STATUS_GOTIT, self::STATUS_PLANIT, + self::STATUS_OVERTIME, self::STATUS_CLOCK, ], - 'btn_income' => [ + 'btn_finished' => [ self::STATUS_TOGET, self::STATUS_GOTIT, self::STATUS_PLANIT, + self::STATUS_OVERTIME, self::STATUS_CLOCK, - self::STATUS_FINISH + //self::STATUS_FINISH ], + 'disabled_status' => [ + self::STATUS_FINISH, + self::STATUS_CANCEL, + self::STATUS_REFUSED, + self::STATUS_MOVE + ] ]; return $btns[$btn]??[]; } + + + + /** + * 管理员权限 + * @param $query + * @param Auth $auth + * @param string $auth_admin_id + * @return mixed + */ + public function scopeAuth($query, Auth $auth, string $admin_id_field='admin_id'){ + + if(!$auth->isSuperAdmin()){ + $query->where('fa_order_dispatch.'.$admin_id_field,$auth->id); + } + return $query; + } + } diff --git a/application/admin/tags.php b/application/admin/tags.php index 7f7020c..4e901f3 100755 --- a/application/admin/tags.php +++ b/application/admin/tags.php @@ -15,9 +15,4 @@ return [ 'app_end' => [ 'app\\admin\\behavior\\AdminLog', ], - - 'order_change' => [ - 'app\\admin\\behavior\\OrderLog', - 'app\\admin\\behavior\\OrderChangeAfter', - ], ]; diff --git a/application/admin/validate/Configorder.php b/application/admin/validate/Configorder.php new file mode 100644 index 0000000..45391dd --- /dev/null +++ b/application/admin/validate/Configorder.php @@ -0,0 +1,27 @@ + [], + 'edit' => [], + ]; + +} diff --git a/application/admin/view/aftersales/aftersale/add.html b/application/admin/view/aftersales/aftersale/add.html index ccb7a53..46dec49 100644 --- a/application/admin/view/aftersales/aftersale/add.html +++ b/application/admin/view/aftersales/aftersale/add.html @@ -3,21 +3,10 @@
- +
-
- -
- -
- {foreach name="statusList" item="vo"} - - {/foreach} -
-
-
@@ -93,7 +82,7 @@
- +
@@ -119,57 +108,48 @@
- -
-
-
- -
- -
-
-
- -
- +
+
+ +
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
+ + + +
+ +
+ +
+ +
+ {foreach name="statusList" item="vo"} + + {/foreach} +
+ +
+
+
diff --git a/application/admin/view/aftersales/aftersale/edit.html b/application/admin/view/aftersales/aftersale/edit.html index 93db8f2..b0afe98 100644 --- a/application/admin/view/aftersales/aftersale/edit.html +++ b/application/admin/view/aftersales/aftersale/edit.html @@ -3,21 +3,10 @@
- +
-
- -
- -
- {foreach name="statusList" item="vo"} - - {/foreach} -
-
-
@@ -93,7 +82,7 @@
- +
@@ -122,18 +111,7 @@
-
- -
- -
-
-
- -
- -
-
+
@@ -170,6 +148,21 @@
+ + +
+ +
+ +
+ {foreach name="statusList" item="vo"} + + {/foreach} +
+ +
+
+
diff --git a/application/admin/view/auth/admin/area.html b/application/admin/view/auth/admin/area.html new file mode 100644 index 0000000..6a78481 --- /dev/null +++ b/application/admin/view/auth/admin/area.html @@ -0,0 +1,21 @@ +
+ {:token()} +
+ +
+ + + +
+
+
+ + +
+ +
+ +
+
+
\ No newline at end of file diff --git a/application/admin/view/orders/abnormal/add.html b/application/admin/view/orders/abnormal/add.html index b038108..7b51559 100644 --- a/application/admin/view/orders/abnormal/add.html +++ b/application/admin/view/orders/abnormal/add.html @@ -26,7 +26,7 @@
- +
diff --git a/application/admin/view/orders/abnormal/edit.html b/application/admin/view/orders/abnormal/edit.html index 936939e..4332711 100644 --- a/application/admin/view/orders/abnormal/edit.html +++ b/application/admin/view/orders/abnormal/edit.html @@ -35,7 +35,7 @@
- +
diff --git a/application/admin/view/orders/auditorder/edit.html b/application/admin/view/orders/auditorder/edit.html index 70c0d7f..5392f79 100644 --- a/application/admin/view/orders/auditorder/edit.html +++ b/application/admin/view/orders/auditorder/edit.html @@ -77,65 +77,6 @@ -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
- - -
- -
- -
-
- - -
- -
- -
-
-
- -
- -
-
- -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
@@ -161,21 +102,14 @@
- +
- -
-
- -
- -
- +
@@ -183,14 +117,14 @@
- +
- +
@@ -198,22 +132,36 @@
- +
- +
+ + +
+ +
+ +
+ + + +
+ +
+
+ +
- +
diff --git a/application/admin/view/orders/configorder/add.html b/application/admin/view/orders/configorder/add.html new file mode 100644 index 0000000..2cf869e --- /dev/null +++ b/application/admin/view/orders/configorder/add.html @@ -0,0 +1,239 @@ +
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+ {foreach name="statusList" item="vo"} + + {/foreach} +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ +
+ + +
+ +
+
    +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    diff --git a/application/admin/view/orders/configorder/edit.html b/application/admin/view/orders/configorder/edit.html new file mode 100644 index 0000000..f364e58 --- /dev/null +++ b/application/admin/view/orders/configorder/edit.html @@ -0,0 +1,87 @@ +
    + +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + + + + + + + + + + + + + + + + + + +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + + + {notempty name='row.audit_admin_id'} + +
    + +
    + +
    +
    + + {/notempty} + + +
    + +
    + +
    +
    +
    diff --git a/application/admin/view/orders/configorder/index.html b/application/admin/view/orders/configorder/index.html new file mode 100644 index 0000000..5b6b25b --- /dev/null +++ b/application/admin/view/orders/configorder/index.html @@ -0,0 +1,45 @@ +
    + + + + + + + + + + + + +
    +
    +
    +
    +
    + + + + + +
    + +
    +
    +
    + +
    +
    +
    diff --git a/application/admin/view/orders/dispatch/edit.html b/application/admin/view/orders/dispatch/edit.html index d3a33ff..4464e69 100644 --- a/application/admin/view/orders/dispatch/edit.html +++ b/application/admin/view/orders/dispatch/edit.html @@ -1,27 +1,23 @@
    + + + + + + +
    - +
    -
    - -
    - - -
    -
    - +
    @@ -48,42 +44,8 @@
    -
    - -
    - - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    +
    diff --git a/application/admin/view/orders/dispatch2/add.html b/application/admin/view/orders/dispatch2/add.html new file mode 100644 index 0000000..47b59d9 --- /dev/null +++ b/application/admin/view/orders/dispatch2/add.html @@ -0,0 +1,110 @@ +
    +
    + +
    +
    +

    订单详情

    +

    订单编号: {$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}

    + + +
    + +
    + +
    + + +
    +
    + +
    + +
    + +
    +
    +
    + +
    + +
    +
    + + + +
    +
    +
    +
    +
    +
    +
    +
    +

    师傅选择

    + + +
    +
    + +
    + + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    + +
    +
    +

    搜索

    +

    清空

    +
    + +
    +
    +
    + +
    +
    +
    +
    +
    + + + \ No newline at end of file diff --git a/application/admin/view/orders/dispatch2/edit.html b/application/admin/view/orders/dispatch2/edit.html new file mode 100644 index 0000000..f402e54 --- /dev/null +++ b/application/admin/view/orders/dispatch2/edit.html @@ -0,0 +1,204 @@ +
    + + + + + + + + + +
    + +
    + +
    +
    + + +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + + {notempty name ='action'} + + + +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + + +
    + +
    + +
    +
    + + +
    + +
    + +
    +
    + + {if $row['is_receipt']==0 } + +
    + +
    + +
    +
    + + {/if} + + {if $row['is_receipt']==1 } +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + + +
    + +
    +
      +
      +
      + + {/if} + + + +
      + +
      +
      + +
      + + +
      + +
      +
        +
        +
        + + +
        + +
        + +
        +
        + + +
        + +
        + +
        +
        + + + {else /} + + +
        + +
        + +
        +
        + + +
        + +
        + +
        +
        + + +
        + +
        + +
        +
        + + + + +
        + +
        + +
        +
        + + + +
        + +
        + +
        +
        + {/notempty} + +
        diff --git a/application/admin/view/orders/dispatch2/index.html b/application/admin/view/orders/dispatch2/index.html new file mode 100644 index 0000000..4f3b9cc --- /dev/null +++ b/application/admin/view/orders/dispatch2/index.html @@ -0,0 +1,54 @@ +
        + +
        + {:build_heading(null,FALSE)} + +
        + + +
        +
        +
        +
        + + +
        +
        +
        + +
        +
        +
        diff --git a/application/admin/view/workers/worker/index.html b/application/admin/view/workers/worker/index.html index a4caafc..f96cc4c 100644 --- a/application/admin/view/workers/worker/index.html +++ b/application/admin/view/workers/worker/index.html @@ -33,24 +33,24 @@ {:__('Recycle bin')}
        -
        - -
        - - -
        -
        -
        - -
        - -
        -
        + + + + + + + + + + + + + + + + + +
        diff --git a/application/common/Logic/OrderLogic.php b/application/common/Logic/OrderLogic.php new file mode 100644 index 0000000..92a1b77 --- /dev/null +++ b/application/common/Logic/OrderLogic.php @@ -0,0 +1,62 @@ +OrderModel = new Order(); + } + + + + /** + * 任务完成以后，修改订单 + * $roleInfo = ['role'=>1,'auth'=>$userInfo,'remark'=''] + * + * @throws DataNotFoundException + * @throws DbException + * @throws ModelNotFoundException + * @throws Exception + */ + public function dispachFinishAfter(OrderDispatch $orderDispatch,$roleInfo=[]): void + { + + $order = $this->OrderModel->where('id',$orderDispatch->order_id)->find(); + if($order->status != Order::STATUS_DISPATCHED){ + throw new Exception('订单状态不允许当前操作'); + } + + $orderUpdate = [ + 'status' => Order::STATUS_CHECKING + ]; + if($orderDispatch->is_receipt == 1){ //要收款，计算确认尾款 + $offline_amount = $orderDispatch->total; + $total = bcadd($order->online_amount,$offline_amount,2); + $orderUpdate['offline_amount'] = $offline_amount; + $orderUpdate['total'] = $total; + } + $order->allowField(true)->save($orderUpdate); + + $params['role'] = $roleInfo['role']; + $params['auth'] = $roleInfo['auth']; + $params['order']= $order; + $params['remark'] = $roleInfo['remark'] ?? $orderDispatch->remark; + + Hook::listen('order_change', $params); + } + +} \ No newline at end of file diff --git a/application/config.php b/application/config.php index 4582b2d..ff66689 100755 --- a/application/config.php +++ b/application/config.php @@ -173,7 +173,7 @@ return [ // 日志保存目录 'path' => LOG_PATH, // 日志记录级别 - 'level' => [], + 'level' => ['log','error'], ], // +---------------------------------------------------------------------- // | Trace设置 开启 app_trace 后 有效 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/application/tags.php b/application/tags.php index 40f076f..f51a20b 100755 --- a/application/tags.php +++ b/application/tags.php @@ -37,4 +37,10 @@ return [ 'log_write' => [], // 应用结束 'app_end' => [], + + + 'order_change' => [ + 'app\\admin\\behavior\\OrderLog', + 'app\\admin\\behavior\\OrderChangeAfter', + ], ]; diff --git a/public/assets/js/addons.js b/public/assets/js/addons.js index e814dbb..349ccac 100755 --- a/public/assets/js/addons.js +++ b/public/assets/js/addons.js @@ -1,6 +1,7 @@ define([], function () { require([], function () { //绑定data-toggle=addresspicker属性点击事件 + console.log('111'); $(document).on('click', "[data-toggle='addresspicker']", function () { var that = this; @@ -11,18 +12,15 @@ define([], function () { var zoom_id = $(that).data("zoom-id") ? $(that).data("zoom-id") : ""; var lat = lat_id ? $("#" + lat_id).val() : ''; var lng = lng_id ? $("#" + lng_id).val() : ''; - var city_code = $("#area_name").val(); + var city_code = $("#area_id").val(); var zoom = zoom_id ? $("#" + zoom_id).val() : ''; - var url = "/addons/address/index/select"; - var parmas = (lat && lng) ? '&lat=' + lat + '&lng=' + lng + (input_id ? "&address=" - + $("#" + input_id).val() : "") + (zoom ? "&zoom=" + zoom : "") : ''; - url += parmas; + var url = "/addons/address/index/select?1=1"; + url += (lat && lng) ? 'lat=' + lat + '&lng=' + lng + + (input_id ? "&address=" + $("#" + input_id).val() : "") + +(zoom ? "&zoom=" + zoom : "") : '' + ; if (city_code){ - if (parmas === ''){ - url += city_code ? "?city_code=" + city_code : ""; - }else { - url += city_code ? "&city_code=" + city_code : ""; - } + url += city_code ? "&city_code=" + city_code : ""; } console.log(url); Fast.api.open(url, '位置选择', { @@ -43,7 +41,7 @@ define([], function () { } }); }); - }); +}); if (typeof Config.upload.storage !== 'undefined' && Config.upload.storage === 'alioss') { require(['upload'], function (Upload) { diff --git a/public/assets/js/backend/auth/admin.js b/public/assets/js/backend/auth/admin.js index 0901410..bd690c6 100755 --- a/public/assets/js/backend/auth/admin.js +++ b/public/assets/js/backend/auth/admin.js @@ -1,62 +1,179 @@ -define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) { - - var Controller = { - index: function () { - // 初始化表格参数配置 - Table.api.init({ - extend: { - index_url: 'auth/admin/index', - add_url: 'auth/admin/add', - edit_url: 'auth/admin/edit', - del_url: 'auth/admin/del', - multi_url: 'auth/admin/multi', - } +define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'jstree'], + function ($, undefined, Backend, Table, Form) { + $.jstree.core.prototype.get_all_checked = function (full) { + var obj = this.get_selected(), i, j; + for (i = 0, j = obj.length; i < j; i++) { + obj = obj.concat(this.get_node(obj[i]).parents); + } + obj = $.grep(obj, function (v, i, a) { + return v != '#'; }); - - var table = $("#table"); - - //在表格内容渲染完成后回调的事件 - table.on('post-body.bs.table', function (e, json) { - $("tbody tr[data-index]", this).each(function () { - if (parseInt($("td:eq(1)", this).text()) == Config.admin.id) { - $("input[type=checkbox]", this).prop("disabled", true); + obj = obj.filter(function (itm, i, a) { + return i == a.indexOf(itm); + }); + return full ? $.map(obj, $.proxy(function (i) { + return this.get_node(i); + }, this)) : obj; + }; + var Controller = { + index: function () { + // 初始化表格参数配置 + Table.api.init({ + extend: { + index_url: 'auth/admin/index', + add_url: 'auth/admin/add', + edit_url: 'auth/admin/edit', + del_url: 'auth/admin/del', + multi_url: 'auth/admin/multi', + area_url: 'auth/admin/setArea', } }); - }); - // 初始化表格 - table.bootstrapTable({ - url: $.fn.bootstrapTable.defaults.extend.index_url, - columns: [ - [ - {field: 'state', checkbox: true, }, - {field: 'id', title: 'ID'}, - {field: 'username', title: __('Username')}, - {field: 'nickname', title: __('Nickname')}, - {field: 'groups_text', title: __('Group'), operate:false, formatter: Table.api.formatter.label}, - {field: 'email', title: __('Email')}, - {field: 'mobile', title: __('Mobile')}, - {field: 'status', title: __("Status"), searchList: {"normal":__('Normal'),"hidden":__('Hidden')}, formatter: Table.api.formatter.status}, - {field: 'logintime', title: __('Login time'), formatter: Table.api.formatter.datetime, operate: 'RANGE', addclass: 'datetimerange', sortable: true}, - {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: function (value, row, index) { - if(row.id == Config.admin.id){ - return ''; - } - return Table.api.formatter.operate.call(this, value, row, index); - }} + var table = $("#table"); + + //在表格内容渲染完成后回调的事件 + table.on('post-body.bs.table', function (e, json) { + $("tbody tr[data-index]", this).each(function () { + if (parseInt($("td:eq(1)", this).text()) == Config.admin.id) { + $("input[type=checkbox]", this).prop("disabled", true); + } + }); + }); + + // 初始化表格 + table.bootstrapTable({ + url: $.fn.bootstrapTable.defaults.extend.index_url, + columns: [ + [ + {field: 'state', checkbox: true,}, + {field: 'id', title: 'ID'}, + {field: 'username', title: __('Username')}, + {field: 'nickname', title: __('Nickname')}, + { + field: 'groups_text', + title: __('Group'), + operate: false, + formatter: Table.api.formatter.label + }, + {field: 'email', title: __('Email')}, + {field: 'mobile', title: __('Mobile')}, + { + field: 'status', + title: __("Status"), + searchList: {"normal": __('Normal'), "hidden": __('Hidden')}, + formatter: Table.api.formatter.status + }, + { + field: 'logintime', + title: __('Login time'), + formatter: Table.api.formatter.datetime, + operate: 'RANGE', + addclass: 'datetimerange', + sortable: true + }, + { + field: 'operate', title: __('Operate'), table: table, + events: Table.api.events.operate, formatter: function (value, row, index) { + if (row.id == Config.admin.id) { + return ''; + } + return Table.api.formatter.operate.call(this, value, row, index); + }, + buttons: [ + { + name: "setArea", + text: "配置管理区域", + title: "区域", + url: 'auth/admin/area', + extend: 'data-toggle="tooltip" data-container="body"', + classname: 'btn btn-xs btn-warning btn-dialog', + //classname:"btn-view btn-dialog", + icon: 'fa fa-add', + refresh: true, + }, + ], + } + ] ] - ] - }); + }); - // 为表格绑定事件 - Table.api.bindevent(table); - }, - add: function () { - Form.api.bindevent($("form[role=form]")); - }, - edit: function () { - Form.api.bindevent($("form[role=form]")); - } - }; - return Controller; -}); + // 为表格绑定事件 + Table.api.bindevent(table); + }, + add: function () { + Form.api.bindevent($("form[role=form]")); + }, + edit: function () { + Form.api.bindevent($("form[role=form]")); + }, + area: function () { + Form.api.bindevent($("form[role=form]"), null, null, function () { + if ($("#treeview").length > 0) { + var r = $("#treeview").jstree("get_all_checked"); + $("input[name='row[area_ids]']").val(r.join(',')); + } + return true; + }); + //渲染权限节点树 + //销毁已有的节点树 + $("#treeview").jstree("destroy"); + + $.ajax({ + url: "auth/admin/areaget", // 你的 API 地址 + type: "GET", + dataType: "json", + data: { + user_id:$('#user_id').val() + }, + success: function (data) { + // console.log(data); + Controller.api.rendertree(data); + }, + error: function () { + console.error("请求失败"); + } + }); + + + //全选和展开 + $(document).on("click", "#checkall", function () { + $("#treeview").jstree($(this).prop("checked") ? "check_all" : "uncheck_all"); + }); + $(document).on("click", "#expandall", function () { + $("#treeview").jstree($(this).prop("checked") ? "open_all" : "close_all"); + }); + $("select[name='row[pid]']").trigger("change"); + }, + api: { + rendertree: function (content) { + $("#treeview") + .on('redraw.jstree', function (e) { + $(".layer-footer").attr("domrefresh", Math.random()); + }) + .jstree({ + "themes": {"stripes": true}, + "checkbox": { + "keep_selected_style": false, + }, + "types": { + "root": { + "icon": "fa fa-folder-open", + }, + "menu": { + "icon": "fa fa-folder-open", + }, + "file": { + "icon": "fa fa-file-o", + } + }, + "plugins": ["checkbox", "types"], + "core": { + 'check_callback': true, + "data": content + } + }); + } + } + }; + return Controller; + }); diff --git a/public/assets/js/backend/order.js b/public/assets/js/backend/order.js index 8f4bd6c..639ccc7 100644 --- a/public/assets/js/backend/order.js +++ b/public/assets/js/backend/order.js @@ -14,7 +14,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','cascader'], function index_url: 'order/index' + location.search, add_url: 'order/add', edit_url: 'order/edit', - del_url: 'order/del', + //del_url: 'order/del', multi_url: 'order/multi', import_url: 'order/import', push_url: 'order/status', @@ -129,6 +129,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','cascader'], function table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate, + align:"left", buttons: [ { name: 'edit', @@ -168,30 +169,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','cascader'], function }, refresh:true, }, - { - name:"income", - text:"新增收款", - title:"新增收款", - classname:"btn-view btn-dialog", - icon:'fa fa-money', - url: function(row){ - return 'orders/income/add?order_id='+row.id; - }, - dropdown:"更多", - visible:function(row){ - return true; - }, - refresh:true, - }, - { - name: 'del', - text:"取消订单", - title:"取消订单", - icon: 'fa fa-trash', - extend: 'data-toggle="tooltip" data-container="body"', - classname: 'btn btn-xs btn-danger btn-delone', - dropdown:"更多", - }, ], } ] diff --git a/public/assets/js/backend/orders/abnormal.js b/public/assets/js/backend/orders/abnormal.js index dca229e..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({ @@ -44,8 +44,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin {field: 'order.customer', title: __('Order.customer'), operate: 'LIKE'}, {field: 'order.tel', title: __('Order.tel'), operate: 'LIKE'}, - {field: 'order.worker_name', title: __('Order.worker_name'), operate: 'LIKE'}, - {field: 'order.worker_tel', title: __('Order.worker_tel'), operate: 'LIKE'}, + // {field: 'order.worker_name', title: __('Order.worker_name'), operate: 'LIKE'}, + // {field: 'order.worker_tel', title: __('Order.worker_tel'), operate: 'LIKE'}, //{field: 'handle_admin_id', title: __('Handle_admin_id')}, {field: 'handle_admin_user', title: __('Handle_admin_user'), operate: 'LIKE'}, {field: 'handle_time', title: __('Handle_time'), operate:false, addclass:'datetimerange', autocomplete:false}, @@ -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/configorder.js b/public/assets/js/backend/orders/configorder.js new file mode 100644 index 0000000..4b740b7 --- /dev/null +++ b/public/assets/js/backend/orders/configorder.js @@ -0,0 +1,85 @@ +define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) { + + var Controller = { + index: function () { + // 初始化表格参数配置 + Table.api.init({ + extend: { + index_url: 'orders/configorder/index' + location.search, + //add_url: 'orders/configorder/add', + edit_url: 'orders/configorder/edit', + // del_url: 'orders/configorder/del', + multi_url: 'orders/configorder/multi', + import_url: 'orders/configorder/import', + table: 'order', + } + }); + + var table = $("#table"); + + // 初始化表格 + table.bootstrapTable({ + url: $.fn.bootstrapTable.defaults.extend.index_url, + pk: 'id', + sortName: 'id', + fixedColumns: true, + fixedRightNumber: 1, + columns: [ + [ + {field: 'id', title: __('Id')}, + {field: 'order_no', title: __('Order_no'), operate: 'LIKE'}, + // {field: 'customer', title: __('Customer'), operate: 'LIKE'}, + //{field: 'tel', title: __('Tel'), operate: 'LIKE'}, + + //{field: 'dispatch.worker_name', title: __('Dispatch.worker_name'), operate: 'LIKE'}, + //{field: 'dispatch.worker_tel', title: __('Dispatch.worker_tel'), operate: 'LIKE'}, + + {field: 'dispatch.admin_user', title: __('Dispatch.admin_user'), operate: 'LIKE'}, + + {field: 'status', title: __('Status'), searchList: {"0":__('Status 0'),"10":__('Status 10'),"20":__('Status 20'),"30":__('Status 30'),"40":__('Status 40'),"50":__('Status 50'),"60":__('Status 60'),"-10":__('Status -10')}, formatter: Table.api.formatter.status}, + + // {field: 'address', title: __('Address'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, + + {field: 'source_shop', title: __('Source_shop'), operate: 'LIKE'}, + // {field: 'source', title: __('Source')}, + // {field: 'source_uid', title: __('Source_uid'), operate: 'LIKE'}, + {field: 'item_title', title: __('Item_title'), operate: 'LIKE'}, + + {field: 'total', title: __('Total'), operate:'BETWEEN'}, + {field: 'online_amount', title: __('Online_amount'), operate:'BETWEEN'}, + {field: 'offline_amount', title: __('Offline_amount'), operate:'BETWEEN'}, + + {field: 'refund_amount', title: __('Refund_amount'), operate:'BETWEEN'}, + {field: 'real_amount', title: __('Real_amount'), operate:'BETWEEN'}, + {field: 'cost', title: __('Cost'), operate:'BETWEEN'}, + {field: 'performance', title: __('Performance'), operate:'BETWEEN'}, + + // {field: 'dispatch_type', title: __('Dispatch_type')}, + {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: 'dispatch.finish_time', title: __('Dispatch.finish_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, + {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate} + ] + ] + }); + + // 为表格绑定事件 + 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; +}); diff --git a/public/assets/js/backend/orders/dispatch2.js b/public/assets/js/backend/orders/dispatch2.js new file mode 100644 index 0000000..e92b561 --- /dev/null +++ b/public/assets/js/backend/orders/dispatch2.js @@ -0,0 +1,238 @@ +define(['jquery', 'bootstrap', 'backend', 'table', 'form','layer'], function ($, undefined, Backend, Table, Form) { + + var Controller = { + index: function () { + // 初始化表格参数配置 + Table.api.init({ + extend: { + index_url: 'orders/dispatch2/index' + location.search, + //add_url: 'orders/dispatch/add', + edit_url: 'orders/dispatch2/edit', + //del_url: 'orders/dispatc2h/del', + multi_url: 'orders/dispatch2/multi', + import_url: 'orders/dispatch2/import', + table: 'order_dispatch', + } + }); + + var table = $("#table"); + + // 初始化表格 + table.bootstrapTable({ + url: $.fn.bootstrapTable.defaults.extend.index_url, + pk: 'id', + sortName: 'id', + fixedColumns: true, + fixedRightNumber: 1, + columns: [ + [ + //{checkbox: true}, + {checkbox: true, formatter: function (value, row, index) { + // 根据 is_selectable 字段控制是否禁用 +// return row.is_selectable ? '' : {disabled: true}; + if(row.is_disabled === true){ + return { + disabled: true + }; + } + return ''; + }}, + + {field: 'id', title: __('Id')}, + //{field: 'order_id', title: __('Order_id')}, + + {field: 'order.order_no', title: __('Order.order_no'), operate: 'LIKE'}, + + + // {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: '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.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}, + + {field: 'order.item_title', title: __('Order.item_title'), operate: 'LIKE'}, + {field: 'order.detail', title: __('Order.detail'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, + + {field: 'order.images', title: __('Order.images'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.images}, + + {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: '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, + + align:'left', + buttons: [ + { + name: 'edit', + text:"修改", + title:"", + icon: 'fa fa-pencil', + //title: __('Edit'), + extend: 'data-toggle="tooltip" data-container="body"', + classname: 'btn btn-xs btn-info btn-editone', + visible:function(row){ + if(row.btn_edit){ + return true; + } + return false; + } + }, + + { + name: 'finish', + text:"完成", + title:"完成", + icon: 'fa fa-check', + url: 'orders/dispatch2/finish', + extend: 'data-toggle="tooltip" data-container="body"', + classname: 'btn btn-xs btn-success btn-dialog', + visible:function(row){ + if(row.btn_finished){ + return true; + } + return false; + } + }, + ], + + } + ] + ] + }); + + // 为表格绑定事件 + Table.api.bindevent(table); + + + // 获取选中项 + $(document).on("click", ".btn-cancel-selected", function () { + //Layer.alert(JSON.stringify(Table.api.selecteddata(table))); + + // 获取选中项的 ID + var selectedData = Table.api.selecteddata(table); + var selectedIds = selectedData.map(item => item.id); // 假设每行数据有 `id` 字段 + + if (selectedIds.length === 0) { + Layer.alert("请先选择至少一项数据！"); + return; + } + + // 弹出确认框并要求输入文本 + Layer.prompt({ + title: "请输入操作理由", + formType: 2, // 多行文本输入框 + }, function (inputValue, index) { + if (!inputValue) { + Layer.alert("输入内容不能为空！"); + return; + } + + // 关闭弹出框 + Layer.close(index); + + //这里可以加入 Ajax 请求处理逻辑 + $.ajax({ + url: 'orders/dispatch2/del', + type: 'POST', + data: { + ids: selectedIds, + reason: inputValue, + }, + success: function (response,data) { + if(response.code == 1){ + // 成功提示 + Toastr.success(data.message || "操作成功！"); + // 刷新表格 + table.bootstrapTable('refresh'); + }else{ + Toastr.error(response.msg || "操作失败！"); + } + return; + }, + error: function () { + Toastr.error("操作失败，请重试！"); + return; + } + }); + + }); + + }); + + + // 获取选中项 + $(document).on("click", ".btn-add-normal", function () { + // 获取选中项的 ID + var selectedData = Table.api.selecteddata(table); + var selectedIds = selectedData.map(item => item.id); // 假设每行数据有 `id` 字段 + + if (selectedIds.length === 0) { + Layer.alert("请先选择至少一项数据！"); + return; + } + + if(selectedIds.length > 1){ + Layer.alert("创建异常，一次只能选择一条订单！"); + return; + } + + // 拼接 ids 到 URL 后面 + var url = 'orders/abnormal/add?ids=' + selectedIds.join(','); + + // 打开弹窗 + Fast.api.open( + url, + "新增订单异常", // 弹窗标题 + { + area: ['800px', '600px'] // 设置弹窗宽度和高度，可以根据需求调整 + } + ); + }); + + + }, + add: function () { + Controller.api.bindevent(); + }, + edit: function () { + Controller.api.bindevent(); + }, + finish: function () { + Controller.api.bindevent(); + }, + api: { + bindevent: function () { + Form.api.bindevent($("form[role=form]")); + } + } + }; + return Controller; +}); diff --git a/public/assets/js/backend/user/rule.js b/public/assets/js/backend/user/rule.js index 0ba2e80..01dfce9 100755 --- a/public/assets/js/backend/user/rule.js +++ b/public/assets/js/backend/user/rule.js @@ -35,7 +35,10 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin {field: 'updatetime', title: __('Updatetime'), formatter: Table.api.formatter.datetime, operate: 'RANGE', addclass: 'datetimerange', sortable: true, visible: false}, {field: 'weigh', title: __('Weigh')}, {field: 'status', title: __('Status'), formatter: Table.api.formatter.status}, - {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate} + {field: 'operate', title: __('Operate'), + table: table, events: Table.api.events.operate, + formatter: Table.api.formatter.operate, + } ] ], pagination: false, diff --git a/public/assets/js/backend/user/user.js b/public/assets/js/backend/user/user.js index 1ee1a74..ba871f1 100755 --- a/public/assets/js/backend/user/user.js +++ b/public/assets/js/backend/user/user.js @@ -43,7 +43,10 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin {field: 'jointime', title: __('Jointime'), formatter: Table.api.formatter.datetime, operate: 'RANGE', addclass: 'datetimerange', sortable: true}, {field: 'joinip', title: __('Joinip'), formatter: Table.api.formatter.search}, {field: 'status', title: __('Status'), formatter: Table.api.formatter.status, searchList: {normal: __('Normal'), hidden: __('Hidden')}}, - {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate} + {field: 'operate', title: __('Operate'), table: table, + events: Table.api.events.operate, + formatter: Table.api.formatter.operate, + } ] ] }); diff --git a/public/assets/js/backend/workers/worker.js b/public/assets/js/backend/workers/worker.js index 177add3..8a8abfa 100644 --- a/public/assets/js/backend/workers/worker.js +++ b/public/assets/js/backend/workers/worker.js @@ -1,4 +1,5 @@ -define(['jquery', 'bootstrap', 'backend', 'table', 'form','jstree'], function ($, undefined, Backend, Table, Form) { +define(['jquery', 'bootstrap', 'backend', 'table', 'form','jstree'], + function ($, undefined, Backend, Table, Form) { $.jstree.core.prototype.get_all_checked = function (full) { var obj = this.get_selected(), i, j; for (i = 0, j = obj.length; i < j; i++) {