From 7dea666b47fe6cd8d45e1ab03e0851e602e9ac20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Mon, 8 Jan 2024 17:11:57 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=B8=9C=E9=98=B3pc=E3=80=91=E9=9D=9E?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=9B=B8=E5=85=B3=E9=A1=B5=E9=9D=A2=EF=BC=8C?= =?UTF-8?q?OA=E5=8D=95=E5=8F=B7=E5=AD=97=E6=AE=B5=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/src/utils/tableColumns/index.js | 6 ++++++ fe/PC/src/utils/tabsDesTions/index.js | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js index af18b6981..26f632ba3 100644 --- a/fe/PC/src/utils/tableColumns/index.js +++ b/fe/PC/src/utils/tableColumns/index.js @@ -2852,6 +2852,7 @@ export const pickingRequest = [ type: "name", width: orderWidth }, + { label: "OA单号", prop: "oaNumber" }, { label: "领料类别", prop: 'unplannedIssueType', type: "filter", filters: "unplannedIssueType" }, { label: "状态", prop: 'requestStatus',type: "tagFilter", filters: "requestStatus" }, { label: "建档日期", prop: "buildDate", type: "dateTime" }, @@ -2882,6 +2883,7 @@ export const pickingApproval = [ type: "name", width: orderWidth }, + { label: "OA单号", prop: "oaNumber" }, { label: "领料类别", prop: 'unplannedIssueType', type: "filter", filters: "unplannedIssueType" }, { label: "状态", prop: 'requestStatus',type: "tagFilter", filters: "requestStatus" }, { label: "建档日期", prop: "buildDate", type: "dateTime" }, @@ -2912,6 +2914,7 @@ export const pickingNote = [ type: "name", width: orderWidth }, + { label: "OA单号", prop: "oaNumber" }, { label: "领料类别", prop: 'unplannedIssueType', type: "filter", filters: "unplannedIssueType" }, { label: "建档日期", prop: "buildDate", type: "dateTime" }, { label: "请求单号", prop: 'unplannedIssueRequestNumber',width: orderWidth}, @@ -2937,6 +2940,7 @@ export const materialReturnRequest = [ type: "name", width: orderWidth }, + { label: "OA单号", prop: "oaNumber" }, { label: "退料类别", prop: 'unplannedReceiptType', type: "filter", filters: "unplannedReceiptType" }, { label: "状态", prop: 'requestStatus', type: "tagFilter", filters: "requestStatus" }, { label: "建档日期", prop: "buildDate", type: "dateTime" }, @@ -2967,6 +2971,7 @@ export const materialReturnApproval = [ type: "name", width: orderWidth }, + { label: "OA单号", prop: "oaNumber" }, { label: "退料类别", prop: 'unplannedReceiptType', type: "filter", filters: "unplannedReceiptType" }, { label: "状态", prop: 'requestStatus', type: "tagFilter", filters: "requestStatus" }, { label: "建档日期", prop: "buildDate", type: "dateTime" }, @@ -2997,6 +3002,7 @@ export const materialReturnNote = [ type: "name", width: orderWidth }, + { label: "OA单号", prop: "oaNumber" }, { label: "退料类别", prop: 'unplannedReceiptType', type: "filter", filters: "unplannedReceiptType" }, { label: "建档日期", prop: "buildDate", type: "dateTime" }, { label: "请求单号", prop: 'unplannedReceiptRequestNumber',width: orderWidth }, diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js index 3b00cdd02..891e268b8 100644 --- a/fe/PC/src/utils/tabsDesTions/index.js +++ b/fe/PC/src/utils/tabsDesTions/index.js @@ -2068,6 +2068,7 @@ export const splitPackingList = [ // 非生产领料申请 20230417 export const pickingRequest = [ { label: "领料单号码", prop: "number" }, + { label: "OA单号", prop: "oaNumber" }, { label: "状态", prop: 'requestStatus', type: "filter", filters: "requestStatus" }, { label: "建档日期", prop: "buildDate", type: "dateTime" }, { label: "操作员", prop: "worker" }, @@ -2092,6 +2093,7 @@ export const pickingRequest = [ // 非生产领料审批 20230417 export const pickingApproval = [ { label: "领料单号码", prop: "number" }, + { label: "OA单号", prop: "oaNumber" }, { label: "状态", prop: 'requestStatus', type: "filter", filters: "requestStatus" }, { label: "建档日期", prop: "buildDate", type: "dateTime" }, { label: "操作员", prop: "worker" }, @@ -2116,6 +2118,7 @@ export const pickingApproval = [ // 非生产领料记录 20230417 export const pickingNote = [ { label: "领料记录单号", prop: "number" }, + { label: "OA单号", prop: "oaNumber" }, { label: "建档日期", prop: "buildDate", type: "dateTime" }, { label: "请求单号", prop: 'unplannedIssueRequestNumber' }, { label: "操作员", prop: "worker" }, @@ -2135,6 +2138,7 @@ export const pickingNote = [ // 非生产退料申请 20230417 export const materialReturnRequest = [ { label: "退料单号", prop: "number" }, + { label: "OA单号", prop: "oaNumber" }, { label: "状态", prop: 'requestStatus',type: "filter", filters: "requestStatus" }, { label: "建档日期", prop: "buildDate", type: "dateTime" }, { label: "操作员", prop: "worker" }, @@ -2159,6 +2163,7 @@ export const materialReturnRequest = [ // 非生产退料审批 20230417 export const materialReturnApproval = [ { label: "退料单号", prop: "number" }, + { label: "OA单号", prop: "oaNumber" }, { label: "状态", prop: 'requestStatus',type: "filter", filters: "requestStatus" }, { label: "建档日期", prop: "buildDate", type: "dateTime" }, { label: "操作员", prop: "worker" }, @@ -2183,6 +2188,7 @@ export const materialReturnApproval = [ // 非生产退料记录 20230417 export const materialReturnNote = [ { label: "退料记录单号", prop: "number" }, + { label: "OA单号", prop: "oaNumber" }, { label: "建档日期", prop: "buildDate", type: "dateTime" }, { label: "请求单号", prop: 'unplannedReceiptRequestNumber' }, { label: "操作员", prop: "worker" },