From 880fd61604a8a85f314613c6af8474044f56b99d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E8=83=9C=E6=A5=A0?= <2792649152@qq.com>
Date: Thu, 30 Nov 2023 17:00:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=AE=A1=E7=90=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=8F=8A=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventoryManage/balance/balance.data.ts   | 108 ++++++------
 .../wms/inventoryManage/balance/index.vue     |  14 +-
 .../container/containerMain.data.ts           |  15 --
 .../wms/inventoryManage/container/index.vue   |   2 +-
 .../inventoryManage/expectin/expectin.data.ts |  26 +--
 .../wms/inventoryManage/expectin/index.vue    |  14 +-
 .../expectout/expectout.data.ts               |  34 ++--
 .../wms/inventoryManage/expectout/index.vue   |  14 +-
 .../locationcapacity/index.vue                |  14 +-
 .../locationcapacity/locationcapacity.data.ts |  18 --
 .../wms/inventoryManage/transaction/index.vue |  14 +-
 .../transaction/transaction.data.ts           | 162 +++++++++---------
 .../wms/inventoryManage/transferlog/index.vue |  14 +-
 .../transferlog/transferlog.data.ts           |  42 ++---
 14 files changed, 229 insertions(+), 262 deletions(-)

diff --git a/src/views/wms/inventoryManage/balance/balance.data.ts b/src/views/wms/inventoryManage/balance/balance.data.ts
index ff5043df1..4ff7f9529 100644
--- a/src/views/wms/inventoryManage/balance/balance.data.ts
+++ b/src/views/wms/inventoryManage/balance/balance.data.ts
@@ -71,6 +71,52 @@ export const Balance = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '仓库代码',
+    field: 'warehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库位组代码',
+    field: 'locationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库区代码',
+    field: 'areaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: 'ERP库位代码',
+    field: 'erpLocationCode',
+    dictType: DICT_TYPE.ERP_LOCATION,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '替代批次',
     field: 'altBatch',
@@ -136,52 +182,6 @@ export const Balance = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '库存状态',
-    field: 'inventoryStatus',
-    dictType: DICT_TYPE.INVENTORY_STATUS,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '库位组代码',
-    field: 'locationGroupCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '库区代码',
-    field: 'areaCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '仓库代码',
-    field: 'warehouseCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: 'ERP库位代码',
-    field: 'erpLocationCode',
-    dictType: DICT_TYPE.ERP_LOCATION,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
   {
     label: '货主代码',
     field: 'ownerCode',
@@ -283,14 +283,6 @@ export const Balance = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '最后事务号',
-    field: 'lastTransNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
   {
     label: '重量',
     field: 'weight',
@@ -324,6 +316,14 @@ export const Balance = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'InputNumber',
     }
   },
+  {
+    label: '最后事务号',
+    field: 'lastTransNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '创建时间',
     field: 'createTime',
diff --git a/src/views/wms/inventoryManage/balance/index.vue b/src/views/wms/inventoryManage/balance/index.vue
index 0f43ba003..99a14f376 100644
--- a/src/views/wms/inventoryManage/balance/index.vue
+++ b/src/views/wms/inventoryManage/balance/index.vue
@@ -27,9 +27,9 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #code="{row}">
-        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
-          <span>{{ row.code }}</span>
+      <template #itemCode="{row}">
+        <el-button type="primary" link @click="openDetail(row, '物料代码', row.itemCode)">
+          <span>{{ row.itemCode }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
@@ -147,7 +147,7 @@ const openForm = (type: string, row?: any) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue, 'basicSupplier')
+  detailRef.value.openDetail(row, titleName, titleValue)
 }
 
 /** 删除按钮操作 */
