Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

src/app/layout/pro/styles/app/_menu.less

@@ -1,26 +1,33 @@
 @{alain-pro-prefix} {
   &__menu {
     display: block;
+
     &-item {
       &--disabled {
         pointer-events: none;
       }
     }
+
     &-only-icon {
       @{alain-pro-prefix}__menu-item {
         padding-right: 8px !important;
         padding-left: 8px !important;
+
         &:first-child {
           padding-left: 0;
         }
       }
+
       @{alain-pro-prefix}__menu-icon {
         margin-right: 0;
         font-size: @alain-pro-top-nav-only-icon-fs;
+        min-width: 14px;
       }
     }
+
     &-title {
       position: relative;
+
       &-badge {
         display: flex;
         justify-content: center;
@@ -31,27 +38,34 @@
         line-height: 18px;
         background: @alain-pro-header-title-badge-bg;
         border-radius: 50%;
-        > em {
+
+        >em {
           color: @alain-pro-header-title-badge-color;
           font-style: normal;
         }
       }
     }
+
     &-img {
-      width: @alain-pro-sider-menu-img-wh !important;
-      height: @alain-pro-sider-menu-img-wh !important;
+      width: @alain-pro-sider-menu-img-wh  !important;
+      height: @alain-pro-sider-menu-img-wh  !important;
     }
+
   }
+
   &__side-nav {
     @{alain-pro-prefix}__menu {
       &-title {
         display: flex;
         align-items: center;
+
         &-text {
           flex: 1;
+          // opacity: 0;
         }
       }
     }
+
     .@{ant-prefix}-menu-inline-collapsed {
       @{alain-pro-prefix}__menu-title-badge {
         position: absolute;
@@ -59,10 +73,28 @@
         right: -16px;
         width: 8px;
         height: 8px;
-        > em {
+
+        >em {
           display: none;
         }
       }
     }
   }
 }
+
+@{aside-collapsed-prefix} {
+  @{alain-pro-prefix} {
+    &__menu {
+      &-icon {
+        overflow: inherit;
+      }
+
+      &-title {
+        &-text {
+          opacity: 0;
+        }
+      }
+    }
+  }
+
+}

src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts

@@ -445,7 +445,8 @@ export class TaxManagementOrderReportingComponent implements OnInit {
       this.service.msgSrv.warning('选择了已上传，请重新勾选！');
       return;
     }
-    // if(this.selectedRows.find(item => item.checkStatus !== '1')) {
+    
+    // if(this.selectedRows.find(item => item.checkStatus !== 1)) {
     //   this.service.msgSrv.warning('选择了未通过校验的订单，请重新勾选！');
     //   return;
     // }