调整ä功能

app/admin/controller/ApprovalRecordsController.php

@@ -36,7 +36,7 @@ class ApprovalRecordsController extends BaseController
 
                     'biz_id' => $record['instance']['biz_id'],
                     'biz_desc' => '备货单【'.$record['instance']['bizInfo']['order_no'].'】',
-                    'biz_type' => $record['instance']['flow_type'],
+                    'biz_type' => $record['instance']['biz_type'],
 
                     'initiator_name' => $record['instance']['initiator']['name'],
                     'initiator_avatar' => $record['instance']['initiator']['avatar'],
@@ -113,7 +113,7 @@ class ApprovalRecordsController extends BaseController
 
                     'biz_id' => $record['instance']['biz_id'],
                     'biz_desc' => '业务单号【'.$record['instance']['bizInfo']['order_no'].'】',
-                    'biz_type' => $record['instance']['flow_type'],
+                    'biz_type' => $record['instance']['biz_type'],
                     'flow_type' => $record['instance']['flow_type'],
 
                     'initiator_name' => $record['instance']['initiator']['name'],

app/admin/controller/StockOrdersController.php

@@ -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'],

app/admin/controller/UserGroupController.php

@@ -29,6 +29,7 @@ class UserGroupController extends BaseController
                 $result = [
                     'id' => $record['id'],
                     'title' => $record['title'],
+                    'scenario_code' => $record['scenario_code'],
                     'leader_id' => 0,
                     'leader_name' => '',
                     'sort' => $record['sort'],