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

src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-14 14:03:07
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-23 14:20:32
+ * @LastEditTime : 2022-03-01 19:27:32
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\bulk\\update-freight\\update-freight.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -19,6 +19,7 @@
         [ngModel]="i.value"
         (ngModelChange)="i.setValue($event)"
         placeholder="请输入"
+        (change)="changeNumVal()"
         oninput="if(value>99999)value=99999;if(value<0)value=0"
       />
     </nz-input-group>

src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.ts

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-14 14:03:07
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-23 14:23:26
+ * @LastEditTime : 2022-03-01 19:27:28
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\bulk\\update-freight\\update-freight.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -50,7 +50,6 @@ export class UpdateFreightComponent implements OnInit {
             placeholder: '请输入',
             widget: 'custom',
             grid: { span: 12 },
-            change: (val: any) => this.changeNumVal()
           } as SFStringWidgetSchema,
           default: data.freightPrice
         },
@@ -181,18 +180,19 @@ export class UpdateFreightComponent implements OnInit {
   }
 
   changeNumVal() {
+    console.log('444')
     if (this.calculateSub) {
       this.calculateSub.unsubscribe();
     }
     const params =  { billId: this.data.billId, changeCause: this.sf.value.changeCause, dto: {...this.sf.value}  }
     this.calculateSub = this.service
       .request(this.service.$api_calculate_cost, params)
-      .subscribe((res: any) => {
+      .subscribe(res => {
         if (res) {
           Object.assign(this.data, {
+            totalAmount: res.totalAmount,
             totalFreight: res.totalFreight,
-            freight: res.freight,
+            totalSurcharge: res.totalSurcharge
-            surcharge: res.surcharge
           });
         }
       });

src/app/routes/order-management/services/order-management.service.ts

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-03 15:31:52
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-28 12:01:42
+ * @LastEditTime : 2022-03-01 19:21:53
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\services\\order-management.service.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */

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

@@ -17,7 +17,7 @@
 </nz-card>
 
 <nz-card>
-  <div class="card-title"
+  <div class="card-title"x
     >装卸货信息<span class="tip-font">预计公里数：{{ totalDistance }}km，预计行程耗时：{{ totalTime }}小时</span></div
   >
 
@@ -43,7 +43,7 @@
               </div>
             </nz-form-control>
           </nz-form-item>
-          <nz-form-item>
+          <nz-form-item >
             <nz-form-label  nzRequired>联系人</nz-form-label>
             <div style="display: flex;width: 86%">
               <nz-form-control [nzErrorTip]="'请输入联系人姓名'">

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

@@ -4,7 +4,7 @@
       width: 100%;
     }
     nz-date-picker {
-      width: 100%;
+      width: 94.3%;
     }
   }
   i {
@@ -37,10 +37,6 @@
   :hover{color: #52acff;}
 }
 
-#container {
-  width: 300px;
-  height: 180px;
-}
 
 input[type='number'] {
   -moz-appearance: textfield;

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

@@ -716,8 +716,8 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
     const oilCardPay = 0;
     const subtotal = prePay + toPay + receiptPay;
     const params = {
-      shipperId: this.envCache?.enterpriseId,
+      shipperId: this?.sf1.value?.shipperAppUserId,
-      enterpriseInfoId: this.envCache?.networkTransporterId,
+      enterpriseInfoId: this?.sf1.value?.enterpriseInfoName,
       totalFreight: subtotal,
       fuelCardAmount: oilCardPay,
       resourcetype: '1'
@@ -732,7 +732,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
         this.service
           .request(
             this.service.$api_getAdditionalRate +
-              `?shipperId=${this.envCache?.enterpriseId}&enterpriseInfoId=${this?.enterpriseProjectIds}&resourcetype='1'`
+              `?shipperId=${this?.sf1.value?.shipperAppUserId || ''}&enterpriseInfoId=${this?.sf1.value?.enterpriseInfoName || ''}&resourcetype='1'`
           )
           .subscribe(res => {
             if (res) {

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

@@ -760,7 +760,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
         this.sf7.setValue('/subtotal', subtotal);
         this.sf7.setValue('/total', subtotal + res.surcharge);
         this.service
-          .request(this.service.$api_getAdditionalRate + `?shipperId=${this?.sf1.value?.shipperAppUserId}&enterpriseInfoId=${this?.sf1.value?.enterpriseInfoName}&resourcetype='1'`)
+          .request(this.service.$api_getAdditionalRate + `?shipperId=${this?.sf1.value?.shipperAppUserId || ''}&enterpriseInfoId=${this?.sf1.value?.enterpriseInfoName || ''}&resourcetype='1'`)
           .subscribe(res => {
             if (res) {
               this.currentRate = res.rate * 100;