diff --git a/angular.json b/angular.json index 9b9432c4..a59093a6 100644 --- a/angular.json +++ b/angular.json @@ -35,8 +35,19 @@ "styles": [ "node_modules/perfect-scrollbar/css/perfect-scrollbar.css", "node_modules/quill/dist/quill.snow.css", - "src/styles.less" + "src/styles.less", + { + "input": "src/styles/default.less", + "bundleName": "default", + "inject": false + }, + { + "input": "src/styles/compact.less", + "bundleName": "compact", + "inject": false + } ], + "scripts": [ "node_modules/quill/dist/quill.min.js", "node_modules/perfect-scrollbar/dist/perfect-scrollbar.js", diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 9ed3961e..7b66e545 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -5,6 +5,7 @@ import { environment } from '@env/environment'; import { NzIconService } from 'ng-zorro-antd/icon'; import { NzModalService } from 'ng-zorro-antd/modal'; import { VERSION as VERSION_ZORRO } from 'ng-zorro-antd/version'; +import { ThemeService } from './theme.service'; @Component({ selector: 'app-root', @@ -17,7 +18,8 @@ export class AppComponent implements OnInit { private router: Router, private titleSrv: TitleService, private modalSrv: NzModalService, - private iconService: NzIconService + private iconService: NzIconService, + private themeService: ThemeService ) { renderer.setAttribute(el.nativeElement, 'ng-alain-version', VERSION_ALAIN.full); renderer.setAttribute(el.nativeElement, 'ng-zorro-version', VERSION_ZORRO.full); @@ -47,5 +49,14 @@ export class AppComponent implements OnInit { this.modalSrv.closeAll(); } }); + const screen: any = window.screen + var zoom = window.devicePixelRatio || screen.deviceXDPI / screen?.logicalXDPI; + console.log(zoom) + if (document.body.clientWidth >= 1280) { + if (zoom != 1 && zoom != 2 && zoom != 3) { + this.themeService.toggleTheme().then(); + } + } + } } diff --git a/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.ts b/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.ts index eee67218..b99aa290 100644 --- a/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.ts +++ b/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.ts @@ -44,7 +44,7 @@ export class VehicleSureArriveComponent implements OnInit { ngOnInit(): void { console.log(this.i) this.initData() - this.i.time = this.i.loadingTime; + this.i.time = this.i?.loadingTime; this.initSF(); } initSF() { @@ -407,7 +407,7 @@ export class VehicleSureArriveComponent implements OnInit { } as SFUploadWidgetSchema, } }, - required: ['time', 'weight' ] + required: ['time' ] }; } this.ui = { @@ -422,19 +422,16 @@ export class VehicleSureArriveComponent implements OnInit { }; } save(value: any): void { - console.log('444'); if(this.Status === 1) { - console.log('555'); - if(!value.time) { this.service.msgSrv.warning('必填项为空！') return; } const params = { id: this.i.id, - imgUrl1: value.imgUrl1.data.fullFilePath, - imgUrl2: value.imgUrl2.data.fullFilePath, - time: value.time, + imgUrl1: value?.imgUrl1?.data?.fullFilePath, + imgUrl2: value?.imgUrl2?.data?.fullFilePath, + time: value?.time, } params.time = this.datePipe.transform(value.time, 'yyyy-MM-dd HH:mm:ss ') this.service.request(this.service.$api_get_insertWholeUnloadCarInfo, params).subscribe((res) => { @@ -444,12 +441,10 @@ export class VehicleSureArriveComponent implements OnInit { } }) } else { - if(!value.time || !this.data.weight) { + if(!value.time ) { this.service.msgSrv.warning('必填项为空！') return; } - console.log(value) - console.log(this.i) const params = { id: this.i?.id, imgUrl1: value?.imgUrl1?.data?.fullFilePath, @@ -459,7 +454,6 @@ export class VehicleSureArriveComponent implements OnInit { weight: this.data?.weight } params.time = this.datePipe.transform(value.time, 'yyyy-MM-dd HH:mm:ss ') - console.log(params) this.service.request(this.service.$api_get_insertBulkUnloadCarInfo, params).subscribe((res) => { if(res) { this.service.msgSrv.success('确认到车成功！') diff --git a/src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.ts b/src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.ts index 31f94dd1..975f559d 100644 --- a/src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.ts +++ b/src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.ts @@ -99,7 +99,6 @@ export class VehicleSureDepartComponent implements OnInit { }, multiple: false, listType: 'picture-card', - showRequired: true, } as SFUploadWidgetSchema, }, imgUrl2: { @@ -138,11 +137,10 @@ export class VehicleSureDepartComponent implements OnInit { }, multiple: false, listType: 'picture-card', - showRequired: true, } as SFUploadWidgetSchema, } }, - required: ['reason'] + required: ['time'] }; } else { this.schema = { @@ -210,7 +208,6 @@ export class VehicleSureDepartComponent implements OnInit { }, multiple: false, listType: 'picture-card', - showRequired: true, } as SFUploadWidgetSchema, }, imgUrl2: { @@ -249,11 +246,10 @@ export class VehicleSureDepartComponent implements OnInit { }, multiple: false, listType: 'picture-card', - showRequired: true, } as SFUploadWidgetSchema, } }, - required: ['time', 'weight'] + required: ['time'] }; } @@ -268,15 +264,15 @@ export class VehicleSureDepartComponent implements OnInit { } save(value: any): void { if(this.Status === 1) { - if(!value.time) { + if(!value?.time) { this.service.msgSrv.warning('必填项为空！') return; } const params = { id: this.i.id, - imgUrl1: value.imgUrl1.data.fullFilePath, - imgUrl2: value.imgUrl2.data.fullFilePath, - time: value.time, + imgUrl1: value?.imgUrl1?.data?.fullFilePath, + imgUrl2: value?.imgUrl2?.data?.fullFilePath, + time: value?.time, } params.time = this.datePipe.transform(value.time, 'yyyy-MM-dd HH:mm:ss ') this.service.request(this.service.$api_get_insertWholeStartCarInfo, params).subscribe((res) => { @@ -286,18 +282,18 @@ export class VehicleSureDepartComponent implements OnInit { } }) } else { - if(!value.time || !this.data.weight) { + if(!value?.time) { this.service.msgSrv.warning('必填项为空！') return; } console.log(value) const params = { id: this.i.id, - imgUrl1: value.imgUrl1.data.fullFilePath, - imgUrl2: value.imgUrl2.data.fullFilePath, - time: value.time, - volume: this.data.volume, - weight: this.data.weight + imgUrl1: value?.imgUrl1?.data?.fullFilePath, + imgUrl2: value?.imgUrl2?.data?.fullFilePath, + time: value?.time, + volume: this.data?.volume, + weight: this.data?.weight } params.time = this.datePipe.transform(value.time, 'yyyy-MM-dd HH:mm:ss ') this.service.request(this.service.$api_get_insertBulkStartCarInfo, params).subscribe((res) => { diff --git a/src/app/routes/supply-management/components/assigned-car-bulk/assigned-car-bulk.component.ts b/src/app/routes/supply-management/components/assigned-car-bulk/assigned-car-bulk.component.ts index 19d3e353..9dcc07d7 100644 --- a/src/app/routes/supply-management/components/assigned-car-bulk/assigned-car-bulk.component.ts +++ b/src/app/routes/supply-management/components/assigned-car-bulk/assigned-car-bulk.component.ts @@ -144,30 +144,30 @@ export class SupplyManagementBulkAssignedCarComponent implements OnInit { title: '司机姓名', index: 'name', className: 'text-center', - width: '80px' + width: '20%' }, { title: '手机号', index: 'telephone', className: 'text-center', - width: '100px' + width: '15%' }, { title: '车队长', render: 'captain', className: 'text-center', - width: '200px' + width: '30%' }, { title: '指定车辆', render: 'carNo', className: 'text-center', - width: '100px' + width: '15%' }, { title: '操作', className: 'text-center', - width: '80px', + width: '20%', buttons: [ { text: '移除', diff --git a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.ts b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.ts index 235faf6f..75b71007 100644 --- a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.ts +++ b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.ts @@ -65,7 +65,7 @@ export class SupplyManagementBulkDetailComponent implements OnInit { get reqParams() { return { operateObject: this.i?.resourceCode, - operateType: 4, + operateTypeList: [4,7], }; } currentStatus = 0; diff --git a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts index 07b45ea3..77178e95 100644 --- a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts +++ b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts @@ -464,19 +464,6 @@ export class SupplyManagementBulkPublishComponent implements OnInit { } } }, - // receiptAddressId: { - // type: 'string', - // title: '选择地址', - // ui: { - // widget: 'custom', - // placeholder: '请点击选择收回单地址', - // // validator: val => (this.sf6?.value?.receiptType === '2' ? [{ keyword: 'required', message: '请点击选择收回单地址' }] : []), - // visibleIf: { - // receiptType: value => value === '2' - // } - // }, - // default: '' - // }, receiptUserName: { type: 'string', title: '联系人', @@ -738,7 +725,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit { nzContent: TranAgreementComponent, nzWidth: 900, nzFooter: null, - nzComponentParams: { object: params, shipperName: this.shipperName } + nzComponentParams: { object: params, shipperName: this.shipperName , type:'bulk'} }); modalRef.afterClose.subscribe(result => { if (result) { diff --git a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts index 9804987e..8ecf1a57 100644 --- a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts +++ b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts @@ -48,6 +48,7 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit { maxTrainNumber: 99999, maxFreight: 9999999 } + shipperName = ''; // // 单位 startInfo: any[] = []; endInfo: any[] = []; @@ -139,10 +140,11 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit { return of([]); } }, - change: (q: any) => { + change: (q: any, qs: any) => { let str =q.replace(/^\s+|\s+$/g,""); if (str) { this.getRegionCode(str); + this.shipperName = qs?.label; } } } as SFSelectWidgetSchema @@ -606,51 +608,54 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit { this.service.msgSrv.error(`当前运费单价已超出限定值【${this.limitValues.maxFreight}元】`); return; } + + // //装卸货信息 + const LoadingList = this.startInfo.concat(this.endInfo); + + // 货物信息 + const sf3Values = { ...this.sf3.value }; + if (sf3Values.goodsTypeName === '其它') { + sf3Values.goodsName = sf3Values.goodsName1; + delete sf3Values.goodsName1; + } + if (this.sf4.value.carModel.includes('999')) { + this.sf4.value.carModel = ['999'] + } + if (this.sf4.value.carLength.includes('999')) { + this.sf4.value.carLength = ['999'] + } + + const goodsInfoList = [ + { + ...sf3Values, + ...this.sf4.value, + carModel: this.sf4.value.carModel.join(','), + carLength: this.sf4.value.carLength.join(',') + } + ]; + const params = { + id: '', + ...this.sf1.value, + unLoadingPlaceDTOList: LoadingList, + goodsInfoDTOList: goodsInfoList, + ...this.sf6.value + }; const modalRef = this.modalService.create({ nzTitle: '运输协议', nzContent: TranAgreementComponent, nzWidth: 900, - nzFooter: null + nzFooter: null, + nzComponentParams: { object: params, shipperName: this.shipperName , type:'bulk'} }); modalRef.afterClose.subscribe(result => { if (result) { - this.submit(submitType); + this.submit(submitType, params); } }); } // 确认提交（下单） - submit(submitType: string): void { - // //装卸货信息 - const LoadingList = this.startInfo.concat(this.endInfo); - - // 货物信息 - const sf3Values = { ...this.sf3.value }; - if (sf3Values.goodsTypeName === '其它') { - sf3Values.goodsName = sf3Values.goodsName1; - delete sf3Values.goodsName1; - } - if (this.sf4.value.carModel.includes('999')) { - this.sf4.value.carModel = ['999'] - } - if (this.sf4.value.carLength.includes('999')) { - this.sf4.value.carLength = ['999'] - } - - const goodsInfoList = [ - { - ...sf3Values, - ...this.sf4.value, - carModel: this.sf4.value.carModel.join(','), - carLength: this.sf4.value.carLength.join(',') - } - ]; - const params = { - id: '', - ...this.sf1.value, - unLoadingPlaceDTOList: LoadingList, - goodsInfoDTOList: goodsInfoList, - ...this.sf6.value - }; + submit(submitType?: string, params?: any): void { + let reqUrl = this.service.$api_consignBulk; if (submitType === 'assign') { 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 ad472530..27c00112 100644 --- a/src/app/routes/supply-management/components/bulk/bulk.component.html +++ b/src/app/routes/supply-management/components/bulk/bulk.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-03-02 18:09:01 + * @LastEditTime : 2022-03-04 15:45:58 * @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\bulk\\bulk.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -32,7 +32,7 @@
- + - +