@@ -172,7 +172,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await BalanceApi.exportBalance(setSearchParams)
-    download.excel(data, '供应商.xlsx')
+    download.excel(data, '库存余额.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
@@ -187,7 +187,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '供应商导入模版.xlsx'
+  templateTitle: '库存余额导入模版.xlsx'
 })
 // 导入成功之后
 const importSuccess = () => {
@@ -206,6 +206,6 @@ const searchFormClick = (searchData) => {
 /** 初始化 **/
 onMounted(async() => {
   getList()
-  importTemplateData.templateUrl = await BalanceApi.importTemplate()
+  // importTemplateData.templateUrl = await BalanceApi.importTemplate()
 })
 </script>
\ No newline at end of file
diff --git a/src/views/wms/inventoryManage/container/containerMain.data.ts b/src/views/wms/inventoryManage/container/containerMain.data.ts
index 9e83841f7..329f80d27 100644
--- a/src/views/wms/inventoryManage/container/containerMain.data.ts
+++ b/src/views/wms/inventoryManage/container/containerMain.data.ts
@@ -8,9 +8,6 @@ export const ContainerMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '号码',
     field: 'number',
     sort: 'custom',
-    table: {
-      width: 150
-    },
     isSearch: true,
   },
   {
@@ -21,18 +18,12 @@ export const ContainerMain = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: true,
     isForm: true,
     sort: 'custom',
-    table: {
-      width: 150
-    },
     isSearch: true,
   },
   {
     label: '总容量',
     field: 'capacity',
     sort: 'custom',
-    table: {
-      width: 150
-    },
     form: {
       component: 'InputNumber',
     },
@@ -42,18 +33,12 @@ export const ContainerMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '状态',
     field: 'status',
     sort: 'custom',
-    table: {
-      width: 150
-    },
     isSearch: true,
   },
   {
     label: '货主代码',
     field: 'ownerCode',
     sort: 'custom',
-    table: {
-      width: 150
-    },
   }
 ]))
 
diff --git a/src/views/wms/inventoryManage/container/index.vue b/src/views/wms/inventoryManage/container/index.vue
index 6e3d3d721..ca69d29a8 100644
--- a/src/views/wms/inventoryManage/container/index.vue
+++ b/src/views/wms/inventoryManage/container/index.vue
@@ -142,7 +142,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ContainerMainApi.exportContainerMain(setSearchParams)
-    download.excel(data, '供应商发票记录主.xlsx')
+    download.excel(data, '器具主.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/inventoryManage/expectin/expectin.data.ts b/src/views/wms/inventoryManage/expectin/expectin.data.ts
index dbcb95ce0..6bdfce756 100644
--- a/src/views/wms/inventoryManage/expectin/expectin.data.ts
+++ b/src/views/wms/inventoryManage/expectin/expectin.data.ts
@@ -39,16 +39,15 @@ export const Expectin = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
   },
   {
-    label: '库存状态',
-    field: 'inventoryStatus',
-    dictType: DICT_TYPE.INVENTORY_STATUS,
-    dictClass: 'string',
-    isSearch: true,
-    isTable: true,
+    label: '数量',
+    field: 'qty',
     sort: 'custom',
     table: {
       width: 150
     },
+    form: {
+      component: 'InputNumber',
+    }
   },
   {
     label: '计量单位',
@@ -63,15 +62,12 @@ export const Expectin = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '数量',
-    field: 'qty',
+    label: '仓库代码',
+    field: 'warehouseCode',
     sort: 'custom',
     table: {
       width: 150
     },
-    form: {
-      component: 'InputNumber',
-    }
   },
   {
     label: '库位代码',
@@ -82,8 +78,12 @@ export const Expectin = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '仓库代码',
-    field: 'warehouseCode',
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
diff --git a/src/views/wms/inventoryManage/expectin/index.vue b/src/views/wms/inventoryManage/expectin/index.vue
index cec9c5928..69af3a6c8 100644
--- a/src/views/wms/inventoryManage/expectin/index.vue
+++ b/src/views/wms/inventoryManage/expectin/index.vue
@@ -27,9 +27,9 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #code="{row}">
-        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
-          <span>{{ row.code }}</span>
+      <template #jobNumber="{row}">
+        <el-button type="primary" link @click="openDetail(row, '任务号', row.jobNumber)">
+          <span>{{ row.jobNumber }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
@@ -147,7 +147,7 @@ const openForm = (type: string, row?: any) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue, 'basicSupplier')
+  detailRef.value.openDetail(row, titleName, titleValue)
 }
 
 /** 删除按钮操作 */
