From cc09d55d314391bd9f18505ed670f82be22bee3a Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 17 Nov 2023 08:43:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../labelManage/manufacturePackage/index.vue  | 267 +++++++++++
 .../manufacturePackage.data.ts}               |  13 +-
 .../labelManage/purchasePackage/index.vue     | 267 +++++++++++
 .../purchasePackage/purchasePackage.data.ts   | 420 ++++++++++++++++++
 .../{package => utensilPackage}/index.vue     |   4 +-
 .../utensilPackage/utensilPackage.data.ts     | 420 ++++++++++++++++++
 6 files changed, 1388 insertions(+), 3 deletions(-)
 create mode 100644 src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue
 rename src/views/wms/basicDataManage/labelManage/{package/package.data.ts => manufacturePackage/manufacturePackage.data.ts} (96%)
 create mode 100644 src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue
 create mode 100644 src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts
 rename src/views/wms/basicDataManage/labelManage/{package => utensilPackage}/index.vue (98%)
 create mode 100644 src/views/wms/basicDataManage/labelManage/utensilPackage/utensilPackage.data.ts

diff --git a/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue b/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue
new file mode 100644
index 000000000..2d01395dc
--- /dev/null
+++ b/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue
@@ -0,0 +1,267 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Package.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="Package.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="basicFormRef" 
+    @success="getList" 
+    :rules="PackageRules" 
+    :formAllSchemas="Package.allSchemas" 
+    :searchTableParams="searchTableParams"
+    :apiUpdate="PackageApi.updatePackage"
+    :apiCreate="PackageApi.createPackage"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Package.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/package/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { getAccessToken } from '@/utils/auth'
+import { Package,PackageRules } from './manufacturePackage.data'
+import * as PackageApi from '@/api/wms/package'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+
+defineOptions({ name: 'ManufacturePackage' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Package.allSchemas.tableColumns)
+
+
+/**
+ * Package2 regularParams = procure采购件标签记录页面   
+ * Package3 regularParams = manufacture  制造件标签记录页面
+ * Package4 regularParams = utensil  器具标签记录页面
+ */
+const regularParams = ref(route.name == 'Package2'?'procure':route.name == 'Package3'?'manufacture':route.name == 'Package4'?'utensil':'')
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+//{
+//  formField: 'productItemCode',
+//  searchTableTitle: '物料信息',
+//  searchTableAllSchemas: Itembasic.allSchemas,
+//  searchTablePage: ItembasicApi.getItembasicPage
+//}
+])
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, basicFormRef, type, row ) => {
+  nextTick(() => {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      basicFormRef.setValues(setV)
+  })
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: PackageApi.getPackagePage // 分页接口
+})
+tableObject.params.regularParams = regularParams.value
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:package:create'}), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:package:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:package:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+// const isShowMainButton = (row,val) => {
+//   if (val.indexOf(row.status) > -1) {
+//     return false
+//   } else {
+//     return true
+//   }
+// }
+
+// 列表-操作按钮
+// const butttondata = (row) => {
+//     return [
+//         defaultButtons.mainListEditBtn({hasPermi:'wms:package:update'}), // 编辑
+//         defaultButtons.mainListDeleteBtn({hasPermi:'wms:package:delete'}), // 删除
+//         defaultButtons.mainListPointBtn(null), // 标签打印
+//     ]
+// }
+
+// 列表-操作按钮
+const butttondata = [
+  // defaultButtons.mainListEditBtn({hasPermi:'wms:package:update'}), // 编辑
+  // defaultButtons.mainListDeleteBtn({hasPermi:'wms:package:delete'}), // 删除
+  defaultButtons.mainListPointBtn(null), // 标签打印
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  } else if (val == 'point') { // 标签打印
+    handlePoint(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm =async (type: string, row?: number) => {
+  basicFormRef.value.open(type, row)
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await PackageApi.deletePackage(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await PackageApi.exportPackage(setSearchParams)
+    download.excel(data, '包装.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+const BASE_URL = 'http://dev.ccwin-in.com:25110'
+const src = ref(BASE_URL + '/jmreport/view/881303562245316608?token=' + getAccessToken())
+// 标签打印
+const handlePoint = async (id) => {
+  window.open(src.value+'&id='+id)
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '包装导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters,
+    regularParams:regularParams.value
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/basicDataManage/labelManage/package/package.data.ts b/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts
similarity index 96%
rename from src/views/wms/basicDataManage/labelManage/package/package.data.ts
rename to src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts
index 0d7b79689..c7d72ffcd 100644
--- a/src/views/wms/basicDataManage/labelManage/package/package.data.ts
+++ b/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts
@@ -7,7 +7,18 @@ export const PackageRules = reactive({
   itemCode: [required],
   itemName: [required],
 })
-
+export const Package2 = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '包装号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150,
+      fixed: 'left'
+    },
+  },
+]))
 export const Package = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '包装号',
diff --git a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue
new file mode 100644
index 000000000..661931d10
--- /dev/null
+++ b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue
@@ -0,0 +1,267 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="Package.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="Package.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm 
+    ref="basicFormRef" 
+    @success="getList" 
+    :rules="PackageRules" 
+    :formAllSchemas="Package.allSchemas" 
+    :searchTableParams="searchTableParams"
+    :apiUpdate="PackageApi.updatePackage"
+    :apiCreate="PackageApi.createPackage"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="Package.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/package/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { getAccessToken } from '@/utils/auth'
+import { Package,PackageRules } from './purchasePackage.data'
+import * as PackageApi from '@/api/wms/package'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+
+defineOptions({ name: 'PurchasePackage' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(Package.allSchemas.tableColumns)
+
+
+/**
+ * Package2 regularParams = procure采购件标签记录页面   
+ * Package3 regularParams = manufacture  制造件标签记录页面
+ * Package4 regularParams = utensil  器具标签记录页面
+ */
+const regularParams = ref(route.name == 'Package2'?'procure':route.name == 'Package3'?'manufacture':route.name == 'Package4'?'utensil':'')
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+
+// 查询列表页面参数设置
+const searchTableParams = ref([
+//{
+//  formField: 'productItemCode',
+//  searchTableTitle: '物料信息',
+//  searchTableAllSchemas: Itembasic.allSchemas,
+//  searchTablePage: ItembasicApi.getItembasicPage
+//}
+])
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, basicFormRef, type, row ) => {
+  nextTick(() => {
+      const setV = {}
+      setV[formField] = val[0][searchField]
+      basicFormRef.setValues(setV)
+  })
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: PackageApi.getPackagePage // 分页接口
+})
+tableObject.params.regularParams = regularParams.value
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:package:create'}), // 新增
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:package:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:package:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 根据状态返回该按钮是否显示
+// const isShowMainButton = (row,val) => {
+//   if (val.indexOf(row.status) > -1) {
+//     return false
+//   } else {
+//     return true
+//   }
+// }
+
+// 列表-操作按钮
+// const butttondata = (row) => {
+//     return [
+//         defaultButtons.mainListEditBtn({hasPermi:'wms:package:update'}), // 编辑
+//         defaultButtons.mainListDeleteBtn({hasPermi:'wms:package:delete'}), // 删除
+//         defaultButtons.mainListPointBtn(null), // 标签打印
+//     ]
+// }
+
+// 列表-操作按钮
+const butttondata = [
+  // defaultButtons.mainListEditBtn({hasPermi:'wms:package:update'}), // 编辑
+  // defaultButtons.mainListDeleteBtn({hasPermi:'wms:package:delete'}), // 删除
+  defaultButtons.mainListPointBtn(null), // 标签打印
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  } else if (val == 'point') { // 标签打印
+    handlePoint(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm =async (type: string, row?: number) => {
+  basicFormRef.value.open(type, row)
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await PackageApi.deletePackage(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await PackageApi.exportPackage(setSearchParams)
+    download.excel(data, '包装.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+const BASE_URL = 'http://dev.ccwin-in.com:25110'
+const src = ref(BASE_URL + '/jmreport/view/881303562245316608?token=' + getAccessToken())
+// 标签打印
+const handlePoint = async (id) => {
+  window.open(src.value+'&id='+id)
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '包装导入模版.xlsx'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters,
+    regularParams:regularParams.value
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts b/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts
new file mode 100644
index 000000000..c7d72ffcd
--- /dev/null
+++ b/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts
@@ -0,0 +1,420 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const PackageRules = reactive({
+  number: [required],
+  itemCode: [required],
+  itemName: [required],
+})
+export const Package2 = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '包装号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150,
+      fixed: 'left'
+    },
+  },
+]))
+export const Package = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '包装号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150,
+      fixed: 'left'
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '物品名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '物品描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '物品描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '替代批次',
+    field: 'altBatch',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    sort: 'custom',
+    formatter: dateFormatter,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+    table: {
+      width: 180,
+    },
+  },
+  {
+    label: '有效期(日)',
+    field: 'validityDays',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0
+      },
+      value: 0
+    },
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '失效日期',
+    field: 'expireDate',
+    sort: 'custom',
+    formatter: dateFormatter,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+    table: {
+      width: 180,
+    },
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    sort: 'custom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    form: {
+      component: 'SelectV2'
+    },
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '替代计量单位',
+    field: 'altUom',
+    sort: 'custom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    form: {
+      component: 'SelectV2'
+    },
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '替代数量',
+    field: 'altQty',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '转换率',
+    field: 'convertRate',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '标包数量',
+    field: 'stdPackQty',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '标包单位',
+    field: 'stdPackUnit',
+    sort: 'custom',
+    dictType: DICT_TYPE.PACK_UNIT,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    form: {
+      component: 'SelectV2'
+    },
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '月台代码',
+    field: 'toDockCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '供应商物品代码',
+    field: 'supplierItemCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '采购订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '采购订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '采购计划单号',
+    field: 'rpNumber',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '发货单号',
+    field: 'asnNumber',
+    sort: 'custom',
+    table: {
+      width: 182,
+    },
+  },
+  {
+    label: '生产订单号',
+    field: 'woNumber',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '生产订单行',
+    field: 'woLine',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '班组代码',
+    field: 'teamCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '班次代码',
+    field: 'shiftCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '客户代码',
+    field: 'customerCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '客户月台代码',
+    field: 'customerDockCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '客户物品代码',
+    field: 'customerItemCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '销售订单号',
+    field: 'soNumber',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '销售订单行',
+    field: 'soLine',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '质量等级',
+    field: 'eqLevel',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '货主代码',
+    field: 'ownerCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '重量',
+    field: 'weight',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '面积',
+    field: 'area',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '体积',
+    field: 'volume',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
diff --git a/src/views/wms/basicDataManage/labelManage/package/index.vue b/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue
similarity index 98%
rename from src/views/wms/basicDataManage/labelManage/package/index.vue
rename to src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue
index e61c0cd73..1bceae1e8 100644
--- a/src/views/wms/basicDataManage/labelManage/package/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue
@@ -61,11 +61,11 @@
 <script setup lang="ts">
 import download from '@/utils/download'
 import { getAccessToken } from '@/utils/auth'
-import { Package,PackageRules } from './package.data'
+import { Package,PackageRules } from './utensilPackage.data'
 import * as PackageApi from '@/api/wms/package'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 
-defineOptions({ name: 'Package' })
+defineOptions({ name: 'UtensilPackage' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
diff --git a/src/views/wms/basicDataManage/labelManage/utensilPackage/utensilPackage.data.ts b/src/views/wms/basicDataManage/labelManage/utensilPackage/utensilPackage.data.ts
new file mode 100644
index 000000000..c7d72ffcd
--- /dev/null
+++ b/src/views/wms/basicDataManage/labelManage/utensilPackage/utensilPackage.data.ts
@@ -0,0 +1,420 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const PackageRules = reactive({
+  number: [required],
+  itemCode: [required],
+  itemName: [required],
+})
+export const Package2 = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '包装号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150,
+      fixed: 'left'
+    },
+  },
+]))
+export const Package = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '包装号',
+    field: 'number',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150,
+      fixed: 'left'
+    },
+  },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '物品名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '物品描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '物品描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '替代批次',
+    field: 'altBatch',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    sort: 'custom',
+    formatter: dateFormatter,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+    table: {
+      width: 180,
+    },
+  },
+  {
+    label: '有效期(日)',
+    field: 'validityDays',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0
+      },
+      value: 0
+    },
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '失效日期',
+    field: 'expireDate',
+    sort: 'custom',
+    formatter: dateFormatter,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+    table: {
+      width: 180,
+    },
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    sort: 'custom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    form: {
+      component: 'SelectV2'
+    },
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '替代计量单位',
+    field: 'altUom',
+    sort: 'custom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    form: {
+      component: 'SelectV2'
+    },
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '替代数量',
+    field: 'altQty',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '转换率',
+    field: 'convertRate',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '标包数量',
+    field: 'stdPackQty',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '标包单位',
+    field: 'stdPackUnit',
+    sort: 'custom',
+    dictType: DICT_TYPE.PACK_UNIT,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    form: {
+      component: 'SelectV2'
+    },
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '月台代码',
+    field: 'toDockCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '供应商物品代码',
+    field: 'supplierItemCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '采购订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '采购订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '采购计划单号',
+    field: 'rpNumber',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '发货单号',
+    field: 'asnNumber',
+    sort: 'custom',
+    table: {
+      width: 182,
+    },
+  },
+  {
+    label: '生产订单号',
+    field: 'woNumber',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '生产订单行',
+    field: 'woLine',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '班组代码',
+    field: 'teamCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '班次代码',
+    field: 'shiftCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '客户代码',
+    field: 'customerCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '客户月台代码',
+    field: 'customerDockCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '客户物品代码',
+    field: 'customerItemCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '销售订单号',
+    field: 'soNumber',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '销售订单行',
+    field: 'soLine',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '质量等级',
+    field: 'eqLevel',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '货主代码',
+    field: 'ownerCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '重量',
+    field: 'weight',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '面积',
+    field: 'area',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '体积',
+    field: 'volume',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))