Merge branch 'dev_hxz' into test

src/views/system/freight/freight_list/indexbtn.vue

@@ -281,12 +281,26 @@ export default {
     },
     /** 运费模板 修改/新增 的保存  */
     handleinfomationclick() {
-
+      let isGone = true;
       if( this.goodsDate.name == '' || !this.goodsDate.name.trim() ) {
         this.$message({type:'warning',message:'模板名称不能为空,且不能包含特殊字符，请重新命名'});
         return;
       }
 
+      if(this.goodsDate.dispatching.length && this.goodsDate.dispatching.length > 0) {
+        for(let i = 0; i < this.goodsDate.dispatching.length;i++) {
+          if(this.goodsDate.dispatching[i].a == '') {
+            isGone = false
+            break;
+          }
+        }
+
+        if(!isGone) {
+          this.$message({type:'warning',message: '配送区域不能为空'});
+          return;
+        }
+      }
+
       this.goodsDate.dispatching.forEach(item=>{
         item.fp= Number(item.fp*100);
         item.np = Number(item.np*100);