批量审核

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

@@ -70,7 +70,7 @@ resourceStatus: any;
   constructor(
     public service: OrderManagementService,
     private modal: NzModalService,
-    public service2: ShipperBaseService,
+    public shipperservice: ShipperBaseService,
     public router: Router,
      ) { }
 
@@ -91,11 +91,25 @@ resourceStatus: any;
     const a:any = {};
     if(this.resourceStatus) {
       a.billStatus = this.resourceStatus;
-    }
-    return {
+     }
+    const params: any = Object.assign({}, this.sf?.value || {});
+    delete params._$expand;
+    return { 
       ...a,
-      ...this.sf?.value,
-    };
+      ...params,
+      createTime: {
+        start: this.sf?.value?.createTime?.[0] || '',
+        end: this.sf?.value?.createTime?.[1] || '',
+      },
+     };
+    // const a:any = {};
+    // if(this.resourceStatus) {
+    //   a.billStatus = this.resourceStatus;
+    // }
+    // return {
+    //   ...a,
+    //   ...this.sf?.value,
+    // };
   }
   get selectedRows() {
     return this.st?.list.filter((item) => item.checked) || [];
@@ -225,7 +239,7 @@ resourceStatus: any;
           } as SFSelectWidgetSchema
         },
 
-        plateNumber: {
+        CarNo: {
           title: '车牌号',
           type: 'string',
           ui: {
@@ -239,7 +253,7 @@ resourceStatus: any;
                   .request(this.service.$api_get_getCarLicenseListByCarNo, {
                     carNo: q
                   })
-                  .pipe(map((res: any) => (res?.records as any[]).map(i => ({ label: i.carNo, value: i.carNo } as SFSchemaEnum))))
+                  .pipe(map((res: any) => (res?.records as any[]).map(i => ({ label: i.carNo, value: i.id } as SFSchemaEnum))))
                   .toPromise();
               } else {
                 return of([]);
@@ -286,7 +300,7 @@ resourceStatus: any;
             },
           } as SFSelectWidgetSchema,
         },
-        creationTime: {
+        createTime: {
           title: '创建时间',
           type: 'string',
           ui: {
@@ -298,13 +312,13 @@ resourceStatus: any;
             }
           } as SFDateWidgetSchema
         },
-        isRiskSheet: {
+        riskStatus: {
           type: 'string',
           title: '是否风险单',
           enum: [
             { label: '全部', value: '' },
-            { label: '是', value: '1' },
-            { label: '否', value: '2' }
+            { label: '是', value: '3' },
+            { label: '否', value: '1' }
           ],
           ui: {
             widget: 'select',
@@ -314,6 +328,19 @@ resourceStatus: any;
             },
           },
         },
+        // riskStatus: {
+        //   title: '是否风险单',
+        //   type: 'string',
+        //   default: '',
+        //   ui: {
+        //     widget: 'dict-select',
+        //     params: { dictKey: 'bill:risk:status' },
+        //     containAllLable:true,
+        //     visibleIf: {
+        //       _$expand: (value: boolean) => value,
+        //     },
+        //   } as SFSelectWidgetSchema,
+        // },
         enterpriseInfoId: {
           type: 'string',
           title: '网络货运人',
@@ -324,7 +351,7 @@ resourceStatus: any;
               _$expand: (value: boolean) => value,
             },
             allowClear: true,
-            asyncData: () => this.service2.getNetworkFreightForwarder(),
+            asyncData: () => this.shipperservice.getNetworkFreightForwarder(),
           },
         },
         goodsNameId: {
@@ -338,7 +365,7 @@ resourceStatus: any;
               _$expand: (value: boolean) => value,
             },
             asyncData: () =>
-              this.service2.loadConfigByKey('goods.name.config.type').pipe(
+              this.shipperservice.loadConfigByKey('goods.name.config.type').pipe(
                 map((data: any) => {
                   return data[0].children?.map((m: any) => {
                     return { label: m.name, value: m.id };
@@ -428,7 +455,7 @@ resourceStatus: any;
       {
         title: '创建时间',
         className: 'text-left',
-        index: 'creationTime',
+        index: 'createTime',
         width: '170px',
       },
       {