From 66407c5adfe6b4680e071e4c38730a9ebf91fb76 Mon Sep 17 00:00:00 2001
From: xman <1946321327@qq.com>
Date: Thu, 27 Mar 2025 20:49:09 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/controller/orders/Auditorder.php    |  2 +-
 application/admin/model/order/Dispatch.php    | 12 -------
 .../admin/view/orders/configorder/edit.html   | 32 +++++++++----------
 .../admin/view/orders/configorder/index.html  | 18 +++++------
 .../assets/js/backend/orders/configorder.js   | 24 ++++++++------
 5 files changed, 40 insertions(+), 48 deletions(-)
 delete mode 100644 application/admin/model/order/Dispatch.php

diff --git a/application/admin/controller/orders/Auditorder.php b/application/admin/controller/orders/Auditorder.php
index 25d3e9e..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);
diff --git a/application/admin/model/order/Dispatch.php b/application/admin/model/order/Dispatch.php
deleted file mode 100644
index f1001b7..0000000
--- a/application/admin/model/order/Dispatch.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-namespace app\admin\model\order;
-
-use think\Model;
-
-class Dispatch extends Model
-{
-    // 表名
-    protected $name = 'order_dispatch';
-    
-}
diff --git a/application/admin/view/orders/configorder/edit.html b/application/admin/view/orders/configorder/edit.html
index d3b298d..ce8694e 100644
--- a/application/admin/view/orders/configorder/edit.html
+++ b/application/admin/view/orders/configorder/edit.html
@@ -15,20 +15,20 @@
     </div>
 
 
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Images')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <div class="input-group">
-                <input id="c-images" class="form-control" size="50" name="row[images]" type="text" value="{$row.images|htmlentities}">
-                <div class="input-group-addon no-border no-padding">
-                    <span><button type="button" id="faupload-images" class="btn btn-danger faupload" data-input-id="c-images" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp,image/webp" data-multiple="true" data-preview-id="p-images"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
-                    <span><button type="button" id="fachoose-images" class="btn btn-primary fachoose" data-input-id="c-images" data-mimetype="image/*" data-multiple="true"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
-                </div>
-                <span class="msg-box n-right" for="c-images"></span>
-            </div>
-            <ul class="row list-inline faupload-preview" id="p-images"></ul>
-        </div>
-    </div>
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Images')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            <div class="input-group">-->
+<!--                <input id="c-images" class="form-control" size="50" name="row[images]" type="text" value="{$row.images|htmlentities}">-->
+<!--                <div class="input-group-addon no-border no-padding">-->
+<!--                    <span><button type="button" id="faupload-images" class="btn btn-danger faupload" data-input-id="c-images" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp,image/webp" data-multiple="true" data-preview-id="p-images"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>-->
+<!--                    <span><button type="button" id="fachoose-images" class="btn btn-primary fachoose" data-input-id="c-images" data-mimetype="image/*" data-multiple="true"><i class="fa fa-list"></i> {:__('Choose')}</button></span>-->
+<!--                </div>-->
+<!--                <span class="msg-box n-right" for="c-images"></span>-->
+<!--            </div>-->
+<!--            <ul class="row list-inline faupload-preview" id="p-images"></ul>-->
+<!--        </div>-->
+<!--    </div>-->
 
 
     <div class="form-group">
@@ -48,7 +48,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Refund_amount')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-refund_amount" class="form-control" step="0.01" name="row[refund_amount]" type="number" value="{$row.refund_amount|htmlentities}">
+            <input id="c-refund_amount" data-rule="required" class="form-control" step="0.01" name="row[refund_amount]" type="number" value="{$row.refund_amount|htmlentities}">
         </div>
     </div>
 
@@ -66,7 +66,7 @@
     </div>
 
 
-    {notempty name='row.audit'}
+    {notempty name='row.audit_admin_id'}
 
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Audit_remark')}:</label>
diff --git a/application/admin/view/orders/configorder/index.html b/application/admin/view/orders/configorder/index.html
index b967c83..5b6b25b 100644
--- a/application/admin/view/orders/configorder/index.html
+++ b/application/admin/view/orders/configorder/index.html
@@ -1,14 +1,14 @@
 <div class="panel panel-default panel-intro">
     
-    <div class="panel-heading">
-        {:build_heading(null,FALSE)}
-        <ul class="nav nav-tabs" data-field="status">
-            <li class="{:$Think.get.status === null ? 'active' : ''}"><a href="#t-all" data-value="" data-toggle="tab">{:__('All')}</a></li>
-            {foreach name="statusList" item="vo"}
-            <li class="{:$Think.get.status === (string)$key ? 'active' : ''}"><a href="#t-{$key}" data-value="{$key}" data-toggle="tab">{$vo}</a></li>
-            {/foreach}
-        </ul>
-    </div>
+<!--    <div class="panel-heading">-->
+<!--        {:build_heading(null,FALSE)}-->
+<!--        <ul class="nav nav-tabs" data-field="status">-->
+<!--            <li class="{:$Think.get.status === null ? 'active' : ''}"><a href="#t-all" data-value="" data-toggle="tab">{:__('All')}</a></li>-->
+<!--            {foreach name="statusList" item="vo"}-->
+<!--            <li class="{:$Think.get.status === (string)$key ? 'active' : ''}"><a href="#t-{$key}" data-value="{$key}" data-toggle="tab">{$vo}</a></li>-->
+<!--            {/foreach}-->
+<!--        </ul>-->
+<!--    </div>-->
 
 
     <div class="panel-body">
diff --git a/public/assets/js/backend/orders/configorder.js b/public/assets/js/backend/orders/configorder.js
index b0962cd..df3b4c8 100644
--- a/public/assets/js/backend/orders/configorder.js
+++ b/public/assets/js/backend/orders/configorder.js
@@ -28,30 +28,34 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     [
                         {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: '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: '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: '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: 'dispatch_type', title: __('Dispatch_type')},
+                       // {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.worker_name', title: __('Dispatch.worker_name'), operate: 'LIKE'},
-                        {field: 'dispatch.worker_tel', title: __('Dispatch.worker_tel'), operate: 'LIKE'},
 
-                        {field: 'dispatch.finish_time', title: __('Dispatch.finish_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}
                     ]
                 ]