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:24:52 +08:00
parent 2c9c5bd894
commit 39bee27491
4 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -288,6 +288,7 @@ class Dispatch2 extends Backend
$validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.edit' : $name) : $this->modelValidate; $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.edit' : $name) : $this->modelValidate;
$row->validateFailException()->validate($validate); $row->validateFailException()->validate($validate);
} }
$params['status'] = OrderDispatch::STATUS_FINISH;
$params['finish_time'] = date('Y-m-d H:i:s'); $params['finish_time'] = date('Y-m-d H:i:s');
$result = $row->allowField(true)->save($params); $result = $row->allowField(true)->save($params);
@ -376,7 +377,7 @@ class Dispatch2 extends Backend
* @throws DataNotFoundException * @throws DataNotFoundException
* @throws ModelNotFoundException * @throws ModelNotFoundException
*/ */
public function del() public function del($ids=null)
{ {
if (false === $this->request->isPost()) { if (false === $this->request->isPost()) {
$this->error(__("Invalid parameters")); $this->error(__("Invalid parameters"));

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

@ -161,9 +161,7 @@
<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>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">
<textarea class="form-control" name="row[audit_remark]" > <textarea class="form-control" placeholder="审核备注" name="row[audit_remark]" >{$row.audit_remark|htmlentities}</textarea>
{$row.audit_remark|htmlentities}
</textarea>
</div> </div>
</div> </div>

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

@ -15,35 +15,35 @@
<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-order_no" readonly data-field="order_no" type="text" value="{$order.order_no|htmlentities}"> <input id="c-order_no" readonly class="form-control" data-field="order_no" type="text" value="{$order.order_no|htmlentities}">
</div> </div>
</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 id="c-item_title" readonly type="text" value="{$order.item_title|htmlentities}"> <input id="c-item_title" readonly class="form-control" type="text" value="{$order.item_title|htmlentities}">
</div> </div>
</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 id="c-customer" readonly type="text" value="{$order.customer|htmlentities}"> <input id="c-customer" readonly class="form-control" type="text" value="{$order.customer|htmlentities}">
</div> </div>
</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 id="c-tel" readonly type="text" value="{$order.tel|htmlentities}"> <input id="c-tel" readonly class="form-control" type="text" value="{$order.tel|htmlentities}">
</div> </div>
</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 id="c-address" readonly type="text" value="{$order.address|htmlentities}"> <input id="c-address" readonly class="form-control" type="text" value="{$order.address|htmlentities}">
</div> </div>
</div> </div>
@ -51,14 +51,14 @@
<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 type="text" value="{$row.worker_name|htmlentities}"> <input readonly type="text" class="form-control" value="{$row.worker_name|htmlentities}">
</div> </div>
</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 type="text" value="{$row.worker_tel|htmlentities}"> <input readonly type="text" class="form-control" value="{$row.worker_tel|htmlentities}">
</div> </div>
</div> </div>
@ -66,7 +66,7 @@
<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 type="text" value="{$row.status_text|htmlentities}"> <input readonly type="text" class="form-control" value="{$row.status_text|htmlentities}">
</div> </div>
</div> </div>
@ -74,7 +74,7 @@
<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 type="text" value="{$order.online_amount|htmlentities}"> <input readonly type="text" class="form-control" value="{$order.online_amount|htmlentities}">
</div> </div>
</div> </div>
@ -121,12 +121,19 @@
</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 class="form-control" placeholder="备注" name="row[remark]" >{$row.remark|htmlentities}</textarea>
</div>
</div>
<div class="form-group layer-footer"> <div class="form-group layer-footer">
<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">
<button type="submit" class="btn btn-primary btn-embossed disabled">{:__('确认完成任务')}</button> <button type="submit" class="btn btn-primary btn-embossed disabled">{:__('确认完成任务')}</button>
<span class="warning">请确认无误后再操作</span> <span class="warning text-danger xs" >请确认无误后再操作</span>
</div> </div>
</div> </div>
@ -178,7 +185,7 @@
<button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button> <button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button>
</div> </div>
</div> </div>
{notempty} {/notempty}

2
application/common/Logic/OrderLogic.php
View File

@ -36,7 +36,7 @@ class OrderLogic
{ {
$order = $this->OrderModel->where('id',$orderDispatch->order_id)->find(); $order = $this->OrderModel->where('id',$orderDispatch->order_id)->find();
if(!$order->status != Order::STATUS_DISPATCHED){ if($order->status != Order::STATUS_DISPATCHED){
throw new Exception('订单状态不允许当前操作'); throw new Exception('订单状态不允许当前操作');
} }