From d8ae933e81645e406a6b9f60cfee885244e8fd60 Mon Sep 17 00:00:00 2001 From: xman <1946321327@qq.com> Date: Thu, 27 Mar 2025 20:36:30 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/lang/zh-cn/order.php | 4 ++-- application/admin/lang/zh-cn/orders/auditorder.php | 8 ++++---- application/admin/lang/zh-cn/orders/configorder.php | 4 ++-- application/admin/lang/zh-cn/orders/dispatch.php | 2 +- application/admin/lang/zh-cn/orders/dispatch2.php | 2 +- application/admin/lang/zh-cn/orders/income.php | 2 +- application/admin/lang/zh-cn/orders/revisitorder.php | 4 ++-- application/admin/model/Order.php | 4 ++-- application/admin/view/orders/dispatch2/edit.html | 4 ++-- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/application/admin/lang/zh-cn/order.php b/application/admin/lang/zh-cn/order.php index 854bd17..e670f8d 100644 --- a/application/admin/lang/zh-cn/order.php +++ b/application/admin/lang/zh-cn/order.php @@ -14,8 +14,8 @@ return [ 'Set status to 20' => '设为已派单', 'Status 30' => '进行中', 'Set status to 30' => '设为进行中', - 'Status 40' => '待验收', - 'Set status to 40' => '设为待验收', + 'Status 40' => '待配置', + 'Set status to 40' => '设为待配置', 'Status 41' => '审核驳回', 'Set status to 41' => '设为审核驳回', 'Status 50' => '待财务审核', diff --git a/application/admin/lang/zh-cn/orders/auditorder.php b/application/admin/lang/zh-cn/orders/auditorder.php index 63aef60..16f856f 100644 --- a/application/admin/lang/zh-cn/orders/auditorder.php +++ b/application/admin/lang/zh-cn/orders/auditorder.php @@ -13,12 +13,12 @@ return [ 'Set status to 20' => '设为已派单', 'Status 30' => '进行中', 'Set status to 30' => '设为进行中', - 'Status 40' => '待验收', - 'Set status to 40' => '设为待验收', + 'Status 40' => '待配置', + 'Set status to 40' => '设为待配置', 'Status 41' => '审核驳回', 'Set status to 41' => '设为审核驳回', - 'Status 50' => '待审核', - 'Set status to 50' => '设为待审核', + 'Status 50' => '待结算', + 'Set status to 50' => '设为待结算', 'Status 60' => '已完成', 'Set status to 60' => '设为已完成', 'Status -10' => '取消', diff --git a/application/admin/lang/zh-cn/orders/configorder.php b/application/admin/lang/zh-cn/orders/configorder.php index 670808e..1ef9259 100644 --- a/application/admin/lang/zh-cn/orders/configorder.php +++ b/application/admin/lang/zh-cn/orders/configorder.php @@ -14,8 +14,8 @@ return [ 'Set status to 20' => '设为已派单', 'Status 30' => '进行中', 'Set status to 30' => '设为进行中', - 'Status 40' => '待验收', - 'Set status to 40' => '设为待验收', + 'Status 40' => '待配置', + 'Set status to 40' => '设为待配置', 'Status 50' => '待财务审核', 'Set status to 50' => '设为待财务审核', 'Status 60' => '已完成', diff --git a/application/admin/lang/zh-cn/orders/dispatch.php b/application/admin/lang/zh-cn/orders/dispatch.php index 9fc67a1..c516811 100644 --- a/application/admin/lang/zh-cn/orders/dispatch.php +++ b/application/admin/lang/zh-cn/orders/dispatch.php @@ -43,7 +43,7 @@ return [ 'Order.status 10' => '未派单', 'Order.status 20' => '已派单', 'Order.status 30' => '进行中', - 'Order.status 40' => '待验收', + 'Order.status 40' => '待配置', 'Order.status 41' => '审核驳回', 'Order.status 50' => '待财务审核', 'Order.status 60' => '已完成', diff --git a/application/admin/lang/zh-cn/orders/dispatch2.php b/application/admin/lang/zh-cn/orders/dispatch2.php index a5663e2..4f886f2 100644 --- a/application/admin/lang/zh-cn/orders/dispatch2.php +++ b/application/admin/lang/zh-cn/orders/dispatch2.php @@ -43,7 +43,7 @@ return [ 'Order.status 10' => '未派单', 'Order.status 20' => '已派单', 'Order.status 30' => '进行中', - 'Order.status 40' => '待验收', + 'Order.status 40' => '待配置', 'Order.status 41' => '审核驳回', 'Order.status 50' => '待财务审核', 'Order.status 60' => '已完成', diff --git a/application/admin/lang/zh-cn/orders/income.php b/application/admin/lang/zh-cn/orders/income.php index 83c21e4..051ddc1 100644 --- a/application/admin/lang/zh-cn/orders/income.php +++ b/application/admin/lang/zh-cn/orders/income.php @@ -12,7 +12,7 @@ return [ 'Item_type 4' => '其它', 'Status' => '审核状态', - 'Status 0' => '待审核', + 'Status 0' => '待结算', 'Status 1' => '通过', 'Status -1' => '未通过', 'Audit_remark' => '审核备注', diff --git a/application/admin/lang/zh-cn/orders/revisitorder.php b/application/admin/lang/zh-cn/orders/revisitorder.php index 0888265..428b6cf 100644 --- a/application/admin/lang/zh-cn/orders/revisitorder.php +++ b/application/admin/lang/zh-cn/orders/revisitorder.php @@ -12,8 +12,8 @@ return [ 'Set status to 20' => '设为已派单', 'Status 30' => '进行中', 'Set status to 30' => '设为进行中', - 'Status 40' => '待验收', - 'Set status to 40' => '设为待验收', + 'Status 40' => '待配置', + 'Set status to 40' => '设为待配置', 'Status 41' => '审核驳回', 'Set status to 41' => '设为审核驳回', 'Status 50' => '待财务审核', diff --git a/application/admin/model/Order.php b/application/admin/model/Order.php index 9438193..7c74feb 100644 --- a/application/admin/model/Order.php +++ b/application/admin/model/Order.php @@ -123,7 +123,7 @@ class Order extends Model self::TAB_AUDIT => [ self::STATUS_AUDITING, self::STATUS_FINISHED - ], //待审核 + ], //待结算 self::TAB_REVIEW => [ self::STATUS_FINISHED ], @@ -156,6 +156,6 @@ class Order extends Model 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); } } diff --git a/application/admin/view/orders/dispatch2/edit.html b/application/admin/view/orders/dispatch2/edit.html index 432c2da..5dc52a5 100644 --- a/application/admin/view/orders/dispatch2/edit.html +++ b/application/admin/view/orders/dispatch2/edit.html @@ -132,8 +132,8 @@
- - 请确认无误后再操作 + + 请确认无误后操作