From 2ed482a97b0d1c81e681fcf0e8e2fda500986f4c Mon Sep 17 00:00:00 2001
From: ljlong_2630 <ljlong_2630@yeah.net>
Date: Mon, 4 Nov 2024 10:50:13 +0800
Subject: [PATCH] =?UTF-8?q?YT-305:=E7=9B=B4=E7=BA=B3=E5=93=81=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/deliverRecordMain/index.ts        |   7 +
 .../ImportForm/src/ImportFormOnlyAdd.vue      |   6 +-
 src/utils/dict.ts                             |   1 +
 .../deliverRecordMain.data.ts                 | 872 ++++++++++++++++++
 .../deliverRecordMain/index.vue               | 238 +++++
 .../unfinishedShipmentDetail.data.ts          |  28 +
 .../unfinishedShipmentMain.data.ts            |  41 +-
 7 files changed, 1168 insertions(+), 25 deletions(-)
 create mode 100644 src/views/wms/deliversettlementManage/DirectSupplyRecordMain/deliverRecordMain/deliverRecordMain.data.ts
 create mode 100644 src/views/wms/deliversettlementManage/DirectSupplyRecordMain/deliverRecordMain/index.vue

diff --git a/src/api/wms/deliverRecordMain/index.ts b/src/api/wms/deliverRecordMain/index.ts
index 6979e4eea..155d1f193 100644
--- a/src/api/wms/deliverRecordMain/index.ts
+++ b/src/api/wms/deliverRecordMain/index.ts
@@ -86,3 +86,10 @@ export const importInducedProductTemplate = () => {
   return request.download({ url: '/wms/deliver-record-main/get-import-induced-product-template' })
 }
 
