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

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

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-28 14:42:03
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-11 13:55:32
+ * @LastEditTime : 2022-02-16 15:42:18
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -206,7 +206,7 @@
     </st> -->
         </div>
         <div nz-col [nzSpan]="12">
-          <amap-path-simplifier></amap-path-simplifier>
+          <amap-path-simplifier [MapList]="MapList"></amap-path-simplifier>
         </div>
       </div>
     </nz-card>

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

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-28 14:42:03
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-10 14:45:47
+ * @LastEditTime : 2022-02-16 16:37:16
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -22,6 +22,7 @@ import { OrderManagementService } from '../../services/order-management.service'
 })
 export class OrderManagementVehicleDetailComponent implements OnInit {
   id = this.route.snapshot.params.id;
+  MapList: any;
   i: any = {
     unLoadingPlaceList: [],
     billExpenseDetails: [],
@@ -63,25 +64,21 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
   ) {}
 
   ngOnInit(): void {
-    console.log(this.id);
     this.initData();
   }
 
   initData() {
     this.service.request(this.service.$api_get_getWholeBillDetail, { id: this.id }).subscribe(res => {
-      console.log(res);
       if (res) {
         this.i = res;
         this.approvalLsit = res.scheduleVOList;
         this.attObj = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === 'ATT')[0];
         this.totalObj = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === 'TOTAL')[0];
         this.approvalLsit.map((item: any, key: any) => {
-          console.log(item);
           if (item.displayStatus === 'HIDE') {
             delete this.approvalLsit[key];
           }
         });
-        console.log(this.approvalLsit);
       }
     });
   }
@@ -105,7 +102,6 @@ cancellation() {
   }
   // 修改订单
   changeOrder() {
-    console.log(this.id);
     this.router.navigate(['order-management/vehicle-detailChange', this.id]);
   }
   agreement(value: any) {
@@ -128,6 +124,21 @@ cancellation() {
       elf['elementRef'].nativeElement.scrollIntoView({ behavior: 'smooth', block: 'start', inline: 'start' , });
       // elf['elementRef'].nativeElement.className = 'target-fix'
     }
-    console.log(elf)
+  }
+  MapInit() {
+    this.service.request('/api/sdc/billShipper/getTrajectoryByBillId', { id: this.id }).subscribe(res => {
+      if (res?.trackArray) {
+        const points = res?.trackArray;
+        const list: any[] = [];
+        points.forEach((item: any) => {
+          list.push({
+            name: item?.hgt,
+            lnglat: [Number((Number(item?.lon) / 600000).toFixed(6)), Number((Number(item?.lat) / 600000).toFixed(6))]
+          });
+        });
+        console.log(list);
+        this.MapList = list
+      }
+    });
   }
 }

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

@@ -367,25 +367,6 @@ export class SupplyManagementBulkComponent implements OnInit {
     }, 500);
   }
 
-  /**
-  * 更新运费
-  */
-  updatePrice(item: any) {
-    const modalRef = this.modal.create({
-      nzTitle: '修改单价',
-      nzWidth: '600px',
-      nzContent: SupplyManagementUpdatePriceComponent,
-      nzComponentParams: {
-        i: item,
-      },
-      nzFooter: null,
-    });
-    modalRef.afterClose.subscribe(res => {
-      if (res) {
-        this.st.reload();
-      }
-    })
-  }
 
   /**
   * 二维码

src/app/routes/supply-management/components/update-price/update-price.component.html

@@ -1,29 +1,37 @@
+<!--
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2021-12-03 11:10:14
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-02-16 15:02:33
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\update-price\\update-price.component.html
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+-->
 <div class="mb-lg">
-  <nz-spin *ngIf="!i" class="modal-spin"></nz-spin>
   <sf *ngIf="i" #sf mode="edit" [schema]="schema" [ui]="ui" [formData]="i" button="none">
     <ng-template sf-template="freightPrice" let-me let-ui="ui" let-schema="schema">
       <nz-input-group [nzAddOnAfter]="freightType[i?.freightType]">
-        <input [max]="99999999" placeholder="请输入" type="number" [ngModel]="me.value"
+        <input [max]="99999999" placeholder="请输入" type="number" [ngModel]="me.value" (ngModelChange)="me.setValue($event)" nz-input />
-          (ngModelChange)="me.setValue($event)" nz-input />
       </nz-input-group>
     </ng-template>
     <div class="modal-footer text-center">
       <button nz-button type="button" (click)="close()">取消</button>
-      <button nz-button type="submit" nzType="primary" (click)="save(sf.value)" [disabled]="!sf.valid"
+      <button nz-button type="submit" nzType="primary" (click)="save(sf.value)" [disabled]="!sf.valid" [nzLoading]="service.http.loading"
-        [nzLoading]="service.http.loading">确定</button>
+        >确定</button
+      >
     </div>
   </sf>
-
 </div>
 <div>
   <h4>变更日志</h4>
-  <st #st [data]="service.$api_get_catalogue_member" [bordered]="true" [columns]="columns" [page]="{show:false}">
+  <st #st [data]="service.$api_getOperationLogRecordsList" [bordered]="true" [columns]="columns" [page]="{ show: false }"     [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }">
     <ng-template st-row="operator" let-item let-index="index">
-      <div>黎日湛</div>
+      <span>{{item.operator}}</span>/
-      <div>18811112222</div>
+      <span>{{item.telephone}}</span>
     </ng-template>
   </st>
 </div>
 <ng-template #addOnAfterTemplate>
-  <span> {{freightType[i?.freightType]}}</span>
+  <span> {{ freightType[i?.freightType] }}</span>
 </ng-template>

src/app/routes/supply-management/components/update-price/update-price.component.ts

@@ -28,10 +28,16 @@ export class SupplyManagementUpdatePriceComponent implements OnInit {
     public service: SupplyManagementService
   ) { }
 
-
+  get reqParams() {
+    return { 
+      operateObject: this.record?.resourceCode,
+      operateType: 7,
+     };
+  }
   ngOnInit(): void {
     this.initSF();
     this.initSt();
+    console.log(this.record)
     if (this.record?.id) this.getGoodsResourceShipperDeatail(this.record?.id);
   }
 
@@ -88,8 +94,8 @@ export class SupplyManagementUpdatePriceComponent implements OnInit {
    */
   initSt() {
     this.columns = [
-      { title: '日志内容', width: 120, index: 'owner', className: 'text-center' },
+      { title: '日志内容', width: 120, index: 'operationContent', className: 'text-center' },
-      { title: '更新时间', index: 'goodsQuantity', width: 100, className: 'text-center' },
+      { title: '更新时间', index: 'operatorTimestamp', width: 100, className: 'text-center' },
       { title: '操作人', width: 100, render: 'operator', className: 'text-center' },
     ];
   }