diff --git a/application/admin/controller/Order.php b/application/admin/controller/Order.php index 627814f..d78c35d 100644 --- a/application/admin/controller/Order.php +++ b/application/admin/controller/Order.php @@ -136,7 +136,12 @@ class Order extends Backend $build = $this->model ->field(['id', 'order_no', 'admin_id', 'customer', 'tel', 'status', 'area_id', 'address', 'source', 'source_shop', 'source_uid', 'source', 'item_title', 'item_id', 'work_tel_id', - 'detail', 'remark', 'images', 'create_time', 'update_time', 'admin_id', 'dispatch_type', 'receive_type','aftersale_id']) + 'detail', 'remark', 'images', 'create_time', 'update_time', 'admin_id', 'dispatch_type', + 'receive_type', + 'plan_time', + 'coupon_id', + 'aftersale_id' + ]) ->where($where); if ($type == 1){ @@ -166,6 +171,8 @@ class Order extends Backend $q->field('id,area_code,merge_name'); }, 'phone' => function ($q) { $q->field('id,model'); + },'coupon' => function ($q) { + $q->field('id,code,description'); }]) ->order($sort, $order) ->paginate($limit); @@ -433,6 +440,7 @@ class Order extends Backend $insert = [ 'order_id' => $params['order_id'], 'status' => 0, + 'level' => $params['level'], 'abnormal_id' => $params['abnormal_id'], 'abnormal_title' => model('abnormal')->get($params['abnormal_id'])->title ?? '', 'detail' => $params['detail'], diff --git a/application/admin/controller/aftersales/Aftersale.php b/application/admin/controller/aftersales/Aftersale.php index 652e306..9dc2c37 100644 --- a/application/admin/controller/aftersales/Aftersale.php +++ b/application/admin/controller/aftersales/Aftersale.php @@ -2,6 +2,7 @@ namespace app\admin\controller\aftersales; +use app\admin\model\Admin; use app\admin\model\Order; use app\common\controller\Backend; use app\common\Logic\OrderLogic; @@ -161,15 +162,14 @@ class Aftersale extends Backend } $params['status'] = 1; - if($params['handle_type'] == 1){ - $params['refund_amount'] = bcadd($params['company_refund_amount'],$params['worker_refund_amount'],2); + if($params['type'] == 1){ + $params['refund_amount'] = bcadd($params['company_refund_amount'] ?? 0,$params['worker_refund_amount']??0,2); }else{ unset($params['company_refund_amount']); unset($params['worker_refund_amount']); } - - $params['dispatch_admin_id'] = $order->dispatch_admin_id; - $params['dispatch_admin_user'] = $order->dispatch_admin_user; + $params['dispatch_admin_id'] = $order->dispatch_admin_id ?? 0; + $params['dispatch_admin_user'] = $order->dispatch_admin_user ?? ''; $result = $this->model->allowField(true)->save($params); $order->aftersale_id = $this->model->id; diff --git a/application/admin/model/Order.php b/application/admin/model/Order.php index cf6f9d0..36da951 100644 --- a/application/admin/model/Order.php +++ b/application/admin/model/Order.php @@ -193,6 +193,9 @@ class Order extends Model public function area(){ return $this->belongsTo(Area::class,'area_id','area_code'); } + public function coupon(){ + return $this->belongsTo(Coupons::class,'coupon_id'); + } public function phone(){ return $this->belongsTo(Phones::class,'work_tel_id',); } diff --git a/application/admin/view/aftersales/aftersale/add.html b/application/admin/view/aftersales/aftersale/add.html index 7e09040..3c2e6ad 100644 --- a/application/admin/view/aftersales/aftersale/add.html +++ b/application/admin/view/aftersales/aftersale/add.html @@ -15,60 +15,17 @@
- +
- - + + + -
-
- -
- -
-
-
- -
- -
-
-
- -
- - - -
-
-
- -
- - - -
-
-
@@ -89,7 +46,7 @@
- - +
diff --git a/application/admin/view/aftersales/aftersale/edit.html b/application/admin/view/aftersales/aftersale/edit.html index ef3e613..6859270 100644 --- a/application/admin/view/aftersales/aftersale/edit.html +++ b/application/admin/view/aftersales/aftersale/edit.html @@ -3,11 +3,45 @@
- +
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
diff --git a/application/admin/view/order/abnormal.html b/application/admin/view/order/abnormal.html index a078151..6c56b33 100644 --- a/application/admin/view/order/abnormal.html +++ b/application/admin/view/order/abnormal.html @@ -17,7 +17,7 @@
- {foreach $options as $item} {/foreach} @@ -25,6 +25,18 @@
+
+ +
+ + +
+
+
diff --git a/application/admin/view/order/add.html b/application/admin/view/order/add.html index 7da2239..14e1137 100644 --- a/application/admin/view/order/add.html +++ b/application/admin/view/order/add.html @@ -30,7 +30,7 @@
- +
- +
- +
diff --git a/application/admin/view/order/copy.html b/application/admin/view/order/copy.html index e36a991..b6268f4 100644 --- a/application/admin/view/order/copy.html +++ b/application/admin/view/order/copy.html @@ -6,169 +6,188 @@
-
录入订单
-
- -
- +
+
+ +
+ +
-
-
- -
- +
+ +
+ +
-
-
- -
- +
+ +
+ + +
-
- - - -
- -
- +
+ +
+
+ +
地图查找
+
+ + + +
-
-
- -
- -
-
-
- -
- -
-
- - -
- -
- -
-
- -
- -
- -
-
- - -
- -
- - -
-
-
- -
- -
地图查找
- - - -
-
- -
- -
- -
-
- -
- -
- -
-
-
- -
+
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+
+ +
+ + +
+ +
+
    +
    +
    +
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    - -
    -
    - -
    - - -
    - + +
    +
    + +
    +
    -
      -
      -
      - -
      - + + + +
      + +
      + +
      + + +
      + +
      + +
      +
      + + +
      + +
      + +
      +
      + +
      + +
      + +
      +
      + + + + + +
      + +
      + +
      +
      + + +
      + +
      + +
      +
      + +
      + +
      + +
      +
      + +
      + +
      + +
      +
      +
      + + +
      @@ -179,6 +198,9 @@ diff --git a/application/admin/view/orders/abnormal/index.html b/application/admin/view/orders/abnormal/index.html index e7aca29..0e729d4 100644 --- a/application/admin/view/orders/abnormal/index.html +++ b/application/admin/view/orders/abnormal/index.html @@ -17,7 +17,7 @@
      - {:__('Add')} + diff --git a/application/admin/view/setting/abnormal/add.html b/application/admin/view/setting/abnormal/add.html index 1b2ae05..d129e1e 100644 --- a/application/admin/view/setting/abnormal/add.html +++ b/application/admin/view/setting/abnormal/add.html @@ -12,9 +12,9 @@
      diff --git a/application/admin/view/setting/abnormal/index.html b/application/admin/view/setting/abnormal/index.html index e0ca121..ba71a24 100644 --- a/application/admin/view/setting/abnormal/index.html +++ b/application/admin/view/setting/abnormal/index.html @@ -1,6 +1,12 @@
      {:build_heading()} - +
      + +
      diff --git a/public/assets/js/backend/order.js b/public/assets/js/backend/order.js index 34a5e7f..07c8328 100644 --- a/public/assets/js/backend/order.js +++ b/public/assets/js/backend/order.js @@ -28,15 +28,17 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'cascader'], function 【订单详情】 录单员: ${data.user.nickname} 订单编号: ${data.order_no} +服务名称: ${data.item_title} 客户姓名: ${data.customer} 客户电话: ${data.tel} +上门时间: ${data.plan_time} +优惠码: ${data.coupon?.description||'无'} 订单状态: ${data.status_text} -地域: ${data.area.merge_name} 详细地址: ${data.address} +订单详情: ${data.detail} +订单备注: ${data.remark} 派单方式: ${data.dispatch_type === 1 ? '手动派单' : '自动派单'} -收款方式: ${data.collect_text || '未收款'} -订单来源: ${data.source_shop} -服务名称: ${data.item_title} +收款方式: ${data.receive_type === 1 ? '已收定金' : '已收全款'} 请查收以上订单信息。`; @@ -71,6 +73,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'cascader'], function fixedRightNumber: 1, fixedNumber: 3, fixedColumns: true, + renderDefault:true, columns: [ [ {checkbox: true}, @@ -92,7 +95,11 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'cascader'], function /*"-20": __('Status -20'), "-30": __('Status -30')*/ }, - formatter: Table.api.formatter.status + defaultValue:10, + formatter: Table.api.formatter.status, + custom:{ + "10":"my_dispatch" + } }, { field: 'dispatch_type', @@ -349,7 +356,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'cascader'], function url: 'aftersales/aftersale/add', dropdown: "更多", visible: function (row) { - if (row.aftersale_btn==true) { + if (row.status!==-10) { return true; } return false; @@ -462,12 +469,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'cascader'], function Controller.api.bindevent(); }, addabnormal: function () { - console.log('abnormal'); - Form.api.bindevent($("#add-form"), null, null, function (data) { - Form.api.submit($("#add-form")); - // console.log(data); - // return false; - }); + Form.api.bindevent($("#add-form")); }, delete: function () { Form.api.bindevent($("form[role=form]")); diff --git a/public/assets/js/backend/orders/abnormal.js b/public/assets/js/backend/orders/abnormal.js index dc97b06..c174473 100644 --- a/public/assets/js/backend/orders/abnormal.js +++ b/public/assets/js/backend/orders/abnormal.js @@ -38,6 +38,13 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin [ {field: 'id', title: __('Id'),operate: false}, {field: 'order.order_no', title: __('Order.order_no'), operate: 'LIKE'}, + {field: 'level', title: '紧急程度', + searchList: { + "1": '一般紧急', + "2": '紧急', + "3": '非常紧急', + }, + formatter: Table.api.formatter.label}, {field: 'abnormal_id', title: __('Abnormal_id'),visible:false}, {field: 'abnormal_title', title: __('Abnormal_title'), operate: false}, {field: 'status', title: __('Status'), searchList: {"0":__('Status 0'),"1":__('Status 1'),"-1":__('Status -1')}, formatter: Table.api.formatter.status}, diff --git a/public/assets/js/require-table.js b/public/assets/js/require-table.js index 3dedb86..2ad0e9a 100755 --- a/public/assets/js/require-table.js +++ b/public/assets/js/require-table.js @@ -1007,7 +1007,7 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table $.each(dropdowns, function (i, j) { dropdownHtml.push('
      • ' + j.join('
      • ') + '
      '); }); - html.unshift(dropdownHtml.join(' ')); + html.push(dropdownHtml.join(' ')); } return html.join(' '); },