From e86888fbc63cadaa226b0e71f561ab1f136ff5bc Mon Sep 17 00:00:00 2001
From: todaywindy <hant@cherrybless.com>
Date: Wed, 28 May 2025 20:27:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/view/order/add.html              | 5 +++--
 application/admin/view/setting/abnormal/add.html   | 4 ++--
 application/admin/view/setting/abnormal/index.html | 8 +++++++-
 public/assets/js/backend/order.js                  | 2 +-
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/application/admin/view/order/add.html b/application/admin/view/order/add.html
index 7da2239..d408b77 100644
--- a/application/admin/view/order/add.html
+++ b/application/admin/view/order/add.html
@@ -68,9 +68,10 @@
                             </div>
 
                             <div class="form-group col-xs-12">
-                                <label class="control-label col-xs-12 col-lg-4">上门时间:</label>
+                                <label class="control-label col-xs-12 col-lg-4">上门时间:
+                                </label>
                                 <div class="col-xs-12 col-sm-8">
-                                    <input  data-rule="required"  name="row[plan_time]" class="form-control datetimepicker">
+                                    <input  name="row[plan_time]" class="form-control datetimepicker">
                                 </div>
                             </div>
 
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 @@
         <div class="col-xs-12 col-sm-8">
             <select id="c-source" data-live-search="true" title="请选择" data-rule="required" name="row[type]"
                     class="form-control">
-                <option selected value="1">报错类型</option>
+                <option selected value="1">订单报错类型</option>
                 <option  value="2">订单取消类型</option>
-                <option  value="3">派单取消类型</option>
+                <option  value="3">订单异常类型</option>
             </select>
         </div>
     </div>
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 @@
 <div class="panel panel-default panel-intro">
     {:build_heading()}
-
+    <div class="panel-heading">
+        <ul class="nav nav-tabs" data-field="type">
+            <li class="{:$Think.get.type === (string)1 ? 'active' : ''}"><a href="#t-1" data-value="1" data-toggle="tab">订单异常类型</a></li>
+            <li class="{:$Think.get.type === (string)2 ? 'active' : ''}"><a href="#t-2" data-value="2" data-toggle="tab">订单取消类型</a></li>
+            <li class="{:$Think.get.type === (string)2 ? 'active' : ''}"><a href="#t-3" data-value="3" data-toggle="tab">订单报错类型</a></li>
+        </ul>
+    </div>
     <div class="panel-body">
         <div id="myTabContent" class="tab-content">
             <div class="tab-pane fade active in" id="one">
diff --git a/public/assets/js/backend/order.js b/public/assets/js/backend/order.js
index 34a5e7f..afd142d 100644
--- a/public/assets/js/backend/order.js
+++ b/public/assets/js/backend/order.js
@@ -349,7 +349,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;