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

src/views/wms/purchasereceiptManage/inspect/inspectJobMain/inspectJobMain.data.ts

@@ -177,8 +177,8 @@ export const InspectJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '承接人用户名',
-    field: 'acceptUserId',
+    label: '承接人',
+    field: 'acceptUserName',
     sort: 'custom',
     table: {
       width: 150
@@ -205,8 +205,8 @@ export const InspectJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '完成人用户名',
-    field: 'completeUserId',
+    label: '完成人',
+    field: 'completeUserName',
     sort: 'custom',
     table: {
       width: 150

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts

@@ -271,7 +271,7 @@ export const PurchasereturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '承接人',
-    field: 'acceptUserId',
+    field: 'acceptUserName',
     sort: 'custom',
     table: {
       width: 150
@@ -299,7 +299,7 @@ export const PurchasereturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '完成人',
-    field: 'completeUserId',
+    field: 'completeUserName',
     sort: 'custom',
     table: {
       width: 150

src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts

@@ -170,8 +170,8 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '承接人用户名',
-    field: 'acceptUserId',
+    label: '承接人',
+    field: 'acceptUserName',
     sort: 'custom',
     table: {
       width: 150
@@ -198,8 +198,8 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '完成人用户名',
-    field: 'completeUserId',
+    label: '完成人',
+    field: 'completeUserName',
     sort: 'custom',
     table: {
       width: 150