diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index 48718c9fb..9ce197e82 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -240,14 +240,14 @@ export enum DICT_TYPE {
   WORK_ORDER_DETAIL_STATUS = 'work_order_detail_status', // 生产订单明细状态
   PURCHASE_PLAN_STATUS = 'purchase_plan_status', // 要货计划状态
   PURCHASE_PLAN_DETAIL_STATUS = 'purchase_plan_detail_status', // 要货计划明细状态
-  PRODUCTION_PLAN_STATUS = 'production_plan_status', // 生产计划状态
-  PRODUCTION_PLAN_DETAIL_STATUS = 'production_plan_detail_status', // 生产计划明细状态
-  PREPARE_TO_ISSUE_PLAN_STATUS = 'prepare_to_issue_plan_status', // 备料计划状态
-  PREPARE_TO_ISSUE_PLAN_DETAIL_STATUS = 'prepare_to_issue_plan_detail_status', // 备料计划明细状态
-  DELIVER_PLAN_STATUS = 'deliver_plan_status', // 发货计划状态
-  DELIVER_DETAIL_STATUS = 'deliver_detail_status', // 发货计划明细状态
-  PREPARE_TO_DELIVER_PLAN_STATUS = 'prepare_to_deliver_plan_status', // 备货计划状态
-  PREPARE_TO_DELIVER_PLAN_DETAIL_STATUS = 'prepare_to_deliver_plan_detail_status', // 备货计划明细状态
+  PLAN_STATUS = 'plan_status', // 计划状态
+  PRODUCTION_PLAN_DETAIL_STATUS = 'production_plan_detail_status', // 计划明细状态
+  // PREPARE_TO_ISSUE_PLAN_STATUS = 'prepare_to_issue_plan_status', // 备料计划状态
+  // PREPARE_TO_ISSUE_PLAN_DETAIL_STATUS = 'prepare_to_issue_plan_detail_status', // 备料计划明细状态
+  // DELIVER_PLAN_STATUS = 'deliver_plan_status', // 发货计划状态
+  // DELIVER_DETAIL_STATUS = 'deliver_detail_status', // 发货计划明细状态
+  // PREPARE_TO_DELIVER_PLAN_STATUS = 'prepare_to_deliver_plan_status', // 备货计划状态
+  // PREPARE_TO_DELIVER_PLAN_DETAIL_STATUS = 'prepare_to_deliver_plan_detail_status', // 备货计划明细状态
   COUNT_PLAN_STATUS = 'count_plan_status', // 盘点计划状态
   COUNT_DIMENSION = 'count_dimension', // 盘点维度
   REQUEST_STATUS = 'request_status', // 申请状态
diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts
index 51eebe51d..bb75f7f8c 100644
--- a/src/utils/disposition/defaultButtons.ts
+++ b/src/utils/disposition/defaultButtons.ts
@@ -270,7 +270,7 @@ export function mainListReAddBtn(option:any) {
     label: '重新添加',
     name: 'mainReAdd',
     hide: false,
-    type: 'danger',
+    type: 'warning',
     color: '',
     link: true, // 文本展现按钮
     hasPermi: ''
@@ -283,7 +283,7 @@ export function mainListSubmitBtn(option:any) {
     label: '提交审批',
     name: 'mainSubmit',
     hide: false,
-    type: 'danger',
+    type: 'primary',
     color: '',
     link: true, // 文本展现按钮
     hasPermi: ''
@@ -309,7 +309,7 @@ export function mainListApproveBtn(option:any) {
     label: '审批通过',
     name: 'mainApprove',
     hide: false,
-    type: 'danger',
+    type: 'primary',
     color: '',
     link: true, // 文本展现按钮
     hasPermi: ''
@@ -322,7 +322,7 @@ export function mainListOrderPubBtn(option:any) {
     label: '发布',
     name: 'mainOrderPub',
     hide: false,
-    type: 'danger',
+    type: 'success',
     color: '',
     link: true, // 文本展现按钮
     hasPermi: ''
@@ -348,7 +348,7 @@ export function mainListOrderOpeBtn(option:any) {
     label: '打开',
     name: 'mainOrderOpe',
     hide: false,
-    type: 'danger',
+    type: 'warning',
     color: '',
     link: true, // 文本展现按钮
     hasPermi: ''
@@ -374,7 +374,7 @@ export function mainListPlanOpeBtn(option:any) {
     label: '打开',
     name: 'mainPlanOpe',
     hide: false,
-    type: 'danger',
+    type: 'warning',
     color: '',
     link: true, // 文本展现按钮
     hasPermi: ''
@@ -400,7 +400,7 @@ export function mainListPlanSubBtn(option:any) {
     label: '提交审批',
     name: 'mainPlanSub',
     hide: false,
-    type: 'danger',
+    type: 'primary',
     color: '',
     link: true, // 文本展现按钮
     hasPermi: ''
@@ -420,18 +420,18 @@ export function mainListPlanTurBtn(option:any) {
   })
 }
 
-// 主列表-计划流程-重置按钮
-export function mainListPlanResBtn(option:any) {
-  return __defaultBtnOption(option,{
-    label: '重置',
-    name: 'mainPlanRes',
-    hide: false,
-    type: 'danger',
-    color: '',
-    link: true, // 文本展现按钮
-    hasPermi: ''
-  })
-}
+// // 主列表-计划流程-重置按钮
+// export function mainListPlanResBtn(option:any) {
+//   return __defaultBtnOption(option,{
+//     label: '重置',
+//     name: 'mainPlanRes',
+//     hide: false,
+//     type: 'danger',
+//     color: '',
+//     link: true, // 文本展现按钮
+//     hasPermi: ''
+//   })
+// }
 
 // 主列表-计划流程-审批通过按钮
 export function mainListPlanAppBtn(option:any) {
@@ -439,7 +439,7 @@ export function mainListPlanAppBtn(option:any) {
     label: '审批通过',
     name: 'mainPlanApp',
     hide: false,
-    type: 'danger',
+    type: 'primary',
     color: '',
     link: true, // 文本展现按钮
     hasPermi: ''
@@ -452,7 +452,7 @@ export function mainListPlanPubBtn(option:any) {
     label: '发布',
     name: 'mainPlanPub',
     hide: false,
-    type: 'danger',
+    type: 'success',
     color: '',
     link: true, // 文本展现按钮
     hasPermi: ''
diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue
index 798d359b2..80c9ed973 100644
--- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue
@@ -83,7 +83,7 @@ import * as DeliverPlanMainApi from '@/api/wms/deliverPlanMain'
 import * as DeliverPlanDetailApi from '@/api/wms/deliverPlanDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 
-// 发货计划主
+// 发货计划
 defineOptions({ name: 'DeliverPlanMain' })
 
 const message = useMessage() // 消息弹窗
@@ -190,30 +190,29 @@ const isShowMainButton = (row,val) => {
 
 // 列表-操作按钮
 const butttondata = (row) => {
-    return [
-        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['REQUEST_NEW','REQUEST_REVIEWING','REQUEST_AGREED','REQUEST_REFUSED','REQUEST_HANDLING'])}), // 关闭
-        defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['REQUEST_REFUSED','REQUEST_CANCELLED'])}), // 重新添加
-        defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['REQUEST_NEW'])}), // 提交审批
-        defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 驳回
-        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 审批通过
-        defaultButtons.mainListEditBtn({hasPermi:'wms:deliver-plan-main:update'}), // 编辑
-        defaultButtons.mainListDeleteBtn({hasPermi:'wms:deliver-plan-main:delete'}), // 删除
-    ]
+  return [
+    defaultButtons.mainListPlanOpeBtn({hide:isShowMainButton(row,['PLAN_CLOSED','PLAN_REFUSED'])}), // 打开
+    defaultButtons.mainListPlanCloBtn({hide:isShowMainButton(row,['PLAN_NEW','PLAN_REVIEWING','PLAN_AGREED','PLAN_REFUSED','PLAN_PUBLISHED'])}), // 关闭
+    defaultButtons.mainListPlanSubBtn({hide:isShowMainButton(row,['PLAN_NEW'])}), // 提交审批
+    defaultButtons.mainListPlanTurBtn({hide:isShowMainButton(row,['PLAN_REVIEWING'])}), // 驳回
+    defaultButtons.mainListPlanAppBtn({hide:isShowMainButton(row,['PLAN_REVIEWING'])}), // 审批通过
+    defaultButtons.mainListPlanPubBtn({hide:isShowMainButton(row,['PLAN_AGREED'])}), // 发布
+    defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['PLAN_NEW']),hasPermi:'wms:production-main:update'}), // 编辑
+    defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['PLAN_NEW']),hasPermi:'wms:production-main:delete'}), // 删除
+  ]
 }
 
