车辆对接

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 11:10:14
- * @LastEditTime: 2021-12-22 09:56:27
+ * @LastEditTime: 2021-12-22 19:48:42
  * @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\supply-management\components\vehicle\vehicle.component.html
@@ -160,7 +160,7 @@
   </ng-container>
   <ng-template #nzModalFooter>
     <button nz-button nzType="primary" (click)="handleCancel('0')">取消</button>
-    <button nz-button nzType="default" (click)="handleOK()">确定</button>
+    <button nz-button nzType="default" (click)="handleCancel('0')">确定</button>
   </ng-template>
 </nz-modal>
 
@@ -172,20 +172,20 @@
     multiSort
     size="small"
     [bordered]="true"
-    [data]="service.$api_get_listChangeApply"
+    [data]="service.$api_getChangeRecordWholeDetail"
     [columns]="columnsFloatView"
-    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: changeViewParams }"
-    [res]="{ reName: { list: 'data', total: 'data.total' } }"
+    [req]="{ method: 'POST', allInBody: true, params: changeViewParams }"
+    [res]="{ reName: { list: 'data.list', total: 'data.total' } }"
     [loadingDelay]="500"
   >
   </st>
-  <div><span>变更原因2：</span></div>
-  <div><span>拒绝原因：</span></div>
-  <div><span>注：</span></div>
+  <div><span>变更原因：{{ViewCause?.changeCause}}</span></div>
+  <div><span>拒绝原因：{{ViewCause?.refuseCause}}</span></div>
+  <div><span>注：附加费依据调整后的运输费用重新计算</span></div>
   </ng-container>
   <ng-template #nzModalFooterview>
     <button nz-button nzType="default" (click)="handleCancel('1')">取消</button>
-    <button nz-button nzType="primary" (click)="handleOK()">确定</button>
+    <button nz-button nzType="primary" (click)="handleCancel('1')">确定</button>
   </ng-template>
 </nz-modal>
 

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

@@ -30,6 +30,7 @@ export class OrderManagementVehicleComponent implements OnInit {
   isVisible = false;
   changeId: any;       // 主页面查看运费变更记录id - 用于运费变更记录
   changeViewId: any;  // 查看运费变更记录id - 用于查看
+  ViewCause: any;  // 变更运费查看数据
   _$expand = false;
   @ViewChild('st') private readonly st!: STComponent;
   @ViewChild('stFloat') private readonly stFloat!: STComponent;
@@ -457,15 +458,16 @@ resourceStatus: any;
         title: '费用名称',
         width: '100px',
         className: 'text-center',
-        render: 'goodsId'
+        index: 'costName'
       },
       {
         title: '变更前',
         width: '100px',
         className: 'text-center',
+        index: 'amountAfterChange'
       },
-      { title: '变更值', index: 'externalSn', width: '120px', className: 'text-center' },
-      { title: '变更后', index: 'externalSn', width: '120px', className: 'text-center' }
+      { title: '变更值', index: 'amountchangeValue', width: '120px', className: 'text-center' },
+      { title: '变更后', index: 'amountBeforeChange', width: '120px', className: 'text-center' }
     ];
   }
   /**
@@ -560,6 +562,9 @@ resourceStatus: any;
   FloatView(item: any) {
     console.log(item)
     this.changeViewId = item.id;
+    this.service.request(this.service.$api_getChangeRecordWholeDetail, {id: this.changeViewId}).subscribe((res) => {
+      this.ViewCause = res;
+    })
     this.isVisibleView = true
   }
    /**