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-06-01 22:28:02 +08:00
parent 7e1abeb449
commit d5050f0dd0
9 changed files with 62 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,6 +4,7 @@ namespace app\admin\controller\orders;
use app\admin\model\Message;
use app\admin\model\Order;
use app\admin\model\Worker;
use app\common\controller\Backend;
use think\Db;
use think\Exception;
@ -108,6 +109,7 @@ class Auditorder extends Backend
}
if (false === $this->request->isPost()) {
$this->view->assign('row', $row);
$this->view->assign('worker',Worker::where('status',$order->worker_id)->find());
return $this->view->fetch();
}
$params = $this->request->post('row/a');

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

@ -103,8 +103,8 @@ class Configorder extends Backend
}
if (false === $this->request->isPost()) {
$this->view->assign('row', $row);
$workerRate = Worker::where('id',$row->worker_id)->value('rate');
$this->view->assign('rate', $workerRate);
$worker = Worker::where('id',$row->worker_id)->find();
$this->view->assign('worker', $worker);
return $this->view->fetch();
}
$params = $this->request->post('row/a');

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

@ -163,6 +163,7 @@ class Dispatch2 extends Backend
if (false === $this->request->isPost()) {
$this->view->assign('row', $row);
$this->view->assign('order', $order);
$this->view->assign('worker',Worker::where('status',$order->worker_id)->find());
return $this->view->fetch();
}
@ -255,8 +256,8 @@ class Dispatch2 extends Backend
$this->view->assign('order', $order);
$this->view->assign('action','finish');
$workerRate = Worker::where('id',$row->worker_id)->value('rate');
$this->view->assign('rate', $workerRate);
$worker = Worker::where('id',$row->worker_id)->find();
$this->view->assign('worker', $worker);
return $this->view->fetch('edit');
}

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

@ -127,12 +127,20 @@
</div>
<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">
<input readonly class="form-control" step="0.01" type="number" value="{$row.cost_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">
<label class="control-label col-xs-12 col-sm-2">{:__('Cost')}:</label>
<div class="col-xs-12 col-sm-8">

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

@ -185,12 +185,17 @@
</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_rate" data-rule="required" name="row[cost_rate]" type="number" min="0" max="100" step="1" class="form-control" value="{$row.cost_rate|htmlentities}">
<input data-rule="required" 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>
@ -203,15 +208,6 @@
</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">
<label class="control-label col-xs-12 col-sm-2">{:__('材料成本')}:</label>
<div class="col-xs-12 col-sm-8">

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

@ -176,22 +176,21 @@
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('师傅提点(%)')}:</label>
<div class="col-xs-12 col-sm-8">
<input data-rule="required" name="order[cost_rate]" type="number" min="0" max="100" step="1" class="form-control" value="{$rate|htmlentities}">
<input data-rule="required" name="order[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 data-rule="required" name="order[cost]" type="number" min="0" max="100" step="1" class="form-control" value="">
</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 data-rule="required" name="order[cost_remark]" type="text" class="form-control" value="{$order.cost_remark}">
<input readonly type="text" class="form-control" value="{$worker.rate_remark}">
</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 data-rule="required" name="order[cost]" type="number" min="0" max="100" step="1" class="form-control" value="">
</div>
</div>

14
application/admin/view/workers/worker/add.html
View File

@ -13,6 +13,20 @@
<input id="c-tel" data-rule="required" class="form-control" name="row[tel]" type="text" value="">
</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-rate" data-rule="required" min="0" max="1" step="1" class="form-control" name="row[rate]" type="number" value="">
</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-rate_remark" data-rule="required" class="form-control" name="row[rate_remark]" type="text" value="">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Area_id')}:</label>
<div class='col-xs-12 col-sm-8'>

14
application/admin/view/workers/worker/edit.html
View File

@ -15,6 +15,20 @@
value="{$row.tel|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 id="c-rate" data-rule="required" min="0" max="1" step="1" class="form-control" name="row[rate]" type="number" value="{$row.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 id="c-rate_remark" data-rule="required" class="form-control" name="row[rate_remark]" type="text" value="{$row.rate_remark|htmlentities}">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
<div class="col-xs-12 col-sm-8">

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

@ -150,7 +150,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','layer'], function ($,
// {field: 'admin_id', title: __('Admin_id')},
{field: 'admin_user', title: __('Admin_user'), operate: 'LIKE'},
{field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
{field: 'update_time', title: __('Update_time'), operate:false, addclass:'datetimerange', autocomplete:false},
//{field: 'update_time', title: __('Update_time'), operate:false, addclass:'datetimerange', autocomplete:false},
{field: 'finish_time', title: __('Finish_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
{field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate,