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

src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html

@@ -119,7 +119,7 @@
 <nz-card>
   <div class="card-title">货物信息</div>
   <div nz-row>
-    <div nz-col nzSpan="12">
+    <div nz-col nzSpan="24">
       <sf #sf3 [schema]="schema3" [formData]="sf3data" [button]="'none'" [ui]="ui3"></sf>
       <sf #sf4 [schema]="schema4" [formData]="sf4data" [button]="'none'" [ui]="ui4">
         <ng-template sf-template="freightPrice" let-i let-ui="ui">

src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts

@@ -406,19 +406,19 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
         grid: { span: 8 }
       },
       $weight: {
-        grid: { span: 8 }
+        grid: { lg: 6, md: 12, sm: 12, xs: 24 }
       },
       $volume: {
-        grid: { span: 8 }
+        grid: { lg: 6, md: 12, sm: 12, xs: 24 }
       },
       $number: {
-        grid: { span: 8 }
+        grid: { lg: 6, md: 12, sm: 12, xs: 24 }
       },
       $carModel: {
-        grid: { span: 12 }
+        grid: { span: 8 }
       },
       $carLength: {
-        grid: { span: 12 }
+        grid: { span: 8 }
       }
     };
   }

src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html

@@ -131,7 +131,7 @@
 <nz-card>
   <div class="card-title">货物信息</div>
   <div nz-row>
-    <div nz-col nzSpan="12">
+    <div nz-col nzSpan="24">
       <sf #sf3 [schema]="schema3" [button]="'none'" [ui]="ui3" [formData]="sf3data"></sf>
       <sf #sf4 [schema]="schema4" [button]="'none'" [ui]="ui4" [formData]="sf4data">
         <ng-template sf-template="freightPrice" let-i let-ui="ui">

src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts

@@ -426,19 +426,19 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit {
         grid: { span: 8 }
       },
       $weight: {
-        grid: { span: 8 }
+        grid: { lg: 6, md: 12, sm: 12, xs: 24 }
       },
       $volume: {
-        grid: { span: 8 }
+        grid: { lg: 6, md: 12, sm: 12, xs: 24 }
       },
       $number: {
-        grid: { span: 8 }
+        grid: { lg: 6, md: 12, sm: 12, xs: 24 }
       },
       $carModel: {
-        grid: { span: 12 }
+        grid: { span: 8 }
       },
       $carLength: {
-        grid: { span: 12 }
+        grid: { span: 8 }
       }
     };
   }

src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html

@@ -170,7 +170,7 @@
 <nz-card>
   <div class="card-title">货物信息</div>
   <div nz-row>
-    <div nz-col nzSpan="12">
+    <div nz-col nzSpan="24">
       <sf #sf3 [schema]="schema3" [formData]="sf3data" [button]="'none'" [ui]="ui3"></sf>
       <sf #sf4 [schema]="schema4" [formData]="sf4data" [button]="'none'" [ui]="ui4">
         <ng-template sf-template="weight" let-i let-ui="ui">

src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts

@@ -370,19 +370,19 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
         grid: { span: 24 }
       },
       $weight: {
-        grid: { span: 8 }
+        grid: { lg: 6, md: 12, sm: 12, xs: 24 }
       },
       $volume: {
-        grid: { span: 8 }
+        grid: { lg: 6, md: 12, sm: 12, xs: 24 }
       },
       $number: {
-        grid: { span: 8 }
+        grid: { lg: 6, md: 12, sm: 12, xs: 24 }
       },
       $carModel: {
-        grid: { span: 12 }
+        grid: { span: 8 }
       },
       $carLength: {
-        grid: { span: 12 }
+        grid: { span: 8 }
       }
     };
   }

src/app/routes/supply-management/components/release-publish/release-publish.component.html

@@ -173,7 +173,7 @@
 <nz-card>
   <div class="card-title">货物信息</div>
   <div nz-row>
-    <div nz-col nzSpan="12">
+    <div nz-col nzSpan="24">
       <sf #sf3 [schema]="schema3" [button]="'none'" [ui]="ui3" [formData]="sf3data"></sf>
       <sf #sf4 [schema]="schema4" [button]="'none'" [ui]="ui4" [formData]="sf4data">
         <ng-template sf-template="weight" let-i let-ui="ui">

src/app/routes/supply-management/components/release-publish/release-publish.component.ts

@@ -386,19 +386,19 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
         grid: { span: 24 }
       },
       $weight: {
-        grid: { span: 8 }
+        grid: { lg: 6, md: 12, sm: 12, xs: 24 }
       },
       $volume: {
-        grid: { span: 8 }
+        grid: { lg: 6, md: 12, sm: 12, xs: 24 }
       },
       $number: {
-        grid: { span: 8 }
+        grid: { lg: 6, md: 12, sm: 12, xs: 24 }
       },
       $carModel: {
-        grid: { span: 12 }
+        grid: { span: 8 }
       },
       $carLength: {
-        grid: { span: 12 }
+        grid: { span: 8 }
       }
     };
   }

src/app/routes/usercenter/components/freight/user/detail/detail.component.html

@@ -73,11 +73,11 @@
         </div>
       </sv-title>
       <sv label="姓名">
-        <input nz-input type="text" [(ngModel)]="userIdentityDetail.name" [readonly]="!isEditUser"
+        <input nz-input type="text" [maxlength]="32" [(ngModel)]="userIdentityDetail.name" [readonly]="!isEditUser"
           [nzBorderless]="!isEditUser" [placeholder]="isEditUser?'':'-'">
       </sv>
       <sv label="身份证号码">
-        <input nz-input type="text" [(ngModel)]="userIdentityDetail.certificateNumber" [readonly]="!isEditUser"
+        <input nz-input type="text" [minlength]="18"  [maxlength]="18" [(ngModel)]="userIdentityDetail.certificateNumber" [readonly]="!isEditUser"
           [nzBorderless]="!isEditUser" [placeholder]="isEditUser?'':'-'">
       </sv>
       <sv label="身份证照">