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

tts

Browse Source
This commit is contained in:
xman 2025-07-09 13:49:56 +08:00
parent 056e0ce2d3
commit e8de8d5bb8
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
application/admin/controller/orders/Dispatch2.php
View File

@ -323,6 +323,7 @@ class Dispatch2 extends Backend
//计算价格
$data = [
'online_amount' => $orderParsms['online_amount'], //线上尾款
'online_amount_last' => $row->online_total, //线上尾款
'offline_amount' => $row->total, //线下尾款
'cost' => $orderParsms['cost'],
@ -340,7 +341,7 @@ class Dispatch2 extends Backend
$cost = bcadd($data['cost'],$data['material_cost'],2);
$data['total'] = bcadd($order->online_amount,$last_amount,2);
$data['total'] = bcadd($data['online_amount'],$last_amount,2);
$data['real_amount'] = $data['total'];
$data['performance'] = bcsub($data['real_amount'],$cost,2);
$order->allowField(true)->save($data);

35
application/admin/view/orders/dispatch2/edit.html
View File

@ -89,7 +89,7 @@
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('线上收款')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="order-online-amount" readonly type="text" class="form-control" value="{$order.online_amount|htmlentities}">
<input id="order-online-amount" name="order[online_amount]" type="text" class="form-control" value="{$order.online_amount|htmlentities}">
</div>
</div>
@ -107,7 +107,7 @@
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('线上预付')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="order-online-amount" readonly type="text" class="form-control" value="{$order.online_amount|htmlentities}">
<input id="order-online-amount" name="order[online_amount]" readonly type="text" class="form-control" value="{$order.online_amount|htmlentities}">
</div>
</div>
@ -153,28 +153,31 @@
{/if}
<div class="form-group">
<!--<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('材料成本(￥)')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="order-material_cost" data-rule="required" name="order[material_cost]" min="1" step="0.01" type="number" class="form-control" value="{$order.material_cost}">
</div>
</div>
</div>-->
<input id="order-material_cost" name="order[material_cost]" min="1" step="0.01" type="hidden" class="form-control" value="0">
<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-material_images" class="form-control" size="50" value="{$order.material_images}" name="order[material_images]" type="text">
<div class="input-group-addon no-border no-padding">
<span><button type="button" id="faupload-material_images" class="btn btn-danger faupload" data-input-id="c-material_images" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp,image/webp" data-multiple="true" data-preview-id="p-material_images"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
<span><button type="button" id="fachoose-material_images" class="btn btn-primary fachoose" data-input-id="c-material_images" data-mimetype="image/*" data-multiple="true"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
<!-- <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-material_images" class="form-control" size="50" value="{$order.material_images}" name="order[material_images]" type="text">
<div class="input-group-addon no-border no-padding">
<span><button type="button" id="faupload-material_images" class="btn btn-danger faupload" data-input-id="c-material_images" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp,image/webp" data-multiple="true" data-preview-id="p-material_images"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
<span><button type="button" id="fachoose-material_images" class="btn btn-primary fachoose" data-input-id="c-material_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-material_images"></span>
</div>
<span class="msg-box n-right" for="c-material_images"></span>
<ul class="row list-inline faupload-preview" id="p-material_images"></ul>
</div>
<ul class="row list-inline faupload-preview" id="p-material_images"></ul>
</div>
</div>
</div>-->
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('完成图片')}:</label>