更新发货提醒列表备料中展示状态

src/main/webapp/resources/tpl/index/sale/notice.html

@@ -158,33 +158,6 @@
         margin-top: -10px;
     }
 
-    .padding-20 {
-        padding: 20px;
-    }
-
-    /* 动画 */
-    .repeat.ng-enter,
-    .repeat.ng-leave {
-        -webkit-transition: 0.5s linear all;
-        transition: 0.5s linear all;
-    }
-
-    .repeat.ng-enter,
-    .repeat.ng-leave.ng-leave-active {
-        opacity: 0;
-    }
-
-    .repeat.ng-leave,
-    .repeat.ng-enter.ng-enter-active {
-        opacity: 1;
-    }
-
-    /* 固定表头 */
-    .fixedHeader {
-        background-color: #f5f5f5;
-        position: relative;
-    }
-
     .menu .new-dot {
         width: 20px;
         height: 20px;
@@ -544,7 +517,7 @@
                         </div>
                     </div>
                 </div>
-                <div ng-if="(!notice.endQty || notice.endQty<notice.qty) && !notice.end && notice.waiting"
+                <div ng-if="(!notice.endQty || notice.endQty<notice.qty) && (!notice.end || notice.end == 0) && notice.waiting == 1"
                      class="text-muted">
                     <div title="暂时不可发货"><i class="fa fa-cog fa-lg"></i><br>备料中</div>
                 </div>