diff --git a/src/app/routes/contract-management/components/contract-template/contract-template.component.html b/src/app/routes/contract-management/components/contract-template/contract-template.component.html index 0482fe35..20a54a75 100644 --- a/src/app/routes/contract-management/components/contract-template/contract-template.component.html +++ b/src/app/routes/contract-management/components/contract-template/contract-template.component.html @@ -52,7 +52,6 @@ [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }" [res]="{ reName: { list: 'data.records', total: 'data.total' } }" [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" - [loadingDelay]="500" [loading]="service.http.loading" > diff --git a/src/app/routes/contract-management/components/policy/policy.component.html b/src/app/routes/contract-management/components/policy/policy.component.html index ce3db2d0..266fd620 100644 --- a/src/app/routes/contract-management/components/policy/policy.component.html +++ b/src/app/routes/contract-management/components/policy/policy.component.html @@ -43,7 +43,6 @@ [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }" [res]="{ reName: { list: 'data.records', total: 'data.total' } }" [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" - [loadingDelay]="500" [loading]="service.http.loading" > diff --git a/src/app/routes/order-management/components/bulk/bulk.component.html b/src/app/routes/order-management/components/bulk/bulk.component.html index f4894903..be5993ef 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.html +++ b/src/app/routes/order-management/components/bulk/bulk.component.html @@ -23,11 +23,11 @@
- - - + - - + - - + -
+ \ No newline at end of file diff --git a/src/app/routes/supply-management/components/bulk/bulk.component.html b/src/app/routes/supply-management/components/bulk/bulk.component.html index a569602a..baa5952d 100644 --- a/src/app/routes/supply-management/components/bulk/bulk.component.html +++ b/src/app/routes/supply-management/components/bulk/bulk.component.html @@ -20,12 +20,12 @@
-
- - - + - - + +
- - - + + + + (click)="approveDriver()">审核通过 diff --git a/src/app/routes/usercenter/components/driver/driver.component.html b/src/app/routes/usercenter/components/driver/driver.component.html index 568fcba3..4d83ded5 100644 --- a/src/app/routes/usercenter/components/driver/driver.component.html +++ b/src/app/routes/usercenter/components/driver/driver.component.html @@ -8,10 +8,9 @@
- - - + + +
- - - + +
- - - - + + + + - - + + +
- + + + + + + + - - - - - - -
diff --git a/src/app/routes/usercenter/components/freight/user/user.component.less b/src/app/routes/usercenter/components/freight/user/user.component.less index d9bd808f..6bcd149d 100644 --- a/src/app/routes/usercenter/components/freight/user/user.component.less +++ b/src/app/routes/usercenter/components/freight/user/user.component.less @@ -3,4 +3,10 @@ nz-range-picker { width: 100%; } + + .content-box { + .ant-card-body { + padding-top: 6px; + } + } } \ No newline at end of file diff --git a/src/app/routes/usercenter/components/freight/user/user.component.ts b/src/app/routes/usercenter/components/freight/user/user.component.ts index 4bfc491e..4618b9e2 100644 --- a/src/app/routes/usercenter/components/freight/user/user.component.ts +++ b/src/app/routes/usercenter/components/freight/user/user.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; -import { STColumn, STColumnBadge, STComponent, STData } from '@delon/abc/st'; +import { STColumn, STColumnBadge, STComponent, STData, STRequestOptions } from '@delon/abc/st'; import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form'; import { NzModalService } from 'ng-zorro-antd/modal'; import { UsermanageService } from '../../../services/usercenter.service'; @@ -19,62 +19,43 @@ export class FreightComponentsUserComponent implements OnInit { @ViewChild('promoterModal', { static: false }) promoterModal!: any; - resourceStatus: any; promotersTelephone = ''; + resourceStatus: any = 0; + constructor(public service: UsermanageService, private modal: NzModalService, private router: Router, private ar: ActivatedRoute) {} - /** - * 查询参数 - */ - get reqParams() { - const a:any = {}; - console.log(this.resourceStatus) - if(this.resourceStatus === 1) { - a.certificationStatus = 0 - } else if(this.resourceStatus === 2) { - a.certificationStatus = 1 - } else if(this.resourceStatus === 3) { - a.certificationStatus = 2 - } - const params: any = { - ...a, - ...(this.sf && this.sf.value) - }; - if (this.sf?.value.effectiveDate) { - Object.assign(params, { - time: { - start: this.sf?.value.effectiveDate[0], - end: this.sf?.value.effectiveDate[1] - } - }); - // params.effectiveDateStart = this.sf?.value.effectiveDate[0]; - // params.effectiveDateEnd = this.sf?.value.effectiveDate[1]; - } - delete params.effectiveDate; - delete params.expand; - return params; - } - - get selectedRows() { - return this.st?.list.filter(item => item.checked) || []; - } - ngOnInit() { this.ar.url.subscribe(params => { this.st?.load(1); }); } - selectChange(e: number) { - console.log(e); - if(e>=1) { - this.resourceStatus = e; + + beforeReq = (requestOptions: STRequestOptions) => { + Object.assign(requestOptions.body, { certificationStatus: this.resourceStatus }); + if (this.sf) { + Object.assign(requestOptions.body, { + ...this.sf.value + }); + if (this.sf?.value.effectiveDate) { + Object.assign(requestOptions.body, { + time: { + start: this.sf?.value.effectiveDate[0], + end: this.sf?.value.effectiveDate[1] + } + }); + } + delete requestOptions.body.effectiveDate; + delete requestOptions.body.expand; } - this.initST(); - setTimeout(() => { - this.st.load(); - }, 500); + return requestOptions; + }; + + selectChange(e: any) { + this.resourceStatus = e; + this.st.load(); } + addPromoter(item?: any) { this.promotersTelephone = item?.promotersTelephone; const modal = this.modal.create({ @@ -129,9 +110,6 @@ export class FreightComponentsUserComponent implements OnInit { this._$expand = !this._$expand; this.sf?.setValue('/expand', this._$expand); } - creat() { - this.router.navigate(['./new'], { relativeTo: this.ar }); - } /** * 重置表单 diff --git a/src/app/routes/vehicle/components/audit/audit.component.html b/src/app/routes/vehicle/components/audit/audit.component.html index dd8f8701..8aaec273 100644 --- a/src/app/routes/vehicle/components/audit/audit.component.html +++ b/src/app/routes/vehicle/components/audit/audit.component.html @@ -32,10 +32,10 @@
-
- - - +
+ + + - - +
+ + + - + + - - -
- -
- \ No newline at end of file + \ No newline at end of file diff --git a/src/app/routes/waybill-management/components/vehicle/vehicle.component.html b/src/app/routes/waybill-management/components/vehicle/vehicle.component.html index bce174df..d4f1f526 100644 --- a/src/app/routes/waybill-management/components/vehicle/vehicle.component.html +++ b/src/app/routes/waybill-management/components/vehicle/vehicle.component.html @@ -22,10 +22,11 @@
-
- - + + @@ -132,24 +119,18 @@ - + - - -
变更原因2：
-
拒绝原因：
-
注：
+ + +
变更原因2：
+
拒绝原因：
+
注：
 @@ -157,19 +138,20 @@ - + -
- 评分: -
评价内容：
-
+
+ 评分: +
评价内容：
+
-
- 暂无评价内容 -
+
+ 暂无评价内容 +
@@ -177,10 +159,4 @@ - - - -
- -
- \ No newline at end of file + \ 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 c736f6d8..ebf6ce4a 100644 --- a/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts @@ -11,11 +11,10 @@ import { VehicleSureArriveComponent } from 'src/app/routes/order-management/moda import { VehicleSureDepartComponent } from 'src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component'; import { WaybillManagementServe } from '../../services/waybill-management.service'; - @Component({ selector: 'app-supply-management-vehicle', templateUrl: './vehicle.component.html', - styleUrls: ['./vehicle.component.less'] + styleUrls: ['./vehicle.component.less', '../../../commom/less/expend-but.less', '../../../commom/less/box.less'] }) export class WaybillManagementVehicleComponent implements OnInit { ui: SFUISchema = {}; @@ -36,62 +35,60 @@ export class WaybillManagementVehicleComponent implements OnInit { columnsFloatView: STColumn[] = []; datass: any = [ { - one: '1', - two: '1', - three: '1', - id: 1 - }, + one: '1', + two: '1', + three: '1', + id: 1 + }, { - one: '2', - two: '2', - three: '2', - id: 2 - }, -]; -tabs = { - signQuantity: 0, - cancelQuantity: 0, - receivedQuantity: 0, - stayQuantity: 0 -}; - constructor(public service: WaybillManagementServe, private modal: NzModalService, public service2: ShipperBaseService) { } + one: '2', + two: '2', + three: '2', + id: 2 + } + ]; + tabs = { + signQuantity: 0, + cancelQuantity: 0, + receivedQuantity: 0, + stayQuantity: 0 + }; + constructor(public service: WaybillManagementServe, private modal: NzModalService, public service2: ShipperBaseService) {} /** - * 查询参数 - */ - get reqParams() { - const a:any = {}; - if(this.resourceStatus) { - a.wayBillStatus = this.resourceStatus + * 查询参数 + */ + get reqParams() { + const a: any = {}; + if (this.resourceStatus) { + a.wayBillStatus = this.resourceStatus; } return { ...a, - ...this.sf?.value, + ...this.sf?.value }; } get selectedRows() { - return this.st?.list.filter((item) => item.checked) || []; + return this.st?.list.filter(item => item.checked) || []; } ngOnInit(): void { this.initSF(); this.initST(); - this.getGoodsSourceStatistical() + this.getGoodsSourceStatistical(); this.initSTFloat(); this.initSTFloatView(); } - - /** - * 初始化查询表单 - */ - initSF() { + * 初始化查询表单 + */ + initSF() { this.schema = { properties: { _$expand: { type: 'boolean', ui: { hidden: true } }, wayBillCodeno: { type: 'string', - title: '运单号', + title: '运单号' }, resourceCode: { type: 'string', @@ -106,8 +103,8 @@ tabs = { title: '装货地', ui: { visibleIf: { - _$expand: (value: boolean) => value, - }, + _$expand: (value: boolean) => value + } } }, dischargePlace: { @@ -115,8 +112,8 @@ tabs = { title: '卸货地', ui: { visibleIf: { - _$expand: (value: boolean) => value, - }, + _$expand: (value: boolean) => value + } } }, driverId: { @@ -130,20 +127,19 @@ tabs = { 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.id } as SFSchemaEnum)))) + .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.id } as SFSchemaEnum)))) .toPromise(); } else { return of([]); } }, visibleIf: { - _$expand: (value: boolean) => value, - }, - } as SFSelectWidgetSchema, + _$expand: (value: boolean) => value + } + } as SFSelectWidgetSchema }, - carNo: { + carNo: { title: '车牌号', type: 'string', ui: { @@ -157,18 +153,18 @@ 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 as any[]).map(i => ({ label: i.carNo, value: i.carNo } as SFSchemaEnum)))) .toPromise(); } else { return of([]); } }, visibleIf: { - _$expand: (value: boolean) => value, - }, - } as SFSelectWidgetSchema, - }, - payeeId: { + _$expand: (value: boolean) => value + } + } as SFSelectWidgetSchema + }, + payeeId: { title: '车队长', type: 'string', ui: { @@ -179,30 +175,29 @@ tabs = { onSearch: (q: any) => { if (!!q) { return this.service - .request(this.service.$api_get_getDriverInfo, { keyword: q, - model: 1, type: 2 }) - .pipe(map((res) => (res as any[]).map((i) => ({ label: i.name, value: i.id } as SFSchemaEnum)))) + .request(this.service.$api_get_getDriverInfo, { keyword: q, model: 1, type: 2 }) + .pipe(map(res => (res as any[]).map(i => ({ label: i.name, value: i.id } as SFSchemaEnum)))) .toPromise(); } else { return of([]); } }, visibleIf: { - _$expand: (value: boolean) => value, - }, - } as SFSelectWidgetSchema, - }, + _$expand: (value: boolean) => value + } + } as SFSelectWidgetSchema + }, paymentstatus: { title: '支付状态', type: 'string', ui: { widget: 'dict-select', params: { dictKey: 'payment:status' }, - containAllLable:true, + containAllLable: true, visibleIf: { - _$expand: (value: boolean) => value, - }, - } as SFSelectWidgetSchema, + _$expand: (value: boolean) => value + } + } as SFSelectWidgetSchema }, createTime: { title: '创建时间', @@ -212,9 +207,9 @@ tabs = { mode: 'range', format: 'yyyy-MM-dd', visibleIf: { - _$expand: (value: boolean) => value, - }, - } as SFDateWidgetSchema, + _$expand: (value: boolean) => value + } + } as SFDateWidgetSchema }, isRiskSheet: { type: 'string', @@ -229,9 +224,9 @@ tabs = { widget: 'select', placeholder: '请选择', visibleIf: { - _$expand: (value: boolean) => value, - }, - }, + _$expand: (value: boolean) => value + } + } }, enterpriseInfoName: { type: 'string', @@ -240,11 +235,11 @@ tabs = { widget: 'select', placeholder: '请选择', visibleIf: { - _$expand: (value: boolean) => value, + _$expand: (value: boolean) => value }, allowClear: true, - asyncData: () => this.service2.getNetworkFreightForwarder(), - }, + asyncData: () => this.service2.getNetworkFreightForwarder() + } }, goodsName: { type: 'string', @@ -253,14 +248,14 @@ tabs = { widget: 'select', placeholder: '请选择', visibleIf: { - _$expand: (value: boolean) => value, + _$expand: (value: boolean) => value }, allowClear: true, - asyncData: () => this.getCatalogueMember(), - }, - }, + asyncData: () => this.getCatalogueMember() + } + } }, - type: 'object', + type: 'object' }; this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } }; } @@ -305,26 +300,23 @@ tabs = { width: '120px', index: 'unloadingAddressArr' }, - { + { title: '货物信息', className: 'text-center', width: '180px', render: 'goodsInfos' - }, { title: '承运司机', className: 'text-center', width: '120px', index: 'driverName' - }, { title: '收款人', className: 'text-center', width: '120px', index: 'payeeName' - }, { title: '装卸货时间', @@ -336,7 +328,7 @@ tabs = { title: '创建时间', width: '130px', className: 'text-center', - index: 'createTime', + index: 'createTime' }, { title: '操作', @@ -346,20 +338,20 @@ tabs = { buttons: [ { text: '查看评价', - click: (_record) => this.viewEvaluate(_record), + click: _record => this.viewEvaluate(_record) }, { text: '确认发车', - click: (_record) => this.sureDepart(_record), - iif: item => item.wayBillStatus == '2' , + click: _record => this.sureDepart(_record), + iif: item => item.wayBillStatus == '2' }, { text: '确认到车', - click: (_record) => this.sureArrive(_record), - iif: item => item.wayBillStatus == '3' , - }, - ], - }, + click: _record => this.sureArrive(_record), + iif: item => item.wayBillStatus == '3' + } + ] + } ]; } initSTFloat() { @@ -367,19 +359,19 @@ tabs = { { title: '序号', className: 'text-center', - index: 'one', + index: 'one' }, { title: '操作时间', className: 'text-center', - index: 'two', + index: 'two' }, { title: '操作人', className: 'text-center', - index: 'three', + index: 'three' }, - { title: '状态', index: 'externalSn', className: 'text-center' }, + { title: '状态', index: 'externalSn', className: 'text-center' }, { title: '操作', fixed: 'right', @@ -387,14 +379,14 @@ tabs = { buttons: [ { text: '查看', - click: (_record) => this.FloatView(_record), + click: _record => this.FloatView(_record) }, { text: '撤销', - click: (_record) => this.audit(_record), - }, - ], - }, + click: _record => this.audit(_record) + } + ] + } ]; } initSTFloatView() { @@ -408,7 +400,7 @@ tabs = { { title: '变更前', width: '100px', - className: 'text-center', + className: 'text-center' }, { title: '变更值', index: 'externalSn', width: '120px', className: 'text-center' }, { title: '变更后', index: 'externalSn', width: '120px', className: 'text-center' } @@ -421,14 +413,14 @@ tabs = { return Object.keys(this.schema?.properties || {}).length; } /** - * 伸缩查询条件 - */ + * 伸缩查询条件 + */ expandToggle(): void { this._$expand = !this._$expand; this.sf?.setValue('/_$expand', this._$expand); } tabChange(item: any) { - console.log(item) + console.log(item); } /** * 重置表单 @@ -438,18 +430,15 @@ tabs = { this._$expand = false; } - - - // 获取录单员 + // 获取录单员 getCatalogueMember() { - const params = { - }; + const params = {}; return this.service.request(this.service.$api_get_catalogue_member, params, 'GET').pipe( - map((res) => { + map(res => { if (res) { - console.log(res) + console.log(res); } - }), + }) ); } @@ -464,105 +453,97 @@ tabs = { /** * 导入货源 */ - importGoodsSource() { - - } + importGoodsSource() {} audit(item: any) { - console.log(item) + console.log(item); } - /* + /* * 审核关闭弹窗 view: 1 浮动费用： 0 查看评价： 3 */ handleCancel(type: string) { - console.log(type) - if(type === '0') { - this.isVisible = false - } else if(type === '1') { - console.log(type) - this.isVisibleView = false - } else if(type === '2') { - console.log(type) - this.isVisibleEvaluate = false + console.log(type); + if (type === '0') { + this.isVisible = false; + } else if (type === '1') { + console.log(type); + this.isVisibleView = false; + } else if (type === '2') { + console.log(type); + this.isVisibleEvaluate = false; } } - /** - * 审核通过按钮 - */ - handleOK() { - - } + /** + * 审核通过按钮 + */ + handleOK() {} OpenPrice() { - this.isVisible = true + this.isVisible = true; } - /** - * 浮动费用查看 - */ + /** + * 浮动费用查看 + */ FloatView(item: any) { - console.log(item) - this.isVisibleView = true + console.log(item); + this.isVisibleView = true; } - /** - *查看评价 - */ + /** + *查看评价 + */ viewEvaluate(item: any) { - console.log(item) - this.isVisibleEvaluate = true + console.log(item); + this.isVisibleEvaluate = true; } getGoodsSourceStatistical() { this.service.request(this.service.$api_get_getWholeStatistics).subscribe(res => { if (res) { - res.forEach((ele: any) => { - switch(ele.wayBillStatus) { + res.forEach((ele: any) => { + switch (ele.wayBillStatus) { case '1': - this.tabs.stayQuantity = ele?.count; - break; + this.tabs.stayQuantity = ele?.count; + break; case '2': this.tabs.receivedQuantity = ele?.count; break; case '3': this.tabs.cancelQuantity = ele?.count; - break; + break; case '4': this.tabs.signQuantity = ele?.count; - break; - - + break; } - }); + }); } - }) + }); } - // *确认发车 - - sureDepart(item: any) { - const modalRef = this.modal.create({ - nzTitle: '确认发车', - nzWidth: '50%', - nzContent: VehicleSureDepartComponent, - nzComponentParams: { - i: item, - Status: 1 - }, - nzFooter: null - }); - } - // 确认到车 - sureArrive(item: any) { - const modalRef = this.modal.create({ - nzTitle: '确认到车', - nzWidth: '50%', - nzContent: VehicleSureArriveComponent, - nzComponentParams: { - i: item, - Status: 1 - }, - nzFooter: null - }); - } - + // *确认发车 + sureDepart(item: any) { + const modalRef = this.modal.create({ + nzTitle: '确认发车', + nzWidth: '50%', + nzContent: VehicleSureDepartComponent, + nzComponentParams: { + i: item, + Status: 1 + }, + nzFooter: null + }); + } + // 确认到车 + sureArrive(item: any) { + const modalRef = this.modal.create({ + nzTitle: '确认到车', + nzWidth: '50%', + nzContent: VehicleSureArriveComponent, + nzComponentParams: { + i: item, + Status: 1 + }, + nzFooter: null + }); + } }