+
+// 下载用户导入模板
+export const importDirectSupplyTemplate = () => {
+  return request.download({ url: '/wms/deliver-record-main/get-direct-supply-import-template' })
+}
+
+
diff --git a/src/components/ImportForm/src/ImportFormOnlyAdd.vue b/src/components/ImportForm/src/ImportFormOnlyAdd.vue
index 45a2c7a16..c2b85156b 100644
--- a/src/components/ImportForm/src/ImportFormOnlyAdd.vue
+++ b/src/components/ImportForm/src/ImportFormOnlyAdd.vue
@@ -263,7 +263,11 @@ const submitFormSuccess = (response: any) => {
               const a = document.createElement('a');
               a.style.display = 'none';
               a.href = url;
-              a.download = 'error_file.txt'; // 设置下载的文件名
+              if(response.data.errorFileName&&response.data.errorFileName!=''){
+                a.download = response.data.errorFileName; // 设置下载的文件名
+              }else{
+                a.download = 'error_file.txt'; // 设置下载的文件名
+              }
               document.body.appendChild(a);
               a.click();
               window.URL.revokeObjectURL(url);
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index fb114e6ca..0cc1ddc92 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -408,4 +408,5 @@ export enum DICT_TYPE {
   RECEIVE_STATUS = 'receive_status',  // 收货确认状态
   LINE_SCRAP_REASON = 'Reason_or_scrapping_of_production_line',  // 线边报废原因(现场史力维护的字典)
   CUSTOMER_STATEMENT_TYPE = 'customer_statement_type',  // wms客户对账单 模具分摊状态
+  DELIVER_METHOD = 'deliver_method'
 }
diff --git a/src/views/wms/deliversettlementManage/DirectSupplyRecordMain/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/DirectSupplyRecordMain/deliverRecordMain/deliverRecordMain.data.ts
new file mode 100644
index 000000000..ddb992a1d
--- /dev/null
+++ b/src/views/wms/deliversettlementManage/DirectSupplyRecordMain/deliverRecordMain/deliverRecordMain.data.ts
@@ -0,0 +1,872 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
+
+/**
+ * @returns {Array} 发货记录主表
+ */
+export const DeliverRecordMain = useCrudSchemas(
+  reactive<CrudSchema[]>([
+    {
+      label: '单据号',
+      field: 'number',
+      sort: 'custom',
+      table: {
+        width: 180,
+        fixed: 'left'
+      },
+      isSearch: true
+    },
+    {
+      label: '申请单号',
+      field: 'requestNumber',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isSearch: true
+    },
+    {
+      label: '任务单号',
+      field: 'jobNumber',
+      sort: 'custom',
+      table: {
+        width: 180
+      }
+    },
+    {
+      label: '发货记录单号',
+      field: 'deliverRecordNumber',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: false,
+      isTable: false,
+      isForm: false,
+      isDetail: false
+    },
+    {
+      label: '发货计划单号',
+      field: 'deliverPlanNumber',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: true,
+      isDetail: true
+    },
+    // {
+    //   label: '客户发货单号',
+    //   field: 'customerDeliverNumber',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    // },
+    {
+      label: '客户订单号',
+      field: 'customerOrderNumber',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isSearch: true,
+      isTable: true,
+      isForm: true,
+      search: {
+        component: 'Input',
+      }
+    },
+    {
+      label: '状态',
+      field: 'status',
+      dictType: DICT_TYPE.REQUEST_STATUS,
+      dictClass: 'string',
+      isSearch: false,
+      isTable: false,
+      isForm: false,
+      isDetail: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      }
+    },
+    {
+      label: '客户代码',
+      field: 'customerCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: true
+    },
+    {
+      label: '发货类型',
+      field: 'deliverType',
+      sort: 'custom',
+      isSearch: true,
+      dictType: DICT_TYPE.DELIVER_TYPE,
+      dictClass: 'string',
+      table: {
+        width: 150
+      }
+    },
+    {
+      label: '客户月台代码',
+      field: 'customerDockCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      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: 'requestTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      }
+    },
+    {
+      label: '截止时间',
+      field: 'dueTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      }
+    },
+    {
+      label: '执行时间',
+      field: 'executeTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      }
+    },
+    {
+      label: '生效日期',
+      field: 'activeDate',
+      formatter: dateFormatter2,
+      detail: {
+        dateFormat: 'YYYY-MM-DD'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          style: { width: '100%' },
+          type: 'date',
+          dateFormat: 'YYYY-MM-DD',
+          valueFormat: 'x'
+        }
+      }
+    },
+    {
+      label: '从仓库代码',
+      field: 'fromWarehouseCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '到仓库代码',
+      field: 'toWarehouseCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '从库区类型范围',
+      field: 'fromAreaTypes',
+      dictType: DICT_TYPE.AREA_TYPE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      }
+    },
+    {
+      label: '到库区类型范围',
+      field: 'toAreaTypes',
+      dictType: DICT_TYPE.AREA_TYPE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      }
+    },
+    {
+      label: '从库区代码范围',
+      field: 'fromAreaCodes',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '到库区代码范围',
+      field: 'toAreaCodes',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '从月台代码',
+      field: 'fromDockCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '出库事务类型',
+      field: 'outTransactionType',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '入库事务类型',
+      field: 'inTransactionType',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '业务类型',
+      field: 'businessType',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '部门',
+      field: 'departmentCode',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '接口类型',
+      field: 'interfaceType',
+      dictType: DICT_TYPE.INTERFACE_TYPE,
+      dictClass: 'string',
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      }
+    },
+    {
+      label: '备注',
+      field: 'remark',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    {
+      label: '创建时间',
+      field: 'createTime',
+      formatter: dateFormatter,
+      detail: {
+        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      },
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isTable: false,
+      form: {
+        component: 'DatePicker',
+        componentProps: {
+          type: 'datetime',
+          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+          valueFormat: 'x'
+        }
+      },
+      isSearch: false,
+      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')]
+        },
+      },
+    },
+    {
+      label: '创建者',
+      field: 'creator',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isTable: false
+    },
+    // {
+    //   label: '代码',
+    //   field: 'code',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    // },
+    {
+      label: '是否可用',
+      field: 'available',
+      dictType: DICT_TYPE.TRUE_FALSE,
+      dictClass: 'string',
+      isSearch: false,
+      isTable: false,
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'Switch',
+        value: 'TRUE',
+        componentProps: {
+          inactiveValue: 'FALSE',
+          activeValue: 'TRUE'
+        }
+      }
+    }
+  ])
+)
+
+//表单校验
+export const DeliverRecordMainRules = reactive({
+  requestNumber: [
+    { required: true, message: '请选择申请单号', trigger: 'change' }
+  ],
+  customerCode: [
+    { required: true, message: '请选择客户代码', trigger: 'change' }
+  ],
+  customerDockCode: [
+    { required: true, message: '请选择客户月台代码', trigger: 'change' }
+  ],
+  fromWarehouseCode: [
+    { required: true, message: '请选择从仓库代码', trigger: 'change' }
+  ],
+  fromAreaTypes: [
+    { required: true, message: '请选择从库区类型范围', trigger: 'change' }
+  ],
+  fromAreaCodes: [
+    { required: true, message: '请选择从库区代码范围', trigger: 'change' }
+  ],
+  toWarehouseCode: [
+    { required: true, message: '请选择到仓库代码', trigger: 'change' }
+  ],
+  toAreaTypes: [
+    { required: true, message: '请选择到库区类型范围', trigger: 'change' }
+  ],
+  outTransaction: [
+    { required: true, message: '请输入出库事务类型', trigger: 'blur' }
+  ],
+  inTransaction: [
+    { required: true, message: '请输入入库事务类型', trigger: 'blur' }
+  ],
+  executeTime: [
+    { required: true, message: '请输入执行时间', trigger: 'change' }
+  ],
+  activeDate: [
+    { required: true, message: '请输入生效日期', trigger: 'change' }
+  ],
+  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 DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTable: false
+  },
+  // {
+  //   label: '销售订单号',
+  //   field: 'soNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '销售订单行',
+  //   field: 'soLine',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain: true
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain: true
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '父包装号',
+    field: 'parentPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    isSearch: false,
+    isTable: false,
+    isForm:false,
+    isDetail:false,
+    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: 'singlePrice',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain: true,
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '金额',
+    field: 'amount',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain: true,
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '在途库库位',
+    field: 'onTheWayLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '到库位',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从库位组',
+    field: 'fromLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain: true,
+  },
+  {
+    label: '到库位组',
+    field: 'toLocationGroupCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain: true,
+  },
+  {
+    label: '从库区',
+    field: 'fromAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain: true,
+  },
+  {
+    label: '到库区',
+    field: 'toAreaCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain: true,
+  },
+  // {
+  //   label: '从器具号',
+  //   field: 'fromContainerNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTable: false,
+  // },
+  // {
+  //   label: '到器具号',
+  //   field: 'toContainerNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTable: false,
+  // },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: false,
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isTable: false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isTable: true,
+    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')]
+      },
+    },
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: true,
+  },
+  // {
+  //   label: '任务明细ID',
+  //   field: 'jobDetailId',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: '代码',
+  //   field: 'code',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+]))
+
+//表单校验
+export const DeliverRecordDetailRules = reactive({
+  // soNumber: [
+  //   { required: true, message: '请选择销售订单号', trigger: 'change' }
+  // ],
+  packingNumber: [
+    { required: true, message: '请选择包装号', trigger: 'change' }
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' }
+  ],
+  inventoryStatus: [
+    { required: true, message: '请选择库存状态', trigger: 'change' }
+  ],
+  fromLocationCode: [
+    { required: true, message: '请选择从库位代码', trigger: 'change' }
+  ],
+  fromLocationGroupCode: [
+    { required: true, message: '请选择从库位组代码', trigger: 'change' }
+  ],
+  fromAreaCode: [
+    { required: true, message: '请选择从库区代码', trigger: 'change' }
+  ],
+  toLocationCode: [
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
+  ],
+  toLocationGroupCode: [
+    { required: true, message: '请选择到库位组代码', trigger: 'change' }
+  ],
+  toAreaCode: [
+    { required: true, message: '请选择到库区代码', trigger: 'change' }
+  ],
+  number: [
+    { required: true, message: '请输入单据号', trigger: 'blur' }
+  ],
+  itemCode: [
+    { required: true, message: '请选择物料代码', trigger: 'change' }
+  ],
+  createTime: [
+    { required: true, message: '请输入创建时间', trigger: 'blur' }
+  ],
+  creator: [
+    { required: true, message: '请输入创建者', trigger: 'blur' }
+  ],
+})
diff --git a/src/views/wms/deliversettlementManage/DirectSupplyRecordMain/deliverRecordMain/index.vue b/src/views/wms/deliversettlementManage/DirectSupplyRecordMain/deliverRecordMain/index.vue
new file mode 100644
index 000000000..5fc5f52a7
--- /dev/null
+++ b/src/views/wms/deliversettlementManage/DirectSupplyRecordMain/deliverRecordMain/index.vue
@@ -0,0 +1,238 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="[...DeliverRecordMain.allSchemas.searchSchema,...DeliverRecordDetail.allSchemas.searchSchema]" 
+            @search="setSearchParams" 
+            @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="DeliverRecordMain.allSchemas"
+    :detailAllSchemas="DeliverRecordDetail.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 }">
+        <ButtonBase :Butttondata="butttondata(row,$index)" 
+                   @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="DeliverRecordMainRules"
+    :formAllSchemas="DeliverRecordMain.allSchemas"
+    :tableAllSchemas="DeliverRecordDetail.allSchemas"
+    :tableFormRules="DeliverRecordDetailRules"
+    :isBusiness="true"
+  />
+
+  <!-- 详情 -->
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="DeliverRecordMain.allSchemas"
+    :detailAllSchemas="DeliverRecordDetail.allSchemas"
+    :detailAllSchemasRules="DeliverRecordDetailRules"
+    :apiPage="DeliverRecordDetailApi.getDeliverRecordDetailPage"
+  />
+
+  <!-- 导入 -->
+  <ImportFormOnlyAdd ref="importFormRef" 
+                     :url="importUrl" 
+                     @success="importSuccess" 
+                     :isShowDownloadBtn="true" 
+                     :extend="importExtend"
+                     accept=".xlsx,.xls"
+                     :importTemplateData="importTemplateData"/>
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { getAccessToken } from '@/utils/auth'
+import { DeliverRecordMain, DeliverRecordMainRules, DeliverRecordDetail, DeliverRecordDetailRules } from './deliverRecordMain.data'
+import * as DeliverRecordMainApi from '@/api/wms/deliverRecordMain'
+import * as DeliverRecordDetailApi from '@/api/wms/deliverRecordDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { getJmreportBaseUrl } from '@/utils/systemParam'
+import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+
+const { loadStart, loadDone } = usePageLoading()
+
+// 发货记录主
+defineOptions({ name: 'DirectSupply' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const route = useRoute() // 路由信息
+const routeName = ref('DirectSupply')
+const businessType = ref('DirectSupply')
+const importFileName = ref('直纳品发货记录')
+const importUrl = ref('/wms/deliver-record-main/import-direct-supply')
+const importExtend = ref('DirectSupply')
+
+const tableColumns = ref([
+  ...DeliverRecordMain.allSchemas.tableColumns,
+  ...DeliverRecordDetail.allSchemas.tableMainColumns
+])
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: DeliverRecordDetailApi.getDeliverRecordDetailPage // 分页接口
+})
+
+// 设置业务类型参数
+tableObject.params = {
+  businessType: 'DirectSupply'
+}
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultImportBtn({hasPermi:'wms:DirectSupply:import'}), // 导入
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+]
+
+// 头部按钮事件
+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 == 'import') {
+    handleImport()
+  }
+}
+
+// 列表-操作按钮
+const butttondata = (row, $index) => {
+  const findIndex = row['masterId'] ? 
+    tableObject.tableList.findIndex(item => item['masterId'] == row['masterId']) : -1
+  if (findIndex > -1 && findIndex < $index) {
+    return []
+  } else {
+    return [defaultButtons.mainListDocumentPrintBtn(null)] // 标签打印
+  }
+}
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'documentPrint') {
+    handlePoint(row)
+  }
+}
+
+// 获取部门 用于详情 部门回显
+const { wsCache } = useCache()
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (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))
+  }
+  detailRef.value.openDetail(row, titleName, titleValue, 'recordDeliverMain')
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    await message.exportConfirm()
+    loadStart()
+    const excelTitle = ref(route.meta.title)
+    const data = await DeliverRecordMainApi.exportDeliverRecordMain(tableObject.params)
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
+  } catch {
+  } finally {
+    loadDone()
+  }
+}
+
+const BASE_URL = getJmreportBaseUrl()
+const src = ref(BASE_URL + '/jmreport/view/929209659733770240?token=' + getAccessToken())
+
+// 标签打印
+const handlePoint = async (row) => {
+  window.open(src.value + '&id=' + row.masterId)
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params.isSearch = true
+  let filters = searchData.filters || []
+  filters = [...filters, {
+    action: '==',
+    column: 'business_type',
+    value: 'DirectSupply',
+  }]
+  tableObject.params.filters = filters
+  getList()
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  tableObject.params.businessType = 'DirectSupply'
+  getList()
+  importTemplateData.templateUrl = await DeliverRecordMainApi.importDirectSupplyTemplate()
+})
+</script>
\ No newline at end of file
diff --git a/src/views/wms/deliversettlementManage/unfinishedShipmentDetail/unfinishedShipmentDetail.data.ts b/src/views/wms/deliversettlementManage/unfinishedShipmentDetail/unfinishedShipmentDetail.data.ts
index 25a8011cf..faddd0d5e 100644
--- a/src/views/wms/deliversettlementManage/unfinishedShipmentDetail/unfinishedShipmentDetail.data.ts
+++ b/src/views/wms/deliversettlementManage/unfinishedShipmentDetail/unfinishedShipmentDetail.data.ts
@@ -38,12 +38,18 @@ export const UnfinishedShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '背番',
     field: 'backNumber',
     sort: 'custom',
