diff --git a/src/api/wms/deliverRecordDetail/index.ts b/src/api/wms/deliverRecordDetail/index.ts
index 293f1c00a..b222acae4 100644
--- a/src/api/wms/deliverRecordDetail/index.ts
+++ b/src/api/wms/deliverRecordDetail/index.ts
@@ -68,6 +68,10 @@ export const createDeliverRecordDetail = async (data: DeliverRecordDetailVO) =>
 export const updateDeliverRecordDetail = async (data: DeliverRecordDetailVO) => {
   return await request.put({ url: `/wms/deliver-record-detail/update`, data })
 }
+// 修改所有子表发货记录
+export const updateDeliverRecordDetailAll = async (data) => {
+  return await request.put({ url: `/wms/deliver-record-detail/updateByMasterId`, data })
+}
 
 // 删除发货记录子
 export const deleteDeliverRecordDetail = async (id: number) => {
diff --git a/src/views/wms/deliversettlementManage/ssSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/ssSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts
index 4d04ca31d..28fc088e2 100644
--- a/src/views/wms/deliversettlementManage/ssSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts
+++ b/src/views/wms/deliversettlementManage/ssSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts
@@ -18,9 +18,9 @@ export const DeliverRecordMain = useCrudSchemas(
         width: 180,
         fixed: 'left'
       },
-      isSearch: true
+      isSearch: true,
+      isForm:false,
     },
-
     {
       label: '发货类型',
       field: 'businessType',
@@ -40,7 +40,8 @@ export const DeliverRecordMain = useCrudSchemas(
       table: {
         width: 150
       },
-      isSearch: true
+      isSearch: true,
+      isForm: false,
     },
     {
       label: '客户月台代码',
@@ -49,7 +50,8 @@ export const DeliverRecordMain = useCrudSchemas(
       table: {
         width: 150
       },
-      isTable: true
+      isTable: true,
+      isForm: false,
     },
     {
       label: '客户订单号',
@@ -60,10 +62,10 @@ export const DeliverRecordMain = useCrudSchemas(
       },
       isSearch: true,
       isTable: true,
-      isForm: true,
       search: {
         component: 'Input',
-      }
+      },
+      isForm: false,
     },
     {
       label: '车牌号',
@@ -72,7 +74,8 @@ export const DeliverRecordMain = useCrudSchemas(
       table: {
         width: 150
       },
-      isTable: false
+      isTable: false,
+      isForm: false,
     },
     {
       label: '截止时间',
@@ -93,7 +96,8 @@ export const DeliverRecordMain = useCrudSchemas(
           dateFormat: 'YYYY-MM-DD HH:mm:ss',
           valueFormat: 'x'
         }
-      }
+      },
+      isForm: false,
     },
     {
       label: '从仓库代码',
@@ -102,7 +106,8 @@ export const DeliverRecordMain = useCrudSchemas(
       table: {
         width: 150
       },
-      isTable: false
+      isTable: false,
+      isForm: false,
     },
     {
       label: '到仓库代码',
@@ -111,7 +116,8 @@ export const DeliverRecordMain = useCrudSchemas(
       table: {
         width: 150
       },
-      isTable: false
+      isTable: false,
+      isForm: false,
     },
     {
       label: '创建时间',
@@ -125,6 +131,7 @@ export const DeliverRecordMain = useCrudSchemas(
         width: 180
       },
       isTable: false,
+      isForm:false,
       form: {
         component: 'DatePicker',
         componentProps: {
@@ -150,7 +157,8 @@ export const DeliverRecordMain = useCrudSchemas(
       table: {
         width: 150
       },
-      isTable: false
+      isTable: false,
+      isForm: false,
     },
     // {
     //   label: '代码',
@@ -178,7 +186,20 @@ export const DeliverRecordMain = useCrudSchemas(
           inactiveValue: 'FALSE',
           activeValue: 'TRUE'
         }
-      }
+      },
+      isForm: false,
+    },
+    {
+      label: '操作',
+      field: 'action',
+      isDetail: false,
+      isForm: false,
+      table: {
+        width: 150,
+        fixed: 'right'
+      },
+      hiddenInMain: true,
+      isTableForm: false,
     }
   ])
 )
diff --git a/src/views/wms/deliversettlementManage/ssSuppliesRecordMain/deliverRecordMain/index.vue b/src/views/wms/deliversettlementManage/ssSuppliesRecordMain/deliverRecordMain/index.vue
index 464f07310..4faea3df5 100644
--- a/src/views/wms/deliversettlementManage/ssSuppliesRecordMain/deliverRecordMain/index.vue
+++ b/src/views/wms/deliversettlementManage/ssSuppliesRecordMain/deliverRecordMain/index.vue
@@ -38,13 +38,11 @@
   </ContentWrap>
   <!-- 表单弹窗：添加/修改 -->
   <BasicForm
-    ref="formRef"
-    @success="getList"
+    ref="basicFormRef"
     :rules="DeliverRecordMainRules"
     :formAllSchemas="DeliverRecordMain.allSchemas"
-    :tableAllSchemas="DeliverRecordDetail.allSchemas"
-    :tableFormRules="DeliverRecordDetailRules"
     :isBusiness="true"
+    @submitForm="submitForm"
   />
   <!-- 详情 -->
   <Detail
@@ -166,16 +164,26 @@ const butttondata = (row,$index) => {
   if(findIndex>-1&&findIndex<$index){
     return []
   }else{
-    return [defaultButtons.mainListDocumentPrintBtn(null),] // 标签打印
+    return [
+      // defaultButtons.mainListDocumentPrintBtn(null), // 标签打印
+      defaultButtons.mainListEditBtn(null), // 编辑
+    ]
   }
 }
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
-  if (val == 'documentPrint') { // 标签打印
-    handlePoint(row)
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
   }
 }
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const tableData = ref([])
+const openForm = (type: string, row?: any) => {
+  tableData.value = []
+  basicFormRef.value.open(type, row)
+}
 
 // 获取部门 用于详情 部门回显
 const { wsCache } = useCache()
@@ -267,6 +275,31 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
     formRef.setValues(setV)
   }
 }
+// 主子数据 提交
+const submitForm = async (formType, submitData) => {
+  let data = {...submitData}
+  if(data.masterId){
+    data.id = data.masterId
+  }
+ 
+  try {
+    if (formType === 'create') {
+       await DeliverRecordMainApi.createDeliverRecordMain(data)
+      message.success(t('common.createSuccess'))
+      getList()
+    } else {
+      await DeliverRecordMainApi.updateDeliverRecordMain(data)
+      await DeliverRecordDetailApi.updateDeliverRecordDetailAll(data)
+      message.success(t('common.updateSuccess'))
+      basicFormRef.value.dialogVisible = false
+      buttonBaseClick('refresh',null)
+    }
+  
+  } finally {
+    basicFormRef.value.formLoading = false
+  }
+}
+
 
 /** 初始化 **/
 onMounted(async () => {