From 9d055a1dfef74df172abf96be5ad1afa31c008dd Mon Sep 17 00:00:00 2001
From: xman <1946321327@qq.com>
Date: Fri, 18 Apr 2025 17:19:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/view/orders/auditorder/edit.html    | 33 ++++++++++++-------
 .../admin/view/orders/auditorder/index.html   | 10 +++---
 public/assets/js/backend/orders/auditorder.js | 29 ++++++++++++++--
 3 files changed, 55 insertions(+), 17 deletions(-)

diff --git a/application/admin/view/orders/auditorder/edit.html b/application/admin/view/orders/auditorder/edit.html
index 6be57b1..5bf96d4 100644
--- a/application/admin/view/orders/auditorder/edit.html
+++ b/application/admin/view/orders/auditorder/edit.html
@@ -18,7 +18,7 @@
     <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" readonly class="form-control"  type="text" value="{$row.detail|htmlentities}">
+            <textarea id="c-detail" readonly class="form-control" placeholder="订单详情" >{$row.detail|htmlentities}</textarea>
         </div>
     </div>
 
@@ -36,12 +36,6 @@
         </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"  class="form-control" readonly type="text" value="{$row.address|htmlentities}">
-        </div>
-    </div>
 
 
 <!--
@@ -76,6 +70,17 @@
         </div>
     </div>
 
+
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Offline_amount_type')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input  readonly  class="form-control"  value="{$row['offline_amount_type_text']}">
+        </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">
@@ -85,12 +90,18 @@
 
 
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Offline_amount_type')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('收款依据')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input  readonly  class="form-control"  value="{$row['offline_amount_type_text']}">
+            <div class="input-group">
+                <input id="c-amount_images" class="form-control" size="50"  type="text" value="{$order.amount_images}" >
+                <div class="input-group-addon no-border no-padding">
+                    <span><button type="button" id="faupload-amount_images" class="btn btn-danger faupload" data-input-id="c-amount_images" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp,image/webp" data-multiple="true" data-preview-id="p-amount_images"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
+                    <span><button type="button" id="fachoose-amount_images" class="btn btn-primary fachoose" data-input-id="c-amount_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-amount_images"></span>
+            </div>
+            <ul class="row list-inline faupload-preview" id="p-amount_images"></ul>
         </div>
-
-
     </div>
 
 
diff --git a/application/admin/view/orders/auditorder/index.html b/application/admin/view/orders/auditorder/index.html
index 97ccaf3..c337f6f 100644
--- a/application/admin/view/orders/auditorder/index.html
+++ b/application/admin/view/orders/auditorder/index.html
@@ -4,10 +4,12 @@
     <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}
+            <li class="active">
+                <a href="#t-50" data-value="50" data-toggle="tab">待结算</a>
+            </li>
+            <li class="{:$Think.get.status === '60' ? 'active' : ''}">
+                <a href="#t-60" data-value="60" data-toggle="tab">已完成</a>
+            </li>
         </ul>
     </div>
 
diff --git a/public/assets/js/backend/orders/auditorder.js b/public/assets/js/backend/orders/auditorder.js
index 066b9f3..4a68552 100644
--- a/public/assets/js/backend/orders/auditorder.js
+++ b/public/assets/js/backend/orders/auditorder.js
@@ -19,6 +19,22 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
 
             // 初始化表格
             table.bootstrapTable({
+
+                queryParams: function (params) {
+                    var filter = params.filter ? JSON.parse(params.filter) : {};
+                    var op = params.op ? JSON.parse(params.op) : {};
+
+                    // 如果没有 status 参数，则默认使用 50
+                    if (!('status' in filter)) {
+                        filter.status = '50';
+                        op.status = '=';
+                    }
+
+                    params.filter = JSON.stringify(filter);
+                    params.op = JSON.stringify(op);
+                    return params;
+                },
+
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
                 sortName: 'id',
@@ -27,11 +43,20 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 columns: [
                     [
                        // {checkbox: true},
+                        {
+                            field: 'status',
+                            title:  __('Status'),
+                            searchList: {"50":__('Status 50'),"60":__('Status 60')},
+                            formatter: Table.api.formatter.label,
+                            custom: {
+                                '50': 'warning',    // 待跟进：灰蓝色（默认 Bootstrap info）
+                                '60': 'success', // 已跟进：绿色
+                            }
+                        },
                         {field: 'id', title: __('Id'),operate: false},
                         {field: 'order_no', title: __('Order_no'), operate: '='},
                         {field: 'customer', title: __('Customer'), operate: false},
                         {field: 'tel', title: __('Tel'), operate: '='},
-                        {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'},
@@ -44,13 +69,13 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'item_title', title: __('Item_title'), operate: false},
                         {field: 'detail', title: __('Detail'), operate: false, table: table, class: 'autocontent', formatter: Table.api.formatter.content},
                         {field: 'remark', title: __('Remark'), operate: false, 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: 'admin_id', title: __('Admin_id'), operate: false},
                         {field: 'online_amount', title: __('Online_amount'), operate:false},
                         {field: 'online_amount_last', title: __('Online_amount_last'), operate:false},
                         {field: 'offline_amount', title: __('Offline_amount'), operate:false},
                         {field: 'offline_amount_type_text', title: __('Offline_amount_type'), operate:false},
+                        {field: 'amount_images', title: __('收款凭据'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.images},
                         {field: 'total', title: __('Total'), operate:'BETWEEN'},
                         {field: 'discount_amount', title: __('Discount_amount'), operate:false},
                         {field: 'real_amount', title: __('Real_amount'), operate:false},