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

src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-06 20:20:26
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-02 11:14:37
+ * @LastEditTime : 2022-03-04 10:04:11
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -135,7 +135,7 @@
   </div>
 </nz-card>
 <nz-card nzTitle="运费信息" #distannce3>
-  <h2>{{i?.goodsInfoList?.[0]?.freightPrice}}{{i?.goodsInfoList?.[0]?.freightTypeLabel}}（以发货为准，保留小数）</h2>
+  <h2>{{i?.goodsInfoList?.[0]?.freightPrice}}{{i?.goodsInfoList?.[0]?.freightTypeLabel}}（{{ i?.goodsInfoList?.[0]?.settlementBasisLabel ? i?.goodsInfoList?.[0]?.settlementBasisLabel + '，' :' ' }}{{i?.goodsInfoList?.[0]?.ruleLabel}}）</h2>
   <st #st [data]="billExpenses" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
     <ng-template st-row="PriceType" let-item let-index="index"> 到付 </ng-template>
     <ng-template st-row="price" let-item let-index="index">

src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-14 15:02:52
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-02 13:43:55
+ * @LastEditTime : 2022-03-04 09:38:45
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\bulk\\confir-receipt\\confir-receipt.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -34,15 +34,15 @@ nzMessage="签收后不可再修改运费，请确保运费等信息准确无误
   </sv-container>
   <sv-container col="2">
     <sv label="装货重量">
-        <div>{{detailList?.goodsInfoVO?.weight}}吨</div>
+      <div>{{ detailList?.loadWeight }}吨</div>
     </sv>
     <sv label="装货体积">
-        <div>{{detailList?.goodsInfoVO?.volume}}方</div>
+      <div>{{ detailList?.loadVolume }}方</div>
     </sv>
   </sv-container>
   <sv-container col="2" >
     <sv label="卸货重量">
-        <div>{{detailList?.goodsInfoVO?.volume}}吨</div>
+      <div>{{ detailList?.settlementWeight }}吨</div>
     </sv>
     <sv label="卸货体积">
       <div>{{ detailList?.settlementVolume }}方</div>

src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-15 13:17:42
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-01-18 17:23:52
+ * @LastEditTime : 2022-03-04 09:48:12
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\sure-arrive\\sure-arrive.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -12,13 +12,13 @@
 <sf #sf mode="edit" [schema]="schema" [ui]="ui" [formData]="formData" button="none">
   <ng-template sf-template="weight" let-me let-ui="ui" let-schema="schema">
     <div style="display: flex">
-      <nz-input-number [(ngModel)]="data.weight" [nzMin]="1" [nzMax]="10" [nzStep]="1"></nz-input-number>
+      <nz-input-number [(ngModel)]="data.weight" [nzMin]="1" [nzMax]="999" [nzStep]="1"></nz-input-number>
       <div class="left_btn">吨</div>
     </div>
   </ng-template>
   <ng-template sf-template="volume" let-me let-ui="ui" let-schema="schema">
     <div style="display: flex">
-      <nz-input-number [(ngModel)]="data.volume" [nzMin]="1" [nzMax]="10" [nzStep]="1"></nz-input-number>
+      <nz-input-number [(ngModel)]="data.volume" [nzMin]="1" [nzMax]="999" [nzStep]="1"></nz-input-number>
       <div class="left_btn">方</div>
     </div>
   </ng-template>

src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.ts

