车辆对接

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

@@ -658,6 +658,9 @@ tabs = {
       },
       nzFooter: null
     });
+    modalRef.afterClose.subscribe((result: any) => {
+        this.st.load(1);
+    });
   }
   userAction() {
     let params: any[] = [];
@@ -668,6 +671,7 @@ tabs = {
     console.log(params)
     this.service.request(this.service.$api_get_batchSignBulkOrder, params).subscribe(res => {
       if (res) {
+        this.st.load(1);
         console.log(res);
       } else {
         this.service.msgSrv.error(res.msg);
@@ -684,7 +688,7 @@ tabs = {
             this.service.request(this.service.$api_get_cancelAnOrder, {id: item.id}).subscribe((res) => {
               if (res === true) {
                 this.service.msgSrv.success('操作成功！');
-                this.st?.reload();
+                this.st?.reload(1);
                 this.initST();
               }
             }),
@@ -699,6 +703,7 @@ tabs = {
             if(res) {
               this.service.msgSrv.success('撤销成功！')
               this.stFloat.reload()
+              this.st?.reload(1);
             } else {
               this.service.msgSrv.error(res.msg)
             }

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-29 15:00:48
+ * @LastEditTime: 2022-01-12 13:30:48
  * @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
@@ -116,15 +116,12 @@
         <span class="mr-xs">{{111111}}</span>
         <a (click)="editEnternalSn(item)">编辑</a>
       </ng-template> -->
-      <ng-template st-row="enStatusStr27878" let-item let-index="index">
-        <div class="mr-xs" nzPopoverTitle="Title" nz-popover [nzPopoverContent]="contentTemplate">{{item.no}}</div>
-      </ng-template>
       <!-- <ng-template st-row="feiong" let-item let-index="index">
         <div style="color: aqua;" (click)="OpenPrice()">
           {{item.no}}
         </div>
       </ng-template> -->
-      <ng-template #contentTemplate>
+      <!-- <ng-template #contentTemplate>
         <div>
           <p>预付：¥200.00</p>
           <p>到付：¥200.00</p>
@@ -133,7 +130,7 @@
           <p>小计：¥200.00</p>
           <p>附加费：¥200.00</p>
         </div>
-      </ng-template>
+      </ng-template> -->
     </st>
   </div>
 </nz-card>

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

@@ -102,13 +102,14 @@ export class SupplyManagementVehicleDetailComponent implements OnInit {
       nzTitle: '<b>确定取消货源吗?</b>',
       nzContent: `<b>取消后不可恢复，谨慎操作</b>`,
       nzOnOk: () =>
-            this.service.msgSrv.success('操作成功！')
+      console.log('1')
-        // this.service.request(this.service.$api_cancle_goods_source, { id: this.i.id }).subscribe((res) => {
+      // this.service.request(this.service.$api_cancle_goods_source, {id: record.id}).subscribe(res => {
       //   if (res === true) {
       //     this.service.msgSrv.success('操作成功！');
-        //     this.getGoodsSourceDetail();
+      //     this.st?.reload();
+      //     this.getGoodsSourceStatistical();
       //   }
-        // }),
+      // })
     })
   }
 

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

@@ -236,7 +236,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
       nzTitle: '<b>确定取消货源吗?</b>',
       nzContent: `<b>取消后不可恢复，谨慎操作</b>`,
       nzOnOk: () =>
-        this.service.request(this.service.$api_cancle_goods_source, [record.id]).subscribe(res => {
+        this.service.request(this.service.$api_cancle_goods_source, {id: record.id}).subscribe(res => {
           if (res === true) {
             this.service.msgSrv.success('操作成功！');
             this.st?.reload();

src/app/routes/waybill-management/components/vehicle/vehicle.component.spec.ts

@@ -1,19 +1,27 @@
+/*
+ * @Author: your name
+ * @Date: 2021-12-07 14:52:29
+ * @LastEditTime: 2022-01-12 13:14:49
+ * @LastEditors: your name
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ * @FilePath: \tms-obc-web\src\app\routes\waybill-management\components\vehicle\vehicle.component.spec.ts
+ */
 import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-import { SupplyManagementVehicleComponent } from './vehicle.component';
+import { WaybillManagementVehicleComponent } from './vehicle.component';
 
-describe('SupplyManagementVehicleComponent', () => {
+describe('WaybillManagementVehicleComponent', () => {
-  let component: SupplyManagementVehicleComponent;
+  let component: WaybillManagementVehicleComponent;
-  let fixture: ComponentFixture<SupplyManagementVehicleComponent>;
+  let fixture: ComponentFixture<WaybillManagementVehicleComponent>;
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
-      declarations: [ SupplyManagementVehicleComponent ]
+      declarations: [ WaybillManagementVehicleComponent ]
     })
     .compileComponents();
   }));
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(SupplyManagementVehicleComponent);
+    fixture = TestBed.createComponent(WaybillManagementVehicleComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });

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

@@ -86,7 +86,7 @@ export class WaybillManagementVehicleComponent implements OnInit {
     this.schema = {
       properties: {
         _$expand: { type: 'boolean', ui: { hidden: true } },
-        wayBillCodeno: {
+        wayBillCode: {
           type: 'string',
           title: '运单号'
         },
@@ -94,9 +94,29 @@ export class WaybillManagementVehicleComponent implements OnInit {
           type: 'string',
           title: '货源编号'
         },
-        no1: {
+        shipperAppUserId: {
           type: 'string',
-          title: '货主'
+          title: '货主',
+          ui: {
+            widget: 'select',
+            serverSearch: true,
+            searchDebounceTime: 300,
+            searchLoadingText: '搜索中...',
+            visibleIf: {
+              _$expand: (value: boolean) => value
+            },
+            onSearch: (q: any) => {
+              console.log(q)
+              if (!!q) {
+                return this.service
+                  .request(this.service.$api_enterpriceList, { enterpriseName: q})
+                  .pipe(map((res: any) => (res as any[]).map((i) => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum))))
+                  .toPromise();
+              } else {
+                return of([]);
+              }
+            },
+          } as SFSelectWidgetSchema,
         },
         loadingPlace: {
           type: 'string',