diff --git a/application/admin/controller/Order.php b/application/admin/controller/Order.php index a641abf..be5da90 100644 --- a/application/admin/controller/Order.php +++ b/application/admin/controller/Order.php @@ -215,6 +215,10 @@ class Order extends Backend $this->error($validate); } + if (!$params['set_time']) { + $params['plan_time'] = null; + } + $params = array_filter($params, function ($val) { return $val != ''; }); diff --git a/application/admin/view/order/copy.html b/application/admin/view/order/copy.html index b6268f4..4ea015b 100644 --- a/application/admin/view/order/copy.html +++ b/application/admin/view/order/copy.html @@ -1,266 +1,369 @@ - -
-
-
- -
-
-
-
-
-
- -
- -
-
-
- -
- -
-
- -
- -
- - -
-
-
- -
-
- -
地图查找
-
- - - -
-
- -
- -
- - -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
-
- -
- - -
- -
-
    -
    -
    - -
    - - -
    -
    - -
    - -
    -
    - - - -
    - -
    - -
    -
    - - -
    - -
    - -
    -
    - - -
    - -
    - -
    -
    - -
    - -
    - -
    -
    - - - - - -
    - -
    - -
    -
    - - -
    - -
    - -
    -
    - -
    - -
    - -
    -
    - -
    - -
    - -
    -
    - -
    - - - -
    -
    +
    +
    +
    +
    + +
    +
    +
    *订单渠道：
    +
    +
    +
    +
    +
    *服务项目：
    +
    + + +
    +
    +
    +
    +
    *客户昵称：
    +
    + +
    +
    +
    +
    *客户电话：
    +
    + +
    +
    +
    +
    +
    *地区：
    +
    + + +
    +
    +
    +
    +
    *详细地址：
    +
    +
    地图查找
    +
    +
    +
    + + + + +
    +
    +
    +
    +
    收款方式：
    +
    + +
    +
    +
    +
    *收款金额：
    +
    + +
    +
    +
    +
    +
    +
    优惠：
    +
    + +
    +
    +
    + +
    +
    +
    上门时间：
    +
    + {:build_radios('row[set_time]', ['1'=>'有', '0'=>'无'], $row.plan_time === '' || $row.plan_time === null ? 0 : 1)} +
    +
    +
    +
    *设置时间：
    +
    + +
    +
    +
    +
    +
    +
    订单备注：
    +
    +
    + +
    +
    +
    +
    +
    录单员：
    +
    + +
    +
    +
    + +
    +
    图片上传：
    +
    +
    + +
    + + +
    + +
    +
      +
      +
      +
      + +
      - + - - - \ No newline at end of file + + + + + + + + + + + + + + diff --git a/public/assets/js/backend/order.js b/public/assets/js/backend/order.js index 6db3c88..50a3c39 100644 --- a/public/assets/js/backend/order.js +++ b/public/assets/js/backend/order.js @@ -424,6 +424,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'cascader'], function } return false; }); + $("#mysubmit").on("click", function () { const res = $("form[role=form]").isValid(); if (res){ @@ -433,7 +434,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'cascader'], function } return false; }); - Form.api.bindevent($("form[role=form]")); + $("#smart").on("click", function () { $.ajax({ url: "order/smart", // 你的 API 地址 @@ -478,16 +479,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'cascader'], function } }); }); + Controller.api.bindevent(); Controller.api.map(); - - $('input[name="row[set_time]"]').on('change', function () { - var val = $(this).val(); - if (val == 1) { - $('#set-time').show(); - } else { - $('#set-time').hide(); - } - }); }, edit: function () { // 未选择上门时间时，隐藏时间选择框 @@ -500,16 +493,16 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'cascader'], function Controller.api.bindevent(); Controller.api.map(); - $('input[name="row[set_time]"]').on('change', function () { - var val = $(this).val(); - if (val == 1) { - $('#set-time').show(); - } else { - $('#set-time').hide(); - } - }); }, copy: function () { + // 未选择上门时间时，隐藏时间选择框 + var planTime = $('input[name="row[plan_time]"]').val() + if (planTime === '' || planTime === 'null') { + $('#set-time').hide(); + } else { + $('#set-time').show(); + } + Controller.api.bindevent(); Controller.api.map(); }, @@ -556,6 +549,15 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'cascader'], function api: { bindevent: function () { Form.api.bindevent($("form[role=form]")); + + $('input[name="row[set_time]"]').on('change', function () { + var val = $(this).val(); + if (val == 1) { + $('#set-time').show(); + } else { + $('#set-time').hide(); + } + }); }, map:function () { $("#c-city").on("cp:updated", function () {