车辆接口更新

src/app/routes/financial-management/components/main-account/setting-financial/setting-financial.component.ts

@@ -37,28 +37,24 @@ export class SettingFinancialComponent implements OnInit {
         phone: {
           title: '纳税人识别号',
           type: 'string',
-          format: 'mobile',
           ui: { widget: 'string', placeholder: '请输入纳税人识别号' },
           default: staff.phone
         },
         phone2: {
           title: '税收分类编码',
           type: 'string',
-          format: 'mobile',
           ui: { widget: 'string', placeholder: '请输入税收分类编码' },
           default: staff.phone
         },
         phone3: {
           title: '发票税率',
           type: 'string',
-          format: 'mobile',
           ui: { widget: 'string', placeholder: '请输入发票税率' },
           default: staff.phone
         },
         phone4: {
           title: '附加费比例',
           type: 'string',
-          format: 'mobile',
           ui: { widget: 'string', placeholder: '请输入附加费比例' },
           default: staff.phone
         }

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

@@ -179,6 +179,7 @@ tabs = {
             serverSearch: true,
             searchDebounceTime: 300,
             searchLoadingText: '搜索中...',
+            allowClear: true,
             onSearch: (q: any) => {
               if (!!q) {
                 return this.service
@@ -191,6 +192,20 @@ tabs = {
             },
           } as SFSelectWidgetSchema,
         },
+        enterpriseProjectId: {
+          type: 'string',
+          title: '所属项目',
+          ui: {
+            widget: 'select',
+            placeholder: '请选择',
+            allowClear: true,
+            asyncData: () => this.service.getEnterpriseProject(),
+            visibleIf: {
+              _$expand: (value: boolean) => value
+            }
+          },
+          default: ''
+        },
         loadingPlace: {
           type: 'string',
           title: '装货地',
@@ -242,7 +257,7 @@ tabs = {
           ui: {
             widget: 'dict-select',
             params: { dictKey: 'overall:payment:status' },
-            containAllLable:true,
+            containsAllLable: true,
             visibleIf: {
               _$expand: (value: boolean) => value,
             },
@@ -255,6 +270,7 @@ tabs = {
             widget: 'date',
             mode: 'range',
             format: 'yyyy-MM-dd',
+            allowClear: true,
             visibleIf: {
               _$expand: (value: boolean) => value
             }
@@ -282,33 +298,13 @@ tabs = {
           ui: {
             widget: 'select',
             placeholder: '请选择',
+            allowClear: true,
             visibleIf: {
               _$expand: (value: boolean) => value,
             },
-            allowClear: true,
             asyncData: () => this.shipperservice.getNetworkFreightForwarder(),
           },
         },
-        goodsNameId: {
-          type: 'string',
-          title: '货物名称',
-          ui: {
-            widget: 'select',
-            placeholder: '请选择',
-            errors: { required: '请选择货物类型' },
-            visibleIf: {
-              _$expand: (value: boolean) => value,
-            },
-            asyncData: () =>
-              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 };
-                  });
-                })
-              ),
-          } as SFSelectWidgetSchema
-        },
         serviceType: {
           title: '服务类型',
           type: 'string',
@@ -316,6 +312,19 @@ tabs = {
           ui: {
             widget: 'dict-select',
             params: { dictKey: 'service:type' },
+            containsAllLable: true,
+            visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
+          } as SFSelectWidgetSchema,
+        },
+        settlementBasis: {
+          title: '结算依据',
+          type: 'string',
+          ui: {
+            widget: 'dict-select',
+            containsAllLable: true,
+            params: { dictKey: 'goodresource:settlement:type' },
             containAllLable:true,
             visibleIf: {
               _$expand: (value: boolean) => value,

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

@@ -175,6 +175,7 @@ resourceStatus: any;
             serverSearch: true,
             searchDebounceTime: 300,
             searchLoadingText: '搜索中...',
+            allowClear: true,
             onSearch: (q: any) => {
               if (!!q) {
                 return this.service
@@ -187,6 +188,20 @@ resourceStatus: any;
             },
           } as SFSelectWidgetSchema,
         },
+        enterpriseProjectId: {
+          type: 'string',
+          title: '所属项目',
+          ui: {
+            widget: 'select',
+            placeholder: '请选择',
+            allowClear: true,
+            asyncData: () => this.service.getEnterpriseProject(),
+            visibleIf: {
+              _$expand: (value: boolean) => value
+            }
+          },
+          default: ''
+        },
         loadingPlace: {
           type: 'string',
           title: '装货地',
@@ -205,29 +220,6 @@ resourceStatus: any;
             }
           }
         },
-        // driverId: {
-        //   title: '承运司机',
-        //   type: 'string',
-        //   ui: {
-        //     widget: 'select',
-        //     serverSearch: true,
-        //     searchDebounceTime: 300,
-        //     searchLoadingText: '搜索中...',
-        //     onSearch: (q: any) => {
-        //       if (!!q) {
-        //         return this.service
-        //           .request(this.service.$api_get_getDriverInfo, { keyword: q, model: 1, type: 1 })
-        //           .pipe(map(res => (res as any[]).map(i => ({ label: i.name, value: i.appUserId } as SFSchemaEnum))))
-        //           .toPromise();
-        //       } else {
-        //         return of([]);
-        //       }
-        //     },
-        //     visibleIf: {
-        //       _$expand: (value: boolean) => value
-        //     }
-        //   } as SFSelectWidgetSchema
-        // },
         driverName: {
           title: '承运司机',
           type: 'string',
@@ -262,7 +254,7 @@ resourceStatus: any;
           ui: {
             widget: 'dict-select',
             params: { dictKey: 'overall:payment:status' },
-            containAllLable:true,
+            containsAllLable: true,
             visibleIf: {
               _$expand: (value: boolean) => value,
             },
@@ -296,19 +288,6 @@ 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: '网络货运人',
@@ -322,26 +301,26 @@ resourceStatus: any;
             asyncData: () => this.shipperservice.getNetworkFreightForwarder(),
           },
         },
-        goodsNameId: {
+        // goodsNameId: {
-          type: 'string',
+        //   type: 'string',
-          title: '货物名称',
+        //   title: '货物名称',
-          ui: {
+        //   ui: {
-            widget: 'select',
+        //     widget: 'select',
-            placeholder: '请选择',
+        //     placeholder: '请选择',
-            errors: { required: '请选择货物类型' },
+        //     errors: { required: '请选择货物类型' },
-            visibleIf: {
+        //     visibleIf: {
-              _$expand: (value: boolean) => value,
+        //       _$expand: (value: boolean) => value,
-            },
+        //     },
-            asyncData: () =>
+        //     asyncData: () =>
-              this.shipperservice.loadConfigByKey('goods.name.config.type').pipe(
+        //       this.shipperservice.loadConfigByKey('goods.name.config.type').pipe(
-                map((data: any) => {
+        //         map((data: any) => {
-                  return data[0].children?.map((m: any) => {
+        //           return data[0].children?.map((m: any) => {
-                    return { label: m.name, value: m.id };
+        //             return { label: m.name, value: m.id };
-                  });
+        //           });
-                })
+        //         })
-              ),
+        //       ),
-          } as SFSelectWidgetSchema
+        //   } as SFSelectWidgetSchema
-        },
+        // },
         serviceType: {
           title: '服务类型',
           type: 'string',
@@ -349,7 +328,7 @@ resourceStatus: any;
           ui: {
             widget: 'dict-select',
             params: { dictKey: 'service:type' },
-            containAllLable:true,
+            containsAllLable: true,
             visibleIf: {
               _$expand: (value: boolean) => value,
             },

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

@@ -146,6 +146,7 @@ export class SupplyManagementBulkComponent implements OnInit {
             visibleIf: {
               _$expand: (value: boolean) => value,
             },
+            allowClear: true,
           } as SFDateWidgetSchema,
         },
         deadlineTime: {
@@ -158,6 +159,7 @@ export class SupplyManagementBulkComponent implements OnInit {
             visibleIf: {
               _$expand: (value: boolean) => value,
             },
+            allowClear: true,
           } as SFDateWidgetSchema,
         },
         enterpriseInfoId: {
@@ -184,6 +186,7 @@ export class SupplyManagementBulkComponent implements OnInit {
             visibleIf: {
               _$expand: (value: boolean) => value
             },
+            allowClear: true,
             onSearch: (q: any) => {
               console.log(q)
               if (!!q) {

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

@@ -350,6 +350,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
             visibleIf: {
               _$expand: (value: boolean) => value
             },
+            allowClear: true,
             onSearch: (q: any) => {
               console.log(q);
               if (!!q) {
@@ -371,6 +372,8 @@ export class SupplyManagementVehicleComponent implements OnInit {
             visibleIf: {
               _$expand: (value: boolean) => value
             },
+            allowClear: true,
+            containsAllLable: true,
             asyncData: () => this.shipperSrv.getEnterpriseProject()
           } as SFSelectWidgetSchema
         },
@@ -383,7 +386,8 @@ export class SupplyManagementVehicleComponent implements OnInit {
             params: { dictKey: 'service:type' },
             visibleIf: {
               _$expand: (value: boolean) => value
-            }
+            },
+            allowClear: true
           } as SFSelectWidgetSchema
         },
         auditStatus: {
@@ -391,10 +395,13 @@ export class SupplyManagementVehicleComponent implements OnInit {
           type: 'string',
           ui: {
             widget: 'dict-select',
+            allowClear: true,
+            containsAllLable: true,
             params: { dictKey: 'goodresource:audit:status' },
             visibleIf: {
               _$expand: (value: boolean) => value
-            }
+            },
+            
           } as SFSelectWidgetSchema
         },
         enterpriseInfoId: {

src/app/routes/sys-setting/components/staff-management/staff-modal/staff-modal.component.ts

@@ -34,7 +34,6 @@ export class SystemStaffStaffModalComponent implements OnInit {
         telephone: {
           title: '手机号码',
           type: 'string',
-          format: 'mobile',
           maxLength: 11,
           ui: { widget: staff?.appUserId ? 'text' : 'string', placeholder: '请输入员工手机号' },
           default: staff.telephone

src/app/routes/usercenter/components/driver/captain/captain.component.ts

@@ -127,7 +127,6 @@ export class UserCenterComponentsDriverCaptainComponent implements OnInit {
         mobile: {
           title: '手机号',
           type: 'string',
-          format: 'mobile',
           maxLength: 11,
           ui: {
             placeholder: '请输入'
@@ -143,7 +142,6 @@ export class UserCenterComponentsDriverCaptainComponent implements OnInit {
         promotersTelephone: {
           title: '业务员手机号',
           type: 'string',
-          format: 'mobile',
           maxLength: 11,
           ui: {
             placeholder: '请输入',

src/app/routes/usercenter/components/driver/driver.component.ts

@@ -148,7 +148,6 @@ export class UserCenterComponentsDriverComponent implements OnInit {
         mobile: {
           title: '手机号',
           type: 'string',
-          format: 'mobile',
           maxLength: 11,
           ui: {
             placeholder: '请输入'
@@ -207,7 +206,6 @@ export class UserCenterComponentsDriverComponent implements OnInit {
         promotersTelephone: {
           title: '推广业务员',
           type: 'string',
-          format: 'mobile',
           maxLength: 11,
           ui: {
             placeholder: '请输入手机号',

src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts

@@ -246,7 +246,6 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
         mobile: {
           title: '手机号',
           type: 'string',
-          format: 'mobile',
           maxLength: 11,
           ui: {
             placeholder: '请输入'

src/app/routes/usercenter/components/freight/list/list.component.ts

@@ -150,23 +150,6 @@ export class FreightComponentsListComponent implements OnInit {
             }
           }
         },
-        crmStatus: {
-          type: 'string',
-          title: 'CRM审核状态',
-          enum: [
-            { label: '全部', value: '' },
-            { label: '待审核', value: '10' },
-            { label: '审核通过', value: '20' },
-            { label: '驳回', value: '30' }
-          ],
-          default: '',
-          ui: {
-            widget: 'select',
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
-          }
-        },
         lockedStatus: {
           type: 'string',
           title: '企业状态',
@@ -197,17 +180,6 @@ export class FreightComponentsListComponent implements OnInit {
       { title: '常用服务', className: 'text-center', index: 'oftenUsedServices', type: 'enum', enum: { 10: '整车发货', 20: '大宗发货' } },
       { title: '推广业务员', className: 'text-center', render: 'promotersTelephone' },
       { title: '注册渠道', className: 'text-center', index: 'source', type: 'enum', enum: { 1: '用户注册', 2: '货主添加' } },
-      {
-        title: 'CRM审核状态',
-        className: 'text-center',
-        index: 'crmStatus',
-        type: 'badge',
-        badge: {
-          10: { text: '待审核', color: 'default' },
-          20: { text: '已成功', color: 'success' },
-          30: { text: '审核失败', color: 'warning' }
-        }
-      },
       {
         title: '企业状态',
         className: 'text-center',

src/app/routes/usercenter/components/freight/user/user.component.ts

@@ -147,7 +147,6 @@ export class FreightComponentsUserComponent implements OnInit {
         telephone: {
           title: '手机号',
           type: 'string',
-          format: 'mobile',
           maxLength: 11,
           ui: {
             placeholder: '请输入'
@@ -173,7 +172,6 @@ export class FreightComponentsUserComponent implements OnInit {
         promotersTelephone: {
           title: '推广业务员',
           type: 'string',
-          format: 'mobile',
           maxLength: 11,
           ui: {
             placeholder: '请输入手机号',

src/app/routes/vehicle/components/audit/audit.component.ts

@@ -80,6 +80,7 @@ export class VehicleComponentsAuditComponent implements OnInit {
             serverSearch: true,
             searchDebounceTime: 300,
             searchLoadingText: '搜索中...',
+            allowClear: true,
             onSearch: (q: any) => {
               if (!!q) {
                 return this.service
@@ -103,6 +104,7 @@ export class VehicleComponentsAuditComponent implements OnInit {
           ui: {
             widget: 'dict-select',
             params: { dictKey: 'car:color' },
+            containsAllLable: true,
           }
         },
         isSelf: {
@@ -114,6 +116,7 @@ export class VehicleComponentsAuditComponent implements OnInit {
           ],
           ui: {
             widget: 'select',
+            allowClear: true,
           }
         },
         saveUser: {

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

@@ -79,6 +79,7 @@ export class VehicleComponentsListComponent implements OnInit {
             serverSearch: true,
             searchDebounceTime: 300,
             searchLoadingText: '搜索中...',
+            allowClear: true,
             onSearch: (q: any) => {
               if (!!q) {
                 return this.service
@@ -101,7 +102,7 @@ export class VehicleComponentsListComponent implements OnInit {
           title: '车牌颜色',
           ui: {
             widget: 'dict-select',
-            containAllLable:true,
+            containsAllLable: true,
             params: { dictKey: 'car:color' },
           },
         },
@@ -113,6 +114,7 @@ export class VehicleComponentsListComponent implements OnInit {
             { label: '运输中', value: 1 },
           ],
           ui: {
+            allowClear: true,
             widget: 'select',
           },
         },
@@ -122,7 +124,7 @@ export class VehicleComponentsListComponent implements OnInit {
           ui: {
             widget: 'dict-select',
             params: { dictKey: 'car:model' },
-            containAllLable:true,
+            containsAllLable: true,
             visibleIf: {
               expand: (value: boolean) => value,
             },
@@ -134,7 +136,7 @@ export class VehicleComponentsListComponent implements OnInit {
            ui: {
             widget: 'dict-select',
             params: { dictKey: 'car:length' },
-            containAllLable:true,
+            containsAllLable: true,
             visibleIf: {
               expand: (value: boolean) => value,
             },
@@ -149,6 +151,7 @@ export class VehicleComponentsListComponent implements OnInit {
           ],
           ui: {
             widget: 'select',
+            allowClear: true,
             visibleIf: {
               expand: (value: boolean) => value,
             },
@@ -165,6 +168,7 @@ export class VehicleComponentsListComponent implements OnInit {
           default: '',
           ui: {
             widget: 'select',
+            allowClear: true,
             visibleIf: {
               expand: (value: boolean) => value,
             },
@@ -180,6 +184,7 @@ export class VehicleComponentsListComponent implements OnInit {
           ],
           ui: {
             widget: 'select',
+            allowClear: true,
             visibleIf: {
               expand: (value: boolean) => value,
             },

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

@@ -132,7 +132,7 @@ tabs = {
             }
           }
         },
-        carNo: {
+        licenseCarNo: {
           title: '车牌号',
           type: 'string',
           ui: {
@@ -141,7 +141,7 @@ tabs = {
             }
           }
         },
-        captainName: {
+        carCaptainName: {
           title: '车队长',
           type: 'string',
           ui: {

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

@@ -141,7 +141,7 @@ export class WaybillManagementVehicleComponent implements OnInit {
             }
           }
         },
-        carNo: {
+        licenseCarNo: {
           title: '车牌号',
           type: 'string',
           ui: {
@@ -150,7 +150,7 @@ export class WaybillManagementVehicleComponent implements OnInit {
             }
           }
         },
-        captainName: {
+        carCaptainName: {
           title: '车队长',
           type: 'string',
           ui: {

src/assets/mocks/menu-data.json

@@ -152,8 +152,7 @@
               {
                 "text": "整车订单",
                 "icon": "anticon anticon-dashboard",
-                "link": "/order-management/vehicle",
+                "link": "/order-management/vehicle"
-                "reuse": true
               },
               {
                 "text": "大宗订单",