Merge branch 'master' of http://dev.ccwin-in.com:3000/eam/eam-ui

src/views/eam/item/itemApplyMain/itemApplyMain.data.ts

@@ -21,17 +21,23 @@ export const ItemApplyMain = useCrudSchemas(reactive<CrudSchema[]>([
       fixed: 'left'
     },
   },
-
+ {
+    label: '申领人',
+    field: 'applyName',
+    sort: 'custom',
+    isForm: false,
+    isSearch: false,
+  },
   {
     label: '审批人',
-    field: 'approveId',
+    field: 'approveName',
     sort: 'custom',
     isForm: false,
     isSearch: false,
   },
   {
     label: '出库人',
-    field: 'outId',
+    field: 'outName',
     sort: 'custom',
     isForm: false,
     isSearch: false,