托书保存判断是否合并

src/views/book/addBookDrawer.vue

@@ -421,7 +421,21 @@ export default {
         //   fixed: 'left',
         //   className: 'replacecolor'
         // },
-        
+        {
+          title: 'hscode',
+          dataIndex: 'hsCode',
+          width: 120,
+          ellipsis: true,
+          hidden:true,
+          className: 'replacecolor'
+        },
+        {
+          title: '报关',
+          dataIndex: 'declarationName',
+          width: 120,
+          ellipsis: true,
+          className: 'replacecolor'
+        },
         {
           title: '款号',
           dataIndex: 'itemNumber',
@@ -876,6 +890,13 @@ export default {
                 this.$message.error('第'+(i+1)+'行集装箱号未填，无法保存！');
                 return
               }
+                  for(var j=(i+1);j<newObj.syShippingOrderItemList.length;j++){
+                    if(row.hsCode == newObj.syShippingOrderItemList[j].hsCode && row.declarationName == newObj.syShippingOrderItemList[j].declarationName){
+                      this.$message.error('数据需要合并，请先合并数据！')
+                      return
+                    }
+                
+                  }
             }
           if(this.defaultMethod === 'add'){
            addPackingList(newObj).then(res => {