Merge branch 'develop'

2025-10-12 17:10:14 +08:00
parent 3a7449e2e9
commit 89d633389c
43 changed files with 4173 additions and 364 deletions
@@ -38,7 +38,7 @@ class StockOrdersController extends BaseController
        if (isset($data['id'])) {
            $appro = new \app\common\utils\approval\service\ApprovalFlowService();
            $appro = $appro->getBriefStatusByBiz($data['id'], null, 'name');
-            $map = ['processing'=>'审批中','pending'=>'审批中','approved'=>'已通过','rejected'=>'已拒绝','revoked'=>'已撤回'];
+            $map = ['processing'=>'审批中','pending'=>'审批中','approved'=>'已通过','rejected'=>'已拒绝','revoked'=>'已撤回','voided'=>'已作废'];
            if ($appro) {
                $data['appro_status'] = [
                    'status' => $appro['status'],