Merge branch 'master' into csc

chengsc

2 天以前 2d809c12abe87c21d6090ce6c5b3c75959cf4a2b

 HTML/views/ASNSetting/ArrivalNoticeDetail.html

@@ -658,13 +658,13 @@
                  }
                  console.log(TypeNum)

                  if (TypeNum == 0) {
                     layer.msg("请输入批次！", {
                        icon: 2,
                        time: 2000 //2秒关闭（如果不配置，默认是3秒）
                     });
                     return -1;
                  }
                  // if (TypeNum == 0) {
                  //    layer.msg("请输入批次！", {
                  //       icon: 2,
                  //       time: 2000 //2秒关闭（如果不配置，默认是3秒）
                  //    });
                  //    return -1;
                  // }

               }