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-04-19 21:20:54 +08:00
parent 6ab546b78f
commit 910e720583
7 changed files with 99 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
application/admin/lang/zh-cn/orders/configorder.php
View File

@ -15,6 +15,7 @@ return [
'Status 30' => '进行中',
'Set status to 30' => '设为进行中',
'Status 40' => '待配置',
'Status 41' => '审核驳回',
'Set status to 40' => '设为待配置',
'Status 50' => '待结算',
'Set status to 50' => '设为待结算',

17
application/admin/view/aftersales/aftersale/add.html
View File

@ -13,18 +13,7 @@
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Handle_type')}:</label>
<div class="col-xs-12 col-sm-8">
<select id="c-handle_type" data-rule="required" class="form-control selectpicker" name="row[handle_type]">
{foreach name="handleTypeList" item="vo"}
<option value="{$key}" {in name="key" value="0"}selected{/in}>{$vo}</option>
{/foreach}
</select>
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('From')}:</label>
<div class="col-xs-12 col-sm-8">
@ -100,7 +89,7 @@
<ul class="row list-inline faupload-preview" id="p-customer_qrcode"></ul>
</div>
</div>
<div class="form-group">
<!-- <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">
@ -113,13 +102,15 @@
</div>
<ul class="row list-inline faupload-preview" id="p-images"></ul>
</div>
</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">
<textarea id="c-remark" class="form-control" name="row[remark]" placeholder="备注"></textarea>
</div>
</div>
-->
<div class="form-group layer-footer">

26
application/admin/view/aftersales/aftersale/edit.html
View File

@ -7,18 +7,7 @@
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Handle_type')}:</label>
<div class="col-xs-12 col-sm-8">
<select id="c-handle_type" data-rule="required" class="form-control selectpicker" name="row[handle_type]">
{foreach name="handleTypeList" item="vo"}
<option value="{$key}" {in name="key" value="$row.handle_type"}selected{/in}>{$vo}</option>
{/foreach}
</select>
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('From')}:</label>
<div class="col-xs-12 col-sm-8">
@ -155,6 +144,21 @@
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Handle_type')}:</label>
<div class="col-xs-12 col-sm-8">
<select id="c-handle_type" data-rule="required" class="form-control selectpicker" name="row[handle_type]">
{foreach name="handleTypeList" item="vo"}
<option value="{$key}" {in name="key" value="$row.handle_type"}selected{/in}>{$vo}</option>
{/foreach}
</select>
</div>
</div>
{if condition='$row.status eq 1'}
<div class="form-group layer-footer">
<label class="control-label col-xs-12 col-sm-2"></label>

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

@ -49,10 +49,63 @@
</div>
</div>
{if condition='$row.status eq 40'}
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Online_amount_last')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-online_amount_last" data-rule="required" class="form-control" step="0.01" name="row[online_amount_last]" type="number" value="{$row.dispatch.online_total|htmlentities}">
</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">
{:build_select('row[offline_amount_type]',$offlineTotalTypeList,$row['dispatch']['offline_total_type'],['class'=>'form-control','data-rule'=>'required'])}
</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.dispatch.total|htmlentities}">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('收款依据')}:</label>
<div class="col-xs-12 col-sm-8">
<div class="input-group">
<input id="c-amount_images" class="form-control" size="50" name="row[amount_images]" type="text" value="{$row.dispatch.image}" >
<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>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Cost')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-cost" data-rule="required" class="form-control" step="0.01" name="row[cost]" type="number" value="{$row.dispatch.amount|htmlentities}">
</div>
</div>
{/if}
{if condition='$row.status eq 41'}
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Online_amount_last')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-online_amount_last" data-rule="required" class="form-control" step="0.01" name="row[online_amount_last]" type="number" value="{$row.dispatch.online_total|htmlentities}">
<input id="c-online_amount_last" data-rule="required" class="form-control" step="0.01" name="row[online_amount_last]" type="number" value="{$row.online_amount_last|htmlentities}">
</div>
</div>
@ -60,14 +113,14 @@
<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">
{:build_select('row[offline_amount_type]',$offlineTotalTypeList,$row['dispatch']['offline_total_type'],['class'=>'form-control','data-rule'=>'required'])}
{:build_select('row[offline_amount_type]',$offlineTotalTypeList,$row['offline_amount_type'],['class'=>'form-control','data-rule'=>'required'])}
</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.dispatch.total|htmlentities}">
<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>
@ -76,7 +129,7 @@
<label class="control-label col-xs-12 col-sm-2">{:__('收款依据')}:</label>
<div class="col-xs-12 col-sm-8">
<div class="input-group">
<input id="c-amount_images" class="form-control" size="50" name="row[amount_images]" type="text" value="{$order.dispatch.image}" >
<input id="c-amount_images" class="form-control" size="50" name="row[amount_images]" type="text" value="{$row.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>
@ -88,6 +141,17 @@
</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">
<input id="c-cost" data-rule="required" class="form-control" step="0.01" name="row[cost]" type="number" value="{$row.cost|htmlentities}">
</div>
</div>
{/if}
<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">
@ -96,12 +160,6 @@
</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">
<input id="c-cost" data-rule="required" class="form-control" step="0.01" name="row[cost]" type="number" value="{$row.dispatch.amount|htmlentities}">
</div>
</div>
<!-- <div class="form-group">

3
public/assets/js/backend/orders/auditorder.js
View File

@ -43,6 +43,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
columns: [
[
// {checkbox: true},
{field: 'id', title: __('Id'),operate: false},
{
field: 'status',
title: __('Status'),
@ -53,7 +54,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
'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: '='},

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

@ -36,7 +36,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
{field: 'dispatch.admin_user', title: __('Dispatch.admin_user'), operate: '='},
{field: 'status', title: __('Status'), searchList: {"0":__('Status 0'),"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: 'status', title: __('Status'), searchList: {"40":__('Status 40'),"41":__('Status 41')}, formatter: Table.api.formatter.status},
{field: 'audit_remark', title: __('审核备注'), operate:false},

11
public/assets/js/backend/orders/dispatch2.js
View File

@ -38,6 +38,10 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','layer'], function ($,
return '';
}},
{field: 'id', title: __('Id'), operate: '='},
{field: 'order.order_no', title: __('Order.order_no'), operate: '='},
{
field: 'follow',
title: '跟进状态',
@ -57,12 +61,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','layer'], function ($,
{field: 'record_count', title: '跟进次数',operate: false},
{field: 'id', title: __('Id'), operate: '='},
//{field: 'order_id', title: __('Order_id')},
{field: 'order.order_no', title: __('Order.order_no'), operate: '='},
{field: 'status', title: __('Status'), searchList: {"0":__('Status 0'),"10":__('Status 10'),"20":__('Status 20'),"25":__('Status 25'),"30":__('Status 30'),"60":__('Status 60'),"-10":__('Status -10'),
//"-20":__('Status -20'),
@ -208,7 +212,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','layer'], function ($,
'<div style="margin-bottom: 10px; color: #f39c12; font-size: 14px;">' +
'提示：取消后该订单会重新进入待派单状态' +
'</div>' +
'<textarea id="input-reason" class="form-control" rows="4" placeholder="请输入操作理由"></textarea>' +
// '<input id="input-title" data-field="title" data-params=\'{"custom[type]":"1"}\' data-rule="required" data-source="setting/abnormal/index" class="form-control selectpage" type="text" value="">'+
'<textarea id="input-reason" class="form-control" data-rule="required" rows="4" placeholder="请输入操作理由"></textarea>' +
'</div>',
yes: function(index, layero) {
var inputValue = $("#input-reason").val().trim();