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

src/app/routes/commom/less/commom-table.less

@@ -1,6 +1,5 @@
 :host {
   ::ng-deep {
-
     nz-card {
       margin: -24px -24px 0;
 
@@ -10,8 +9,8 @@
     }
 
     .ant-tabs-tab {
-            padding: 12px 0px;
-            margin : 0 0 0 16px;
+      margin: 0 0 0 16px;
+      padding: 12px 0;
     }
 
     .ant-table-body {
@@ -20,7 +19,7 @@
 
     .table-box {
       .ant-card-body {
-                padding: 0px;
+        padding: 0;
       }
     }
 
@@ -28,25 +27,25 @@
       margin: 8px;
     }
 
-        .ant-table-thead>tr>th,
-        .ant-table-tbody>tr>td,
-        .ant-table tfoot>tr>th,
-        .ant-table tfoot>tr>td {
+    .ant-table-thead > tr > th,
+    .ant-table-tbody > tr > td,
+    .ant-table tfoot > tr > th,
+    .ant-table tfoot > tr > td {
       padding: 8px;
     }
 
-        .ant-table.ant-table-bordered>.ant-table-container {
+    .ant-table.ant-table-bordered > .ant-table-container {
       border-top: 0;
     }
 
     .ant-pagination-item {
-            min-width  : 24px;
-            height     : 24px;
+      min-width: 24px;
+      height: 24px;
       line-height: 21px;
     }
 
     .ant-pagination-total-text {
-            height     : 24px;
+      height: 24px;
       line-height: 24px;
     }
 
@@ -54,8 +53,8 @@
     .ant-pagination-next,
     .ant-pagination-jump-prev,
     .ant-pagination-jump-next {
-            min-width  : 24px;
-            height     : 24px;
+      min-width: 24px;
+      height: 24px;
       line-height: 21px;
     }
 

src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts

@@ -140,7 +140,10 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
         _$expand: { type: 'boolean', ui: { hidden: true } },
         billCode: {
           type: 'string',
-          title: '订单号'
+          title: '订单号',
+          ui: {
+            placeholder: '最多100个单号，空号隔开'
+          }
         },
         resourceCode: {
           type: 'string',

src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts

@@ -115,7 +115,10 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
         _$expand: { type: 'boolean', ui: { hidden: true } },
         billCode: {
           type: 'string',
-          title: '订单号'
+          title: '订单号',
+          ui: {
+            placeholder: '最多100个单号，空号隔开'
+          }
         },
         resourceCode: {
           type: 'string',

src/app/routes/order-management/components/risk/risk.component.ts

@@ -109,7 +109,10 @@ export class OrderManagementRiskComponent implements OnInit {
         _$expand: { type: 'boolean', ui: { hidden: true } },
         billCode: {
           type: 'string',
-          title: '订单号'
+          title: '订单号',
+          ui: {
+            placeholder: '最多100个单号，空号隔开'
+          }
         },
         resourceCode: {
           type: 'string',

src/app/routes/usercenter/components/driver/driver.component.ts

@@ -77,6 +77,7 @@ export class UserCenterComponentsDriverComponent implements OnInit {
       nzContent: this.promoterModal,
       nzOnOk: () => {
         if (!!!this.promotersTelephone) {
+          this.service.msgSrv.error('请填写手机号!');
           return false;
         }
         if (typeof this.promotersTelephone === 'string' && !/(^1\d{10}$)/.test(this.promotersTelephone)) {

src/app/routes/waybill-management/components/bulk/bulk.component.ts

@@ -80,6 +80,9 @@ tabs = {
         wayBillCode: {
           type: 'string',
           title: '运单号',
+          ui: {
+            placeholder: '最多100个运单，空号隔开'
+          }
         },
         resourceCode: {
           type: 'string',

src/app/routes/waybill-management/components/vehicle/vehicle.component.ts

@@ -77,7 +77,10 @@ export class WaybillManagementVehicleComponent implements OnInit {
         _$expand: { type: 'boolean', ui: { hidden: true } },
         wayBillCode: {
           type: 'string',
-          title: '运单号'
+          title: '运单号',
+          ui: {
+            placeholder: '最多100个运单，空号隔开'
+          }
         },
         resourceCode: {
           type: 'string',