-
-
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
-  if (val == 'mainClose') { // 关闭
+  if (val == 'mainPlanOpe') { // 打开
+    console.log('列表-操作按钮事件-打开')
+  } else if (val == 'mainPlanClo') { // 关闭
     console.log('列表-操作按钮事件-关闭')
-  } else if (val == 'mainReAdd') { // 重新添加
-    console.log('列表-操作按钮事件-重新添加')
-  } else if (val == 'mainSubmit') { // 提交审批
+  } else if (val == 'mainPlanSub') { // 提交审批
     console.log('列表-操作按钮事件-提交审批')
-  } else if (val == 'mainTurnDown') { // 驳回
+  } else if (val == 'mainPlanTur') { // 驳回
     console.log('列表-操作按钮事件-驳回')
-  } else if (val == 'mainApprove') { // 审批通过
+  } else if (val == 'mainPlanApp') { // 审批通过
     console.log('列表-操作按钮事件-审批通过')
   } else if (val == 'edit') { // 编辑
     openForm('update', row)
diff --git a/src/views/wms/deliversettlementManage/deliverplan/saleMain/index.vue b/src/views/wms/deliversettlementManage/deliverplan/saleMain/index.vue
index b76feb41d..9b685b34e 100644
--- a/src/views/wms/deliversettlementManage/deliverplan/saleMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliverplan/saleMain/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -195,8 +195,8 @@ const butttondata = (row) => {
         defaultButtons.mainListOrderPubBtn({hide:isShowMainButton(row,['ORDER_READY'])}), // 发布
         defaultButtons.mainListOrderOpeBtn({hide:isShowMainButton(row,['ORDER_CLOSED'])}), // 打开
         defaultButtons.mainListOrderWitBtn({hide:isShowMainButton(row,['ORDER_PUBLISHED'])}), // 下架
-        defaultButtons.mainListEditBtn({hasPermi:'wms:sale-main:update'}), // 编辑
-        defaultButtons.mainListDeleteBtn({hasPermi:'wms:sale-main:delete'}), // 删除
+        defaultButtons.mainListEditBtn({hasPermi:'wms:sale-main:update',hide:isShowMainButton(row,['ORDER_READY'])}), // 编辑
+        defaultButtons.mainListDeleteBtn({hasPermi:'wms:sale-main:delete',hide:isShowMainButton(row,['ORDER_READY'])}), // 删除
     ]
 }
 
diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue
index 089f3f642..08b3f1fdb 100644
--- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue
+++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue
@@ -190,30 +190,29 @@ const isShowMainButton = (row,val) => {
 
 // 列表-操作按钮
 const butttondata = (row) => {
-    return [
-        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['REQUEST_NEW','REQUEST_REVIEWING','REQUEST_AGREED','REQUEST_REFUSED','REQUEST_HANDLING'])}), // 关闭
-        defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['REQUEST_REFUSED','REQUEST_CANCELLED'])}), // 重新添加
-        defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['REQUEST_NEW'])}), // 提交审批
-        defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 驳回
-        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 审批通过
-        defaultButtons.mainListEditBtn({hasPermi:'wms:preparetoissue-main:update'}), // 编辑
-        defaultButtons.mainListDeleteBtn({hasPermi:'wms:preparetoissue-main:delete'}), // 删除
-    ]
+  return [
+    defaultButtons.mainListPlanOpeBtn({hide:isShowMainButton(row,['PLAN_CLOSED','PLAN_REFUSED'])}), // 打开
+    defaultButtons.mainListPlanCloBtn({hide:isShowMainButton(row,['PLAN_NEW','PLAN_REVIEWING','PLAN_AGREED','PLAN_REFUSED','PLAN_PUBLISHED'])}), // 关闭
+    defaultButtons.mainListPlanSubBtn({hide:isShowMainButton(row,['PLAN_NEW'])}), // 提交审批
+    defaultButtons.mainListPlanTurBtn({hide:isShowMainButton(row,['PLAN_REVIEWING'])}), // 驳回
+    defaultButtons.mainListPlanAppBtn({hide:isShowMainButton(row,['PLAN_REVIEWING'])}), // 审批通过
+    defaultButtons.mainListPlanPubBtn({hide:isShowMainButton(row,['PLAN_AGREED'])}), // 发布
+    defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['PLAN_NEW']),hasPermi:'wms:production-main:update'}), // 编辑
+    defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['PLAN_NEW']),hasPermi:'wms:production-main:delete'}), // 删除
+  ]
 }
 
