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

修改

Browse Source
This commit is contained in:
todaywindy 2025-06-03 15:39:35 +08:00
parent 41dd493e57
commit e2842bf17c
6 changed files with 37 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/address/bootstrap.js vendored
View File

@ -1,7 +1,5 @@
require([], function () { require([], function () {
//绑定data-toggle=addresspicker属性点击事件 //绑定data-toggle=addresspicker属性点击事件
console.log('111');
$(document).on('click', "[data-toggle='addresspicker']", function () { $(document).on('click', "[data-toggle='addresspicker']", function () {
var that = this; var that = this;
var callback = $(that).data('callback'); var callback = $(that).data('callback');

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

@ -108,8 +108,9 @@ class Auditorder extends Backend
$this->error(__('You have no permission')); $this->error(__('You have no permission'));
} }
if (false === $this->request->isPost()) { if (false === $this->request->isPost()) {
$order = Order::where('id',$ids)->find();
$this->view->assign('row', $row); $this->view->assign('row', $row);
$this->view->assign('worker',Worker::where('status',$order->worker_id)->find()); $this->view->assign('worker',Worker::where('id',$order->worker_id)->find());
return $this->view->fetch(); return $this->view->fetch();
} }
$params = $this->request->post('row/a'); $params = $this->request->post('row/a');

4
application/admin/controller/orders/Configorder.php
View File

@ -136,8 +136,8 @@ class Configorder extends Backend
'amount_images' => $params['amount_images'], 'amount_images' => $params['amount_images'],
'material_cost' => $params['material_cost'], 'material_cost' => $params['material_cost'],
'cost_rate' => $params['cost_rate'], 'cost_rate' => $params['cost_rate'],
'cost_remark' => $params['cost_remark'], 'cost_remark' => $params['cost_remark'] ?? '',
'material_images' => $params['material_images'], 'material_images' => $params['material_images'] ?? '',
]; ];
$last_amount = bcadd($params['online_amount_last'],$params['offline_amount'],2); $last_amount = bcadd($params['online_amount_last'],$params['offline_amount'],2);

10
application/admin/view/orders/auditorder/edit.html
View File

@ -126,10 +126,18 @@
</div> </div>
</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">
<input readonly class="form-control" type="text" value="{$worker.name|htmlentities}">
</div>
</div>
<div class="form-group"> <div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('师傅提点(%)')}:</label> <label class="control-label col-xs-12 col-sm-2">{:__('师傅提点(%)')}:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">
<input readonly class="form-control" step="0.01" type="number" value="{$row.cost_rate|htmlentities}"> <input readonly class="form-control" step="0.01" type="number" value="{$worker.rate|htmlentities}">
</div> </div>
</div> </div>

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

@ -92,12 +92,27 @@
<div class="form-group"> <div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('师傅提点(%)')}:</label> <label class="control-label col-xs-12 col-sm-2">师傅名称:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">
<input id="c-cost_rate" data-rule="required" name="row[cost_rate]" type="number" min="0" max="100" step="1" class="form-control" value="{$rate|htmlentities}"> <input readonly min="0" max="100" step="1" class="form-control" value="{$worker->name}" />
</div> </div>
</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">
<input readonly name="row[cost_rate]" type="number" min="0" max="100" step="1" class="form-control" value="{$worker.rate|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">
<input readonly type="text" class="form-control" value="{$worker.rate_remark}">
</div>
</div>
<div class="form-group"> <div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Cost')}:</label> <label class="control-label col-xs-12 col-sm-2">{:__('Cost')}:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">
@ -105,16 +120,6 @@
</div> </div>
</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">
<input id="c-cost_remark" data-rule="required" name="row[cost_remark]" type="text" class="form-control" value="{$row.cost_remark}">
</div>
</div>
<div class="form-group"> <div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('材料成本')}:</label> <label class="control-label col-xs-12 col-sm-2">{:__('材料成本')}:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">
@ -184,11 +189,17 @@
</div> </div>
</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">
<input readonly min="0" max="100" step="1" class="form-control" value="{$worker->name}" />
</div>
</div>
<div class="form-group"> <div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('师傅提点(%)')}:</label> <label class="control-label col-xs-12 col-sm-2">{:__('师傅提点(%)')}:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">
<input name="row[cost_rate]" readonly type="number" min="0" max="100" step="1" class="form-control" value="{$worker.rate|htmlentities}"> <input name="row[cost_rate]" readonly type="number" min="0" max="100" step="1" class="form-control" value="{$worker.rate|htmlentities}" />
</div> </div>
</div> </div>

1
public/assets/js/addons.js
View File

@ -1,7 +1,6 @@
define([], function () { define([], function () {
require([], function () { require([], function () {
//绑定data-toggle=addresspicker属性点击事件 //绑定data-toggle=addresspicker属性点击事件
console.log('111');
$(document).on('click', "[data-toggle='addresspicker']", function () { $(document).on('click', "[data-toggle='addresspicker']", function () {
var that = this; var that = this;