chenlei 3 月之前
父节点
当前提交
f36a052143

+ 3 - 3
src/pages/A_workbench/A3flow/data.ts

@@ -20,7 +20,7 @@ export const DEFAULT_A3FLOW_PARAMS: IA3flowListParams = {
   type: '',
   name: '',
   deptName: '',
-  userName: '',
+  creatorName: '',
   date: '',
   status: '',
   userType: ''
@@ -31,7 +31,7 @@ export const A3FLOW_PARAM_ROWS: A3flowSearchType[] = [
   { name: '业务编号', key: 'num', type: '输入框' },
   { name: '申请名称', key: 'name', type: '输入框' },
   { name: '发起部门', key: 'deptName', type: '输入框' },
-  { name: '发起人', key: 'userName', type: '输入框' },
+  { name: '发起人', key: 'creatorName', type: '输入框' },
   { name: '发起日期范围', key: 'date', type: '日期选择' },
   { name: '申请状态', key: 'status', type: '下拉框', data: selectObj['流程申请状态'] },
   { name: '选择角色', key: 'userType', type: '下拉框', data: selectObj['角色'] }
@@ -42,7 +42,7 @@ export const A3FLOW_TABLE_COLUMNS = [
   ['txt', '业务编号', 'num'],
   ['txt', '申请名称', 'name'],
   ['txt', '发起部门', 'deptName'],
-  ['txt', '发起人', 'userName'],
+  ['txt', '发起人', 'creatorName'],
   ['txt', '发起日期', 'createTime'],
   ['txtChange', '申请状态', 'status', statusObj]
 ]

+ 1 - 1
src/pages/A_workbench/A3flow/index.tsx

@@ -152,7 +152,7 @@ function A3flow() {
             { key: 'num', txt: '业务编号' },
             { key: 'name', txt: '申请名称' },
             { key: 'deptName', txt: '发起部门' },
-            { key: 'userName', txt: '发起人' },
+            { key: 'creatorName', txt: '发起人' },
             { key: 'createTime', txt: '发起日期' },
             { key: 'status', txt: '申请状态' }
           ],

+ 2 - 2
src/pages/A_workbench/A3flow/types.ts

@@ -5,7 +5,7 @@ export interface IA3flowListParams {
   type: string
   name: string
   deptName: string
-  userName: string
+  creatorName: string
   date: string
   status: string
   userType: string
@@ -24,7 +24,7 @@ export type A3flowItemType = {
   type: string
   name: string
   deptName: string
-  userName: string
+  creatorName: string
   date: string
   status: string
   userType: string

+ 4 - 4
src/pages/C_goodsManage/C21wealth/constants.ts

@@ -1,12 +1,12 @@
 import { selectObj } from '@/utils/select'
 import { C21WealthSearchType, IC21WealthParams } from './types'
-import { statusObj, statusStorageObj } from '@/utils/tableData'
+import { statusObj } from '@/utils/tableData'
 
 export const C21WEALTH_PARAM_ROWS: C21WealthSearchType[] = [
   { name: '业务编号', key: 'num', type: '输入框' },
   { name: '申请名称', key: 'name', type: '输入框' },
   { name: '发起部门', key: 'deptName', type: '输入框' },
-  { name: '发起人', key: 'userName', type: '输入框' },
+  { name: '发起人', key: 'creatorName', type: '输入框' },
   { name: '发起日期范围', key: 'date', type: '日期选择' },
   { name: '申请状态', key: 'status', type: '下拉框', data: selectObj['流程申请状态'] },
   { name: '选择角色', key: 'userType', type: '下拉框', data: selectObj['角色'] }
@@ -16,7 +16,7 @@ export const C21WEALTH_TABLE_COLUMNS = [
   ['txt', '业务编号', 'num'],
   ['txt', '申请名称', 'name'],
   ['txt', '发起部门', 'deptName'],
-  ['txt', '发起人', 'userName'],
+  ['txt', '发起人', 'creatorName'],
   ['txt', '发起日期', 'createTime'],
   ['txtChange', '申请状态', 'status', statusObj]
 ]
@@ -52,7 +52,7 @@ export const DEFAULT_C21WEALTH_PARAMS: IC21WealthParams = {
   pageNum: 1,
   pageSize: 10,
   num: '',
-  userName: '',
+  creatorName: '',
   deptName: '',
   name: '',
   status: '',

+ 4 - 4
src/pages/C_goodsManage/C21wealth/index.tsx

@@ -202,11 +202,11 @@ function C21wealth() {
           name: '资源使用',
           show: true,
           arr: [
-            { key: 'num', txt: '申请编号' },
-            { key: 'dateStart', txt: '交修日期' },
-            { key: 'authUnit', txt: '交修部门' },
+            { key: 'num', txt: '业务编号' },
+            { key: 'name', txt: '申请名称' },
+            { key: 'deptName', txt: '发起部门' },
             { key: 'creatorName', txt: '发起人' },
-            { key: 'createTime', txt: '发送日期' },
+            { key: 'createTime', txt: '发起日期范围' },
             { key: 'status', txt: '申请状态' }
           ],
           data: res.data.records.map((v: IC21WealthItem) => ({

+ 1 - 1
src/pages/C_goodsManage/C21wealth/types.ts

@@ -18,7 +18,7 @@ export interface IC21WealthParams {
   pageNum: number
   num: string
   date?: string[]
-  userName: string
+  creatorName: string
   deptName: string
   name: string
   status: string