-
-
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
-  if (val == 'mainClose') { // 关闭
+  if (val == 'mainPlanOpe') { // 打开
+    console.log('列表-操作按钮事件-打开')
+  } else if (val == 'mainPlanClo') { // 关闭
     console.log('列表-操作按钮事件-关闭')
-  } else if (val == 'mainReAdd') { // 重新添加
-    console.log('列表-操作按钮事件-重新添加')
-  } else if (val == 'mainSubmit') { // 提交审批
+  } else if (val == 'mainPlanSub') { // 提交审批
     console.log('列表-操作按钮事件-提交审批')
-  } else if (val == 'mainTurnDown') { // 驳回
+  } else if (val == 'mainPlanTur') { // 驳回
     console.log('列表-操作按钮事件-驳回')
-  } else if (val == 'mainApprove') { // 审批通过
+  } else if (val == 'mainPlanApp') { // 审批通过
     console.log('列表-操作按钮事件-审批通过')
   } else if (val == 'edit') { // 编辑
     openForm('update', row)
diff --git a/src/views/wms/productionManage/productionplan/productionMain/index.vue b/src/views/wms/productionManage/productionplan/productionMain/index.vue
index cbb63ea65..10d0c0967 100644
--- a/src/views/wms/productionManage/productionplan/productionMain/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMain/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -147,7 +147,7 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:production-main:create'}), // 新增——需要手动修改下权限
+  defaultButtons.defaultAddBtn({hasPermi:'wms:production-main:create'}), // 新增
   defaultButtons.defaultImportBtn({hasPermi:'wms:production-main:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:production-main:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
@@ -190,30 +190,29 @@ const isShowMainButton = (row,val) => {
 
 // 列表-操作按钮
 const butttondata = (row) => {
-    return [
-        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['REQUEST_NEW','REQUEST_REVIEWING','REQUEST_AGREED','REQUEST_REFUSED','REQUEST_HANDLING'])}), // 关闭
-        defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['REQUEST_REFUSED','REQUEST_CANCELLED'])}), // 重新添加
-        defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['REQUEST_NEW'])}), // 提交审批
-        defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 驳回
-        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['REQUEST_REVIEWING'])}), // 审批通过
-        defaultButtons.mainListEditBtn({hasPermi:'wms:production-main:update'}), // 编辑
-        defaultButtons.mainListDeleteBtn({hasPermi:'wms:production-main:delete'}), // 删除
-    ]
+  return [
+    defaultButtons.mainListPlanOpeBtn({hide:isShowMainButton(row,['PLAN_CLOSED','PLAN_REFUSED'])}), // 打开
+    defaultButtons.mainListPlanCloBtn({hide:isShowMainButton(row,['PLAN_NEW','PLAN_REVIEWING','PLAN_AGREED','PLAN_REFUSED','PLAN_PUBLISHED'])}), // 关闭
+    defaultButtons.mainListPlanSubBtn({hide:isShowMainButton(row,['PLAN_NEW'])}), // 提交审批
+    defaultButtons.mainListPlanTurBtn({hide:isShowMainButton(row,['PLAN_REVIEWING'])}), // 驳回
+    defaultButtons.mainListPlanAppBtn({hide:isShowMainButton(row,['PLAN_REVIEWING'])}), // 审批通过
+    defaultButtons.mainListPlanPubBtn({hide:isShowMainButton(row,['PLAN_AGREED'])}), // 发布
+    defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['PLAN_NEW']),hasPermi:'wms:production-main:update'}), // 编辑
+    defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['PLAN_NEW']),hasPermi:'wms:production-main:delete'}), // 删除
+  ]
 }
 
