Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into intex

src/api/wms/purchasePlanMain/index.ts

@@ -62,8 +62,8 @@ export const validation = async (id: number) => {
   return await request.post({ url: `/wms/purchase-plan-main/validation?id=` + id })
 }
 // 发布要货计划主
-export const publishPurchasePlanMain = async (id: number) => {
-  return await request.post({ url: `/wms/purchase-plan-main/publish?id=` + id })
+export const publishPurchasePlanMain = async (id: number,isPublish=``) => {
+  return await request.post({ url: `/wms/purchase-plan-main/publish?id=` + id +`&isPublish=`+isPublish})
 }
 // 下架要货计划主
 export const witPurchasePlanMain = async (id: number) => {

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

@@ -887,12 +887,15 @@ const handlePublish = async (id: number) => {
     const res = await PurchasePlanMainApi.validation(id)
     if (res) {
       await message.confirm(t('要货数量超过打切数量，是否确认发布？'))
+          // 发起发布
+         const isPublish=`1`;
+    await PurchasePlanMainApi.publishPurchasePlanMain(id,isPublish)
     } else {
       // 发布的二次确认
       await message.confirm(t('ts.是否发布所选中数据？'))
-    }
-    // 发起发布
+          // 发起发布
     await PurchasePlanMainApi.publishPurchasePlanMain(id)
+    }
     message.success(t('ts.发布成功!'))
     tableObject.loading = false
     // 刷新列表