Merge remote-tracking branch 'origin/master'

src/views/bg/xispeak/BgXiSpeak.data.ts

@@ -96,9 +96,9 @@ export const columns: BasicColumn[] = [
   //   dataIndex: 'completionStatus_dictText',
   // },
   {
-    title: '业务状态',
+    title: '督办状态',
     align: 'center',
-    dataIndex: 'status_dictText',
+    dataIndex: 'bpmStatus_dictText',
   },
   {
     title: '截止日期',
@@ -281,7 +281,7 @@ export const superQuerySchema = {
   deadline: { title: '截止日期', order: 17, view: 'date', type: 'string' },
   treeDepth: { title: '层深(最顶层节点层深为0)', order: 18, view: 'number', type: 'number' },
   sortOrder: { title: '同级数据排序号', order: 19, view: 'number', type: 'number' },
-  bpmStatus: { title: '流程引擎状态字段', order: 21, view: 'number', type: 'number' },
+  bpmStatus: { title: '督办状态', order: 21, view: 'list', type: 'string', dictCode: 'super_status' },
   supervisionCount: { title: '督办次数', order: 22, view: 'number', type: 'number' },
   approveInfo: { title: '审批信息', order: 23, view: 'text', type: 'string' },
 };

src/views/dq/inspectTask/DqInspectTask.data.ts

@@ -296,8 +296,8 @@ export const ledgerColumns: BasicColumn[] = [
     dataIndex: 'taskStatus'
    },
    {
-    title: '业务状态',
+    title: '督办状态',
     align:"center",
-    dataIndex: 'status_dictText'
+    dataIndex: 'bpmStatus_dictText'
    },
 ];