要货计划

src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue

@@ -334,7 +334,7 @@ const getSearchTableData = async (number,formField,searchField)=>{
   }
     return [
       defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['2']) }), // 打开
-      defaultButtons.mainListPurchasePlanCloBtn({ hide: isShowMainButton(row, ['1']) }), // 关闭
+      defaultButtons.mainListPurchasePlanCloBtn({ hide: !(row.status==6&&row.type=='SCHEDULE') }), // 关闭
       defaultButtons.mainListPurchasePlanPubBtn({ hide: isShowMainButton(row, ['1']) }), // 发布
       defaultButtons.mainListPurchasePlanAccBtn({ hide: isShowMainButton(row, ['3']) }), // 接受
       defaultButtons.mainListPurchasePlanRejBtn({ hide: isShowMainButton(row, ['3']) }), // 不接受

src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts

@@ -162,7 +162,6 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictClass: 'string',
     isTable: true,
     isForm:true,
-    isSearch: true,
     table: {
       width: 150
     },

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue

@@ -103,7 +103,7 @@ const openFormByCreate = async ( data ) => {
     setV['ppNumber'] = data['number'] // 要货单号
     searchPage: SupplierApi.getSupplierPage
     //新增--选择完要货计划，自动展示明细
-    getSearchTableData(data['number'],'ppNumber','number')
+    getSearchTableData(data['number'],'ppNumber','number',0)
 
     // 设置计划到货时间
     let beginTime =  data['endTime']
@@ -234,7 +234,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
         //新增--选择完要货计划，自动展示明细
         
         setV['poNumber'] = val[0]['poNumber'] //采购订单
-        getSearchTableData(val[0]['number'],formField,searchField)
+        getSearchTableData(val[0]['number'],formField,searchField,1)
 
         // 设置计划到货时间
         
@@ -258,9 +258,9 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
   })
 }
 
-const getSearchTableData = async (number,formField,searchField)=>{
+const getSearchTableData = async (number,formField,searchField,isAll)=>{
   const {tableObject ,tableMethods} = useTable({
-    defaultParams:{number,flag:1},
+    defaultParams:{number,flag:1,isAll},
     getListApi: PurchasePlanDetailApi.getPurchasePlanDetailPage // 分页接口
   })
   tableObject.pageSize = 500

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts

@@ -642,6 +642,16 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
           key: 'available',
           value: 'TRUE',
           isMainValue: false
+        },
+        {
+          key: 'flag',
+          value: '1',
+          isMainValue: false
+        },
+        {
+          key: 'isAll',
+          value: '1',
+          isMainValue: false
         }]
     }
   },