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

src/components/Detail/src/Detail.vue

@@ -563,7 +563,7 @@ const openForm = async (type: string, row?: number) => {
 const submitForm = async (formType, data) => {
   try {
     // 子表新增编辑校验 如果业务需要子表提交校验 需在主页详情组件添加 detailValidate 参数及方法
-    const rs = (await props.detailValidate) ? props.detailValidate(data) : true
+    const rs = (await props.detailValidate) ? await props.detailValidate(data) : true
     if (!rs) return
     if (formType === 'create') {
       await props.apiCreate(data)

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

@@ -35,12 +35,17 @@
     @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" @searchTableSuccessDetail="searchTableSuccessDetail"
+    :apiDelete="PurchasePlanDetailApi.deletePurchasePlanDetail"
+    @searchTableSuccessDetail="searchTableSuccessDetail"
     :detailValidate="detailValidate" />
 
   <!-- 导入 -->
@@ -55,6 +60,7 @@
   import * as PurchasePlanDetailApi from '@/api/wms/purchasePlanDetail'
   import * as defaultButtons from '@/utils/disposition/defaultButtons'
   import * as PurchaseDetailApi from '@/api/wms/purchaseDetail'
+  import {mainListPurchasePlanModBtn} from "@/utils/disposition/defaultButtons";
 
   // 要货计划
   defineOptions({ name: 'PurchasePlanMain' })
@@ -191,6 +197,7 @@
       defaultButtons.mainListPurchasePlanAccBtn({ hide: isShowMainButton(row, ['3']) }), // 接受
       defaultButtons.mainListPurchasePlanRejBtn({ hide: isShowMainButton(row, ['3']) }), // 不接受
       defaultButtons.mainListPurchasePlanWitBtn({ hide: isShowMainButton(row, ['3']) }), // 下架
+      defaultButtons.mainListPurchasePlanModBtn({ hide: isShowMainButton(row, ['5']) }), // 修改
       // defaultButtons.mainListEditBtn({ hide: isShowMainButton(row, ['1']), hasPermi: 'wms:purchase-plan-main:update' }), // 编辑
       // defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchase-plan-main:delete'}), // 删除
     ]
@@ -210,6 +217,8 @@
       handleRej(row.id)
     } else if (val == 'mainPurPlanWit') { // 下架
       handleWit(row.id)
+    } else if(val == 'mainPurPlanMod'){ // 修改
+      handleReOpen(row.id)
     }else if (val == 'edit') { // 编辑
       openForm('update', row)
     } else if (val == 'delete') { // 删除
@@ -269,6 +278,20 @@
     } catch { }
   }
 
+
+  /** 打开按钮操作 */
+  const handleReOpen = async (id : number) => {
+    try {
+      // 打开的二次确认
+      await message.confirm('是否重新打开所选中数据？')
+      // 发起打开
+      await PurchasePlanMainApi.openPurchasePlanMain(id)
+      message.success(t('打开成功!'))
+      // 刷新列表
+      await getList()
+    } catch { }
+  }
+
   /** 发布按钮操作 */
   const handlePublish = async (id : number) => {
     try {
@@ -391,9 +414,9 @@
   }
 
   // 子表新增/编辑校验
-  const detailValidate = (data) => {
+  const detailValidate = async (data) => {
     let tag = false
-    PurchaseDetailApi.getPurchaseDetailPage({
+    await PurchaseDetailApi.getPurchaseDetailPage({
       number: data.poNumber,
       lineNumber: data.poLine
     }).then(res => {
@@ -403,6 +426,8 @@
       } else {
         tag = true
       }
+    }).catch(err =>{
+      console.log(err);
     })
     return tag
   }

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

@@ -334,8 +334,20 @@ const openForm = async (type: string, row?: number) => {
       }
     })
   }else {
+    SupplierdeliverRequestMain.allSchemas.formSchema.forEach((item) => {
+      if(item.field == 'supplierCode'){
         item.componentProps.isSearchList = true
-    item.componentProps.disabled = true
+      }
+      if(item.field == 'ppNumber'){
+        item.componentProps.isSearchList = true
+      }
+      if(item.field == 'asnNumber'){
+        item.componentProps.disabled = false
+      }
+      if(item.field == 'planArriveTime'){
+        item.componentProps.disabled = false
+      }
+    })
   }
   tableData.value = [] // 重置明细数据
   formRef.value.open(type, row)