解决冲突

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

@@ -65,6 +65,8 @@ export class OrderManagementRiskComponent extends BasicTableComponent implements
   beforeReq = (requestOptions: STRequestOptions) => {
     const a: any = {};
     if (this.resourceStatus) {
+      console.log(this.resourceStatus);
+      
       a.representationsStatus = this.resourceStatus;
     }
     const params: any = Object.assign({}, this.sf?.value || {});

src/app/routes/vehicle/components/list/carauth/carauth.component.ts

@@ -469,13 +469,8 @@ export class CarSettleCarauthComponent implements OnInit {
           title: '使用性质',
           type: 'string',
           maxLength: 30,
-          enum: [
-            { label: '非营运', value: 0 },
-            { label: '营运', value: 1 },
-          ],
           ui: {
-            widget: 'select',
-            placeholder: '请选择',
+            placeholder: '请输入',
           },
         },
         curbWeight: {
@@ -602,6 +597,7 @@ export class CarSettleCarauthComponent implements OnInit {
         'carNo',
         'carNoColor',
         'carModel',
+        'carEnergyType',
         'carLength',
         'carLoad',
         'isSelf',
@@ -689,7 +685,7 @@ export class CarSettleCarauthComponent implements OnInit {
           this.sf.setValue('/driverLicenseSigningOrg', res.issuingAuthority);
           this.sf.setValue('/carDistinguishCode', res.vin);
           this.sf.setValue('/carOwner', res.name);
-          this.sf.setValue('/useNature', res.useCharacter === '非营运' ? 0 : 1);
+          this.sf.setValue('/useNature', res.useCharacter);
           this.sf.setValue('/carModel', res?.vehicleType);
           
         } else {