Merge remote-tracking branch 'origin/master'

src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue

@@ -124,7 +124,6 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         // 获取子表数据 getBomDisassemble
         DeliverPlanDetailApi.selectDetailByMasterID(val[0]['id'])
         .then(res => {
-          console.log(120,res)
           res.forEach(item => {
             item.qty = item.planQty
           })
@@ -298,8 +297,6 @@ const formRef = ref()
 const openForm =async (type: string, row?: number) => {
   if(type == "update"){
     DeliverRequestMain.allSchemas.formSchema.forEach((item) => {
-      console.log(95132,item);
-      
       if (item.field == 'deliverPlanNumber') {
               item.componentProps.isSearchList = false,
               item.componentProps.disabled = true
@@ -380,11 +377,18 @@ const flag = ref(false)
 
 // 主子数据 提交
 const submitForm = async (formType, data) => {
+  if(tableData.value.length <= 0){
+    message.warning(`子表明细不能为空!`)
+      flag.value = true
+      formRef.value.formLoading = false
+      return;
+  }
   data.subList = tableData.value // 拼接子表数据参数
   data.subList.forEach(obj => {
     if(obj.qty == 0){
-      message.error(`数量不能为0!`)
+      message.warning(`数量不能为0!`)
       flag.value = true
+      formRef.value.formLoading = false
       return;
     }
   })