From b00990ebe9e22aceb5f416a4b908be7df163b2d5 Mon Sep 17 00:00:00 2001
From: xman <1946321327@qq.com>
Date: Mon, 10 Mar 2025 15:35:36 +0800
Subject: [PATCH] sth

---
 .../admin/lang/zh-cn/orders/auditorder.php    |   5 +
 .../admin/view/orders/auditorder/edit.html    | 159 ++++++------------
 public/assets/js/backend/orders/auditorder.js |  32 ++--
 3 files changed, 79 insertions(+), 117 deletions(-)

diff --git a/application/admin/lang/zh-cn/orders/auditorder.php b/application/admin/lang/zh-cn/orders/auditorder.php
index f007435..63aef60 100644
--- a/application/admin/lang/zh-cn/orders/auditorder.php
+++ b/application/admin/lang/zh-cn/orders/auditorder.php
@@ -39,6 +39,11 @@ return [
     'Plan_time'          => '客户预约时间',
     'Admin_id'           => '录单员ID',
     'Total'              => '总收款',
+    'Online_amount'              => '线上收款',
+    'Offline_amount'              => '线下收款',
+    'Discount_amount'              => '优惠抵扣',
+    'Real_amount'              => '实际收款',
+    'Refund_amount'         =>  '退款金额',
     'Cost'               => '师傅成本',
     'Performance'        => '预计利润',
     'Cancel_reason_id'   => '取消原因',
diff --git a/application/admin/view/orders/auditorder/edit.html b/application/admin/view/orders/auditorder/edit.html
index 639365a..cae8278 100644
--- a/application/admin/view/orders/auditorder/edit.html
+++ b/application/admin/view/orders/auditorder/edit.html
@@ -1,118 +1,70 @@
 <form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
 
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('User_id')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-user_id" data-rule="required" data-source="user/user/index" data-field="nickname" class="form-control selectpage" name="row[user_id]" type="text" value="{$row.user_id|htmlentities}">
-        </div>
-    </div>
+
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Order_no')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-order_no" data-rule="required" class="form-control" name="row[order_no]" type="text" value="{$row.order_no|htmlentities}">
+            <input id="c-order_no" disabled data-rule="required" class="form-control" name="row[order_no]" type="text" value="{$row.order_no|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Customer')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-customer" class="form-control" name="row[customer]" type="text" value="{$row.customer|htmlentities}">
+            <input id="c-customer" disabled class="form-control" name="row[customer]" type="text" value="{$row.customer|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Tel')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-tel" data-rule="required" class="form-control" name="row[tel]" type="text" value="{$row.tel|htmlentities}">
+            <input id="c-tel" disabled data-rule="required" class="form-control" name="row[tel]" type="text" value="{$row.tel|htmlentities}">
         </div>
     </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            
-            <div class="radio">
-            {foreach name="statusList" item="vo"}
-            <label for="row[status]-{$key}"><input id="row[status]-{$key}" name="row[status]" type="radio" value="{$key}" {in name="key" value="$row.status"}checked{/in} /> {$vo}</label> 
-            {/foreach}
-            </div>
 
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Area_id')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-area_id" data-rule="required" data-source="area/index" class="form-control selectpage" name="row[area_id]" type="text" value="{$row.area_id|htmlentities}">
-        </div>
-    </div>
+
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Address')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-address" data-rule="required" class="form-control" name="row[address]" type="text" value="{$row.address|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Lng')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-lng" class="form-control" step="0.000001" name="row[lng]" type="number" value="{$row.lng|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Lat')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-lat" class="form-control" step="0.000001" name="row[lat]" type="number" value="{$row.lat|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Work_tel_id')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-work_tel_id" data-rule="required" data-source="work/tel/index" class="form-control selectpage" name="row[work_tel_id]" type="text" value="{$row.work_tel_id|htmlentities}">
+            <input id="c-address" disabled data-rule="required" class="form-control" name="row[address]" type="text" value="{$row.address|htmlentities}">
         </div>
     </div>
