From c27258cad41a1aed8dff263cecca051485e112d2 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, 7 Jun 2024 17:07:46 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90nev-pc=E3=80=91=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/src/utils/detailsTableColumns/index.js | 12 ++++++------ fe/PC/src/utils/tableColumns/index.js | 8 ++++---- fe/PC/src/utils/tabsDesTions/index.js | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js index 66456eb06..997cfe865 100644 --- a/fe/PC/src/utils/detailsTableColumns/index.js +++ b/fe/PC/src/utils/detailsTableColumns/index.js @@ -691,9 +691,9 @@ export const PurchaseReturnRequest = [ { label: "订单号", prop: 'poNumber', width:orderWidth }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, { label: "单据号", prop: 'number' }, - { label: "到货时间", prop: 'arriveDate' }, - { label: "生产时间", prop: 'produceDate' }, - { label: "过期时间", prop: 'expireDate' }, + { label: "到货时间", prop: 'arriveDate',type: "dateTime"}, + { label: "生产时间", prop: 'produceDate',type: "dateTime" }, + { label: "过期时间", prop: 'expireDate',type: "dateTime" }, { label: "标包数量", prop: 'stdPackQty' }, { label: "库位组", prop: 'locationGroup' }, { label: "订单行", prop: 'poLine' }, @@ -714,9 +714,9 @@ export const PurchaseReturnApprove = [ { label: _Names.locationErpCode, prop: "locationErpCode" }, { label: "订单号", prop: 'poNumber', width:orderWidth }, { label: "单据号", prop: 'number' }, - { label: "到货时间", prop: 'arriveDate' }, - { label: "生产时间", prop: 'produceDate' }, - { label: "过期时间", prop: 'expireDate' }, + { label: "到货时间", prop: 'arriveDate',type: "dateTime" }, + { label: "生产时间", prop: 'produceDate',type: "dateTime" }, + { label: "过期时间", prop: 'expireDate',type: "dateTime" }, { label: "标包数量", prop: 'stdPackQty' }, { label: "库位组", prop: 'locationGroup' }, { label: "订单行", prop: 'poLine' }, diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js index 8212546e9..529233e1b 100644 --- a/fe/PC/src/utils/tableColumns/index.js +++ b/fe/PC/src/utils/tableColumns/index.js @@ -289,7 +289,7 @@ export const CustomerAddress = [ { label: _Public.remark, prop: "remark" }, { label: _Public.description, prop: "desc" }, { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, - { label: _Public.lastModificationTime, prop: "lastModificationTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 客户项目信息 @@ -2147,9 +2147,9 @@ export const InventoryInitialNote = [ type: "name", width: orderWidth }, - { label: "库存初始化请求单号", prop: "requestNumber" }, + // { label: "库存初始化请求单号", prop: "requestNumber" }, { label: "操作员", prop: 'worker' }, - { label: "生效日期", prop: "activeDate" }, + { label: "生效日期", prop: "activeDate",type: "dateTime" }, ] // 库存余额 @@ -3624,7 +3624,7 @@ export const transferLibNote = [ { label: "任务单号", prop: 'jobNumber' }, { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, { label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" }, - { label: "确认时间", prop: 'confirmTime' }, + { label: "确认时间", prop: 'confirmTime',type: "dateTime" }, { label: "备注", prop: 'remark' }, { label: "操作员", prop: "worker" }, { label: "创建时间", prop: "creationTime",type: "dateTime" }, diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js index b90557dee..9ed07e135 100644 --- a/fe/PC/src/utils/tabsDesTions/index.js +++ b/fe/PC/src/utils/tabsDesTions/index.js @@ -930,7 +930,7 @@ export const automaticCallNote = [ { label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "备注", prop: 'remark' }, - { label: "生效日期", prop: 'activeDate' }, + { label: "生效日期", prop: 'activeDate',type: "dateTime" }, { label: "车间", prop: 'workshop' }, { label: "确认时间", prop: 'confirmTime' }, ] @@ -1057,7 +1057,7 @@ export const ProductReceiptRequest = [ { label: "生产线", prop: 'prodLine' }, { label: "班次", prop: 'shift' }, { label: "班组", prop: 'team' }, - { label: "计划日期", prop: 'planDate' }, + { label: "计划日期", prop: 'planDate',type: "dateTime" }, ] // 完工收货缴库记录 @@ -1372,9 +1372,9 @@ export const labelsList = [ // 库存初始化记录 export const InventoryInitialNote = [ { label: "单据号", prop: "number" }, - { label: "库存初始化请求单号", prop: "requestNumber" }, + // { label: "库存初始化请求单号", prop: "requestNumber" }, { label: "操作员", prop: 'worker' }, - { label: "生效日期", prop: "activeDate" }, + { label: "生效日期", prop: "activeDate",type: "dateTime" }, ] // 库存余额 @@ -2448,7 +2448,7 @@ export const transferLibNote = [ { label: "任务单号", prop: 'jobNumber' }, { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, { label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" }, - { label: "确认时间", prop: 'confirmTime' }, + { label: "确认时间", prop: 'confirmTime',type: "dateTime" }, { label: "备注", prop: 'remark' }, { label: "操作员", prop: "worker" }, { label: "创建时间", prop: "creationTime",type: "dateTime" },