车辆对接

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

@@ -287,11 +287,12 @@ export class OrderManagementRiskComponent implements OnInit {
         buttons: [
           {
             text: '审核',
-            click: _record => this.audit(_record)
+            click: _record => this.audit(_record),
+            iif: item => item.representationsStatus == '1' || item.representationsStatus == '2' ,
           },
           {
             text: '详情',
-            click: _record => this.viewEvaluate(_record)
+            click: _record => this.viewEvaluate(_record),
           }
         ]
       }
@@ -372,17 +373,6 @@ export class OrderManagementRiskComponent implements OnInit {
     this._$expand = false;
   }
 
-  // 获取录单员
-  getCatalogueMember() {
-    const params = {};
-    return this.service.request(this.service.$api_get_catalogue_member, params, 'GET').pipe(
-      map(res => {
-        if (res) {
-          console.log(res);
-        }
-      })
-    );
-  }
 
   selectChange(e: number) {
     console.log(e);
@@ -412,7 +402,7 @@ export class OrderManagementRiskComponent implements OnInit {
       id: this.sfView.value.billCode,
       representationsCause: this.sfView.value.representationsCause
     };
-    this.service.request(this.service.$api_get_catalogue_member, parms).subscribe(res => {
+    this.service.request(this.service.$api_get_listRisk_audit, parms).subscribe(res => {
       console.log(res);
       if (res) {
         this.service.msgSrv.success('审核通过！');
@@ -431,7 +421,7 @@ export class OrderManagementRiskComponent implements OnInit {
       id: this.sfView.value.billCode,
       representationsCause: this.sfView.value.representationsCause
     };
-    this.service.request(this.service.$api_get_catalogue_member, parms).subscribe(res => {
+    this.service.request(this.service.$api_get_listRisk_audit, parms).subscribe(res => {
       console.log(res);
       if (res) {
         this.service.msgSrv.success('审核通过！');

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 11:10:14
- * @LastEditTime: 2021-12-13 14:51:27
+ * @LastEditTime: 2021-12-22 10:36:57
  * @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\bulk\bulk.component.html
@@ -76,11 +76,14 @@
         <div *ngIf="item.serviceType === 2">指派</div>
       </ng-template>
       <ng-template st-row="orderSn" let-item let-index="index">
-        <div>待发车 (<span [ngStyle]="{ color:index>0?'#1890FF':''}">0</span>)</div>
+        <div *ngFor="let item of item?.wayBillClassifiedStatisticsVOList">
-        <div>运输中 (<span [ngStyle]="{ color:index>0?'#1890FF':''}">0</span>)</div>
+          <label>{{item.wayBillStatusLabel}}</label>
-        <div>待签收 (<span [ngStyle]="{ color:index>0?'#1890FF':''}">0</span>)</div>
+          (<span [ngStyle]="{ color:item?.count>0?'#1890FF':''}">{{item?.count}}</span>)
-        <div>已完成 (<span [ngStyle]="{ color:index>0?'#1890FF':''}">0</span>)</div>
+        </div>
-        <div>已取消 (<span [ngStyle]="{ color:index>0?'#1890FF':''}">0</span>)</div>
+      </ng-template>
+      <ng-template st-row="demand" let-item let-index="index">
+        <div>车型: {{item.maxWeightLabel}}</div>
+        <div class="error">车长: {{item.maxCubeLabel}} 米</div>
       </ng-template>
       <ng-template st-row="goodsInfo" let-item let-index="index">
         <div>{{item.owner}}</div>

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

@@ -200,7 +200,7 @@ export class SupplyManagementBulkComponent implements OnInit {
         title: '用车需求',
         className: 'text-center',
         width: '150px',
-        index: 'vehicleDemand'
+        render: 'demand'
       },
       {
         title: '运费单价',