托书-新增-美元人民币必填

src/views/book/addBookDrawer.vue

@@ -698,6 +698,7 @@ export default {
       allNet:0,
       allMoney:0,
       allBox:0,
+      allow:'yes',
       itemIds:[],//参照面料选中的ID集合
       validatorRules: {
           shippingOrderDate:[{required: true, message: '托书日期不能为空!'}],
@@ -1004,6 +1005,30 @@ export default {
                   // }
             }
             this.confirmLoading = true
+            this.allow = 'yes'
+          if(newObj.rmbList.length==0&& newObj.usdList.length==0){
+            this.$message.error('请输入人民币，美元');
+            this.allow = 'no'
+          }else if(newObj.rmbList.length!==0){
+            newObj.rmbList.every(item=>{
+                if(item.freightForwarder==''||!item.freightForwarder||item.amount==''||!item.amount||item.itemColumn==''||!item.itemColumn){
+                  this.$message.error('货代，金额，项目列均为必填');
+                  this.allow = 'no'
+                  return false
+                }
+                return true
+              })
+          }else if(newObj.usdList.length!==0){
+            newObj.usdList.every(item=>{
+                if(item.freightForwarder==''||!item.freightForwarder||item.amount==''||!item.amount||item.itemColumn==''||!item.itemColumn){
+                  this.$message.error('货代，金额，项目列均为必填');
+                  this.allow = 'no'
+                  return false
+                }
+                return true
+              })
+          }
+        if(this.allow=='yes'){
           if(this.defaultMethod === 'add'){
            addPackingList(newObj).then(res => {
             this.confirmLoading = false
@@ -1033,8 +1058,11 @@ export default {
             }
            })
         }
+      }else{
+        this.confirmLoading = false
+      }
         
-        }
+      }
       })
       // this.getShipmentList() // 刷新托书列表
     },