diff --git a/src/app/routes/commom/less/box.less b/src/app/routes/commom/less/box.less index 40095399..a9e86f05 100644 --- a/src/app/routes/commom/less/box.less +++ b/src/app/routes/commom/less/box.less @@ -16,8 +16,8 @@ } .ant-tabs-tab-btn { - padding-left : 16px; padding-right: 16px; + padding-left : 16px; } .text-truncate { diff --git a/src/app/routes/commom/less/expend-but.less b/src/app/routes/commom/less/expend-but.less index cf56baf5..f454e789 100644 --- a/src/app/routes/commom/less/expend-but.less +++ b/src/app/routes/commom/less/expend-but.less @@ -1,13 +1,13 @@ .expend-options { - margin-top: 0px; + margin-top: 0; } @media (min-width: 1200px) { .expend-options { - max-width: 450px; position : absolute; right : 0; bottom : 25px; + max-width: 450px; } } \ No newline at end of file diff --git a/src/app/routes/order-management/components/bulk/bulk.component.ts b/src/app/routes/order-management/components/bulk/bulk.component.ts index c0ef5cb5..59e014fe 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.ts +++ b/src/app/routes/order-management/components/bulk/bulk.component.ts @@ -185,7 +185,7 @@ tabs = { } as SFSelectWidgetSchema }, - carNo: { + carNo: { title: '车牌号', type: 'string', ui: { @@ -199,17 +199,17 @@ tabs = { .request(this.service.$api_get_getCarLicenseListByCarNo, { carNo: q }) - .pipe(map((res: any[]) => (res 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.carNo } as SFSchemaEnum)))) .toPromise(); } else { return of([]); } }, visibleIf: { - _$expand: (value: boolean) => value, - }, - } as SFSelectWidgetSchema, - }, + _$expand: (value: boolean) => value + } + } as SFSelectWidgetSchema + }, payeeId: { title: '车队长', type: 'string', @@ -287,18 +287,35 @@ tabs = { asyncData: () => this.service2.getNetworkFreightForwarder(), }, }, - goodsName: { + // goodsName: { + // type: 'string', + // title: '货物名称', + // ui: { + // widget: 'select', + // placeholder: '请选择', + // visibleIf: { + // _$expand: (value: boolean) => value, + // }, + // allowClear: true, + // asyncData: () => this.getCatalogueMember(), + // }, + // }, + goodsTypeId: { type: 'string', title: '货物名称', ui: { widget: 'select', placeholder: '请选择', - visibleIf: { - _$expand: (value: boolean) => value, - }, - allowClear: true, - asyncData: () => this.getCatalogueMember(), - }, + errors: { required: '请选择货物类型' }, + asyncData: () => + this.service2.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: '服务类型', @@ -640,7 +657,7 @@ tabs = { nzComponentParams: { data: { ...data, billId: item.id } }, }); - modal.afterClose.subscribe(_ => this.st.reload()); + modal.afterClose.subscribe(_ => this.st.reload(1)); } }); } @@ -691,6 +708,7 @@ tabs = { this.st?.reload(1); this.initST(); } + this.st?.reload(1); }), }) } diff --git a/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.html b/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.html index 97817a28..5d13143c 100644 --- a/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.html +++ b/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.html @@ -1,7 +1,7 @@ - TMS运营管理系统 -
提交时间：{{datailList?.complainantTime}}
- - 运多星运营后台 -
操作人员：{{datailList?.complainantIdLabel}}
-
处理状态：{{datailList?.complaintStatusLabel}}
-
处理详情：{{datailList?.handleDetails}}
-
处理结果：{{datailList?.handleResult}}
+ {{i?.nodeNameLabel}} +
{{i?.nodeName}}：{{i?.result}}
 diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.ts b/src/app/routes/order-management/components/vehicle/vehicle.component.ts index 04897e01..73822a0a 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -199,7 +199,7 @@ resourceStatus: any; } as SFSelectWidgetSchema }, - carNo: { + carNo: { title: '车牌号', type: 'string', ui: { @@ -213,17 +213,17 @@ resourceStatus: any; .request(this.service.$api_get_getCarLicenseListByCarNo, { carNo: q }) - .pipe(map((res: any[]) => (res 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.carNo } as SFSchemaEnum)))) .toPromise(); } else { return of([]); } }, visibleIf: { - _$expand: (value: boolean) => value, - }, - } as SFSelectWidgetSchema, - }, + _$expand: (value: boolean) => value + } + } as SFSelectWidgetSchema + }, payeeId: { title: '车队长', type: 'string', @@ -305,13 +305,10 @@ resourceStatus: any; type: 'string', title: '货物名称', ui: { - widget: 'select', placeholder: '请选择', visibleIf: { _$expand: (value: boolean) => value, }, - allowClear: true, - asyncData: () => this.getCatalogueMember(), }, }, serviceType: { @@ -621,7 +618,7 @@ resourceStatus: any; // return false; // } }); - modal.afterClose.subscribe(_ => this.st.reload()); + modal.afterClose.subscribe(_ => this.st.reload(1)); } }); } @@ -683,6 +680,11 @@ resourceStatus: any; // return false; // } }); + modal.afterClose.subscribe((result) => { + if (result) { + this.st.load(1); + } + }); } /** *修改网络货运人 @@ -713,6 +715,11 @@ resourceStatus: any; // return false; // } }); + modal.afterClose.subscribe((result) => { + if (result) { + this.st.load(1); + } + }); } // *确认签收 @@ -737,7 +744,7 @@ resourceStatus: any; console.log(res) if(res) { this.service.msgSrv.success('撤销成功！') - this.stFloat.reload() + this.stFloat.reload(1) } else { this.service.msgSrv.error(res.msg) } @@ -754,7 +761,7 @@ resourceStatus: any; 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(); } }), @@ -772,6 +779,7 @@ resourceStatus: any; this.service.request(this.service.$api_get_batchSignWholeOrder, params).subscribe(res => { if (res) { console.log(res); + this.st?.reload(1); } else { this.service.msgSrv.error(res.msg); } diff --git a/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.html b/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.html index 526df3c5..0e8c3c41 100644 --- a/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.html +++ b/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.html @@ -1,7 +1,7 @@ - + diff --git a/src/app/routes/vehicle/components/audit/audit.component.ts b/src/app/routes/vehicle/components/audit/audit.component.ts index 140c46fa..1f9524cd 100644 --- a/src/app/routes/vehicle/components/audit/audit.component.ts +++ b/src/app/routes/vehicle/components/audit/audit.component.ts @@ -13,6 +13,7 @@ import { VehicleService } from '../../../vehicle/services/vehicle.service'; export class VehicleComponentsAuditComponent implements OnInit { _$expand = false; resourceStatus: any; + defaultTabs = 1; ui!: SFUISchema; schema!: SFSchema; columns!: STColumn[]; @@ -74,33 +75,31 @@ export class VehicleComponentsAuditComponent implements OnInit { hidden: true, }, }, - carNo: { + carNo: { title: '车牌号', type: 'string', ui: { widget: 'select', serverSearch: true, - searchDebounceTime: 250, + searchDebounceTime: 300, searchLoadingText: '搜索中...', onSearch: (q: any) => { if (!!q) { return this.service - .request(this.service.$api_get_getCarLicenseListByCarNo_audit, { + .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.carNo } as SFSchemaEnum)))) .toPromise(); } else { return of([]); } }, - } as SFSelectWidgetSchema, - }, + visibleIf: { + _$expand: (value: boolean) => value + } + } as SFSelectWidgetSchema + }, carNoColor: { type: 'string', title: '车牌颜色', diff --git a/src/app/routes/vehicle/components/list/list.component.ts b/src/app/routes/vehicle/components/list/list.component.ts index 19d1c30b..612cdb6a 100644 --- a/src/app/routes/vehicle/components/list/list.component.ts +++ b/src/app/routes/vehicle/components/list/list.component.ts @@ -71,13 +71,13 @@ export class VehicleComponentsListComponent implements OnInit { hidden: true, }, }, - carNo: { + carNo: { title: '车牌号', type: 'string', ui: { widget: 'select', serverSearch: true, - searchDebounceTime: 250, + searchDebounceTime: 300, searchLoadingText: '搜索中...', onSearch: (q: any) => { if (!!q) { @@ -85,19 +85,17 @@ export class VehicleComponentsListComponent implements OnInit { .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.carNo } as SFSchemaEnum)))) .toPromise(); } else { return of([]); } }, - } as SFSelectWidgetSchema, - }, + visibleIf: { + _$expand: (value: boolean) => value + } + } as SFSelectWidgetSchema + }, carNoColor: { type: 'string', title: '车牌颜色', diff --git a/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.ts b/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.ts index 71457e9a..ccfd49e8 100644 --- a/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.ts +++ b/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.ts @@ -166,30 +166,30 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit { } } as SFSelectWidgetSchema }, - customerCode: { + carNo: { title: '车牌号', - type: 'string', - ui: { - widget: 'select', - serverSearch: true, - searchDebounceTime: 300, - searchLoadingText: '搜索中...', - onSearch: (q: any) => { - if (!!q) { - return this.service - .request(this.service.$api_get_getCarLicenseListByCarNo, { - carNo: q - }) - .pipe(map((res: any[]) => (res as any[]).map((i) => ({ label: i.carNo, value: i.carNo } as SFSchemaEnum)))) - .toPromise(); - } else { - return of([]); - } - }, - visibleIf: { - _$expand: (value: boolean) => value, - }, - } as SFSelectWidgetSchema, + type: 'string', + ui: { + widget: 'select', + serverSearch: true, + searchDebounceTime: 300, + searchLoadingText: '搜索中...', + onSearch: (q: any) => { + if (!!q) { + return this.service + .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)))) + .toPromise(); + } else { + return of([]); + } + }, + visibleIf: { + _$expand: (value: boolean) => value + } + } as SFSelectWidgetSchema }, reportingTime: { title: '上报时间', diff --git a/src/app/routes/waybill-management/components/bulk/bulk.component.html b/src/app/routes/waybill-management/components/bulk/bulk.component.html index 5ddfa425..809d8b71 100644 --- a/src/app/routes/waybill-management/components/bulk/bulk.component.html +++ b/src/app/routes/waybill-management/components/bulk/bulk.component.html @@ -1,7 +1,7 @@ + +
+

+ {{ data.costCodeLabel }}：{{ data.price }} +

+
+ + +
+

+ {{ data.costCodeLabel }}：{{ data.price }} + {{ data.paymentStatusLabel }} +

+
{{item.wayBillCode}} diff --git a/src/app/routes/waybill-management/components/vehicle/vehicle.component.less b/src/app/routes/waybill-management/components/vehicle/vehicle.component.less index 29a5e65b..8d4d1e5c 100644 --- a/src/app/routes/waybill-management/components/vehicle/vehicle.component.less +++ b/src/app/routes/waybill-management/components/vehicle/vehicle.component.less @@ -1,2 +1,5 @@ -:host { +:host ::ng-deep{ + ::ng-deep nz-range-picker{ + width: 100%; + } } \ No newline at end of file diff --git a/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts b/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts index 0ae544d0..bf735b56 100644 --- a/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts @@ -102,9 +102,6 @@ export class WaybillManagementVehicleComponent implements OnInit { serverSearch: true, searchDebounceTime: 300, searchLoadingText: '搜索中...', - visibleIf: { - _$expand: (value: boolean) => value - }, onSearch: (q: any) => { console.log(q) if (!!q) { @@ -173,7 +170,7 @@ export class WaybillManagementVehicleComponent implements OnInit { .request(this.service.$api_get_getCarLicenseListByCarNo, { carNo: q }) - .pipe(map((res: any[]) => (res 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.carNo } as SFSchemaEnum)))) .toPromise(); } else { return of([]); @@ -260,19 +257,36 @@ export class WaybillManagementVehicleComponent implements OnInit { asyncData: () => this.service2.getNetworkFreightForwarder() } }, - goodsName: { + // goodsName: { + // type: 'string', + // title: '货物名称', + // ui: { + // placeholder: '请选择', + // visibleIf: { + // _$expand: (value: boolean) => value + // }, + // } + // } + goodsNameId: { type: 'string', title: '货物名称', ui: { widget: 'select', placeholder: '请选择', + errors: { required: '请选择货物类型' }, visibleIf: { _$expand: (value: boolean) => value }, - allowClear: true, - asyncData: () => this.getCatalogueMember() - } - } + asyncData: () => + this.service2.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 + }, }, type: 'object' }; @@ -293,31 +307,31 @@ export class WaybillManagementVehicleComponent implements OnInit { }, { title: '货主出价', - width: '100px', + width: '250px', className: 'text-center', - index: 'resourceCode' + render: 'billExpenseDetailVOList2' }, { title: '货源编号', - width: '100px', + width: '150px', className: 'text-center', index: 'resourceCode' }, { - title: '运费明细', - width: '100px', + title: '费用明细', + width: '250px', className: 'text-center', render: 'billExpenseDetailVOList' }, - { title: '网络货运人', index: 'enterpriseInfoName', width: '120px', className: 'text-center' }, - { title: '货主', index: 'shipperAppUserName', width: '120px', className: 'text-center' }, - { title: '关联订单号', render: 'wayBill', width: '120px', className: 'text-center' }, - { title: '装货地', index: 'loadingAddressArr', width: '120px', className: 'text-center' }, + { title: '网络货运人', index: 'enterpriseInfoName', width: '180px', className: 'text-center' }, + { title: '货主', index: 'shipperAppUserName', width: '150px', className: 'text-center' }, + { title: '关联订单号', render: 'wayBill', width: '180px', className: 'text-center' }, + { title: '装货地', index: 'loadingPlace', width: '180px', className: 'text-center' }, { title: '卸货地', className: 'text-center', - width: '120px', - index: 'unloadingAddressArr' + width: '180px', + index: 'dischargePlace' }, { title: '货物信息', @@ -345,7 +359,7 @@ export class WaybillManagementVehicleComponent implements OnInit { }, { title: '创建时间', - width: '130px', + width: '180px', className: 'text-center', index: 'createTime' }, diff --git a/src/app/routes/waybill-management/services/waybill-management.service.ts b/src/app/routes/waybill-management/services/waybill-management.service.ts index 29c8f0fb..d5ab48d6 100644 --- a/src/app/routes/waybill-management/services/waybill-management.service.ts +++ b/src/app/routes/waybill-management/services/waybill-management.service.ts @@ -2,7 +2,7 @@ import { WaybillManagementBulkComponent } from './../components/bulk/bulk.compon /* * @Author: your name * @Date: 2021-12-07 14:52:29 - * @LastEditTime: 2022-01-11 19:07:29 + * @LastEditTime: 2022-01-12 14:34:04 * @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\waybill-management\services\waybill-management.service.ts @@ -35,7 +35,7 @@ export class WaybillManagementServe extends BaseService { $api_get_getBulkStatistics = `/api/sdc/wayBillOperate/getBulkStatistics`; // 根据车牌号查询车辆信息 - $api_get_getCarLicenseListByCarNo= `/api/mdc/cuc/carLicenseAudit/operate/getCarLicenseListByCarNo`; + $api_get_getCarLicenseListByCarNo= `/api/mdc/cuc/carLicense/findCarLicenseByCarNo`; // 大宗确认发车 $api_get_insertBulkStartCarInfo= `/api/sdc/wayBillOperate/insertBulkStartCarInfo`; diff --git a/src/app/shared/services/business/shipper-base.service.ts b/src/app/shared/services/business/shipper-base.service.ts index 4f0258b8..3d7c3305 100644 --- a/src/app/shared/services/business/shipper-base.service.ts +++ b/src/app/shared/services/business/shipper-base.service.ts @@ -140,6 +140,7 @@ export class ShipperBaseService extends BaseService { getNetworkTransporterById(id: string) { return this.request(this.$api_get_network_freight_forwarder_one, { id }); } + // 根据FullKey获取系统子配置(树) loadConfigByKey(configFullKey:string ='') { return this.http.post(this.$api_getSysConfigTreeByParentFullKey, { configFullKey }).pipe(