+
+
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Source_shop')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-source_shop" data-rule="required" class="form-control" name="row[source_shop]" type="text" value="{$row.source_shop|htmlentities}">
+            <input id="c-source_shop" readonly data-rule="required" class="form-control" name="row[source_shop]" type="text" value="{$row.source_shop|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Source')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-source" data-rule="required" class="form-control" name="row[source]" type="number" value="{$row.source|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Source_uid')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-source_uid" class="form-control" name="row[source_uid]" type="text" value="{$row.source_uid|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Item_id')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-item_id" data-rule="required" data-source="item/index" class="form-control selectpage" name="row[item_id]" type="text" value="{$row.item_id|htmlentities}">
+            <input id="c-source" readonly data-rule="required" class="form-control" name="row[source]" type="number" value="{$row.source|htmlentities}">
         </div>
     </div>
+
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Item_title')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-item_title" data-rule="required" class="form-control" name="row[item_title]" type="text" value="{$row.item_title|htmlentities}">
+            <input id="c-item_title" readonly data-rule="required" class="form-control" name="row[item_title]" type="text" value="{$row.item_title|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Detail')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-detail" class="form-control" name="row[detail]" type="text" value="{$row.detail|htmlentities}">
+            <input id="c-detail" readonly class="form-control" name="row[detail]" type="text" value="{$row.detail|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Remark')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-remark" class="form-control" name="row[remark]" type="text" value="{$row.remark|htmlentities}">
+            <input id="c-remark" readonly class="form-control" name="row[remark]" type="text" value="{$row.remark|htmlentities}">
         </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}">
+                <input disabled 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>
@@ -122,18 +74,51 @@
             <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">{:__('Plan_time')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Online_amount')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-plan_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[plan_time]" type="text" value="{$row.plan_time}">
+            <input id="c-online_amount" data-rule="required" class="form-control" step="0.01" name="row[online_amount]" type="number" value="{$row.online_amount|htmlentities}">
         </div>
     </div>
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Offline_amount')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-offline_amount" data-rule="required" class="form-control" step="0.01" name="row[offline_amount]" type="number" value="{$row.offline_amount|htmlentities}">
+        </div>
+    </div>
+
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Total')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-total" data-rule="required" class="form-control" step="0.01" name="row[total]" type="number" value="{$row.total|htmlentities}">
+            <input id="c-total" disabled data-rule="required" class="form-control" step="0.01" name="row[total]" type="number" value="{$row.total|htmlentities}">
         </div>
     </div>
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Discount_amount')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-discount_amount" disabled data-rule="required" class="form-control" step="0.01" name="row[discount_amount]" type="number" value="{$row.discount_amount|htmlentities}">
+        </div>
+    </div>
+
+
+    <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" disabled data-rule="required" class="form-control" step="0.01" name="row[refund_amount]" type="number" value="{$row.refund_amount|htmlentities}">
+        </div>
+    </div>
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Real_amount')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-real_amount" data-rule="required" class="form-control" step="0.01" name="row[real_amount]" type="number" value="{$row.real_amount|htmlentities}">
+        </div>
+    </div>
+
+
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Cost')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -146,48 +131,16 @@
             <input id="c-performance" data-rule="required" class="form-control" step="0.01" name="row[performance]" type="number" value="{$row.performance|htmlentities}">
         </div>
     </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Cancel_reason_id')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-cancel_reason_id" data-rule="required" data-source="cancel/reason/index" class="form-control selectpage" name="row[cancel_reason_id]" type="text" value="{$row.cancel_reason_id|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Cancel_detail')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-cancel_detail" class="form-control" name="row[cancel_detail]" type="text" value="{$row.cancel_detail|htmlentities}">
-        </div>
-    </div>
+
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Audit_remark')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-audit_remark" class="form-control" name="row[audit_remark]" type="text" value="{$row.audit_remark|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Audit_admin_id')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-audit_admin_id" data-rule="required" data-source="auth/admin/selectpage" data-field="nickname" class="form-control selectpage" name="row[audit_admin_id]" type="text" value="{$row.audit_admin_id|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Create_time')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-create_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[create_time]" type="text" value="{$row.create_time}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Update_time')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-update_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[update_time]" type="text" value="{$row.update_time}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Delete_time')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-delete_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[delete_time]" type="text" value="{$row.delete_time}">
+            <textarea class="form-control" name="row[audit_remark]" >
+                {$row.audit_remark|htmlentities}
+            </textarea>
         </div>
     </div>
