From 550dbc5b234d8739b421d4409b0edc5de2a1ed09 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Fri, 22 Nov 2024 14:16:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../finishedShipmentMain.data.ts              | 33 ++++++++++++++++++
 .../unfinishedShipmentMain/index.vue          |  8 ++---
 .../unfinishedShipmentMain.data.ts            | 34 +++++++++++++++++++
 3 files changed, 71 insertions(+), 4 deletions(-)

diff --git a/src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/finishedShipmentMain.data.ts b/src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/finishedShipmentMain.data.ts
index d3861ace2..bd50e7bd5 100644
--- a/src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/finishedShipmentMain.data.ts
+++ b/src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/finishedShipmentMain.data.ts
@@ -61,6 +61,39 @@ export const FinishedShipmentMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true
   },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    isDetail:true,
+    isForm: false,
+    isTable:true,
+    sortTableDefault:10000
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    detail: {
+      dateFormat : 'YYYY-MM-DD HH:mm:ss'
+    },
+    isTable:true,
+    isForm: false,
+    table:{
+      width:180
+    },
+    sortTableDefault:10000
+
+  },
   {
     label: '操作',
     field: 'action',
diff --git a/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/index.vue b/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/index.vue
index ab3e24366..6ad160ca0 100644
--- a/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/index.vue
+++ b/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/index.vue
@@ -109,8 +109,8 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:unfinished-shipment-main:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:unfinished-shipment-main:import'}), // 导入
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:unfinished-shipment-main:create'}), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:unfinished-shipment-main:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:unfinished-shipment-main:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
@@ -143,8 +143,8 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'wms:unfinished-shipment-main:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'wms:unfinished-shipment-main:delete'}), // 删除
+  // defaultButtons.mainListEditBtn({hasPermi:'wms:unfinished-shipment-main:update'}), // 编辑
+  // defaultButtons.mainListDeleteBtn({hasPermi:'wms:unfinished-shipment-main:delete'}), // 删除
 ]
 
 // 列表-操作按钮事件
diff --git a/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/unfinishedShipmentMain.data.ts b/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/unfinishedShipmentMain.data.ts
index a66431d05..92d2548f1 100644
--- a/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/unfinishedShipmentMain.data.ts
+++ b/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/unfinishedShipmentMain.data.ts
@@ -53,6 +53,40 @@ export const UnfinishedShipmentMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true
   },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    isDetail:true,
+    isForm: false,
+    isTable:true,
+    sortTableDefault:10000
+
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    detail: {
+      dateFormat : 'YYYY-MM-DD HH:mm:ss'
+    },
+    isTable:true,
+    isForm: false,
+    table:{
+      width:180
+    },
+    sortTableDefault:10000
+
+  },
   {
     label: '操作',
     field: 'action',