+    table: {
+      width: 150,
+    },
     isSearch: true
   },
   {
     label: '物料描述',
     field: 'materialDescription',
     sort: 'custom',
+    table: {
+      width: 150,
+    },
     isSearch: true,
     form: {
       component: 'Editor',
@@ -57,6 +63,9 @@ export const UnfinishedShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '发货数量',
     field: 'shipmentQuantity',
     sort: 'custom',
+    table: {
+      width: 150,
+    },
     isSearch: true,
     form: {
       component: 'InputNumber',
@@ -67,12 +76,18 @@ export const UnfinishedShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '销售单价',
     field: 'unitPrice',
     sort: 'custom',
+    table: {
+      width: 150,
+    },
     isSearch: true
   },
   {
     label: '锁定数量',
     field: 'lockedQuantity',
     sort: 'custom',
+    table: {
+      width: 150,
+    },
     isSearch: true,
     form: {
       component: 'InputNumber',
@@ -95,10 +110,14 @@ export const UnfinishedShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
   //                 }
   //               }
   // },
+
   {
     label: '创建时间',
     field: 'createTime',
     sort: 'custom',
+    table: {
+      width: 150
+    },
     formatter: dateFormatter,
     isSearch: true,
     search: {
@@ -111,6 +130,15 @@ export const UnfinishedShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isForm: false
   },
+  {
+    label: '创建人',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable: true,
+  },
   // {
   //   label: '操作',
   //   field: 'action',
diff --git a/src/views/wms/deliversettlementManage/unfinishedShipmentMain/unfinishedShipmentMain.data.ts b/src/views/wms/deliversettlementManage/unfinishedShipmentMain/unfinishedShipmentMain.data.ts
index b63fb0317..3941ca95b 100644
--- a/src/views/wms/deliversettlementManage/unfinishedShipmentMain/unfinishedShipmentMain.data.ts
+++ b/src/views/wms/deliversettlementManage/unfinishedShipmentMain/unfinishedShipmentMain.data.ts
@@ -17,19 +17,30 @@ export const UnfinishedShipmentMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '单据号',
     field: 'code',
     sort: 'custom',
+    table: {
+      width: 150,
+    },
     isSearch: true
   },
   {
     label: '发货记录单号',
     field: 'shipmentRecordNumber',
     sort: 'custom',
+    table: {
+      width: 150,
+    },
     isSearch: true
   },
   {
-    label: '发货类型',
+    label: '发货方式',
     field: 'shipmentType',
     sort: 'custom',
     isSearch: true,
+    table: {
+      width: 150,
+    },
+    dictType: DICT_TYPE.DELIVER_METHOD,
+    dictClass: 'string',
     form: {
       component: 'SelectV2'
     }
@@ -38,35 +49,17 @@ export const UnfinishedShipmentMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '客户订单号',
     field: 'customerOrderNumber',
     sort: 'custom',
-    isSearch: true
-  },
-  {
-    label: '创建人',
-    field: 'creator',
-    sort: 'custom',
-    isSearch: false,
-    isForm: false
-  },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    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')]
-      }
+    table: {
+      width: 150,
     },
-    isForm: false
+    isSearch: true
   },
   {
     label: '操作',
     field: 'action',
     isForm: false,
+    isDetail: false,
+    isTable: false,
     table: {
       width: 150,
       fixed: 'right'