hant/allocatr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

配置订单

Browse Source
This commit is contained in:
xman 2025-03-27 20:49:09 +08:00
parent d8ae933e81
commit 66407c5adf
5 changed files with 40 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/admin/controller/orders/Auditorder.php
View File

@ -62,7 +62,7 @@ class Auditorder extends Backend
$list = $this->model $list = $this->model
->scope('tab',Order::TAB_AUDIT) ->scope('tab',Order::TAB_AUDIT)
->alias('order') ->alias('order')
->with(['auditadmin:id,username,nickname']) ->with(['auditadmin'])
->where($where) ->where($where)
->order($sort, $order) ->order($sort, $order)
->paginate($limit); ->paginate($limit);

12
application/admin/model/order/Dispatch.php
View File

@ -1,12 +0,0 @@
<?php
namespace app\admin\model\order;
use think\Model;
class Dispatch extends Model
{
// 表名
protected $name = 'order_dispatch';
}

32
application/admin/view/orders/configorder/edit.html
View File

@ -15,20 +15,20 @@
</div> </div>
<div class="form-group"> <!-- <div class="form-group">-->
<label class="control-label col-xs-12 col-sm-2">{:__('Images')}:</label> <!-- <label class="control-label col-xs-12 col-sm-2">{:__('Images')}:</label>-->
<div class="col-xs-12 col-sm-8"> <!-- <div class="col-xs-12 col-sm-8">-->
<div class="input-group"> <!-- <div class="input-group">-->
<input id="c-images" class="form-control" size="50" name="row[images]" type="text" value="{$row.images|htmlentities}"> <!-- <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"> <!-- <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="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> <!-- <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> <!-- </div>-->
<span class="msg-box n-right" for="c-images"></span> <!-- <span class="msg-box n-right" for="c-images"></span>-->
</div> <!-- </div>-->
<ul class="row list-inline faupload-preview" id="p-images"></ul> <!-- <ul class="row list-inline faupload-preview" id="p-images"></ul>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
<div class="form-group"> <div class="form-group">
@ -48,7 +48,7 @@
<div class="form-group"> <div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Refund_amount')}:</label> <label class="control-label col-xs-12 col-sm-2">{:__('Refund_amount')}:</label>
<div class="col-xs-12 col-sm-8"> <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>
</div> </div>
@ -66,7 +66,7 @@
</div> </div>
{notempty name='row.audit'} {notempty name='row.audit_admin_id'}
<div class="form-group"> <div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Audit_remark')}:</label> <label class="control-label col-xs-12 col-sm-2">{:__('Audit_remark')}:</label>

18
application/admin/view/orders/configorder/index.html
View File

@ -1,14 +1,14 @@
<div class="panel panel-default panel-intro"> <div class="panel panel-default panel-intro">
<div class="panel-heading"> <!-- <div class="panel-heading">-->
{:build_heading(null,FALSE)} <!-- {:build_heading(null,FALSE)}-->
<ul class="nav nav-tabs" data-field="status"> <!-- <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> <!-- <li class="{:$Think.get.status === null ? 'active' : ''}"><a href="#t-all" data-value="" data-toggle="tab">{:__('All')}</a></li>-->
{foreach name="statusList" item="vo"} <!-- {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> <!-- <li class="{:$Think.get.status === (string)$key ? 'active' : ''}"><a href="#t-{$key}" data-value="{$key}" data-toggle="tab">{$vo}</a></li>-->
{/foreach} <!-- {/foreach}-->
</ul> <!-- </ul>-->
</div> <!-- </div>-->
<div class="panel-body"> <div class="panel-body">

24
public/assets/js/backend/orders/configorder.js
View File

@ -28,30 +28,34 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
[ [
{field: 'id', title: __('Id')}, {field: 'id', title: __('Id')},
{field: 'order_no', title: __('Order_no'), operate: 'LIKE'}, {field: 'order_no', title: __('Order_no'), operate: 'LIKE'},
{field: 'customer', title: __('Customer'), operate: 'LIKE'}, // {field: 'customer', title: __('Customer'), operate: 'LIKE'},
{field: 'tel', title: __('Tel'), 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: '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_shop', title: __('Source_shop'), operate: 'LIKE'},
{field: 'source', title: __('Source')}, // {field: 'source', title: __('Source')},
{field: 'source_uid', title: __('Source_uid'), operate: 'LIKE'}, // {field: 'source_uid', title: __('Source_uid'), operate: 'LIKE'},
{field: 'item_title', title: __('Item_title'), operate: 'LIKE'}, {field: 'item_title', title: __('Item_title'), operate: 'LIKE'},
{field: 'total', title: __('Total'), operate:'BETWEEN'}, {field: 'total', title: __('Total'), operate:'BETWEEN'},
{field: 'online_amount', title: __('Online_amount'), operate:'BETWEEN'}, {field: 'online_amount', title: __('Online_amount'), operate:'BETWEEN'},
{field: 'offline_amount', title: __('Offline_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: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
{field: 'update_time', title: __('Update_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} {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
] ]
] ]