diff --git a/src/api/wms/inspectJobMain/index.ts b/src/api/wms/inspectJobMain/index.ts
index d56edc50d..bfd3d2db3 100644
--- a/src/api/wms/inspectJobMain/index.ts
+++ b/src/api/wms/inspectJobMain/index.ts
@@ -88,4 +88,9 @@ export const exportInspectJobMain = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/inspect-job-main/get-import-template' })
-}
\ No newline at end of file
+}
+
+// 关闭检验任务主
+export const closeInspectJobMain = (id: number) => {
+  return request.download({ url: '/wms/inspect-job-main/close?id=' + id })
+}
diff --git a/src/api/wms/inspectRequestMain/index.ts b/src/api/wms/inspectRequestMain/index.ts
index d699630f1..d9b833a56 100644
--- a/src/api/wms/inspectRequestMain/index.ts
+++ b/src/api/wms/inspectRequestMain/index.ts
@@ -73,4 +73,34 @@ export const exportInspectRequestMain = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/inspect-request-main/get-import-template' })
-}
\ No newline at end of file
+}
+
+// 关闭检验申请主 Excel
+export const closeInspectRequestMain = async (id) => {
+  return await request.put({ url: `/wms/inspect-request-main/close?id=` + id })
+}
+
+// 重新添加检验申请主 Excel
+export const reAddInspectRequestMain = async (id) => {
+  return await request.put({ url: `/wms/inspect-request-main/reAdd?id=` + id })
+}
+
+// 提交检验申请主 Excel
+export const submitInspectRequestMain = async (id) => {
+  return await request.put({ url: `/wms/inspect-request-main/submit?id=` + id })
+}
+
+// 审批通过检验申请主 Excel
+export const agreeInspectRequestMain = async (id) => {
+  return await request.put({ url: `/wms/inspect-request-main/agree?id=` + id })
+}
+
+// 审批驳回检验申请主 Excel
+export const refusedInspectRequestMain = async (id) => {
+  return await request.put({ url: `/wms/inspect-request-main/refused?id=` + id })
+}
+
+// 处理检验申请主 Excel
+export const handleInspectRequestMain = async (id) => {
+  return await request.put({ url: `/wms/inspect-request-main/handle?id=` + id })
+}
diff --git a/src/api/wms/purchasereceiptRequestMain/index.ts b/src/api/wms/purchasereceiptRequestMain/index.ts
index 9b15e960b..9d5c588d7 100644
--- a/src/api/wms/purchasereceiptRequestMain/index.ts
+++ b/src/api/wms/purchasereceiptRequestMain/index.ts
@@ -73,31 +73,31 @@ export const importTemplate = () => {
 }
 
 // 关闭采购收货申请主 Excel
-export const closeProductreceiptRequestMain = async (id) => {
+export const closePurchasereceiptRequestMain = async (id) => {
   return await request.put({ url: `/wms/purchasereceipt-request-main/close?id=` + id })
 }
 
 // 重新添加采购收货申请主 Excel
-export const reAddProductreceiptRequestMain = async (id) => {
+export const reAddPurchasereceiptRequestMain = async (id) => {
   return await request.put({ url: `/wms/purchasereceipt-request-main/reAdd?id=` + id })
 }
 
 // 提交采购收货申请主 Excel
-export const submitProductreceiptRequestMain = async (id) => {
+export const submitPurchasereceiptRequestMain = async (id) => {
   return await request.put({ url: `/wms/purchasereceipt-request-main/submit?id=` + id })
 }
 
 // 审批通过采购收货申请主 Excel
-export const agreeProductreceiptRequestMain = async (id) => {
+export const agreePurchasereceiptRequestMain = async (id) => {
   return await request.put({ url: `/wms/purchasereceipt-request-main/agree?id=` + id })
 }
 
 // 审批驳回采购收货申请主 Excel
-export const refusedProductreceiptRequestMain = async (id) => {
+export const refusedPurchasereceiptRequestMain = async (id) => {
   return await request.put({ url: `/wms/purchasereceipt-request-main/refused?id=` + id })
 }
 
-// 处理驳回采购收货申请主 Excel
-export const handleProductreceiptRequestMain = async (id) => {
+// 处理采购收货申请主 Excel
+export const handlePurchasereceiptRequestMain = async (id) => {
   return await request.put({ url: `/wms/purchasereceipt-request-main/handle?id=` + id })
 }
diff --git a/src/api/wms/purchasereturnJobMain/index.ts b/src/api/wms/purchasereturnJobMain/index.ts
index 6cadfb4e9..c59b9c735 100644
--- a/src/api/wms/purchasereturnJobMain/index.ts
+++ b/src/api/wms/purchasereturnJobMain/index.ts
@@ -87,4 +87,9 @@ export const exportPurchasereturnJobMain = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/purchasereturn-job-main/get-import-template' })
-}
\ No newline at end of file
+}
+
+// 关闭采购退货任务主
+export const closePurchasereturnJobMain = (id: number) => {
+  return request.download({ url: '/wms/purchasereturn-job-main/close?id=' + id })
+}
diff --git a/src/api/wms/purchasereturnRequestMain/index.ts b/src/api/wms/purchasereturnRequestMain/index.ts
index 06f252f23..bcdfbd6c5 100644
--- a/src/api/wms/purchasereturnRequestMain/index.ts
+++ b/src/api/wms/purchasereturnRequestMain/index.ts
@@ -71,4 +71,34 @@ export const exportPurchasereturnRequestMain = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/purchasereturn-request-main/get-import-template' })
-}
\ No newline at end of file
+}
+
+// 关闭采购退货申请主 Excel
+export const closePurchasereturnRequestMain = async (id) => {
+  return await request.put({ url: `/wms/purchasereturn-request-main/close?id=` + id })
+}
+
+// 重新添加采购退货申请主 Excel
+export const reAddPurchasereturnRequestMain = async (id) => {
+  return await request.put({ url: `/wms/purchasereturn-request-main/reAdd?id=` + id })
+}
+
+// 提交采购退货申请主 Excel
+export const submitPurchasereturnRequestMain = async (id) => {
+  return await request.put({ url: `/wms/purchasereturn-request-main/submit?id=` + id })
+}
+
+// 审批通过采购退货申请主 Excel
+export const agreePurchasereturnRequestMain = async (id) => {
+  return await request.put({ url: `/wms/purchasereturn-request-main/agree?id=` + id })
+}
+
+// 审批驳回采购退货申请主 Excel
+export const refusedPurchasereturnRequestMain = async (id) => {
+  return await request.put({ url: `/wms/purchasereturn-request-main/refused?id=` + id })
+}
+
+// 处理采购退货申请主 Excel
+export const handlePurchasereturnRequestMain = async (id) => {
+  return await request.put({ url: `/wms/purchasereturn-request-main/handle?id=` + id })
+}
diff --git a/src/api/wms/putawayJobMain/index.ts b/src/api/wms/putawayJobMain/index.ts
index 180c1d19f..f072d9287 100644
--- a/src/api/wms/putawayJobMain/index.ts
+++ b/src/api/wms/putawayJobMain/index.ts
@@ -80,4 +80,9 @@ export const exportPutawayJobMain = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/putaway-job-main/get-import-template' })
-}
\ No newline at end of file
+}
+
+// 关闭上架任务主
+export const closePutawayJobMain = (id: number) => {
+  return request.download({ url: '/wms/putaway-job-main/close?id=' + id })
+}
diff --git a/src/api/wms/putawayRequestMain/index.ts b/src/api/wms/putawayRequestMain/index.ts
index a85b81ec0..e8f454d58 100644
--- a/src/api/wms/putawayRequestMain/index.ts
+++ b/src/api/wms/putawayRequestMain/index.ts
@@ -64,4 +64,34 @@ export const exportPutawayRequestMain = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/putaway-request-main/get-import-template' })
-}
\ No newline at end of file
+}
+
+// 关闭上架申请主 Excel
+export const closePutawayRequestMain = async (id) => {
+  return await request.put({ url: `/wms/putaway-request-main/close?id=` + id })
+}
+
+// 重新添加上架申请主 Excel
+export const reAddPutawayRequestMain = async (id) => {
+  return await request.put({ url: `/wms/putaway-request-main/reAdd?id=` + id })
+}
+
+// 提交上架申请主 Excel
+export const submitPutawayRequestMain = async (id) => {
+  return await request.put({ url: `/wms/putaway-request-main/submit?id=` + id })
+}
+
+// 审批通过上架申请主 Excel
+export const agreePutawayRequestMain = async (id) => {
+  return await request.put({ url: `/wms/putaway-request-main/agree?id=` + id })
+}
+
+// 审批驳回上架申请主 Excel
+export const refusedPutawayRequestMain = async (id) => {
+  return await request.put({ url: `/wms/putaway-request-main/refused?id=` + id })
+}
+
+// 处理上架申请主 Excel
+export const handlePutawayRequestMain = async (id) => {
+  return await request.put({ url: `/wms/putaway-request-main/handle?id=` + id })
+}
diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue b/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue
index beb62947b..185cda2e2 100644
--- a/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue
@@ -174,9 +174,9 @@ const isShowMainButton = (row,val) => {
 // 列表-操作按钮
 const butttondata = (row) => {
   return [
-    defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
-    defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
-    defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+    // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
+    defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:inspect-job-main:close'}), // 关闭
+    // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
     // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
   ]
 }
@@ -188,12 +188,22 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainJobAba') { // 放弃
     console.log('列表-操作按钮事件-放弃')
   } else if (val == 'mainJobClo') { // 关闭
-    console.log('列表-操作按钮事件-关闭')
+    handleClose(row.id)
   } else if (val == 'mainJobAcc') { // 承接
     console.log('列表-操作按钮事件-承接')
   }
 }
 