-
-
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
-  if (val == 'mainClose') { // 关闭
+  if (val == 'mainPlanOpe') { // 打开
+    console.log('列表-操作按钮事件-打开')
+  } else if (val == 'mainPlanClo') { // 关闭
     console.log('列表-操作按钮事件-关闭')
-  } else if (val == 'mainReAdd') { // 重新添加
-    console.log('列表-操作按钮事件-重新添加')
-  } else if (val == 'mainSubmit') { // 提交审批
+  } else if (val == 'mainPlanSub') { // 提交审批
     console.log('列表-操作按钮事件-提交审批')
-  } else if (val == 'mainTurnDown') { // 驳回
+  } else if (val == 'mainPlanTur') { // 驳回
     console.log('列表-操作按钮事件-驳回')
-  } else if (val == 'mainApprove') { // 审批通过
+  } else if (val == 'mainPlanApp') { // 审批通过
     console.log('列表-操作按钮事件-审批通过')
   } else if (val == 'edit') { // 编辑
     openForm('update', row)
diff --git a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
index 7523d4b12..b071654e0 100644
--- a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
@@ -6,6 +6,14 @@ const { t } = useI18n() // 国际化
  * @returns {Array} 生产计划主表
  */
 export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '顺序',
     field: 'displayOrder',
@@ -66,14 +74,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
+  
   {
     label: '业务类型',
     field: 'businessType',
@@ -122,6 +123,10 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '状态',
     field: 'status',
     sort: 'custom',
+    dictType: DICT_TYPE.PLAN_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
     table: {
       width: 150
     },
@@ -214,6 +219,16 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 220,
+      fixed: 'right'
+    },
+  }
 ]))
 
 //表单校验
