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:36:30 +08:00
parent d6d9db14e4
commit d8ae933e81
9 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/admin/lang/zh-cn/order.php
View File

@ -14,8 +14,8 @@ return [
'Set status to 20' => '设为已派单', 'Set status to 20' => '设为已派单',
'Status 30' => '进行中', 'Status 30' => '进行中',
'Set status to 30' => '设为进行中', 'Set status to 30' => '设为进行中',
'Status 40' => '待验收', 'Status 40' => '待配置',
'Set status to 40' => '设为待验收', 'Set status to 40' => '设为待配置',
'Status 41' => '审核驳回', 'Status 41' => '审核驳回',
'Set status to 41' => '设为审核驳回', 'Set status to 41' => '设为审核驳回',
'Status 50' => '待财务审核', 'Status 50' => '待财务审核',

8
application/admin/lang/zh-cn/orders/auditorder.php
View File

@ -13,12 +13,12 @@ return [
'Set status to 20' => '设为已派单', 'Set status to 20' => '设为已派单',
'Status 30' => '进行中', 'Status 30' => '进行中',
'Set status to 30' => '设为进行中', 'Set status to 30' => '设为进行中',
'Status 40' => '待验收', 'Status 40' => '待配置',
'Set status to 40' => '设为待验收', 'Set status to 40' => '设为待配置',
'Status 41' => '审核驳回', 'Status 41' => '审核驳回',
'Set status to 41' => '设为审核驳回', 'Set status to 41' => '设为审核驳回',
'Status 50' => '待审核', 'Status 50' => '待结算',
'Set status to 50' => '设为待审核', 'Set status to 50' => '设为待结算',
'Status 60' => '已完成', 'Status 60' => '已完成',
'Set status to 60' => '设为已完成', 'Set status to 60' => '设为已完成',
'Status -10' => '取消', 'Status -10' => '取消',

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

@ -14,8 +14,8 @@ return [
'Set status to 20' => '设为已派单', 'Set status to 20' => '设为已派单',
'Status 30' => '进行中', 'Status 30' => '进行中',
'Set status to 30' => '设为进行中', 'Set status to 30' => '设为进行中',
'Status 40' => '待验收', 'Status 40' => '待配置',
'Set status to 40' => '设为待验收', 'Set status to 40' => '设为待配置',
'Status 50' => '待财务审核', 'Status 50' => '待财务审核',
'Set status to 50' => '设为待财务审核', 'Set status to 50' => '设为待财务审核',
'Status 60' => '已完成', 'Status 60' => '已完成',

2
application/admin/lang/zh-cn/orders/dispatch.php
View File

@ -43,7 +43,7 @@ return [
'Order.status 10' => '未派单', 'Order.status 10' => '未派单',
'Order.status 20' => '已派单', 'Order.status 20' => '已派单',
'Order.status 30' => '进行中', 'Order.status 30' => '进行中',
'Order.status 40' => '待验收', 'Order.status 40' => '待配置',
'Order.status 41' => '审核驳回', 'Order.status 41' => '审核驳回',
'Order.status 50' => '待财务审核', 'Order.status 50' => '待财务审核',
'Order.status 60' => '已完成', 'Order.status 60' => '已完成',

2
application/admin/lang/zh-cn/orders/dispatch2.php
View File

@ -43,7 +43,7 @@ return [
'Order.status 10' => '未派单', 'Order.status 10' => '未派单',
'Order.status 20' => '已派单', 'Order.status 20' => '已派单',
'Order.status 30' => '进行中', 'Order.status 30' => '进行中',
'Order.status 40' => '待验收', 'Order.status 40' => '待配置',
'Order.status 41' => '审核驳回', 'Order.status 41' => '审核驳回',
'Order.status 50' => '待财务审核', 'Order.status 50' => '待财务审核',
'Order.status 60' => '已完成', 'Order.status 60' => '已完成',

2
application/admin/lang/zh-cn/orders/income.php
View File

@ -12,7 +12,7 @@ return [
'Item_type 4' => '其它', 'Item_type 4' => '其它',
'Status' => '审核状态', 'Status' => '审核状态',
'Status 0' => '待审核', 'Status 0' => '待结算',
'Status 1' => '通过', 'Status 1' => '通过',
'Status -1' => '未通过', 'Status -1' => '未通过',
'Audit_remark' => '审核备注', 'Audit_remark' => '审核备注',

4
application/admin/lang/zh-cn/orders/revisitorder.php
View File

@ -12,8 +12,8 @@ return [
'Set status to 20' => '设为已派单', 'Set status to 20' => '设为已派单',
'Status 30' => '进行中', 'Status 30' => '进行中',
'Set status to 30' => '设为进行中', 'Set status to 30' => '设为进行中',
'Status 40' => '待验收', 'Status 40' => '待配置',
'Set status to 40' => '设为待验收', 'Set status to 40' => '设为待配置',
'Status 41' => '审核驳回', 'Status 41' => '审核驳回',
'Set status to 41' => '设为审核驳回', 'Set status to 41' => '设为审核驳回',
'Status 50' => '待财务审核', 'Status 50' => '待财务审核',

4
application/admin/model/Order.php
View File

@ -123,7 +123,7 @@ class Order extends Model
self::TAB_AUDIT => [ self::TAB_AUDIT => [
self::STATUS_AUDITING, self::STATUS_AUDITING,
self::STATUS_FINISHED self::STATUS_FINISHED
], //待审核 ], //待结算
self::TAB_REVIEW => [ self::TAB_REVIEW => [
self::STATUS_FINISHED self::STATUS_FINISHED
], ],
@ -156,6 +156,6 @@ class Order extends Model
public function dispatch() public function dispatch()
{ {
return $this->hasOne(OrderDispatch::class, 'id', 'order_id', [], 'LEFT')->setEagerlyType(0)->where('fa_order_dispatch.status',OrderDispatch::STATUS_FINISH); return $this->hasOne(OrderDispatch::class, 'order_id', 'id', [], 'LEFT')->setEagerlyType(0)->where('fa_order_dispatch.status',OrderDispatch::STATUS_FINISH);
} }
} }

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

@ -132,8 +132,8 @@
<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 text-danger xs" >请确认无误后再操作</span> <span class="warning text-danger " style="font-size: 13px;margin-left:5px;" > 请确认无误后操作</span>
</div> </div>
</div> </div>