+
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">
diff --git a/public/assets/js/backend/orders/auditorder.js b/public/assets/js/backend/orders/auditorder.js
index 6d1b217..d8fd511 100644
--- a/public/assets/js/backend/orders/auditorder.js
+++ b/public/assets/js/backend/orders/auditorder.js
@@ -9,7 +9,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     add_url: 'orders/auditorder/add',
                     edit_url: 'orders/auditorder/edit',
                    // del_url: 'orders/auditorder/del',
-                    multi_url: 'orders/auditorder/multi',
+                    //multi_url: 'orders/auditorder/multi',
                     import_url: 'orders/auditorder/import',
                     table: 'order',
                 }
@@ -26,31 +26,35 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 fixedRightNumber: 1,
                 columns: [
                     [
-                        {checkbox: true},
-                        {field: 'id', title: __('Id')},
-                        {field: 'user_id', title: __('User_id')},
+                       // {checkbox: true},
+                        {field: 'id', title: __('Id'),operate: false},
                         {field: 'order_no', title: __('Order_no'), operate: 'LIKE'},
                         {field: 'customer', title: __('Customer'), operate: 'LIKE'},
                         {field: 'tel', title: __('Tel'), operate: 'LIKE'},
-                        {field: 'status', title: __('Status'), searchList: {"10":__('Status 10'),"20":__('Status 20'),"30":__('Status 30'),"40":__('Status 40'),"41":__('Status 41'),"50":__('Status 50'),"60":__('Status 60'),"-10":__('Status -10')}, formatter: Table.api.formatter.status},
-                        {field: 'area_id', title: __('Area_id')},
-                        {field: 'address', title: __('Address'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
-                        {field: 'lng', title: __('Lng'), operate:'BETWEEN'},
-                        {field: 'lat', title: __('Lat'), operate:'BETWEEN'},
+                        {field: 'status', title: __('Status'), searchList: {"50":__('Status 50'),"60":__('Status 60')}, formatter: Table.api.formatter.status},
+                        //{field: 'area_id', title: __('Area_id')},
+                        //{field: 'address', title: __('Address'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+                       // {field: 'lng', title: __('Lng'), operate:'BETWEEN'},
+                       // {field: 'lat', title: __('Lat'), operate:'BETWEEN'},
                         //{field: 'work_tel_id', title: __('Work_tel_id')},
                         {field: 'source_shop', title: __('Source_shop'), operate: 'LIKE'},
                         {field: 'source', title: __('Source')},
                         {field: 'source_uid', title: __('Source_uid'), operate: 'LIKE'},
-                        {field: 'item_id', title: __('Item_id')},
+                       // {field: 'item_id', title: __('Item_id')},
                         {field: 'item_title', title: __('Item_title'), operate: 'LIKE'},
                         {field: 'detail', title: __('Detail'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
                         {field: 'remark', title: __('Remark'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
-                        {field: 'images', title: __('Images'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.images},
-                        {field: 'plan_time', title: __('Plan_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
+                       // {field: 'images', title: __('Images'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.images},
+                       // {field: 'plan_time', title: __('Plan_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
                         {field: 'admin_id', title: __('Admin_id')},
+                        {field: 'online_amount', title: __('Online_amount'), operate:false},
+                        {field: 'offline_amount', title: __('Offline_amount'), operate:false},
                         {field: 'total', title: __('Total'), operate:'BETWEEN'},
-                        {field: 'cost', title: __('Cost'), operate:'BETWEEN'},
-                        {field: 'performance', title: __('Performance'), operate:'BETWEEN'},
+                        {field: 'discount_amount', title: __('Discount_amount'), operate:false},
+                        {field: 'real_amount', title: __('Real_amount'), operate:false},
+                        {field: 'refund_amount', title: __('Refund_amount'), operate:false},
+                        {field: 'cost', title: __('Cost'), operate:false},
+                        {field: 'performance', title: __('Performance'), operate:false},
                        // {field: 'cancel_reason_id', title: __('Cancel_reason_id')},
                         //{field: 'cancel_detail', title: __('Cancel_detail'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
                        // {field: 'audit_admin_id', title: __('Audit_admin_id')},