@@ -428,7 +443,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
         activeValue: 'TRUE'
       }
     }
-  },
+  }
 ]))
 
 //表单校验
diff --git a/src/views/wms/productionManage/productionplan/workMain/index.vue b/src/views/wms/productionManage/productionplan/workMain/index.vue
index 79387b698..1bc3c3673 100644
--- a/src/views/wms/productionManage/productionplan/workMain/index.vue
+++ b/src/views/wms/productionManage/productionplan/workMain/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -195,8 +195,8 @@ const butttondata = (row) => {
         defaultButtons.mainListOrderPubBtn({hide:isShowMainButton(row,['ORDER_READY'])}), // 发布
         defaultButtons.mainListOrderOpeBtn({hide:isShowMainButton(row,['ORDER_CLOSED'])}), // 打开
         defaultButtons.mainListOrderWitBtn({hide:isShowMainButton(row,['ORDER_PUBLISHED'])}), // 下架
-        defaultButtons.mainListEditBtn({hasPermi:'wms:work-main:update'}), // 编辑
-        defaultButtons.mainListDeleteBtn({hasPermi:'wms:work-main:delete'}), // 删除
+        defaultButtons.mainListEditBtn({hasPermi:'wms:work-main:update',hide:isShowMainButton(row,['ORDER_READY'])}), // 编辑
+        defaultButtons.mainListDeleteBtn({hasPermi:'wms:work-main:delete',hide:isShowMainButton(row,['ORDER_READY'])}), // 删除
     ]
 }
 
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
index bbff9e9c3..a225f9c6b 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -195,8 +195,8 @@ const butttondata = (row) => {
         defaultButtons.mainListOrderPubBtn({hide:isShowMainButton(row,['ORDER_READY'])}), // 发布
         defaultButtons.mainListOrderOpeBtn({hide:isShowMainButton(row,['ORDER_CLOSED'])}), // 打开
         defaultButtons.mainListOrderWitBtn({hide:isShowMainButton(row,['ORDER_PUBLISHED'])}), // 下架
-        defaultButtons.mainListEditBtn({hasPermi:'wms:purchaseMain:update'}), // 编辑
-        defaultButtons.mainListDeleteBtn({hasPermi:'wms:purchaseMain:delete'}), // 删除
+        defaultButtons.mainListEditBtn({hasPermi:'wms:purchase-main:update',hide:isShowMainButton(row,['ORDER_READY'])}), // 编辑
+        defaultButtons.mainListDeleteBtn({hasPermi:'wms:purchase-main:delete',hide:isShowMainButton(row,['ORDER_READY'])}), // 删除
     ]
 }
 
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
index 6f277a09e..6d703d426 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
@@ -7,17 +7,20 @@ const { t } = useI18n() // 国际化
  */
 export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '供应商代码',
