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

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 15:31:52
- * @LastEditTime: 2021-12-27 13:28:13
+ * @LastEditTime: 2021-12-27 14:15:35
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \tms-obc-web\src\app\routes\order-management\components\vehicle-detail\vehicle-detail.component.html
@@ -251,14 +251,8 @@
 </nz-card>
 
 
-<nz-card nzTitle="运费信息" id="distannce3">
+<!-- <nz-card nzTitle="运费信息" id="distannce3">
   <st #st [data]="dirvingMessage" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
-    <!-- <ng-template st-row="price" let-item let-index="index">
-      <input  nz-input [ngModel]="item?.price" (ngModelChange)="st.setRow(index, { price: $event })" />
-    </ng-template>
-    <ng-template st-row="paymentMethodRate" let-item let-index="index">
-      <input  nz-input [ngModel]="item?.paymentMethodRate" (ngModelChange)="st.setRow(index, { paymentMethodRate: $event })" />
-    </ng-template> -->
   </st>
   <div style="margin-top: 15px;">总计：{{i?.total | currency: '￥'}}（运费￥3500.00，附加运费￥191.98，附加费率3.5%）</div>
   <div style="display: flex;">收款人：
@@ -268,6 +262,14 @@
     </div>
     
   </div>
+</nz-card> -->
+<nz-card nzTitle="运费信息" id="distannce3">
+  <h2>{{i?.freightPrice}}{{i?.freightTypeLabel}}（以发货为准，保留小数）</h2>
+  <st #st [data]="i?.billExpenseDetails" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
+
+  </st>
+  <div>总计：{{i?.total | currency: '￥'}}（运费￥3500.00，附加运费￥191.98，附加费率3.5%）</div>
+  <div>收款人：</div>
 </nz-card>
 
 <nz-card nzTitle="附件信息" id="distannce4">

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

@@ -2,7 +2,7 @@ import { ViewChild } from '@angular/core';
 /*
  * @Author: your name
  * @Date: 2021-12-03 15:31:52
- * @LastEditTime: 2021-12-24 17:55:35
+ * @LastEditTime: 2021-12-27 14:38:15
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \tms-obc-web\src\app\routes\order-management\components\vehicle-detail\vehicle-detail.component.ts
@@ -300,8 +300,13 @@ loadTime: any; // 货源单设置回显
           uid: index
         })
         });
+        this.sf4data
         this.listImagUrls = arr;
-        this.sf4data = res?.goodsInfoList?.[0]
+        // this.sf4data = res?.goodsInfoList?.[0]
+        this.sf4data = {
+          ...res,
+          ...res?.goodsInfoList?.[0]
+        }
         // 对装卸货信息进行初始化
         res?.unLoadingPlaceList.forEach((element: any) => {
           if(element.type === 1 || element.type === '1') {
@@ -423,9 +428,6 @@ loadTime: any; // 货源单设置回显
       var c = new Date(this.loadTime);  
       this.loadTime = c.getFullYear() + '-' + this.addPreZero(c.getMonth() + 1) + '-' + this.addPreZero(c.getDate()) + ' ' + this.addPreZero(c.getHours()) + ':' + this.addPreZero(c.getMinutes()) + ':' + this.addPreZero(c.getSeconds())
     }
-    console.log('dirvingMessage=>>>>>>'+ this.dirvingMessage)
-    console.log( this.dirvingMessage)
-    console.log( this.st._data)
     const params = {
       id: this.id,
       unLoadingPlaceDTOList: [...this.startInfo, ...this.endInfo,], 
@@ -440,9 +442,13 @@ loadTime: any; // 货源单设置回显
       payeeId: this.dirverPhone,
       dirverBankCard: this.dirverBankCard, // 银行卡
       // 发车时间
-    loadTime: this.loadTime,
+      loadTime: this.loadTime,
       // 到车时间
       unloadTime: this.unloadTime,
+      acceptWeight: this.sf4.value?.acceptWeight,
+      acceptVolume: this.sf4.value?.acceptVolume,
+      settlementWeight: this.sf4.value?.settlementWeight,
+      settlementVolume: this.sf4.value?.settlementVolume,
       loadingLadingBillFilePath: this.sf.value?.loadingLadingBillFilePath?.data ? this.sf.value?.loadingLadingBillFilePath.data.fullFilePath : this.sf.value?.loadingLadingBillFilePath?.url,
 
       loadingPeopleVehiclesGoodsFilePath: this.sf.value?.loadingPeopleVehiclesGoodsFilePath?.data ? this.sf.value?.loadingPeopleVehiclesGoodsFilePath.data.fullFilePath : this.sf.value?.loadingPeopleVehiclesGoodsFilePath?.url,
@@ -456,7 +462,7 @@ loadTime: any; // 货源单设置回显
       console.log(res)
       if(res) {
         this.service.msgSrv.success('修改成功！');
-        this.router.navigate(['/order-management/vehicle']);
+        this.router.navigate(['/order-management/bulk']);
       } else {
         this.service.msgSrv.error(res?.msg);
       }

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 15:31:52
- * @LastEditTime: 2021-12-27 13:37:18
+ * @LastEditTime: 2021-12-27 14:22:03
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \tms-obc-web\src\app\routes\order-management\components\vehicle-detail\vehicle-detail.component.html
@@ -167,7 +167,7 @@
 </nz-card>
 
 <nz-card nzTitle="运费信息" id="distannce3">
-  <h2>{{i?.freightPrice}}{{i?.freightTypeLabel}}（以发货为准，保留小数）</h2>
+  <h2>{{i?.goodsInfoList?.[0]?.freightPrice}}{{i?.goodsInfoList?.[0]?.freightTypeLabel}}（以发货为准，保留小数）</h2>
   <st #st [data]="i?.billExpenseDetails" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
 
   </st>

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 15:31:52
- * @LastEditTime: 2021-12-27 11:45:44
+ * @LastEditTime: 2021-12-27 14:16:23
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \tms-obc-web\src\app\routes\order-management\components\vehicle-detail\vehicle-detail.component.html
@@ -273,7 +273,7 @@
 </nz-card>
 
 
-<nz-card nzTitle="运费信息" id="distannce3">
+<!-- <nz-card nzTitle="运费信息" id="distannce3">
   <st #st [data]="dirvingMessage" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
     <ng-template st-row="price" let-item let-index="index">
       <input  nz-input [ngModel]="item?.price" (ngModelChange)="st.setRow(index, { price: $event })" />
@@ -290,6 +290,13 @@
     </div>
     
   </div>
+</nz-card> -->
+<nz-card nzTitle="运费信息" id="distannce3">
+  <st #st [data]="i?.billExpenseDetails" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
+
+  </st>
+  <div>总计：{{i?.total | currency: '￥'}}（运费￥3500.00，附加运费￥191.98，附加费率3.5%）</div>
+  <div>收款人：</div>
 </nz-card>
 
 <nz-card nzTitle="附件信息" id="distannce4">

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

@@ -398,12 +398,9 @@ export class  SupplyManagementOnecarPublishComponent implements OnInit {
         receiptType: {
           type: 'string',
           title: '回单类型',
-          enum: [
-            { label: '电子回单', value: 1 },
-            { label: '纸质回单', value: 2 }
-          ],
           ui: {
-            widget: 'select',
+            widget: 'dict-select',
+            params: { dictKey: 'receipt:type' },
             placeholder: '请选择',
             errors: { required: '请选择' },
             visibleIf: {

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

@@ -11,7 +11,7 @@
         <h4 class="ml-md">货源编码 : {{ i?.resourceCode }}</h4>
       </div>
       <div nz-row>
-        <div nz-col nzSpan="14" class="text-grey-darker">网络货运人：{{i?.carrierInformationVO?.enterpriseInfoName}}</div>
+        <div nz-col nzSpan="14" class="text-grey-darker">网络货运人：{{i?.enterpriseInfoName}}</div>
         <div nz-col nzSpan="10">
           <button nz-button (click)="cancleGoodsSource()" *ngIf="i?.resourceStatus  === '1'">取消货源</button>
           <button nz-button (click)="assignedCar(i)"
@@ -22,7 +22,7 @@
       </div>
       <div class="mt-sm mb-sm" nz-row>
         <div>
-          <b>总费用：<span class="text-red-light text-md">{{totalExpensePrice | currency}}</span></b>
+          <b>总费用：<span class="text-red-light text-md">{{i?.shippingInformationVO?.totalFee | currency: '￥'}}</span></b>
         </div>
       </div>
       <nz-divider></nz-divider>