+/** 关闭按钮操作 */
+const handleClose = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmColse'))
+    await InspectJobMainApi.closeInspectJobMain(id)
+    message.success(t('common.closeSuccess'))
+    await getList()
+  } catch {}
+}
+
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
@@ -209,7 +219,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await InspectJobMainApi.exportInspectJobMain(setSearchParams)
-    download.excel(data, '检验任务主.xlsx')
+    download.excel(data, '检验任务主.xls')
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue b/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue
index c3f54add3..ab42193c9 100644
--- a/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue
@@ -142,7 +142,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await InspectRecordMainApi.exportInspectRecordMain(setSearchParams)
-    download.excel(data, '检验记录主.xlsx')
+    download.excel(data, '检验记录主.xls')
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue
index e2f48d494..cb3ab5a45 100644
--- a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue
@@ -183,13 +183,13 @@ const isShowMainButton = (row,val) => {
 // 列表-操作按钮
 const butttondata = (row) => {
     return [
-        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6'])}), // 关闭
-        defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5'])}), // 重新添加
-        defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1'])}), // 提交审批
-        defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2'])}), // 驳回
-        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2'])}), // 审批通过
-        defaultButtons.mainListEditBtn({hasPermi:'wms:inspect-request-main:update'}), // 编辑
-        defaultButtons.mainListDeleteBtn({hasPermi:'wms:inspect-request-main:delete'}), // 删除
+        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:purchasereceipt-request-main:close'}), // 关闭
+        defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:purchasereceipt-request-main:reAdd'}), //重新添加
+        defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-request-main:submit'}), // 提交审批
+        defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-request-main:refused'}), // 驳回
+        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-request-main:agree'}), // 审批通过
+        defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:purchasereceipt-request-main:handle'}), // 处理
+        defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-request-main:update'}), // 编辑
     ]
 }
 
@@ -198,22 +198,82 @@ const butttondata = (row) => {
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
   if (val == 'mainClose') { // 关闭
-    console.log('列表-操作按钮事件-关闭')
+    handleClose(row.id)
   } else if (val == 'mainReAdd') { // 重新添加
-    console.log('列表-操作按钮事件-重新添加')
+    handleReAdd(row.id)
   } else if (val == 'mainSubmit') { // 提交审批
-    console.log('列表-操作按钮事件-提交审批')
+    handleSubmit(row.id)
   } else if (val == 'mainTurnDown') { // 驳回
-    console.log('列表-操作按钮事件-驳回')
+    handleRefused(row.id)
   } else if (val == 'mainApprove') { // 审批通过
-    console.log('列表-操作按钮事件-审批通过')
+    handleAgree(row.id)
+  } else if (val == 'mainHandle') { // 处理
+    handleHandle(row.id)
   } else if (val == 'edit') { // 编辑
     openForm('update', row)
-  } else if (val == 'delete') { // 删除
-    handleDelete(row.id)
   }
 }
 
+/** 关闭按钮操作 */
+const handleClose = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmColse'))
+    await InspectRequestMainApi.closeInspectRequestMain(id)
+    message.success(t('common.closeSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 重新添加按钮操作 */
+const handleReAdd = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmReAdd'))
+    await InspectRequestMainApi.reAddInspectRequestMain(id)
+    message.success(t('common.reAddSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 审批通过按钮操作 */
+const handleAgree = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmAgree'))
+    await InspectRequestMainApi.agreeInspectRequestMain(id)
+    message.success(t('common.agreeSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 审批驳回按钮操作 */
+const handleRefused = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmRefused'))
+    await InspectRequestMainApi.refusedInspectRequestMain(id)
+    message.success(t('common.refusedSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 处理按钮操作 */
+const handleHandle = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmHandle'))
+    await InspectRequestMainApi.handleInspectRequestMain(id)
+    message.success(t('common.handleSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 提交按钮操作 */
+const handleSubmit = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmSubmit'))
+    await InspectRequestMainApi.submitInspectRequestMain(id)
+    message.success(t('common.closeSuccess'))
+    await getList()
+  } catch {}
+}
+
 /** 添加/修改操作 */
 const formRef = ref()
 const openForm =async (type: string, row?: number) => {
@@ -249,7 +309,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await InspectRequestMainApi.exportInspectRequestMain(setSearchParams)
-    download.excel(data, '检验申请主.xlsx')
+    download.excel(data, '检验申请主.xls')
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
index 1b2e08a0a..0144dd0e8 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
@@ -140,14 +140,6 @@ const HeadButttondata = [
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
-  // {
-  //   label: '自定义扩展按钮',
-  //   name: 'zdy',
-  //   hide: false,
-  //   type: 'primary',
-  //   icon: 'Select',
-  //   color: ''
-  // },
 ]
 
 // 头部按钮事件
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
index f01c9b15f..0b8d50af7 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
@@ -96,14 +96,6 @@ const HeadButttondata = [
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
-  // {
-  //   label: '自定义扩展按钮',
-  //   name: 'zdy',
-  //   hide: false,
-  //   type: 'primary',
-  //   icon: 'Select',
-  //   color: ''
-  // },
 ]
 
 // 头部按钮事件
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
index 2054a111d..3c83f0073 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
@@ -224,7 +224,7 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
 const handleClose = async (id: number) => {
   try {
     await message.confirm(t('common.confirmColse'))
-    await PurchasereceiptRequestMainApi.closeProductreceiptRequestMain(id)
+    await PurchasereceiptRequestMainApi.closePurchasereceiptRequestMain(id)
     message.success(t('common.closeSuccess'))
     await getList()
   } catch {}
@@ -234,7 +234,7 @@ const handleClose = async (id: number) => {
 const handleReAdd = async (id: number) => {
   try {
     await message.confirm(t('common.confirmReAdd'))
-    await PurchasereceiptRequestMainApi.reAddProductreceiptRequestMain(id)
+    await PurchasereceiptRequestMainApi.reAddPurchasereceiptRequestMain(id)
     message.success(t('common.reAddSuccess'))
     await getList()
   } catch {}
@@ -244,7 +244,7 @@ const handleReAdd = async (id: number) => {
 const handleAgree = async (id: number) => {
   try {
     await message.confirm(t('common.confirmAgree'))
-    await PurchasereceiptRequestMainApi.agreeProductreceiptRequestMain(id)
+    await PurchasereceiptRequestMainApi.agreePurchasereceiptRequestMain(id)
     message.success(t('common.agreeSuccess'))
     await getList()
   } catch {}
@@ -254,7 +254,7 @@ const handleAgree = async (id: number) => {
 const handleRefused = async (id: number) => {
   try {
     await message.confirm(t('common.confirmRefused'))
-    await PurchasereceiptRequestMainApi.refusedProductreceiptRequestMain(id)
+    await PurchasereceiptRequestMainApi.refusedPurchasereceiptRequestMain(id)
     message.success(t('common.refusedSuccess'))
     await getList()
   } catch {}
@@ -264,7 +264,7 @@ const handleRefused = async (id: number) => {
 const handleHandle = async (id: number) => {
   try {
     await message.confirm(t('common.confirmHandle'))
-    await PurchasereceiptRequestMainApi.handleProductreceiptRequestMain(id)
+    await PurchasereceiptRequestMainApi.handlePurchasereceiptRequestMain(id)
     message.success(t('common.handleSuccess'))
     await getList()
   } catch {}
@@ -274,7 +274,7 @@ const handleHandle = async (id: number) => {
 const handleSubmit = async (id: number) => {
   try {
     await message.confirm(t('common.confirmSubmit'))
-    await PurchasereceiptRequestMainApi.submitProductreceiptRequestMain(id)
+    await PurchasereceiptRequestMainApi.submitPurchasereceiptRequestMain(id)
     message.success(t('common.closeSuccess'))
     await getList()
   } catch {}
@@ -342,7 +342,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '采购收货申请主导入模版.xlsx'
+  templateTitle: '采购收货申请主导入模版.xls'
 })
 
 // 导入成功之后
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue
index 2dcfaa33d..81adbf5b1 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue
@@ -174,9 +174,9 @@ const isShowMainButton = (row,val) => {
 // 列表-操作按钮
 const butttondata = (row) => {
   return [
-    defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
-    defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
-    defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+    // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
+    defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-job-main:close'}), // 关闭
+    // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
     // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
   ]
 }
@@ -188,12 +188,22 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainJobAba') { // 放弃
     console.log('列表-操作按钮事件-放弃')
   } else if (val == 'mainJobClo') { // 关闭
-    console.log('列表-操作按钮事件-关闭')
+    handleClose(row.id)
   } else if (val == 'mainJobAcc') { // 承接
     console.log('列表-操作按钮事件-承接')
   }
 }
 
+/** 关闭按钮操作 */
+const handleClose = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmColse'))
+    await PurchasereceiptJobMainApi.closePurchasereceiptJobMain(id)
+    message.success(t('common.closeSuccess'))
+    await getList()
+  } catch {}
+}
+
 /** 详情操作 */
 const detailRef = ref()
 const openDetail = (row: any, titleName: any, titleValue: any) => {
@@ -209,7 +219,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await PurchasereturnJobMainApi.exportPurchasereturnJobMain(setSearchParams)
-    download.excel(data, '采购退货任务主.xlsx')
+    download.excel(data, '采购退货任务主.xls')
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue
index e4fca8ac9..042310b1c 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue
@@ -142,7 +142,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMain(setSearchParams)
-    download.excel(data, '采购退货记录主.xlsx')
+    download.excel(data, '采购退货记录主.xls')
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
index bf4bcb04e..222f074a7 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
@@ -140,20 +140,15 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:purchasereturn-request-main:create'}), // 新增——需要手动修改下权限
-  defaultButtons.defaultImportBtn({hasPermi:'wms:purchasereturn-request-main:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'wms:purchasereturn-request-main:export'}), // 导出
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:purchasereturn-request-main:create'}), // 新增——需要手动修改下权限
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:purchasereturn-request-main:import'}), // 导入
+  // defaultButtons.defaultExportBtn({hasPermi:'wms:purchasereturn-request-main:export'}), // 导出
+  defaultButtons.defaultAddBtn(null), // 新增——需要手动修改下权限
+  defaultButtons.defaultImportBtn(null), // 导入
+  defaultButtons.defaultExportBtn(null), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
-  // {
-  //   label: '自定义扩展按钮',
-  //   name: 'zdy',
-  //   hide: false,
-  //   type: 'primary',
-  //   icon: 'Select',
-  //   color: ''
-  // },
 ]
 
 // 头部按钮事件
@@ -184,34 +179,32 @@ const isShowMainButton = (row,val) => {
 // 列表-操作按钮
 const butttondata = (row) => {
     return [
-        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6'])}), // 关闭
-        defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5'])}), // 重新添加
-        defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1'])}), // 提交审批
-        defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2'])}), // 驳回
-        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2'])}), // 审批通过
-        defaultButtons.mainListEditBtn({hasPermi:'wms:purchasereturn-request-main:update'}), // 编辑
-        defaultButtons.mainListDeleteBtn({hasPermi:'wms:purchasereturn-request-main:delete'}), // 删除
+        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:purchasereceipt-request-main:close'}), // 关闭
+        defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:purchasereceipt-request-main:reAdd'}), //重新添加
+        defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-request-main:submit'}), // 提交审批
+        defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-request-main:refused'}), // 驳回
+        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-request-main:agree'}), // 审批通过
+        defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:purchasereceipt-request-main:handle'}), // 处理
+        defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-request-main:update'}), // 编辑
     ]
 }
 
-
-
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
   if (val == 'mainClose') { // 关闭
-    console.log('列表-操作按钮事件-关闭')
+    handleClose(row.id)
   } else if (val == 'mainReAdd') { // 重新添加
-    console.log('列表-操作按钮事件-重新添加')
+    handleReAdd(row.id)
   } else if (val == 'mainSubmit') { // 提交审批
-    console.log('列表-操作按钮事件-提交审批')
+    handleSubmit(row.id)
   } else if (val == 'mainTurnDown') { // 驳回
-    console.log('列表-操作按钮事件-驳回')
+    handleRefused(row.id)
   } else if (val == 'mainApprove') { // 审批通过
-    console.log('列表-操作按钮事件-审批通过')
+    handleAgree(row.id)
+  } else if (val == 'mainHandle') { // 处理
+    handleHandle(row.id)
   } else if (val == 'edit') { // 编辑
     openForm('update', row)
-  } else if (val == 'delete') { // 删除
-    handleDelete(row.id)
   }
 }
 
@@ -228,15 +221,62 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
   detailRef.value.openDetail(row, titleName, titleValue)
 }
 
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
+/** 关闭按钮操作 */
+const handleClose = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmColse'))
+    await PurchasereturnRequestMainApi.closePurchasereturnRequestMain(id)
+    message.success(t('common.closeSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 重新添加按钮操作 */
+const handleReAdd = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmReAdd'))
+    await PurchasereturnRequestMainApi.reAddPurchasereturnRequestMain(id)
+    message.success(t('common.reAddSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 审批通过按钮操作 */
+const handleAgree = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmAgree'))
+    await PurchasereturnRequestMainApi.agreePurchasereturnRequestMain(id)
+    message.success(t('common.agreeSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 审批驳回按钮操作 */
+const handleRefused = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmRefused'))
+    await PurchasereturnRequestMainApi.refusedPurchasereturnRequestMain(id)
+    message.success(t('common.refusedSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 处理按钮操作 */
+const handleHandle = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmHandle'))
+    await PurchasereturnRequestMainApi.handlePurchasereturnRequestMain(id)
+    message.success(t('common.handleSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 提交按钮操作 */
+const handleSubmit = async (id: number) => {
   try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await PurchasereturnRequestMainApi.deletePurchasereturnRequestMain(id)
-    message.success(t('common.delSuccess'))
-    // 刷新列表
+    await message.confirm(t('common.confirmSubmit'))
+    await PurchasereturnRequestMainApi.submitPurchasereturnRequestMain(id)
+    message.success(t('common.closeSuccess'))
     await getList()
   } catch {}
 }
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
index 079ac574b..3f6f6edd5 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue
@@ -209,7 +209,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await PutawayJobMainApi.exportPutawayJobMain(setSearchParams)
-    download.excel(data, '上架任务主.xlsx')
+    download.excel(data, '上架任务主.xls')
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue
index 8bed0a9c2..d467266f7 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue
@@ -142,7 +142,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await PutawayRecordMainApi.exportPutawayRecordMain(setSearchParams)
-    download.excel(data, '上架记录主.xlsx')
+    download.excel(data, '上架记录主.xls')
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue
index 20d440549..2a5302fec 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue
@@ -250,7 +250,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await PutawayRequestMainApi.exportPutawayRequestMain(setSearchParams)
-    download.excel(data, '上架申请主.xlsx')
+    download.excel(data, '上架申请主.xls')
   } catch {
   } finally {
     exportLoading.value = false
@@ -303,7 +303,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '上架申请主导入模版.xlsx'
+  templateTitle: '上架申请主导入模版.xls'
 })
 
 // 导入成功之后
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
index 64b445365..666a5a7f0 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
@@ -244,7 +244,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await DemandforecastingMainApi.exportDemandforecastingMain(setSearchParams)
-    download.excel(data, '要货预测主.xlsx')
+    download.excel(data, '要货预测主.xls')
   } catch {
   } finally {
     exportLoading.value = false
@@ -297,7 +297,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '要货预测主导入模版.xlsx'
+  templateTitle: '要货预测主导入模版.xls'
 })
 
 // 导入成功之后
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
index 501f83388..08a1669d8 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
@@ -4,16 +4,29 @@
     <Search :schema="PurchaseMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
-  <!-- 列表头部 -->
-  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
-    @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick" :allSchemas="PurchaseMain.allSchemas" />
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="PurchaseMain.allSchemas"
+    />
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
+    <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">
+      }"
+      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>
@@ -26,311 +39,282 @@
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <BasicForm ref="formRef" @success="getList" :rules="PurchaseMainRules" :formAllSchemas="PurchaseMain.allSchemas"
-    :tableAllSchemas="PurchaseDetail.allSchemas" :tableFormRules="PurchaseDetailRules" :tableData="tableData"
-    :apiUpdate="PurchaseMainApi.updatePurchaseMain" :apiCreate="PurchaseMainApi.createPurchaseMain" :isBusiness="true"
-    @handleAddTable="handleAddTable" @handleDeleteTable="handleDeleteTable" @searchTableSuccess="searchTableSuccess"
-    @submitForm="submitForm" />
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="PurchaseMainRules"
+    :formAllSchemas="PurchaseMain.allSchemas"
+    :tableAllSchemas="PurchaseDetail.allSchemas"
+    :tableFormRules="PurchaseDetailRules"
+    :tableData="tableData"
+    :apiUpdate="PurchaseMainApi.updatePurchaseMain"
+    :apiCreate="PurchaseMainApi.createPurchaseMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+  />
 
   <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="false" :allSchemas="PurchaseMain.allSchemas"
-    :detailAllSchemas="PurchaseDetail.allSchemas" :detailAllSchemasRules="PurchaseDetailRules"
-    :apiCreate="PurchaseDetailApi.createPurchaseDetail" :apiUpdate="PurchaseDetailApi.updatePurchaseDetail"
-    :apiPage="PurchaseDetailApi.getPurchaseDetailPage" :apiDelete="PurchaseDetailApi.deletePurchaseDetail" :Echo="Echo"
-    @searchTableSuccessDetail="searchTableSuccessDetail" />
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="PurchaseMain.allSchemas"
+    :detailAllSchemas="PurchaseDetail.allSchemas"
+    :detailAllSchemasRules="PurchaseDetailRules"
+    :apiCreate="PurchaseDetailApi.createPurchaseDetail"
+    :apiUpdate="PurchaseDetailApi.updatePurchaseDetail"
+    :apiPage="PurchaseDetailApi.getPurchaseDetailPage"
+    :apiDelete="PurchaseDetailApi.deletePurchaseDetail"
+    :Echo="Echo"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+  />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/wms/purchase-main/import" :importTemplateData="importTemplateData"
-    @success="importSuccess" :isShowOut="true" />
+  <ImportForm ref="importFormRef" url="/wms/purchase-main/import" :importTemplateData="importTemplateData" @success="importSuccess" :isShowOut="true" />
 </template>
 
 <script setup lang="ts">
-  import download from '@/utils/download'
-  import { PurchaseMain, PurchaseMainRules, PurchaseDetail, PurchaseDetailRules } from './purchaseMain.data'
-  import * as PurchaseMainApi from '@/api/wms/purchaseMain'
-  import * as PurchaseDetailApi from '@/api/wms/purchaseDetail'
-  import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
-  // 采购订单
-  defineOptions({ name: 'PurchaseMain' })
-
-  const message = useMessage() // 消息弹窗
-  const { t } = useI18n() // 国际化
-  const route = useRoute() // 路由信息
-  const routeName = ref()
-  routeName.value = route.name
-  const tableColumns = ref(PurchaseMain.allSchemas.tableColumns)
-
-  // 字段设置 更新主列表字段
-  const updataTableColumns = (val) => {
-    tableColumns.value = val
-  }
-
-  // 查询页面返回
-  const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
-    nextTick(() => {
-      if (type == 'tableForm') {
-        // 明细查询页赋值
-        row[formField] = val[0][searchField]
-      } else {
-        const setV = {}
-        setV[formField] = val[0][searchField]
-        formRef.setValues(setV)
-      }
-    })
-  }
-  // 查询页面返回——详情
-  const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
-    nextTick(() => {
+import download from '@/utils/download'
+import { PurchaseMain,PurchaseMainRules,PurchaseDetail,PurchaseDetailRules } from './purchaseMain.data'
+import * as PurchaseMainApi from '@/api/wms/purchaseMain'
+import * as PurchaseDetailApi from '@/api/wms/purchaseDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+
+// 采购订单
+defineOptions({ name: 'PurchaseMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(PurchaseMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      row[formField] = val[0][searchField]
+    } else {
       const setV = {}
       setV[formField] = val[0][searchField]
       formRef.setValues(setV)
-    })
-  }
-
-  // 子表新增的时候选择表格之后需要会显得字段
-  // const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
-  const Echo = []
-
-  const { tableObject, tableMethods } = useTable({
-    getListApi: PurchaseMainApi.getPurchaseMainPage // 分页接口
-  })
-
-  // 获得表格的各种操作
-  const { getList, setSearchParams } = tableMethods
-
-  // 列表头部按钮
-  const HeadButttondata = [
-    defaultButtons.defaultAddBtn({ hasPermi: 'wms:purchase-main:create' }), // 新增
-    defaultButtons.defaultImportBtn({ hasPermi: 'wms:purchase-main:import' }), // 导入
-    defaultButtons.defaultExportBtn({ hasPermi: 'wms:purchase-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 == '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.mainListOrderCloBtn({ hide: isShowMainButton(row, ['1']) }), // 关闭
-      defaultButtons.mainListOrderOpeBtn({ hide: isShowMainButton(row, ['3']) }), // 打开
-      defaultButtons.mainListOrderPubBtn({ hide: isShowMainButton(row, ['1']) }), // 发布
-      defaultButtons.mainListOrderWitBtn({ hide: isShowMainButton(row, ['2']) }), // 下架
-      defaultButtons.mainListEditBtn({ hasPermi: 'wms:purchase-main:update', hide: isShowMainButton(row, ['1']) }), // 编辑
-      defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:purchase-main:delete', hide: isShowMainButton(row, ['1']) }), // 删除
-    ]
-  }
-
-  // 列表-操作按钮事件
-  const buttonTableClick = async (val, row) => {
-    if (val == 'edit') { // 编辑
-      openForm('update', row)
-    } else if (val == 'delete') { // 删除
-      handleDelete(row.id)
-    } else if (val == 'mainOrderClo') { // 关闭
-      handleClose(row.id)
-    } else if (val == 'mainOrderOpe') { // 打开
-      handleOpen(row.id)
-    } else if (val == 'mainOrderPub') { // 发布
-      handlePublish(row.id)
-    } else if (val == 'mainOrderWit') { // 下架
-      handleWit(row.id)
-    }
-  }
-
-  /** 添加/修改操作 */
-  const formRef = ref()
-  const openForm = async (type : string, row ?: number) => {
-    tableData.value = [] // 重置明细数据
-    formRef.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 PurchaseMainApi.deletePurchaseMain(id)
-      message.success(t('common.delSuccess'))
-      // 刷新列表
-      await getList()
-    } catch { }
-  }
-
-  /** 关闭按钮操作 */
-  const handleClose = async (id : number) => {
-    try {
-      // 关闭的二次确认
-      await message.confirm('是否关闭所选中数据？')
-      // 发起关闭
-      await PurchaseMainApi.closePurchaseMain(id)
-      message.success(t('关闭成功!'))
-      // 刷新列表
-      await getList()
-    } catch { }
-  }
-
-  /** 打开按钮操作 */
-  const handleOpen = async (id : number) => {
-    try {
-      // 打开的二次确认
-      await message.confirm('是否打开所选中数据？')
-      // 发起打开
-      await PurchaseMainApi.openPurchaseMain(id)
-      message.success(t('打开成功!'))
-      // 刷新列表
-      await getList()
-    } catch { }
-  }
-
-  /** 发布按钮操作 */
-  const handlePublish = async (id : number) => {
-    try {
-      // 发布的二次确认
-      await message.confirm('是否发布所选中数据？')
-      // 发起发布
-      await PurchaseMainApi.publishPurchaseMain(id)
-      message.success(t('发布成功!'))
-      // 刷新列表
-      await getList()
-    } catch { }
-  }
-
-  /** 下架按钮操作 */
-  const handleWit = async (id : number) => {
-    try {
-      // 下架的二次确认
-      await message.confirm('是否下架所选中数据？')
-      // 发起下架
-      await PurchaseMainApi.witPurchaseMain(id)
-      message.success(t('下架成功!'))
-      // 刷新列表
-      await getList()
-    } catch { }
-  }
-
-  /** 导出按钮操作 */
-  const exportLoading = ref(false) // 导出的加载中
-  const handleExport = async () => {
-    try {
-      // 导出的二次确认
-      await message.exportConfirm()
-      // 发起导出
-      exportLoading.value = true
-      const data = await PurchaseMainApi.exportPurchaseMain(setSearchParams)
-      download.excel(data, '采购订单主.xls')
-    } catch {
-    } finally {
-      exportLoading.value = false
     }
-  }
-
-  /**
-    * tableForm方法
-  */
-  const tableFormKeys = {}
-  PurchaseDetail.allSchemas.tableFormColumns.forEach(item => {
-    tableFormKeys[item.field] = item.default ? item.default : ''
   })
-  const tableData = ref([])
-
-  // 添加明细
-  const handleAddTable = () => {
-    tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 查询页面返回——详情
+const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+// 子表新增的时候选择表格之后需要会显得字段
+// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
+const Echo =  []
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: PurchaseMainApi.getPurchaseMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:purchase-main:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:purchase-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:purchase-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 == '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 handleDeleteTable = (item, index) => {
-    tableData.value.splice(index, 1)
+}
+
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
   }
-
-  // 主子数据 提交
-  const submitForm = async (formType, data) => {
-    data.subList = tableData.value // 拼接子表数据参数
-    try {
-      if (formType === 'create') {
-        await PurchaseMainApi.createPurchaseMain(data)
-        message.success(t('common.createSuccess'))
-      } else {
-        await PurchaseMainApi.updatePurchaseMain(data)
-        message.success(t('common.updateSuccess'))
-      }
-      formRef.value.dialogVisible = false
-      // 刷新当前列表
-      getList()
-    } finally {
-      formRef.value.formLoading = false
-    }
+}
+
+// 列表-操作按钮
+const butttondata = (row) => {
+  return [
+    defaultButtons.mainListOrderCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
+    defaultButtons.mainListOrderPubBtn({hide:isShowMainButton(row,['1'])}), // 发布
+    defaultButtons.mainListOrderOpeBtn({hide:isShowMainButton(row,['3'])}), // 打开
+    defaultButtons.mainListOrderWitBtn({hide:isShowMainButton(row,['2'])}), // 下架
+    defaultButtons.mainListEditBtn({hasPermi:'wms:purchase-main:update',hide:isShowMainButton(row,['1'])}), // 编辑
+    // defaultButtons.mainListDeleteBtn({hasPermi:'wms:purchase-main:delete',hide:isShowMainButton(row,['1'])}), // 删除
+  ]
+}
+
+
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainClose') { // 关闭
+    console.log('列表-操作按钮事件-关闭')
+  } else if (val == 'mainReAdd') { // 重新添加
+    console.log('列表-操作按钮事件-重新添加')
+  } else if (val == 'mainSubmit') { // 提交审批
+    console.log('列表-操作按钮事件-提交审批')
+  } else if (val == 'mainTurnDown') { // 驳回
+    console.log('列表-操作按钮事件-驳回')
+  } else if (val == 'mainApprove') { // 审批通过
+    console.log('列表-操作按钮事件-审批通过')
+  } else if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
   }
-
-  /** 导入 */
-  const importFormRef = ref()
-  const handleImport = () => {
-    importFormRef.value.open()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  formRef.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 PurchaseMainApi.deletePurchaseMain(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 PurchaseMainApi.exportPurchaseMain(setSearchParams)
+    download.excel(data, '采购订单主.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
   }
-
-  // 导入附件弹窗所需的参数
-  const importTemplateData = reactive({
-    templateUrl: '',
-    templateTitle: '采购订单主导入模版.xlsx'
-  })
-
-  // 导入成功之后
-  const importSuccess = () => {
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+PurchaseDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  try {
+    if (formType === 'create') {
+      await PurchaseMainApi.createPurchaseMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await PurchaseMainApi.updatePurchaseMain(data)
+      message.success(t('common.updateSuccess'))
+    }
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
     getList()
+  } finally {
+    formRef.value.formLoading = false
   }
-
-  // 筛选提交
-  const searchFormClick = (searchData) => {
-    tableObject.params = {
-      isSearch: true,
-      filters: searchData.filters
-    }
-    getList() // 刷新当前列表
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '采购订单主导入模版.xls'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
   }
-
-  /** 初始化 **/
-  onMounted(async () => {
-    getList()
-    importTemplateData.templateUrl = await PurchaseMainApi.importTemplate()
-  })
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await PurchaseMainApi.importTemplate()
+})
 </script>
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
index da26c53c4..043ebc659 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
@@ -4,17 +4,29 @@
     <Search :schema="PurchasePlanMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
   </ContentWrap>
 
-  <!-- 列表头部 -->
-  <TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
-    @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick"
-    :allSchemas="PurchasePlanMain.allSchemas" />
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="PurchasePlanMain.allSchemas"
+    />
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
+    <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">
+      }"
+      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>
@@ -27,354 +39,295 @@
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <BasicForm ref="formRef" @success="getList" :rules="PurchasePlanMainRules"
-    :formAllSchemas="PurchasePlanMain.allSchemas" :tableAllSchemas="PurchasePlanDetail.allSchemas"
-    :tableFormRules="PurchasePlanDetailRules" :tableData="tableData"
-    :apiUpdate="PurchasePlanMainApi.updatePurchasePlanMain" :apiCreate="PurchasePlanMainApi.createPurchasePlanMain"
-    :isBusiness="true" @handleAddTable="handleAddTable" @handleDeleteTable="handleDeleteTable"
-    @searchTableSuccess="searchTableSuccess" @submitForm="submitForm" />
+  <BasicForm
+    ref="formRef"
+    @success="getList"
+    :rules="PurchasePlanMainRules"
+    :formAllSchemas="PurchasePlanMain.allSchemas"
+    :tableAllSchemas="PurchasePlanDetail.allSchemas"
+    :tableFormRules="PurchasePlanDetailRules"
+    :tableData="tableData"
+    :apiUpdate="PurchasePlanMainApi.updatePurchasePlanMain"
+    :apiCreate="PurchasePlanMainApi.createPurchasePlanMain"
+    :isBusiness="true"
+    @handleAddTable="handleAddTable"
+    @handleDeleteTable="handleDeleteTable"
+    @searchTableSuccess="searchTableSuccess"
+    @submitForm="submitForm"
+  />
 
   <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="false" :allSchemas="PurchasePlanMain.allSchemas"
-    :detailAllSchemas="PurchasePlanDetail.allSchemas" :detailAllSchemasRules="PurchasePlanDetailRules"
+  <Detail
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="PurchasePlanMain.allSchemas"
+    :detailAllSchemas="PurchasePlanDetail.allSchemas"
+    :detailAllSchemasRules="PurchasePlanDetailRules"
     :apiCreate="PurchasePlanDetailApi.createPurchasePlanDetail"
     :apiUpdate="PurchasePlanDetailApi.updatePurchasePlanDetail"
     :apiPage="PurchasePlanDetailApi.getPurchasePlanDetailPage"
-    :apiDelete="PurchasePlanDetailApi.deletePurchasePlanDetail" :Echo="Echo"
-    @searchTableSuccessDetail="searchTableSuccessDetail" />
+    :apiDelete="PurchasePlanDetailApi.deletePurchasePlanDetail"
+    :Echo="Echo"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
+  />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/wms/purchase-plan-main/import" :importTemplateData="importTemplateData"
-    @success="importSuccess" />
+  <ImportForm ref="importFormRef" url="/wms/purchase-plan-main/import" :importTemplateData="importTemplateData" @success="importSuccess" />
 </template>
 
 <script setup lang="ts">
-  import download from '@/utils/download'
-  import { PurchasePlanMain, PurchasePlanMainRules, PurchasePlanDetail, PurchasePlanDetailRules } from './purchasePlanMain.data'
-  import * as PurchasePlanMainApi from '@/api/wms/purchasePlanMain'
-  import * as PurchasePlanDetailApi from '@/api/wms/purchasePlanDetail'
-  import * as defaultButtons from '@/utils/disposition/defaultButtons'
-
-  // 要货计划
-  defineOptions({ name: 'PurchasePlanMain' })
-
-  const message = useMessage() // 消息弹窗
-  const { t } = useI18n() // 国际化
-
-  const route = useRoute() // 路由信息
-  const routeName = ref()
-  routeName.value = route.name
-  const tableColumns = ref(PurchasePlanMain.allSchemas.tableColumns)
-
-  // 字段设置 更新主列表字段
-  const updataTableColumns = (val) => {
-    tableColumns.value = val
-  }
-
-  // 查询页面返回
-  const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
-    nextTick(() => {
-      if (type == 'tableForm') {
-        // 明细查询页赋值
-        row[formField] = val[0][searchField]
-        row['itemCode'] = val[0]['code']
-        row['poNumber'] = val[0]['number']
-        row['poLine'] = val[0]['lineNumber']
-      } else {
-        const setV = {}
-        setV[formField] = val[0][searchField]
-        formRef.setValues(setV)
-      }
-    })
-  }
-  // 查询页面返回——详情
-  const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
-    nextTick(() => {
+import download from '@/utils/download'
+import { PurchasePlanMain,PurchasePlanMainRules,PurchasePlanDetail,PurchasePlanDetailRules } from './purchasePlanMain.data'
+import * as PurchasePlanMainApi from '@/api/wms/purchasePlanMain'
+import * as PurchasePlanDetailApi from '@/api/wms/purchasePlanDetail'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+
+// 要货计划
+defineOptions({ name: 'PurchasePlanMain' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(PurchasePlanMain.allSchemas.tableColumns)
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
+  nextTick(() => {
+    if (type == 'tableForm') {
+      // 明细查询页赋值
+      row[formField] = val[0][searchField]
+      row['itemCode'] = val[0]['code']
+      row['poNumber'] = val[0]['number']
+      row['poLine'] = val[0]['lineNumber']
+    } else {
       const setV = {}
       setV[formField] = val[0][searchField]
-      setV['itemCode'] = val[0]['code']
-      setV['poNumber'] = val[0]['number']
-      setV['poLine'] = val[0]['lineNumber']
       formRef.setValues(setV)
-    })
-  }
-
-  // 子表新增的时候选择表格之后需要会显得字段
-  // const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
-  const Echo = []
-
-  const { tableObject, tableMethods } = useTable({
-    getListApi: PurchasePlanMainApi.getPurchasePlanMainPage // 分页接口
-  })
-
-  // 获得表格的各种操作
-  const { getList, setSearchParams } = tableMethods
-
-  // 列表头部按钮
-  const HeadButttondata = [
-    defaultButtons.defaultAddBtn({ hasPermi: 'wms:purchase-plan-main:create' }), // 新增——需要手动修改下权限
-    defaultButtons.defaultImportBtn({ hasPermi: 'wms:purchase-plan-main:import' }), // 导入
-    defaultButtons.defaultExportBtn({ hasPermi: 'wms:purchase-plan-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 == '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 searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    setV['itemCode'] = val[0]['code']
+    setV['poNumber'] = val[0]['number']
+    setV['poLine'] = val[0]['lineNumber']
+    formRef.setValues(setV)
+  })
+}
+
+// 子表新增的时候选择表格之后需要会显得字段
+// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
+const Echo =  []
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: PurchasePlanMainApi.getPurchasePlanMainPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:purchase-plan-main:create'}), // 新增——需要手动修改下权限
+  defaultButtons.defaultImportBtn({hasPermi:'wms:purchase-plan-main:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:purchase-plan-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 == '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 isShowMainButton = (row,val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
   }
+}
 
-  // 列表-操作按钮
-  const butttondata = (row) => {
+// 列表-操作按钮
+const butttondata = (row) => {
     return [
-      defaultButtons.mainListPurchasePlanWitBtn({ hide: isShowMainButton(row, ['3']) }), // 下架
-      defaultButtons.mainListPurchasePlanRejBtn({ hide: isShowMainButton(row, ['3']) }), // 不接受
-      defaultButtons.mainListPurchasePlanAccBtn({ hide: isShowMainButton(row, ['3']) }), // 接受
-      defaultButtons.mainListPurchasePlanPubBtn({ hide: isShowMainButton(row, ['1']) }), // 发布
-      defaultButtons.mainListPurchasePlanCloBtn({ hide: isShowMainButton(row, ['1']) }), // 关闭
-      defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['2']) }), // 打开
-      defaultButtons.mainListEditBtn({ hide: isShowMainButton(row, ['1']), hasPermi: 'wms:purchase-plan-main:update' }), // 编辑
-      defaultButtons.mainListDeleteBtn({ hide: isShowMainButton(row, ['1']), hasPermi: 'wms:purchase-plan-main:delete' }), // 删除
+        defaultButtons.mainListPurchasePlanModBtn({hide:isShowMainButton(row,['PLAN_PURCHASE_REJECTED'])}), // 修改
+        defaultButtons.mainListPurchasePlanWitBtn({hide:isShowMainButton(row,['PLAN_PURCHASE_PUBLISHED'])}), // 下架
+        defaultButtons.mainListPurchasePlanRejBtn({hide:isShowMainButton(row,['PLAN_PURCHASE_PUBLISHED'])}), // 不接受
+        defaultButtons.mainListPurchasePlanAccBtn({hide:isShowMainButton(row,['PLAN_PURCHASE_PUBLISHED'])}), // 接受
+        defaultButtons.mainListPurchasePlanPubBtn({hide:isShowMainButton(row,['PLAN_PURCHASE_READY'])}), // 发布
+        defaultButtons.mainListPurchasePlanCloBtn({hide:isShowMainButton(row,['PLAN_PURCHASE_READY'])}), // 关闭
+        defaultButtons.mainListPurchasePlanOpeBtn({hide:isShowMainButton(row,['PLAN_PURCHASE_CLOSED'])}), // 打开
+        defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['PLAN_PURCHASE_READY']),hasPermi:'wms:purchase-plan-main:update'}), // 编辑
+        defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['PLAN_PURCHASE_READY']),hasPermi:'wms:purchase-plan-main:delete'}), // 删除
     ]
+}
+
+
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'mainPurPlanOpe') { // 打开
+    console.log('列表-操作按钮事件-打开')
+  } else if (val == 'mainPurPlanClo') { // 关闭
+    console.log('列表-操作按钮事件-关闭')
+  } else if (val == 'mainPurPlanPub') { // 发布
+    console.log('列表-操作按钮事件-发布')
+  } else if (val == 'mainPurPlanAcc') { // 接受
+    console.log('列表-操作按钮事件-接受')
+  } else if (val == 'mainPurPlanRej') { // 不接受
+    console.log('列表-操作按钮事件-不接受')
+  } else if (val == 'mainPurPlanWit') { // 下架
+    console.log('列表-操作按钮事件-下架')
+  } else if (val == 'mainPurPlanMod') { // 修改
+    console.log('列表-操作按钮事件-修改')
+  } else if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
   }
-
-  // 列表-操作按钮事件
-  const buttonTableClick = async (val, row) => {
-    if (val == 'edit') { // 编辑
-      openForm('update', row)
-    } else if (val == 'delete') { // 删除
-      handleDelete(row.id)
-    } else if (val == 'mainPurPlanClo') { // 关闭
-      handleClose(row.id)
-    } else if (val == 'mainPurPlanOpe') { // 打开
-      handleOpen(row.id)
-    } else if (val == 'mainPurPlanPub') { // 发布
-      handlePublish(row.id)
-    } else if (val == 'mainPurPlanWit') { // 下架
-      handleWit(row.id)
-    } else if (val == 'mainPurPlanAcc') { // 接受
-      handleAcc(row.id)
-    } else if (val == 'mainPurPlanRej') { // 驳回
-      handleWit(row.id)
-    }
-  }
-
-  /** 添加/修改操作 */
-  const formRef = ref()
-  const openForm = async (type : string, row ?: number) => {
-    tableData.value = [] // 重置明细数据
-    formRef.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 PurchasePlanMainApi.deletePurchasePlanMain(id)
-      message.success(t('common.delSuccess'))
-      // 刷新列表
-      await getList()
-    } catch { }
-  }
-
-  /** 关闭按钮操作 */
-  const handleClose = async (id : number) => {
-    try {
-      // 关闭的二次确认
-      await message.confirm('是否关闭所选中数据？')
-      // 发起关闭
-      await PurchasePlanMainApi.closePurchasePlanMain(id)
-      message.success(t('关闭成功!'))
-      // 刷新列表
-      await getList()
-    } catch { }
-  }
-
-  /** 打开按钮操作 */
-  const handleOpen = async (id : number) => {
-    try {
-      // 打开的二次确认
-      await message.confirm('是否打开所选中数据？')
-      // 发起打开
-      await PurchasePlanMainApi.openPurchasePlanMain(id)
-      message.success(t('打开成功!'))
-      // 刷新列表
-      await getList()
-    } catch { }
-  }
-
-  /** 发布按钮操作 */
-  const handlePublish = async (id : number) => {
-    try {
-      // 发布的二次确认
-      await message.confirm('是否发布所选中数据？')
-      // 发起发布
-      await PurchasePlanMainApi.publishPurchasePlanMain(id)
-      message.success(t('发布成功!'))
-      // 刷新列表
-      await getList()
-    } catch { }
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm =async (type: string, row?: number) => {
+  tableData.value = [] // 重置明细数据
+  formRef.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 PurchasePlanMainApi.deletePurchasePlanMain(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 PurchasePlanMainApi.exportPurchasePlanMain(setSearchParams)
+    download.excel(data, '要货计划主.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
   }
-
-  /** 下架按钮操作 */
-  const handleWit = async (id : number) => {
-    try {
-      // 下架的二次确认
-      await message.confirm('是否下架所选中数据？')
-      // 发起下架
-      await PurchasePlanMainApi.witPurchasePlanMain(id)
-      message.success(t('下架成功!'))
-      // 刷新列表
-      await getList()
-    } catch { }
-  }
-
-  /** 接受按钮操作 */
-  const handleAcc = async (id : number) => {
-    try {
-      // 接受的二次确认
-      await message.confirm('是否接受所选中数据？')
-      // 发起接受
-      await PurchasePlanMainApi.accPurchasePlanMain(id)
-      message.success(t('接受成功!'))
-      // 刷新列表
-      await getList()
-    } catch { }
-  }
-
-  /** 驳回按钮操作 */
-  const handleRej = async (id : number) => {
-    try {
-      // 驳回的二次确认
-      await message.confirm('是否驳回所选中数据？')
-      // 发起驳回
-      await PurchasePlanMainApi.rejPurchasePlanMain(id)
-      message.success(t('驳回成功!'))
-      // 刷新列表
-      await getList()
-    } catch { }
-  }
-
-
-  /** 导出按钮操作 */
-  const exportLoading = ref(false) // 导出的加载中
-  const handleExport = async () => {
-    try {
-      // 导出的二次确认
-      await message.exportConfirm()
-      // 发起导出
-      exportLoading.value = true
-      const data = await PurchasePlanMainApi.exportPurchasePlanMain(setSearchParams)
-      download.excel(data, '要货计划主.xls')
-    } catch {
-    } finally {
-      exportLoading.value = false
-    }
-  }
-
-  /**
-    * tableForm方法
-  */
-  const tableFormKeys = {}
-  PurchasePlanDetail.allSchemas.tableFormColumns.forEach(item => {
-    tableFormKeys[item.field] = item.default ? item.default : ''
-  })
-  const tableData = ref([])
-
-  // 添加明细
-  const handleAddTable = () => {
-    tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
-  }
-  // 删除明细
-  const handleDeleteTable = (item, index) => {
-    tableData.value.splice(index, 1)
-  }
-
-  // 主子数据 提交
-  const submitForm = async (formType, data) => {
-    data.subList = tableData.value // 拼接子表数据参数
-    try {
-      if (formType === 'create') {
-        await PurchasePlanMainApi.createPurchasePlanMain(data)
-        message.success(t('common.createSuccess'))
-      } else {
-        await PurchasePlanMainApi.updatePurchasePlanMain(data)
-        message.success(t('common.updateSuccess'))
-      }
-      formRef.value.dialogVisible = false
-      // 刷新当前列表
-      getList()
-    } finally {
-      formRef.value.formLoading = false
+}
+
+/**
+  * tableForm方法
+*/
+const tableFormKeys = {}
+PurchasePlanDetail.allSchemas.tableFormColumns.forEach(item => {
+  tableFormKeys[item.field] = item.default ? item.default : ''
+})
+const tableData = ref([])
+
+// 添加明细
+const handleAddTable = () => {
+  tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
+}
+// 删除明细
+const handleDeleteTable = (item, index) => {
+  tableData.value.splice(index, 1)
+}
+
+// 主子数据 提交
+const submitForm = async (formType, data) => {
+  data.subList = tableData.value // 拼接子表数据参数
+  try {
+    if (formType === 'create') {
+      await PurchasePlanMainApi.createPurchasePlanMain(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await PurchasePlanMainApi.updatePurchasePlanMain(data)
+      message.success(t('common.updateSuccess'))
     }
-  }
-
-  /** 导入 */
-  const importFormRef = ref()
-  const handleImport = () => {
-    importFormRef.value.open()
-  }
-
-  // 导入附件弹窗所需的参数
-  const importTemplateData = reactive({
-    templateUrl: '',
-    templateTitle: '要货计划主导入模版.xlsx'
-  })
-
-  // 导入成功之后
-  const importSuccess = () => {
+    formRef.value.dialogVisible = false
+    // 刷新当前列表
     getList()
+  } finally {
+    formRef.value.formLoading = false
   }
-
-  // 筛选提交
-  const searchFormClick = (searchData) => {
-    tableObject.params = {
-      isSearch: true,
-      filters: searchData.filters
-    }
-    getList() // 刷新当前列表
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '要货计划主导入模版.xls'
+})
+
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
   }
-
-  /** 初始化 **/
-  onMounted(async () => {
-    getList()
-    importTemplateData.templateUrl = await PurchasePlanMainApi.importTemplate()
-  })
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await PurchasePlanMainApi.importTemplate()
+})
 </script>
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
index 9d55ccfc5..e6e26b3f0 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
@@ -90,7 +90,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '状态',
     field: 'status',
     sort: 'custom',
-    dictType: DICT_TYPE.PURCHASE_PLAN_STATUS ,
+    dictType: DICT_TYPE.PURCHASE_PLAN_STATUS,
     dictClass: 'string',
     isTable: true,
     isSearch: true,
@@ -98,7 +98,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     form: {
-      value: '1',
+      value: 'PLAN_PURCHASE_READY',
       componentProps: {
         disabled: true
       }
@@ -107,18 +107,46 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '开始时间',
     field: 'beginTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
     },
     isForm: false,
   },
   {
     label: '结束时间',
     field: 'endTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
     },
     isForm: false,
   },
@@ -526,4 +554,4 @@ export const PurchasePlanDetailRules = reactive({
   planQty: [
     { required: true, message: '请输入计划数量', trigger: 'blur' }
   ],
-})
+})
\ No newline at end of file
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue
index 0203a493b..45e1da0a7 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue
@@ -144,7 +144,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await SupplierdeliverRecordMainApi.exportSupplierdeliverRecordMain(setSearchParams)
-    download.excel(data, '供应商发货记录主.xlsx')
+    download.excel(data, '供应商发货记录主.xls')
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index b2a5b921a..99f9930a5 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -250,7 +250,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await SupplierdeliverRequestMainApi.exportSupplierdeliverRequestMain(setSearchParams)
-    download.excel(data, '供应商发货申请主.xlsx')
+    download.excel(data, '供应商发货申请主.xls')
   } catch {
   } finally {
     exportLoading.value = false
@@ -318,7 +318,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '供应商发货申请主导入模版.xlsx'
+  templateTitle: '供应商发货申请主导入模版.xls'
 })
 
 // 导入成功之后