@@ -172,7 +172,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ExpectinApi.exportExpectin(setSearchParams)
-    download.excel(data, '供应商.xlsx')
+    download.excel(data, '预计入库存.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
@@ -187,7 +187,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '供应商导入模版.xlsx'
+  templateTitle: '预计入库存导入模版.xlsx'
 })
 // 导入成功之后
 const importSuccess = () => {
@@ -206,6 +206,6 @@ const searchFormClick = (searchData) => {
 /** 初始化 **/
 onMounted(async() => {
   getList()
-  importTemplateData.templateUrl = await ExpectinApi.importTemplate()
+  // importTemplateData.templateUrl = await ExpectinApi.importTemplate()
 })
 </script>
\ No newline at end of file
diff --git a/src/views/wms/inventoryManage/expectout/expectout.data.ts b/src/views/wms/inventoryManage/expectout/expectout.data.ts
index 6751eaa63..033aa9a8a 100644
--- a/src/views/wms/inventoryManage/expectout/expectout.data.ts
+++ b/src/views/wms/inventoryManage/expectout/expectout.data.ts
@@ -21,8 +21,8 @@ export const Expectout = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '包装号',
-    field: 'packingNumber',
+    label: '物品代码',
+    field: 'itemCode',
     sort: 'custom',
     table: {
       width: 150
@@ -30,8 +30,8 @@ export const Expectout = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
   },
   {
-    label: '物品代码',
-    field: 'itemCode',
+    label: '包装号',
+    field: 'packingNumber',
     sort: 'custom',
     table: {
       width: 150
@@ -48,16 +48,15 @@ export const Expectout = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
   },
   {
-    label: '库存状态',
-    field: 'inventoryStatus',
-    dictType: DICT_TYPE.INVENTORY_STATUS,
-    dictClass: 'string',
-    isSearch: true,
-    isTable: true,
+    label: '数量',
+    field: 'qty',
     sort: 'custom',
     table: {
       width: 150
     },
+    form: {
+      component: 'InputNumber',
+    }
   },
   {
     label: '计量单位',
@@ -71,15 +70,12 @@ export const Expectout = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '数量',
-    field: 'qty',
+    label: '仓库代码',
+    field: 'warehouseCode',
     sort: 'custom',
     table: {
       width: 150
     },
-    form: {
-      component: 'InputNumber',
-    }
   },
   {
     label: '库位代码',
@@ -90,8 +86,12 @@ export const Expectout = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '仓库代码',
-    field: 'warehouseCode',
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
diff --git a/src/views/wms/inventoryManage/expectout/index.vue b/src/views/wms/inventoryManage/expectout/index.vue
index 5d6234241..c7553dcac 100644
--- a/src/views/wms/inventoryManage/expectout/index.vue
+++ b/src/views/wms/inventoryManage/expectout/index.vue
@@ -27,9 +27,9 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #code="{row}">
-        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
-          <span>{{ row.code }}</span>
+      <template #jobNumber="{row}">
+        <el-button type="primary" link @click="openDetail(row, '任务号', row.jobNumber)">
+          <span>{{ row.jobNumber }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
@@ -147,7 +147,7 @@ const openForm = (type: string, row?: any) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue, 'basicSupplier')
+  detailRef.value.openDetail(row, titleName, titleValue)
 }
 
 /** 删除按钮操作 */
@@ -172,7 +172,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ExpectoutApi.exportExpectout(setSearchParams)
-    download.excel(data, '供应商.xlsx')
+    download.excel(data, '预计出库存.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
@@ -187,7 +187,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '供应商导入模版.xlsx'
+  templateTitle: '预计出库存导入模版.xlsx'
 })
 // 导入成功之后
 const importSuccess = () => {
@@ -206,6 +206,6 @@ const searchFormClick = (searchData) => {
 /** 初始化 **/
 onMounted(async() => {
   getList()
-  importTemplateData.templateUrl = await ExpectoutApi.importTemplate()
+  // importTemplateData.templateUrl = await ExpectoutApi.importTemplate()
 })
 </script>
\ No newline at end of file
diff --git a/src/views/wms/inventoryManage/locationcapacity/index.vue b/src/views/wms/inventoryManage/locationcapacity/index.vue
index 0086ba78a..8da5d0ff7 100644
--- a/src/views/wms/inventoryManage/locationcapacity/index.vue
+++ b/src/views/wms/inventoryManage/locationcapacity/index.vue
@@ -27,9 +27,9 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #code="{row}">
-        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
-          <span>{{ row.code }}</span>
+      <template #locationCode="{row}">
+        <el-button type="primary" link @click="openDetail(row, '库位代码', row.locationCode)">
+          <span>{{ row.locationCode }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
@@ -147,7 +147,7 @@ const openForm = (type: string, row?: any) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue, 'basicSupplier')
+  detailRef.value.openDetail(row, titleName, titleValue)
 }
 
 /** 删除按钮操作 */
@@ -172,7 +172,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await LocationcapacityApi.exportLocationcapacity(setSearchParams)
-    download.excel(data, '供应商.xlsx')
+    download.excel(data, '库位容量.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
@@ -187,7 +187,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '供应商导入模版.xlsx'
+  templateTitle: '库位容量导入模版.xlsx'
 })
 // 导入成功之后
 const importSuccess = () => {
@@ -206,6 +206,6 @@ const searchFormClick = (searchData) => {
 /** 初始化 **/
 onMounted(async() => {
   getList()
-  importTemplateData.templateUrl = await LocationcapacityApi.importTemplate()
+  // importTemplateData.templateUrl = await LocationcapacityApi.importTemplate()
 })
 </script>
\ No newline at end of file
diff --git a/src/views/wms/inventoryManage/locationcapacity/locationcapacity.data.ts b/src/views/wms/inventoryManage/locationcapacity/locationcapacity.data.ts
index c6106f49b..8c6945dfe 100644
--- a/src/views/wms/inventoryManage/locationcapacity/locationcapacity.data.ts
+++ b/src/views/wms/inventoryManage/locationcapacity/locationcapacity.data.ts
@@ -8,44 +8,29 @@ export const Locationcapacity = useCrudSchemas(reactive<CrudSchema[]>([
     label: '库位代码',
     field: 'locationCode',
     sort: 'custom',
-    table: {
-      width: 150
-    },
     isSearch: true,
   },
   {
     label: '仓库代码',
     field: 'warehouseCode',
     sort: 'custom',
-    table: {
-      width: 150
-    },
     isSearch: true,
   },
   {
     label: '已用容量百分比',
     field: 'usedCapacity',
     sort: 'custom',
-    table: {
-      width: 150
-    },
     isSearch: true,
   },
   {
     label: '可用容量百分比',
     field: 'availableCapacity',
     sort: 'custom',
-    table: {
-      width: 150
-    },
   },
   {
     label: '可承受过载容量百分比',
     field: 'bearableOverloadCapacity',
     sort: 'custom',
-    table: {
-      width: 150
-    },
   },
   {
     label: '是否无限容量',
@@ -55,9 +40,6 @@ export const Locationcapacity = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
     isTable: true,
     sort: 'custom',
-    table: {
-      width: 150
-    },
     form: {
       component: 'Switch',
       value: 'TRUE',
diff --git a/src/views/wms/inventoryManage/transaction/index.vue b/src/views/wms/inventoryManage/transaction/index.vue
index d1a492103..c400a60dd 100644
--- a/src/views/wms/inventoryManage/transaction/index.vue
+++ b/src/views/wms/inventoryManage/transaction/index.vue
@@ -27,9 +27,9 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #code="{row}">
-        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
-          <span>{{ row.code }}</span>
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '事务号', row.number)">
+          <span>{{ row.number }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
@@ -147,7 +147,7 @@ const openForm = (type: string, row?: any) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue, 'basicSupplier')
+  detailRef.value.openDetail(row, titleName, titleValue)
 }
 
 /** 删除按钮操作 */
@@ -172,7 +172,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await TransactionApi.exportTransaction(setSearchParams)
-    download.excel(data, '供应商.xlsx')
+    download.excel(data, '事务类型.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
@@ -187,7 +187,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '供应商导入模版.xlsx'
+  templateTitle: '事务类型导入模版.xlsx'
 })
 // 导入成功之后
 const importSuccess = () => {
@@ -206,6 +206,6 @@ const searchFormClick = (searchData) => {
 /** 初始化 **/
 onMounted(async() => {
   getList()
-  importTemplateData.templateUrl = await TransactionApi.importTemplate()
+  // importTemplateData.templateUrl = await TransactionApi.importTemplate()
 })
 </script>
\ No newline at end of file
diff --git a/src/views/wms/inventoryManage/transaction/transaction.data.ts b/src/views/wms/inventoryManage/transaction/transaction.data.ts
index 181a89be9..02ab76f45 100644
--- a/src/views/wms/inventoryManage/transaction/transaction.data.ts
+++ b/src/views/wms/inventoryManage/transaction/transaction.data.ts
@@ -58,32 +58,67 @@ export const Transaction = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '生效时间',
-    field: 'activeTime',
-    isTable: true,
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
     },
+    isSearch: true,
+  },
+  {
+    label: '数量',
+    field: 'qty',
     sort: 'custom',
     table: {
       width: 150
     },
     form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-      }
+      component: 'InputNumber',
     }
   },
   {
-    label: '物料代码',
-    field: 'itemCode',
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '单价',
+    field: 'singlePrice',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '金额',
+    field: 'amount',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
     sort: 'custom',
     table: {
       width: 150
     },
-    isSearch: true,
   },
   {
     label: '批次',
@@ -94,6 +129,14 @@ export const Transaction = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true,
   },
+  {
+    label: '库位代码',
+    field: 'locationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '库存状态',
     field: 'inventoryStatus',
@@ -107,38 +150,35 @@ export const Transaction = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
+    label: '仓库代码',
+    field: 'warehouseCode',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '数量',
-    field: 'qty',
+    label: '库区代码',
+    field: 'areaCode',
     sort: 'custom',
     table: {
       width: 150
     },
-    form: {
-      component: 'InputNumber',
-    }
   },
   {
-    label: '单价',
-    field: 'singlePrice',
+    label: '库位组代码',
+    field: 'locationGroupCode',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '金额',
-    field: 'amount',
+    label: 'ERP库位代码',
+    field: 'erpLocationCode',
+    dictType: DICT_TYPE.ERP_LOCATION,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
@@ -191,8 +231,8 @@ export const Transaction = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '失效日期',
-    field: 'expireDate',
+    label: '生效时间',
+    field: 'activeTime',
     isTable: true,
     formatter: dateFormatter,
     detail: {
@@ -210,63 +250,23 @@ export const Transaction = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '包装号',
-    field: 'packingNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '器具号',
-    field: 'containerNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '库位代码',
-    field: 'locationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '仓库代码',
-    field: 'warehouseCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '库区代码',
-    field: 'areaCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '库位组代码',
-    field: 'locationGroupCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: 'ERP库位代码',
-    field: 'erpLocationCode',
-    dictType: DICT_TYPE.ERP_LOCATION,
-    dictClass: 'string',
+    label: '失效日期',
+    field: 'expireDate',
     isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
     sort: 'custom',
     table: {
       width: 150
     },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+      }
+    }
   },
   {
     label: '货主代码',
diff --git a/src/views/wms/inventoryManage/transferlog/index.vue b/src/views/wms/inventoryManage/transferlog/index.vue
index c03e031f7..006e9c133 100644
--- a/src/views/wms/inventoryManage/transferlog/index.vue
+++ b/src/views/wms/inventoryManage/transferlog/index.vue
@@ -27,9 +27,9 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #code="{row}">
-        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
-          <span>{{ row.code }}</span>
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '库存转移日志', row.number)">
+          <span>{{ row.number }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
@@ -147,7 +147,7 @@ const openForm = (type: string, row?: any) => {
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
-  detailRef.value.openDetail(row, titleName, titleValue, 'basicSupplier')
+  detailRef.value.openDetail(row, titleName, titleValue)
 }
 
 /** 删除按钮操作 */
@@ -172,7 +172,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await ExpectinApi.exportTransferlog(setSearchParams)
-    download.excel(data, '供应商.xlsx')
+    download.excel(data, '库存转移日志.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
@@ -187,7 +187,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '供应商导入模版.xlsx'
+  templateTitle: '库存转移日志导入模版.xlsx'
 })
 // 导入成功之后
 const importSuccess = () => {
@@ -206,6 +206,6 @@ const searchFormClick = (searchData) => {
 /** 初始化 **/
 onMounted(async() => {
   getList()
-  importTemplateData.templateUrl = await ExpectinApi.importTemplate()
+  // importTemplateData.templateUrl = await ExpectinApi.importTemplate()
 })
 </script>
\ No newline at end of file
diff --git a/src/views/wms/inventoryManage/transferlog/transferlog.data.ts b/src/views/wms/inventoryManage/transferlog/transferlog.data.ts
index e3352b8e9..6e7e035ac 100644
--- a/src/views/wms/inventoryManage/transferlog/transferlog.data.ts
+++ b/src/views/wms/inventoryManage/transferlog/transferlog.data.ts
@@ -46,26 +46,24 @@ export const Transferlog = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '生效时间',
-    field: 'activeTime',
-    isTable: true,
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
+    label: '物品代码',
+    field: 'itemCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    isSearch: true,
   },
   {
-    label: '物品代码',
-    field: 'itemCode',
+    label: '数量',
+    field: 'qty',
     sort: 'custom',
     table: {
       width: 150
     },
-    isSearch: true,
+    form: {
+      component: 'InputNumber',
+    }
   },
   {
     label: '计量单位',
@@ -79,17 +77,6 @@ export const Transferlog = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true,
   },
-  {
-    label: '数量',
-    field: 'qty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-    }
-  },
   {
     label: '替代批次',
     field: 'altBatch',
@@ -136,6 +123,19 @@ export const Transferlog = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '生效时间',
+    field: 'activeTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '失效日期',
     field: 'expireDate',