-    field: 'supplierCode',
+    label: '单据号',
+    field: 'number',
     sort: 'custom',
+    isSearch: true,
+    isForm: false,
     table: {
       width: 150
     },
   },
   {
-    label: '单据号',
-    field: 'number',
+    label: '供应商代码',
+    field: 'supplierCode',
     sort: 'custom',
+    isSearch: true,
     table: {
       width: 150
     },
@@ -136,7 +139,6 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'isConsignment',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
     isTable: true,
     sort: 'custom',
     table: {
@@ -172,7 +174,6 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'available',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
     isTable: true,
     sort: 'custom',
     table: {
@@ -191,6 +192,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '创建者',
     field: 'creator',
     sort: 'custom',
+    isForm: false,
     table: {
       width: 150
     },
@@ -204,6 +206,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     sort: 'custom',
+    isForm: false,
     table: {
       width: 180
     },
@@ -220,6 +223,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '最后更新者',
     field: 'updater',
     sort: 'custom',
+    isForm: false,
     table: {
       width: 150
     },
@@ -233,6 +237,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     sort: 'custom',
+    isForm: false,
     table: {
       width: 180
     },
@@ -244,6 +249,16 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 200,
+      fixed: 'right'
+    }
   }
 ]))
 
@@ -323,7 +338,6 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'stdPackUnit',
     dictType: DICT_TYPE.PACK_UNIT,
     dictClass: 'string',
-    isSearch: true,
     isTable: true,
     table: {
       width: 150
@@ -344,7 +358,6 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'supplierUom',
     dictType: DICT_TYPE.UOM,
     dictClass: 'string',
-    isSearch: true,
     isTable: true,
     table: {
       width: 150
@@ -445,7 +458,6 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'uom',
     dictType: DICT_TYPE.UOM,
     dictClass: 'string',
-    isSearch: true,
     isTable: true,
     table: {
       width: 150
@@ -454,6 +466,7 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '单据号',
     field: 'nuumber',
+    isTableForm: false,
     table: {
       width: 150
     },
@@ -505,6 +518,7 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '创建者',
     field: 'creator',
+    isTableForm: false,
     table: {
       width: 150
     },
@@ -513,25 +527,19 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '创建时间',
     field: 'createTime',
     isTable: true,
+    isTableForm: false,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     table: {
       width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
+    }
   },
   {
     label: '最后更新者',
     field: 'updater',
+    isTableForm: false,
     table: {
       width: 150
     },
@@ -539,6 +547,7 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '最后更新时间',
     field: 'updateTime',
+    isTableForm: false,
     isTable: true,
     formatter: dateFormatter,
     detail: {
@@ -546,24 +555,6 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     table: {
       width: 150
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-  },
-  {
-    label: '操作',
-    field: 'action',
-    isDetail: false,
-    isForm: false,
-    table: {
-      width: 150,
-      fixed: 'right'
     }
   }
 ]))