车辆接口更新

src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-12 10:52:50
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-01-21 16:57:10
+ * @LastEditTime : 2022-01-24 11:06:06
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\receipts-audit\\receipts-audit.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -63,13 +63,13 @@
     </ng-template>
     <ng-template st-row="loadingLadingBillFilePath" let-item let-index="index">
       <div>
-        <span><img [src]="item.loadingLadingBillFilePath" alt=""></span>
+        <span><img style="height: 60px; padding-right: 5px;" [src]="item.loadingLadingBillFilePath" alt=""></span>
-        <span><img [src]="item.loadingPeopleVehiclesGoodsFilePath" alt=""></span>
+        <span><img style="height: 60px;" [src]="item.loadingPeopleVehiclesGoodsFilePath" alt=""></span>
       </div>
     </ng-template>
     <ng-template st-row="unloadingLadingBillFilePath" let-item let-index="index">
-      <span><img [src]="item.unloadingLadingBillFilePath" alt=""></span>
+      <span><img style="height: 60px; padding-right: 5px;" [src]="item.unloadingLadingBillFilePath" alt=""></span>
-      <span><img [src]="item.unloadingPeopleVehiclesGoodsFilePath" alt=""></span>
+      <span><img  style="height: 60px;" [src]="item.unloadingPeopleVehiclesGoodsFilePath" alt=""></span>
     </ng-template>
     <ng-template st-row="loadingTime" let-item let-index="index">
       <div *ngIf="item?.loadingTime">装 | {{item?.loadingTime}}</div>

src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.html

@@ -27,5 +27,5 @@
 <div class="modal-footer">
   <button nz-button type="button"   *ngIf="Status === 1" (click)="close()">关闭</button>
   <button nz-button type="submit"   *ngIf="Status === 1" nzType="primary" (click)="save(sf.value)" [nzLoading]="http.loading">确定</button>
-  <button nz-button type="submit"  nzType="primary" *ngIf="Status !== 1" (click)="save(sf.value)" [nzLoading]="http.loading">生成电子单据</button>
+  <button nz-button type="submit"  nzType="primary" *ngIf="Status !== 1" (click)="sure()" [nzLoading]="http.loading">生成电子单据</button>
 </div>

src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts

@@ -398,49 +398,37 @@ export class orderManagementVoucherViewComponent implements OnInit {
     };
   }
   save(value: any): void {
-    if(this.Status === 1) {
+      if(!value) {
-      if(!value.time) {
         this.service.msgSrv.warning('必填项为空！')
         return;
        }
+      console.log(value)
        const params = {
         id: this.i.id,
+        loadingLadingBillFilePath: value.loadingLadingBillFilePath.data.fullFilePath,
+        loadingPeopleVehiclesGoodsFilePath: value.loadingPeopleVehiclesGoodsFilePath.data.fullFilePath,
         unloadingLadingBillFilePath: value.unloadingLadingBillFilePath.data.fullFilePath,
         unloadingPeopleVehiclesGoodsFilePath: value.unloadingPeopleVehiclesGoodsFilePath.data.fullFilePath,
-        time: value.time,
       }
-      // params.time = this.datePipe.transform(value.time, 'yyyy-MM-dd HH:mm:ss ')
+      console.log(params)
-      // this.service.request(this.service.$api_get_insertWholeUnloadCarInfo, params).subscribe((res) => {
+      this.service.request(this.service.$api_get_updateBillExamine, params).subscribe((res) => {
-      //   if(res) {
+        if(res) {
-      //     this.service.msgSrv.success('确认到车成功！')
+          this.service.msgSrv.success('修改成功！')
-      //      this.modal.destroy(true);
+           this.modal.destroy(true);
-      //   }
-      // })
-    } else {
-      if(!value.time || !this.data.weight) {
-        this.service.msgSrv.warning('必填项为空！')
-        return;
-       }
-        console.log(value)
-        console.log(this.i)
-        const params = {
-          id: this.i?.id,
-          unloadingLadingBillFilePath: value.unloadingLadingBillFilePath.data.fullFilePath,
-          unloadingPeopleVehiclesGoodsFilePath: value.unloadingPeopleVehiclesGoodsFilePath.data.fullFilePath,
-          time: value.time,
-          volume: this.data.volume,
-          weight: this.data.weight
         }
-        // params.time = this.datePipe.transform(value.time, 'yyyy-MM-dd HH:mm:ss ')
+      })
-        // console.log(params)
+  }
-        // this.service.request(this.service.$api_get_insertBulkUnloadCarInfo, params).subscribe((res) => {
+  sure() {
-        //   if(res) {
+    const params = {
-        //     this.service.msgSrv.success('确认到车成功！')
+     id: this.i.id,
-        //      this.modal.destroy(true);
+   }
-        //   }
+   console.log(params)
-        // })
+   this.service.request(this.service.$api_get_billAuditPass, params).subscribe((res) => {
-    }
+     if(res) {
-
+       this.service.msgSrv.success('审核成功！')
+        this.modal.destroy(true);
+     }
+   })
   }
     //  确认到车界面信息(两个只能看的图片)
   initData() {

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

@@ -135,6 +135,10 @@ export class OrderManagementService extends ShipperBaseService {
   public $api_get_billAudit = '/api/sdc/billExamine/billAudit';
     // 统计单据审核状态数量
   public $api_get_getAuditStatistical = '/api/sdc/billExamine/getAuditStatistical';
+    // 修改单据审核
+  public $api_get_updateBillExamine = '/api/sdc/billExamine/updateBillExamine';
+    // 单据审核通过
+  public $api_get_billAuditPass = '/api/sdc/billExamine/billAuditPass';
 
 
     // 查询规则抽查列表