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

src/views/book/addBookDrawer.vue

@@ -1006,21 +1006,35 @@ 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){
+           if(newObj.rmbList.length!==0){
             newObj.rmbList.every(item=>{
-                if(item.freightForwarder==''||!item.freightForwarder||item.amount==''||!item.amount||item.itemColumn==''||!item.itemColumn){
+                if((item.freightForwarder!==''&&item.freightForwarder)&&((item.amount==''||!item.amount)||(item.itemColumn==''||!item.itemColumn))){
+                  this.$message.error('货代，金额，项目列均为必填');
+                  this.allow = 'no'
+                  return false
+                }else if((item.amount!==''&&item.amount)&&((item.freightForwarder==''||!item.freightForwarder)||(item.itemColumn==''||!item.itemColumn))){
+                  this.$message.error('货代，金额，项目列均为必填');
+                  this.allow = 'no'
+                  return false
+                }else if((item.itemColumn!==''&&item.itemColumn)&&((item.freightForwarder==''||!item.freightForwarder)||(item.amount==''||!item.amount))){
                   this.$message.error('货代，金额，项目列均为必填');
                   this.allow = 'no'
                   return false
                 }
                 return true
               })
-          }else if(newObj.usdList.length!==0){
+          }
+          if(newObj.usdList.length!==0){
             newObj.usdList.every(item=>{
-                if(item.freightForwarder==''||!item.freightForwarder||item.amount==''||!item.amount||item.itemColumn==''||!item.itemColumn){
+              if((item.freightForwarder!==''&&item.freightForwarder)&&((item.amount==''||!item.amount)||(item.itemColumn==''||!item.itemColumn))){
+                  this.$message.error('货代，金额，项目列均为必填');
+                  this.allow = 'no'
+                  return false
+                }else if((item.amount!==''&&item.amount)&&((item.freightForwarder==''||!item.freightForwarder)||(item.itemColumn==''||!item.itemColumn))){
+                  this.$message.error('货代，金额，项目列均为必填');
+                  this.allow = 'no'
+                  return false
+                }else if((item.itemColumn!==''&&item.itemColumn)&&((item.freightForwarder==''||!item.freightForwarder)||(item.amount==''||!item.amount))){
                   this.$message.error('货代，金额，项目列均为必填');
                   this.allow = 'no'
                   return false