diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
index 0ceee171b..4455a977f 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts
@@ -234,6 +234,11 @@ hiddenSearchHigh:true,
       width: 150
     },
   },
+  {
+    label: 'QAD版本号',
+    field: 'detailVersion',
+    sort: 'custom',
+  },
   {
     label: '版本号',
     field: 'version',
@@ -247,7 +252,7 @@ hiddenSearchHigh:true,
         enterSearch: true,
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择版本号', // 输入框占位文本
-        searchField: 'detailVersion', // 查询弹窗赋值字段
+        searchField: 'scpVersion', // 查询弹窗赋值字段
         searchTitle: '版本号', // 查询弹窗标题
         searchAllSchemas: Version.allSchemas, // 查询弹窗所需类
         searchPage: DemandforecastingDetailApi.queryScpVersion, // 查询弹窗所需分页方法
@@ -548,7 +553,7 @@ export const DemandforecastingDetailRules = reactive({
 export const DemandforecastingMainPlan = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '版本号',
-    field: 'detailVersion',
+    field: 'scpVersion',
     sort: 'custom',
     table: {
       width: 150
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts
index b2377c6af..01c5580c4 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts
@@ -124,6 +124,11 @@ hiddenSearchHigh:true,
       width: 150
     },
   },
+  {
+    label: 'QAD版本号',
+    field: 'detailVersion',
+    sort: 'custom',
+  },
   {
     label: '版本号',
     field: 'version',
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
index 717f0a235..98caa4efd 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
@@ -502,7 +502,7 @@ const isShowMainButton1 = (row, val) => {
   }
     return [
       // defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['2']) }), // 打开
-      defaultButtons.mainListPurchasePlanCloBtn({ hide: !(row.status!=6&&row.status!=2&&row.type=='SCHEDULE'),hasPermi: 'wms:purchase-plan-main:close' }), // 关闭
+      defaultButtons.mainListPurchasePlanCloBtn({ hide: !(row.isClose!=1&&row.status!=6&&row.status!=2&&row.type=='SCHEDULE'),hasPermi: 'wms:purchase-plan-main:close' }), // 关闭
       defaultButtons.mainListPurchasePlanPubBtn({ hide: isShowMainButton(row, ['1']) ,hasPermi: 'wms:purchase-plan-main:publish'}), // 发布
       defaultButtons.mainListPurchasePlanAccBtn({ hide: isShowMainButton(row, ['3']) ,hasPermi: 'wms:purchase-plan-main:accept'}), // 接受
       defaultButtons.mainListPurchasePlanRejBtn({ hide: isShowMainButton(row, ['3']) ,hasPermi: 'wms:purchase-plan-main:noaccept'}), // 不接受