@@ -422,7 +422,10 @@ export class VehicleSureArriveComponent implements OnInit {
     };
   }
   save(value: any): void {
+    console.log('444');
     if(this.Status === 1) {
+      console.log('555');
+      
       if(!value.time) {
         this.service.msgSrv.warning('必填项为空！')
         return;
@@ -449,11 +452,11 @@ export class VehicleSureArriveComponent implements OnInit {
         console.log(this.i)
         const params = {
           id: this.i?.id,
-          imgUrl1: value.imgUrl1.data.fullFilePath,
+          imgUrl1: value?.imgUrl1?.data?.fullFilePath,
-          imgUrl2: value.imgUrl2.data.fullFilePath,
+          imgUrl2: value?.imgUrl2?.data?.fullFilePath,
-          time: value.time,
+          time: value?.time,
-          volume: this.data.volume,
+          volume: this.data?.volume,
-          weight: this.data.weight
+          weight: this.data?.weight
         }
         params.time = this.datePipe.transform(value.time, 'yyyy-MM-dd HH:mm:ss ')
         console.log(params)

src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.html

@@ -1,6 +1,6 @@
-<h2 style="text-align: center;">
+<nz-card class="card-height" >
   <div [innerHTML]="agreement | safehtml"></div>
-</h2>
+</nz-card>
 <div *nzModalFooter>
   <button nz-button nzType="primary" (click)="handleOk()" >我已阅读并同意签署</button>
 </div>

src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html

@@ -159,10 +159,10 @@
       <sv label="增值服务套餐">
         {{ i?.insuranceTypeLabel }}
       </sv>
-      <sv label="货物价值">
+      <sv label="货物价值" *ngIf="i?.insuranceType !== '3'">
         {{ i?.goodsValue | currency }}
       </sv>
-      <sv label="保价费金额"> {{ i?.insurancePremium | currency }} 元 </sv>
+      <sv label="保价费金额" *ngIf="i?.insuranceType !== '3'"> {{ i?.insurancePremium | currency }} 元 </sv>
     </sv-container>
   </nz-card>
   <nz-card [nzTitle]="'运费信息（到货后' + i?.paymentDays + '天内支付运费）'">

src/app/routes/supply-management/components/vehicle/vehicle.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-12 10:52:50
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-01 13:12:12
+ * @LastEditTime : 2022-03-04 09:57:16
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\vehicle\\vehicle.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -80,17 +80,17 @@
         <p>{{ item?.resourceStatusLabel }}</p>
       </ng-template>
       <ng-template st-row="total" let-item let-index="index">
-        <div class="mr-xs">{{ item?.totalAmount + item?.surcharge | currency }} </div>
+        <div class="mr-xs">{{ item?.totalAmount | currency }} </div>
       </ng-template>
       <ng-template st-row="totalAmount" let-item let-index="index">
-        <div class="mr-xs">{{ item?.totalAmount | currency }} </div>
+        <div class="mr-xs">{{ item?.freight | currency }} </div>
       </ng-template>
       <ng-template st-row="surcharge" let-item let-index="index">
         <div class="mr-xs">{{ item?.surcharge | currency }} </div>
       </ng-template>
       <ng-template st-row="useCarDemand" let-item let-index="index">
         <div>车型: {{ item?.carModelLabel }}</div>
-        <div class="error">车长: {{ item?.expand }} 米</div>
+        <div class="error">车长: {{ item?.carLenghtLabel }} 米</div>
       </ng-template>
     </st>
   </div>

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

@@ -549,10 +549,9 @@ export class SupplyManagementVehicleComponent implements OnInit {
       },
       {
         title: '创建时间',
-        width: '170px',
+        width: '200px',
         index: 'createTime',
         className: 'text-left',
-        type: 'date'
       },
       {
         title: '审核状态',

src/app/routes/usercenter/components/driver/detail/detail.component.html

@@ -96,7 +96,7 @@
       </sv>
       <sv label="有效期"  col="1">
         <nz-date-picker [(ngModel)]="userIdentityDetail.validStartTime" [nzDisabled]="!isEditUser" nzPlaceHolder=" "
-          [nzBorderless]="!isEditUser" [nzSuffixIcon]="userIdentityDetail?'calendar':''" style="width: 110px;" class="calendar">
+        [nzBorderless]="!isEditUser" [nzSuffixIcon]="isEditUser?'calendar':''" style="width: 110px;" class="calendar">
       </nz-date-picker>
         -
         <ng-container *ngIf="!isEditUser && !userIdentityDetail?.validEndTime && userIdentityDetail?.validStartTime">
@@ -215,25 +215,7 @@
         <input nz-input type="text" [(ngModel)]="licenseDetail.licenseNo" [readonly]="!isEditDriver"
           [nzBorderless]="!isEditDriver" [placeholder]="isEditDriver?'':'-'">
       </sv>
-      <sv label="发证日期">
+      <sv label="公司所在地" >
-        <nz-date-picker [(ngModel)]="licenseDetail.validStartTime" [nzDisabled]="!isEditDriver"
-          [nzPlaceHolder]="isEditDriver?'':'-'" [nzBorderless]="!isEditDriver"
-          [nzSuffixIcon]="isEditDriver?'calendar':''"></nz-date-picker>
-      </sv>
-      <sv label="有效期至">
-        <nz-date-picker [(ngModel)]="licenseDetail.validEndTime" [nzDisabled]="!isEditDriver"
-          [nzPlaceHolder]="isEditDriver?'':'-'" [nzBorderless]="!isEditDriver"
-          [nzSuffixIcon]="isEditDriver?'calendar':''"></nz-date-picker>
-
-          <ng-container *ngIf="!isEditDriver && !licenseDetail?.validEndTime && licenseDetail?.validStartTime">
-            <label style="padding-left: 11px;">长期</label>
-          </ng-container>
-          <ng-container *ngIf="isEditDriver">
-            <label nz-checkbox [ngModel]="!!!licenseDetail.validEndTime"
-              (ngModelChange)="$event?licenseDetail.validEndTime='':''" class="ml-sm">长期</label>
-          </ng-container>
-      </sv>
-      <sv label="公司所在地" col="3">
         <ng-container *ngIf="isEditDriver; else cascaderelseTemplate">
           <nz-select [(ngModel)]="licenseDetail.regionCode">
             <ng-container *ngFor="let item of adressCodeList">
@@ -245,6 +227,24 @@
           {{licenseDetail?.regionCodeName }}
         </ng-template>
       </sv>
+      <sv label="发证日期" col="1">
+        <nz-date-picker [(ngModel)]="licenseDetail.validStartTime" [nzDisabled]="!isEditDriver" nzPlaceHolder=" "
+        [nzBorderless]="!isEditDriver" [nzSuffixIcon]="isEditDriver?'calendar':''" style="width: 110px;" class="calendar">
+      </nz-date-picker>
+        -
+        <ng-container *ngIf="!isEditDriver && !licenseDetail?.validEndTime && licenseDetail?.validStartTime">
+          <label style="padding-left: 11px;">长期</label>
+        </ng-container>
+        <nz-date-picker [(ngModel)]="licenseDetail.validEndTime" [nzDisabled]="!isEditDriver" nzPlaceHolder=" "
+          [nzBorderless]="!isEditDriver" [nzSuffixIcon]="isEditDriver?'calendar':''" style="width: 110px;" class="calendar">
+        </nz-date-picker>
+        <ng-container *ngIf="isEditDriver">
+          <label nz-checkbox [ngModel]="!!!licenseDetail.validEndTime"
+            (ngModelChange)="$event?licenseDetail.validEndTime='':''" class="ml-sm">长期</label>
+        </ng-container>
+
+      </sv>
+  
       <sv label="从业资格证照片" col="1">
         <ng-container
           *ngTemplateOutlet="uploadTemplate;context:{data:licenseDetail,status:isEditDriver,key:'certificatePhotoWatermark',key2:'certificatePhoto',hover:'licenseCertificate'}">