From fc1bf80208b498fe84de25eb9890d0e6c9e810bb Mon Sep 17 00:00:00 2001
From: "YEJIAXING-PC\\lenovo" <591141169@qq.com>
Date: Sat, 29 Mar 2025 23:19:18 +0800
Subject: [PATCH 1/7] YT-2298

---
 .../repleinshRequestMain/repleinshRequestMain.data.ts | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
index dafff9d9e..9887391fd 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
+++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
@@ -728,6 +728,17 @@ export const RepleinshRequestDetail = useCrudSchemas(
         }
       }
     },
+    {
+      label: 'ERP默认收货库位',
+      field: 'defaultErpLocationCode',
+      sort: 'custom',
+      isTableForm: false,
+      sortTableDefault: 10,
+      table: {
+        width: 150
+      },
+      isTable: true,
+    },
     {
       label: '到库位代码',
       field: 'toLocationCode',

From 6270f1a46cd1d2e2665e831c0c3cfe9c9cee1157 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Sun, 30 Mar 2025 11:43:36 +0800
Subject: [PATCH 2/7] YT-2303

---
 .../purchasereceipt/purchasereceiptJobMain/index.vue            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
index 9429f85e2..e62f895f0 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
@@ -328,7 +328,7 @@ const resonSubmit = async (row) => {
     confirmButtonText: t('common.ok'),
     cancelButtonText: t('common.cancel'),
     inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
-    inputErrorMessage: t(`ts.${'驳回原因不能为空，且不超过256字'}`),
+    inputErrorMessage: t(`${'驳回原因不能为空，且不超过256字'}`),
     inputType: 'textarea',
     inputValidator: (value) => {
       if (value.length > 60 || value.length == 0) {

From f7b7ebc9dbaf7085ebfb776d5689c6e852ef7ade Mon Sep 17 00:00:00 2001
From: songguoqiang <yiran_zhao6@163.com>
Date: Sun, 30 Mar 2025 15:53:40 +0800
Subject: [PATCH 3/7] =?UTF-8?q?wms=E6=B7=BB=E5=8A=A0=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E5=8F=91=E8=B4=A7=E5=88=B0=E6=94=B6=E8=B4=A7=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/dict.ts                             |    1 +
 .../supplierdeliverRecordWMS/index.vue        |  382 +++++
 .../supplierdeliverRecordMain.data.ts         | 1431 +++++++++++++++++
 3 files changed, 1814 insertions(+)
 create mode 100644 src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordWMS/index.vue
 create mode 100644 src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordWMS/supplierdeliverRecordMain.data.ts

diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index 4db6e2269..9d7588f3d 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -430,4 +430,5 @@ export enum DICT_TYPE {
   INVENTORY_MODE = "inventory_mode",
   INVOICE_TYPE = 'invoice_type', // 开票种类
   DELISHIF = "deliShif",// 班次
+  IS_RECEIVE = "is_receive",//是否生成
 }
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordWMS/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordWMS/index.vue
new file mode 100644
index 000000000..db635b889
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordWMS/index.vue
@@ -0,0 +1,382 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search
+      :schema="[
+        ...SupplierdeliverRecordMain.allSchemas.searchSchema,
+        ...SupplierdeliverRecordDetail.allSchemas.searchSchema
+      ]"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="SupplierdeliverRecordMain.allSchemas"
+    :detailAllSchemas="SupplierdeliverRecordDetail.allSchemas"
+  />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      v-clientTable
+      :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, $index }">
+        <ButtonBaseMore
+          :Butttondata="butttondata(row, $index)"
+          @button-base-click="buttonTableClick($event, row)"
+        />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="SupplierdeliverRecordMainRules"
+    :formAllSchemas="SupplierdeliverRecordMain.allSchemas"
+    :tableAllSchemas="SupplierdeliverRecordDetail.allSchemas"
+    :tableFormRules="SupplierdeliverRecordDetailRules"
+    :isBusiness="true"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isShowPackNumber="true"
+    :annexTable="[
+      {
+        label: '质检明细',
+        prop: 'uploadFile',
+        hasPermi: 'wms:supplierdeliver-request-main:uploadCheck',
+        tableName: 'SupplierdeliverInspectionDetail',
+        hasSubDetail: true, // 附件中是否展示明细表
+        showPreview: true, // 附件中是否展示预览按钮
+        showDownload: true,
+        hiddenDelete: true,
+        hiddenUpload: true,
+        align: 'left',
+        queryParams: [
+          {
+            queryField: 'tableId',
+            rowField: 'annexMasterId'
+          }
+        ],
+        //明细表数据
+        subDetailTableData: {
+          queryParams: [
+            {
+              queryField: 'masterId',
+              rowField: 'annexMasterId'
+            }
+          ], // 查询参数
+          getSubList: SupplierdeliverInspectionDetailApi.getSupplierdeliverInspectionDetailPage, //请求接口
+          tableColumns: SupplierdeliverInspectionDetail.allSchemas.tableColumns,
+          tableList: [], //表格数据
+          total: 1,
+          pageSize: 10,
+          currentPage: 1
+        }
+      }
+    ]"
+    :isBasic="false"
+    :allSchemas="SupplierdeliverRecordMain.allSchemas"
+    :detailAllSchemas="SupplierdeliverRecordDetail.allSchemas"
+    :detailAllSchemasRules="SupplierdeliverRecordDetailRules"
+    :apiPage="SupplierdeliverRecordDetailApi.getSupplierdeliverRecordDetailPage"
+    :buttondataTable="buttondataTable"
+    @tableFormButton="tableFormButton"
+  />
+
+  <!-- 父包装弹窗 -->
+  <BasicForm
+    ref="detailParenPackingRef"
+    @success="getList"
+    :tableAllSchemas="SupplierdeliverRecordDetailPickingNumer.allSchemas"
+    :tableFormRules="SupplierdeliverRecordDetailRules"
+    :tableData="detatableData.tableList"
+    :isBusiness="true"
+    :isShowButton="false"
+    :isShowReduceButton="false"
+    :isShowFooterButtton="false"
+  />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import * as SupplierdeliverInspectionDetailApi from '@/api/wms/supplierdeliverInspectionDetail'
+import {
+  SupplierdeliverInspectionDetail,
+  SupplierdeliverInspectionDetailRules
+} from '../supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data'
+import {
+  SupplierdeliverRecordMain,
+  SupplierdeliverRecordMainRules,
+  SupplierdeliverRecordDetail,
+  SupplierdeliverRecordDetailRules,
+  SupplierdeliverRecordDetailPickingNumer
+} from './supplierdeliverRecordMain.data'
+import * as SupplierdeliverRecordMainApi from '@/api/wms/supplierdeliverRecordMain'
+import * as SupplierdeliverRecordDetailApi from '@/api/wms/supplierdeliverRecordDetail'
+import * as SupplierdeliverRequestDetailApi from '@/api/wms/supplierdeliverRequestDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { getAccessToken } from '@/utils/auth'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { getJmreportBaseUrl } from '@/utils/systemParam'
+import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+import * as SupplierdeliverRequestMainApi from '@/api/wms/supplierdeliverRequestMain'
+import { SupplierdeliverRequestMainRules } from '../supplierdeliverRequestMain/supplierdeliverRequestMain.data'
+const { loadStart, loadDone } = usePageLoading()
+// 供应商发货记录主
+defineOptions({ name: 'SupplierdeliverRecordWMS' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref([
+  ...SupplierdeliverRecordMain.allSchemas.tableColumns,
+  ...SupplierdeliverRecordDetail.allSchemas.tableMainColumns
+])
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: SupplierdeliverRecordDetailApi.getSupplierdeliverRecordDetailPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultExportBtn({ hasPermi: 'wms:supplierdeliver-record-main: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 == 'export') {
+    // 导出
+    handleExport()
+  } else if (val == 'refresh') {
+    // 刷新
+    if (tableObject.params.filters && tableObject.params.filters.length > 0) {
+      searchFormClick({
+        filters: tableObject.params.filters
+      })
+    } else {
+      getList()
+    }
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row, $index) => {
+  const findIndex = row['masterId']
+    ? tableObject.tableList.findIndex((item) => item['masterId'] == row['masterId'])
+    : -1
+  if (findIndex > -1 && findIndex < $index) {
+    return []
+  }
+  return [
+    defaultButtons.mainListGenerateApplicationBtn({
+      hasPermi: 'wms:supplierdeliver-record-main:createPurchasereceiptRequest',
+      hide: !row.purchasereceiptRequestFlag
+    }), // 生成采购申请
+    defaultButtons.mainListDocumentPrintBtn({}) // 单据打印
+  ]
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'generateApplication') {
+    handlerCreatePurchasereceiptRequest(row.number)
+  } else if (val == 'documentPrint') {
+    // 单据打印
+    handleDocumentPrint(row.masterId)
+  }
+}
+
+/** 生成采购收货申请按钮操作 */
+const handlerCreatePurchasereceiptRequest = async (number: string) => {
+  try {
+    await message.confirm(t('ts.确认生成采购申请吗？'))
+    tableObject.loading = true
+    await SupplierdeliverRecordMainApi.createPurchasereceiptRequest(number)
+    message.success(t('ts.采购申请生成成功'))
+    await getList()
+  } catch {
+  } finally {
+    tableObject.loading = false
+  }
+}
+
+// 单据打印
+const BASE_URL = getJmreportBaseUrl()
+// 品番状态是“补给品”和其余状态 的发货单模版
+const documentSrc = ref(BASE_URL + '/jmreport/view/1019060741381099520?token=' + getAccessToken())
+// 品番状态是号试显示生准订单的发货单模版
+const documentSrc2 = ref(BASE_URL + '/jmreport/view/1019406772438372352?token=' + getAccessToken())
+
+const handleDocumentPrint = async (id) => {
+  await SupplierdeliverRecordMainApi.getPoLineType(id).then(async (res) => {
+    if (res.isM && res.haveNOM == false) {
+      //号试（生准订单）模板
+      window.open(documentSrc2.value + '&id=' + id + '&type=' + 'M')
+    }
+    if (res.isM && res.haveNOM && res.noMAndItemStatus == '生准订单') {
+      //号试（生准订单）模板
+      window.open(documentSrc2.value + '&id=' + id )
+    }
+    if (res.isM && res.haveNOM && res.noMAndItemStatus != '生准订单') {
+      //（生准订单）模板 M型物料
+      window.open(documentSrc.value + '&id=' + id+ '&type=' + 'M')
+       //（补给品订单）模板
+       window.open(documentSrc.value + '&id=' + id+ '&type=' + 'noM')
+    }
+    if (res.isM == false) {
+      await SupplierdeliverRecordMainApi.getItemStatus(id).then(async (res) => {
+        if (res) {
+          //号试（生准订单）模板
+          window.open(documentSrc2.value + '&id=' + id)
+        } else {
+          window.open(documentSrc.value + '&id=' + id)
+        }
+      })
+    }
+  })
+}
+
+// 子包装数据
+const detailParenPackingRef = ref()
+const { tableObject: detatableData, tableMethods: detatableMethods } = useTable({
+  getListApi: SupplierdeliverRecordDetailApi.queryChildPickingNumber
+})
+const { getList: getDetailList } = detatableMethods
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = async (row: any, titleName: any, titleValue: any) => {
+  const departmentCode = wsCache
+    .get(CACHE_KEY.DEPT)
+    .find((account) => account.id == row.departmentCode)?.name
+  if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
+  //获取申请中的masterId
+  const { tableObject: requestTableObject, tableMethods: requestTableMethods } = useTable({
+    getListApi: SupplierdeliverRequestDetailApi.getSupplierdeliverRequestDetailPage // 分页接口
+  })
+  const { getList: requestGetList } = requestTableMethods
+  requestTableObject.params.number = row.requestNumber
+  await requestGetList()
+  if (requestTableObject.tableList.length > 0) {
+    row.annexMasterId = requestTableObject.tableList[0].masterId
+    detailRef.value.openDetail(row, titleName, titleValue, 'recordSupplierdeliverMain')
+  }
+}
+
+// 详情 table 操作扩展 按钮
+const buttondataTable = ref([
+  {
+    label: t('ts.查看其他包装规格'),
+    name: 'viewParentPickingNumber',
+    hide: false,
+    type: 'primary',
+    icon: '',
+    color: '',
+    hasPermi: '',
+    link: true // 文本展现按钮
+  }
+])
+
+// 查看其他包装规格
+const tableFormButton = async (val, row) => {
+  if (val == 'viewParentPickingNumber') {
+    //查看其他包装规格
+    detatableData.params = {
+      masterId: row.masterId,
+      parentPackingNumber: row.packingNumber
+    }
+    await getDetailList()
+    detailParenPackingRef.value.open('create', row, null, 'viewDetail') //查看明细数据
+  }
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    loadStart()
+    const excelTitle = ref(route.meta.title)
+    const data = await SupplierdeliverRecordMainApi.exportSupplierdeliverRecordMain(
+      tableObject.params
+    )
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
+  } catch {
+  } finally {
+    loadDone()
+  }
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+})
+onActivated(() => {
+  getList()
+})
+</script>
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordWMS/supplierdeliverRecordMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordWMS/supplierdeliverRecordMain.data.ts
new file mode 100644
index 000000000..38bf53e81
--- /dev/null
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordWMS/supplierdeliverRecordMain.data.ts
@@ -0,0 +1,1431 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 供应商发货记录主表
+ */
+export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180,
+      fixed: 'left'
+    },
+    isSearch: true,
+    sortTableDefault:1
+  },
+  {
+    label: '发货单号',
+    field: 'asnNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true,
+    sortTableDefault:2
+  },
+  {
+    label: '要货计划单号',
+    field: 'ppNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    sortTableDefault:3
+  },
+  {
+    label: '便次',
+    field: 'deliNo',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        disabled: true
+      },
+    },
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true,
+    isTable:false
+    ,
+    sortTableDefault:4
+  },
+  {
+    label: '是否生成',
+    field: 'isReceive',
+    dictType: DICT_TYPE.IS_RECEIVE,
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true,
+    isTable:true
+    ,
+    sortTableDefault:5
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: true,
+    isDetail: true,
+    sortTableDefault:6
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true
+  },
+  {
+    label: '供应商名称',
+    field: 'supplierName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true
+  },
+  {
+    label: '联系人姓名',
+    field: 'contactName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:false,
+  },
+  {
+    label: '联系人电话',
+    field: 'contactPhone',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '联系人电子邮件',
+    field: 'contactEmail',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '从仓库代码',
+    field: 'fromWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '到仓库代码',
+    field: 'toWarehouseCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '到月台代码',
+    field: 'toDockCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '时间窗口',
+    field: 'timeWindow',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '计划到货时间',
+    field: 'planArriveTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '承运商',
+    field: 'carrierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '运输方式',
+    field: 'transferMode',
+    dictType: DICT_TYPE.TRANSFER_MODE,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '车牌号',
+    field: 'vehiclePlateNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '出库事务类型',
+    field: 'outTransaction',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+    isDetail: false
+  },
+  {
+    label: '入库事务类型',
+    field: 'inTransaction',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+    isDetail: false
+  },
+  {
+    label: '执行时间',
+    field: 'executeTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTable: false,
+    isDetail:false
+  },
+  {
+    label: '生效日期',
+    field: 'activeDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    isTable: false,
+  },
+  {
+    label: '申请时间',
+    field: 'requestTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTable: false,
+    isDetail: false
+  },
+  {
+    label: '截止时间',
+    field: 'dueTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isTable: false,
+    isDetail: false
+  },
+  {
+    label: '部门',
+    field: 'departmentCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+    isDetail: false
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isDetail: false
+  },
+  {
+    label: '业务类型',
+    field: 'businessType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+    isDetail: false
+  },
+  
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isSearch: true,
+    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')]
+      }
+    },
+    isTable: true,
+    sortTableDefault:7
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault: 1000,
+    isTable: false,
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isDetail: false,
+  },
+  // {
+  //   label: '操作',
+  //   field: 'action',
+  //   isDetail: false,
+  //   isForm: false,
+  //   table: {
+  //     width: 300,
+  //     fixed: 'right'
+  //   },
+  // }
+]))
+
+//表单校验
+export const SupplierdeliverRecordMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请输入申请单号', trigger: 'blur' }
+  ],
+  supplierCode: [
+    { required: true, message: '请输入供应商代码', trigger: 'blur' }
+  ],
+  fromWarehouseCode: [
+    { required: true, message: '请输入从仓库代码', trigger: 'blur' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请输入到仓库代码', trigger: 'blur' }
+  ],
+  toDockCode: [
+    { required: true, message: '请输入到月台代码', trigger: 'blur' }
+  ],
+  planArriveTime: [
+    { required: true, message: '请输入计划到货时间', trigger: 'blur' }
+  ],
+  outTransaction: [
+    { required: true, message: '请输入出库事务类型', trigger: 'blur' }
+  ],
+  inTransaction: [
+    { required: true, message: '请输入入库事务类型', trigger: 'blur' }
+  ],
+  executeTime: [
+    { required: true, message: '请输入执行时间', trigger: 'blur' }
+  ],
+  activeDate: [
+    { required: true, message: '请输入生效日期', trigger: 'blur' }
+  ],
+  available: [
+    { required: true, message: '请输入是否可用', trigger: 'blur' }
+  ],
+  departmentCode: [
+    { required: true, message: '请输入部门', trigger: 'blur' }
+  ],
+  interfaceType: [
+    { required: true, message: '请选择接口类型', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  businessType: [
+    { required: true, message: '请输入业务类型', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+/**
+ * @returns {Array} 供应商发货记录子表
+ */
+export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    hiddenInMain: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '品番',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '品名',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '背番',
+    field: 'backNumber',
+    sort: 'custom',
+    isSearch: true,
+    hiddenSearchHigh:true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '供应商发货数量',
+    field: 'supplierQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '供应商发货计量单位',
+    field: 'supplierUom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '库存计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '转换率',
+    field: 'convertRate',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从包装号',
+    field: 'fromPackingNumber',
+    sort: 'custom',
+    hiddenInMain: true,
+    isTable:false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装号',
+    field: 'toPackingNumber',
+    sort: 'custom',
+    hiddenInMain: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从批次',
+    field: 'toBatch',
+    sort: 'custom',
+    hiddenInMain: true,
+    isTable: false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'toBatch',
+    sort: 'custom',
+    hiddenInMain: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到货日期',
+    field: 'arriveDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width: '100%' },
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '取货日期',
+    field: 'pickDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width: '100%' },
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width: '100%' },
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width: '100%' },
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain: true,
+    isTable: false,
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    hiddenInMain: true,
+    isTable: false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    hiddenInMain: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位组代码',
+    field: 'fromLocationGroupCode',
+    sort: 'custom',
+    hiddenInMain: true,
+    isTable: false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位组代码',
+    field: 'toLocationGroupCode',
+    sort: 'custom',
+    hiddenInMain: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库区代码',
+    field: 'fromAreaCode',
+    sort: 'custom',
+    hiddenInMain: true,
+    isTable: false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库区代码',
+    field: 'toAreaCode',
+    sort: 'custom',
+    hiddenInMain: true,
+    table: {
+      width: 150
+    },
+  },
+
+  {
+    label: '背番',
+    field: 'itemDesc1',
+    sort: 'custom',
+    hiddenInMain: true,
+    isTable: false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '描述',
+    field: 'itemDesc2',
+    sort: 'custom',
+    hiddenInMain: true,
+    isTable: false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    hiddenInMain: true,
+    table: {
+      width: 150
+    },
+  },
+ 
+  // {
+  //   label: '操作',
+  //   hiddenInMain:true,
+  //   field: 'action',
+  //   isDetail: false,
+  //   isForm: false ,
+  //   table: {
+  //     width: 150,
+  //     fixed: 'right'
+  //   },
+  //   isTableForm:true,
+  // }
+]))
+
+//表单校验
+export const SupplierdeliverRecordDetailRules = reactive({
+  fromPackingNumber: [
+    { required: true, message: '请输入从包装号', trigger: 'blur' }
+  ],
+  toPackingNumber: [
+    { required: true, message: '请输入到包装号', trigger: 'blur' }
+  ],
+  fromBatch: [
+    { required: true, message: '请输入从批次', trigger: 'blur' }
+  ],
+  toBatch: [
+    { required: true, message: '请输入到批次', trigger: 'blur' }
+  ],
+  arriveDate: [
+    { required: true, message: '请输入到货日期', trigger: 'blur' }
+  ],
+  produceDate: [
+    { required: true, message: '请输入生产日期', trigger: 'blur' }
+  ],
+  expireDate: [
+    { required: true, message: '请输入到货日期', trigger: 'blur' }
+  ],
+  poNumber: [
+    { required: true, message: '请输入订单号', trigger: 'blur' }
+  ],
+  poLine: [
+    { required: true, message: '请输入订单行', trigger: 'blur' }
+  ],
+  packQty: [
+    { required: true, message: '请输入包装数量', trigger: 'blur' }
+  ],
+  packUnit: [
+    { required: true, message: '请选择包装规格', trigger: 'blur' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请输入到库位代码', trigger: 'blur' }
+  ],
+  toLocationGroupCode: [
+    { required: true, message: '请输入到库位组代码', trigger: 'change' }
+  ],
+  toAreaCode: [
+    { required: true, message: '请输入到库区代码', trigger: 'blur' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请输入品番', trigger: 'blur' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
+
+
+/**
+ * @returns {Array} 供应商发货记录子表根据包装号展示
+ */
+export const SupplierdeliverRecordDetailPickingNumer = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form:{
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form:{
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form:{
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '订单数量',
+    field: 'orderQty',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled: true,
+        min: 0,
+        precision: 6
+      }
+    },
+    tableForm: {
+      disabled: true,
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    }
+  },
+  {
+    label: '品番',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form:{
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form:{
+      componentProps: {
+      disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '供应商计量数量',
+    field: 'supplierQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '供应商计量单位',
+    field: 'supplierUom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form:{
+      componentProps: {
+      disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '到货日期',
+    field: 'arriveDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        disabled: true,
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        disabled: true,
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        disabled: true,
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form:{
+      componentProps: {
+      disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form:{
+      componentProps: {
+      disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '从库位组代码',
+    field: 'fromLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form:{
+      componentProps: {
+      disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '到库位组代码',
+    field: 'toLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form:{
+      componentProps: {
+      disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '从库区代码',
+    field: 'fromAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form:{
+      componentProps: {
+      disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '到库区代码',
+    field: 'toAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form:{
+      componentProps: {
+      disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form:{
+      componentProps: {
+      disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form:{
+      componentProps: {
+      disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+ 
+  {
+    label: '品名',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form:{
+      componentProps: {
+      disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '背番',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form:{
+      componentProps: {
+      disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '描述',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form:{
+      componentProps: {
+      disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form:{
+      componentProps: {
+      disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form:{
+      componentProps: {
+      disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form:{
+      componentProps: {
+      disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form:{
+      componentProps: {
+      disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        disabled: true,
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form:{
+      componentProps: {
+      disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  }
+]))
\ No newline at end of file

From d14649c86203ebf49dda4faf8f6ffd497aab0262 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Mon, 31 Mar 2025 08:31:58 +0800
Subject: [PATCH 4/7] =?UTF-8?q?YT-2291pc=E7=AB=AF=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                                     |  6 ++++++
 src/utils/systemParam.ts                 | 11 ++++++++++-
 src/views/login/components/QRCodePDA.vue |  8 ++++++--
 src/views/profile/index.vue              |  6 ++++++
 4 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/.env b/.env
index 832d68083..3e54319a1 100644
--- a/.env
+++ b/.env
@@ -15,3 +15,9 @@ VITE_APP_CAPTCHA_ENABLE=true
 
 # 百度统计
 VITE_APP_BAIDU_CODE = a1ff8825baa73c3a78eb96aa40325abc
+
+# 应用版本号
+VITE_VERSION = V1.0
+# 更新版本号时间
+VITE_VERSION_TIME = 2025-03-31 09:00:00
+
diff --git a/src/utils/systemParam.ts b/src/utils/systemParam.ts
index 9cb51bf51..357583329 100644
--- a/src/utils/systemParam.ts
+++ b/src/utils/systemParam.ts
@@ -8,7 +8,8 @@ const systermUpdateAlert = ref(import.meta.env.VITE_SYSTERM_UPDATE_ALERT)
 const systermUpdateUrl = ref(import.meta.env.VITE_SYSTERM_UPDATE_URL)
 const needCode = ref(import.meta.env.VITE_NEED_CODE)
 const pdaUrl = ref(import.meta.env.VITE_PDA_URL)
-
+const version = ref(import.meta.env.VITE_VERSION)
+const versionTime = ref(import.meta.env.VITE_VERSION_TIME)
 const mode = ref(import.meta.env.MODE)
 // 获取baseUrl
 export const getBaseUrl = () => {
@@ -95,4 +96,12 @@ export const getPDAUrl = () => {
   }
 }
 
+//获取版本号
+export const getVersion = () => {
+  return version.value
+}
+//获取版本号更新时间
+export const getVersionTime = () => {
+  return versionTime.value
+}
 
diff --git a/src/views/login/components/QRCodePDA.vue b/src/views/login/components/QRCodePDA.vue
index d8d3b05fc..348a5b02e 100644
--- a/src/views/login/components/QRCodePDA.vue
+++ b/src/views/login/components/QRCodePDA.vue
@@ -5,12 +5,16 @@
       <!-- <vue-qr bgSrc='https://img2.baidu.com/it/u=1188690822,3145215011&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=1038' logoSrc="https://img1.baidu.com/it/u=605875105,1314303687&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=500" text="Hello world!" :size="200"></vue-qr> -->
       <vue-qr :text="apkUrl" :size="200" ></vue-qr>
     </div>
-    <el-button type="primary" v-if="pdaUrl" link @click="handleClose">PDA安装程序下载链接</el-button>
+    <div style="display: flex; flex-direction: row; justify-content: space-between;width: 100%;">
+      <span style="margin-left:50px;color:#909399;font-size: 14px;" v-if="version">版本号 {{version}}</span>
+      <el-button type="primary" v-if="pdaUrl" link @click="handleClose">PDA安装程序下载链接</el-button>
+    </div>
   </div>
 </template>
 <script setup lang="ts">
 import { downloadApk } from "@/api/login";
-import { getPDAUrl,getNeedCode } from '@/utils/systemParam'
+import { getPDAUrl,getNeedCode,getVersion } from '@/utils/systemParam'
+const version = ref(getVersion())
 
 // import logoImg from '@/assets/imgs/logo_white_blue.png'
 
diff --git a/src/views/profile/index.vue b/src/views/profile/index.vue
index e813f0435..8e289f14c 100644
--- a/src/views/profile/index.vue
+++ b/src/views/profile/index.vue
@@ -29,12 +29,18 @@
       </div>
     </el-card>
   </div>
+  <span style="position:absolute;bottom:20px;right:20px;color:#909399;font-size: 14px;" v-if="version">版本号 {{ version }}&nbsp;&nbsp;&nbsp;更新时间：{{versionTime}}</span>
+
 </template>
 <script setup lang="ts" name="Profile">
 import { BasicInfo, ProfileUser, ResetPwd, UserSocial } from './components/'
+import { getPDAUrl,getNeedCode,getVersion,getVersionTime } from '@/utils/systemParam'
 const { t } = useI18n()
 
 const activeName = ref('basicInfo')
+const version = ref(getVersion())
+const versionTime = ref(getVersionTime())
+
 </script>
 <style scoped>
 .user {

From 0b197e4dc5990183a738274a1e701f170bdb6f37 Mon Sep 17 00:00:00 2001
From: zhang_li <li.zhang@ccwin-in.com>
Date: Mon, 31 Mar 2025 09:14:09 +0800
Subject: [PATCH 5/7] =?UTF-8?q?YT-2305=E4=BE=9B=E5=BA=94=E5=95=86=E5=9C=B0?=
 =?UTF-8?q?=E7=82=B9=E5=8F=97=E5=85=A5=E5=8F=B7=E4=BE=BF=E6=AC=A1=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=EF=BC=8C=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E5=A2=9E=E5=8A=A0=E4=BE=BF=E6=AC=A1=E6=95=B0=E9=9D=9E?=
 =?UTF-8?q?=E7=A9=BA=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierManage/supplierAddressModelDeli/index.vue           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/basicDataManage/supplierManage/supplierAddressModelDeli/index.vue b/src/views/wms/basicDataManage/supplierManage/supplierAddressModelDeli/index.vue
index 2f8cb4233..f7a084b22 100644
--- a/src/views/wms/basicDataManage/supplierManage/supplierAddressModelDeli/index.vue
+++ b/src/views/wms/basicDataManage/supplierManage/supplierAddressModelDeli/index.vue
@@ -58,7 +58,7 @@
   <Detail ref="detailRef" :isBasic="true" :allSchemas="SupplierAddressModelDeli.allSchemas" />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/wms/supplier-address-model-deli/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+  <ImportForm ref="importFormRef" url="/wms/supplier-address-model-deli/import" :importTemplateData="importTemplateData" @success="importSuccess" :updateIsShow="false" :coverIsShow="false" :mode="2"/>
 </template>
 
 <script setup lang="ts">

From 94712298688579378eefc85160fd131af6b51da0 Mon Sep 17 00:00:00 2001
From: zhang_li <li.zhang@ccwin-in.com>
Date: Mon, 31 Mar 2025 10:24:38 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=B7=BB=E5=8A=A0loadmin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../saleEstimate/unfinishedShipmentMain/index.vue               | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/index.vue b/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/index.vue
index 6af2f7beb..b8704a8cd 100644
--- a/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/index.vue
+++ b/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/index.vue
@@ -215,9 +215,11 @@ const handleExport = async () => {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
+    tableObject.loading = true
     exportLoading.value = true
     const data = await UnfinishedShipmentDetailApi.exportUnfinishedShipmentDetail(tableObject.params)
     download.excel(data, '已发未结记录主.xlsx')
+    tableObject.loading = false
   } catch {
   } finally {
     exportLoading.value = false

From aa9d6b53e9fb77ccae2b2c718f19da282c53580d Mon Sep 17 00:00:00 2001
From: zhang_li <li.zhang@ccwin-in.com>
Date: Mon, 31 Mar 2025 10:58:12 +0800
Subject: [PATCH 7/7] =?UTF-8?q?YT-2006=E5=8F=B7=E5=8F=A3=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=92=8C=E5=8F=B7=E5=8F=A3=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=8C=E7=82=B9=E5=87=BB=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=8E=92=E5=BA=8F=E4=B8=8D=E5=A5=BD=E4=BD=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/XButton/src/ButtonBase.vue | 11 +++++++++++
 src/components/rowDrop/index.vue          |  8 ++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/components/XButton/src/ButtonBase.vue b/src/components/XButton/src/ButtonBase.vue
index 4aa3d3700..48e3390f0 100644
--- a/src/components/XButton/src/ButtonBase.vue
+++ b/src/components/XButton/src/ButtonBase.vue
@@ -1,4 +1,5 @@
 <template>
+  <div ref="buttonRefs">
   <div v-for="(item, index) in Butttondata" :key="index" class="btn-div">
     <el-button
       v-show="!item.hide"
@@ -28,6 +29,7 @@
         :detailAllSchemas="detailAllSchemas"
         @closeRowDrop="closeRowDrop"
         @updataTableColumns="updataTableColumns"
+        :rowDropHeight="rowDropHeight"
       />
       <template #reference>
         <el-button
@@ -45,6 +47,7 @@
       </template>
     </el-popover>
   </div>
+  </div>
   <slot></slot>
 </template>
 <script setup>
@@ -106,6 +109,14 @@ defineExpose({
 const updataTableColumns = (val) => {
   emit('updataTableColumns', val)
 }
+const buttonRefs = ref()
+const rowDropHeight = ref('')
+onMounted(() => {
+  const client = buttonRefs.value.getBoundingClientRect()
+  console.log(999, client.top)
+  rowDropHeight.value = client.top + 'px'
+  // console.log(100,height22)
+})
 </script>
 <style scoped lang="scss">
 .btn-div{
diff --git a/src/components/rowDrop/index.vue b/src/components/rowDrop/index.vue
index 747f0f3d3..d49ae8e57 100644
--- a/src/components/rowDrop/index.vue
+++ b/src/components/rowDrop/index.vue
@@ -1,6 +1,6 @@
 <template>
   <!-- <Dialog title="字段设置"  width="270" v-model="popoverVisible" :scroll="true" :maxHeight="500"> -->
-    <div class="test_wrapper" @dragover="dragover($event)">
+    <div class="test_wrapper" @dragover="dragover($event)" :style="{maxHeight:`calc(100vh - ${rowDropHeight} - 100px)`}">
       <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handlecheckallchange">{{  t('ts.全部') }}</el-checkbox>
       <el-checkbox-group v-model="checkedDataList" @change="handlecheckedchange">
         <draggable :list="allData" :force-fallback="true" chosen-class="chosen" animation="300" @end="dragend" @update="dragenter" >
@@ -36,6 +36,10 @@ const props = defineProps({
     type: Object,
     default: null
   },
+  rowDropHeight: {
+    type: String,
+    default: ''
+  },
 })
 const popoverVisible = ref(false)
 const route = useRoute() // 路由信息
@@ -257,7 +261,7 @@ defineExpose({
 </script>
 <style lang="scss" scoped>
 .test_wrapper{
-  max-height: calc(100vh - 350px);
+  // max-height: calc(100vh - 350px);
   overflow-y: auto;
 }
 .footer{