From 7e3080d6ae86dcba1bec151cba78ed2782b00536 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Fri, 8 Nov 2024 17:07:59 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90nev-pc=E3=80=91=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/src/utils/tableColumns/index.js | 16 ++++++++-------- fe/PC/src/utils/tabsDesTions/index.js | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js index b50e0817c..1587b0a29 100644 --- a/fe/PC/src/utils/tableColumns/index.js +++ b/fe/PC/src/utils/tableColumns/index.js @@ -2520,8 +2520,8 @@ export const pickingJob = [ // { label: "领料类别", prop: 'unplannedIssueType', type: "filter", filters: "unplannedIssueType" }, { label: "建档日期", prop: "buildDate", type: "dateTime" }, // { label: "操作员", prop: "worker" }, - { label: "部门代码", prop: "deptCode" }, - { label: "部门名称", prop: "deptName" }, + // { label: "部门代码", prop: "deptCode" }, + // { label: "部门名称", prop: "deptName" }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" }, { label: "完成时间", prop: "completeTime",type: "dateTime" }, @@ -2558,8 +2558,8 @@ export const pickingNote = [ // { label: "领料类别", prop: 'unplannedIssueType', type: "filter", filters: "unplannedIssueType" }, { label: "建档日期", prop: "buildDate", type: "dateTime" }, { label: "请求单号", prop: 'unplannedIssueRequestNumber',width: orderWidth}, - { label: "操作员", prop: "worker" }, - { label: "执行人", prop: "executor" }, + { label: "申请人", prop: "worker" }, + { label: "实际发料人", prop: "executor" }, // { label: "部门代码", prop: "deptCode" }, // { label: "部门名称", prop: "deptName" }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, @@ -2634,8 +2634,8 @@ export const materialReturnJob = [ // { label: "退料类别", prop: 'unplannedReceiptType', type: "filter", filters: "unplannedReceiptType" }, { label: "建档日期", prop: "buildDate", type: "dateTime" }, // { label: "操作员", prop: "worker" }, - { label: "部门代码", prop: "deptCode" }, - { label: "部门名称", prop: "deptName" }, + // { label: "部门代码", prop: "deptCode" }, + // { label: "部门名称", prop: "deptName" }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, // { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" }, { label: "完成时间", prop: "completeTime",type: "dateTime" }, @@ -2659,8 +2659,8 @@ export const materialReturnNote = [ // { label: "退料类别", prop: 'unplannedReceiptType', type: "filter", filters: "unplannedReceiptType" }, { label: "建档日期", prop: "buildDate", type: "dateTime" }, { label: "请求单号", prop: 'unplannedReceiptRequestNumber',width: orderWidth }, - { label: "操作员", prop: "worker" }, - { label: "执行人", prop: "executor" }, + { label: "申请人", prop: "worker" }, + { label: "实际退料人", prop: "executor" }, // { label: "部门代码", prop: "deptCode" }, // { label: "部门名称", prop: "deptName" }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js index 29f116cd5..f27c4da2e 100644 --- a/fe/PC/src/utils/tabsDesTions/index.js +++ b/fe/PC/src/utils/tabsDesTions/index.js @@ -1697,8 +1697,8 @@ export const pickingJob = [ // { label: "领料类别", prop: 'unplannedIssueType', type: "filter", filters: "unplannedIssueType" }, { label: "建档日期", prop: "buildDate", type: "dateTime" }, // { label: "操作员", prop: "worker" }, - { label: "部门代码", prop: "deptCode" }, - { label: "部门名称", prop: "deptName" }, + // { label: "部门代码", prop: "deptCode" }, + // { label: "部门名称", prop: "deptName" }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" }, { label: "完成时间", prop: "completeTime",type: "dateTime" }, @@ -1716,8 +1716,8 @@ export const pickingNote = [ // { label: "领料类别", prop: 'unplannedIssueType', type: "filter", filters: "unplannedIssueType" }, { label: "建档日期", prop: "buildDate", type: "dateTime" }, { label: "请求单号", prop: 'unplannedIssueRequestNumber'}, - { label: "操作员", prop: "worker" }, - { label: "执行人", prop: "executor" }, + { label: "申请人", prop: "worker" }, + { label: "实际发料人", prop: "executor" }, // { label: "部门代码", prop: "deptCode" }, // { label: "部门名称", prop: "deptName" }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, @@ -1779,8 +1779,8 @@ export const materialReturnJob = [ // { label: "退料类别", prop: 'unplannedReceiptType', type: "filter", filters: "unplannedReceiptType" }, { label: "建档日期", prop: "buildDate", type: "dateTime" }, // { label: "操作员", prop: "worker" }, - { label: "部门代码", prop: "deptCode" }, - { label: "部门名称", prop: "deptName" }, + // { label: "部门代码", prop: "deptCode" }, + // { label: "部门名称", prop: "deptName" }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, // { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" }, { label: "完成时间", prop: "completeTime",type: "dateTime" }, @@ -1798,8 +1798,8 @@ export const materialReturnNote = [ // { label: "退料类别", prop: 'unplannedReceiptType', type: "filter", filters: "unplannedReceiptType" }, { label: "建档日期", prop: "buildDate", type: "dateTime" }, { label: "请求单号", prop: 'unplannedReceiptRequestNumber' }, - { label: "操作员", prop: "worker" }, - { label: "执行人", prop: "executor" }, + { label: "申请人", prop: "worker" }, + { label: "实际退料人", prop: "executor" }, // { label: "部门代码", prop: "deptCode" }, // { label: "部门名称", prop: "deptName" }, { label: "创建时间", prop: "creationTime", type: "dateTime" },