diff --git a/package.json b/package.json index 302ef98a..e39be873 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "tms-obc-web", "version": "0.0.0", - "description": "运营后台－WEB", + "description": "运营后台-WEB", "author": "cipchk ", "repository": { "type": "git", diff --git a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html index 56f4b723..b345a0b4 100644 --- a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html +++ b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-24 16:58:02 * @LastEditors : Shiming - * @LastEditTime : 2022-03-11 11:02:51 + * @LastEditTime : 2022-03-11 16:40:47 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail-change\\bulk-detail-change.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -256,7 +256,6 @@ -

{{i?.goodsInfoList?.[0]?.freightPrice}}{{i?.goodsInfoList?.[0]?.freightTypeLabel}}（{{ i?.goodsInfoList?.[0]?.settlementBasisLabel ? i?.goodsInfoList?.[0]?.settlementBasisLabel + '，' :' ' }}{{i?.goodsInfoList?.[0]?.ruleLabel}}）

到付 @@ -274,7 +273,6 @@
收款人：{{ i?.payeeName }}/{{ i?.payeePhone }}
- diff --git a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts index e11f3786..9d9756a2 100644 --- a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts +++ b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts @@ -1,10 +1,10 @@ /* - * @Description : + * @Description : * @Version : 1.0 * @Author : Shiming * @Date : 2021-12-24 16:58:02 * @LastEditors : Shiming - * @LastEditTime : 2022-03-11 11:24:51 + * @LastEditTime : 2022-03-11 17:51:15 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail-change\\bulk-detail-change.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -42,13 +42,13 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit { validateForm1: FormGroup; id = this.route.snapshot.params.id; @ViewChild('distannce3', { static: false }) - i: any= {unLoadingPlaceList:[]}; + i: any = { unLoadingPlaceList: [] }; totalDistance = 0.0; //总里程 totalTime = 0.0; //路程总时间 - startInfo: any = []; // 装货信息 - endInfo: any = []; // 卸货信息 + startInfo: any = []; // 装货信息 + endInfo: any = []; // 卸货信息 unloadTime: any; // 货源单设置回显 -loadTime: any; // 货源单设置回显 + loadTime: any; // 货源单设置回显 sf3data: any; // 货源单设置回显 sf4data: any; // 货源单设置回显 dirverPhone: any; // 货源单设置回显 @@ -75,7 +75,7 @@ loadTime: any; // 货源单设置回显 ui: SFUISchema = {}; logColumns2: STColumn[] = [ { title: '时间', index: 'vinOutTime' }, - { title: '地点', index: 'cityName' }, + { title: '地点', index: 'cityName' } ]; logColumns: STColumn[] = [ { title: '款项', index: 'expenseCodeLabel' }, @@ -98,8 +98,8 @@ loadTime: any; // 货源单设置回显 } ]; trajectory = 'car'; - mapList:any[] = []; //地图点位数据组 - addressItems:any[] = []; //打点地址数据组 + mapList: any[] = []; //地图点位数据组 + addressItems: any[] = []; //打点地址数据组 constructor( private route: ActivatedRoute, private router: Router, @@ -108,21 +108,21 @@ loadTime: any; // 货源单设置回显 private modalService: NzModalService, private amapService: AmapService, public shipperservice: ShipperBaseService, - fb: FormBuilder, + fb: FormBuilder, private envSrv: EAEnvironmentService, - private ar: ActivatedRoute, + private ar: ActivatedRoute ) { this.validateForm1 = fb.group({ - loadTime: [null, []], - unloadTime: [null, []], + loadTime: [null, []], + unloadTime: [null, []] }); } ngOnInit(): void { - this.initData() + this.initData(); this.initSF3(); this.initSF4(); - this.getTrajectory() + this.getTrajectory(); } initSF() { this.schema = { @@ -141,7 +141,7 @@ loadTime: any; // 货源单设置回显 urlReName: 'data.fullFileWatermarkPath', descriptionI18n: '提货单', data: { - appId: this.envSrv.env.appId, + appId: this.envSrv.env.appId }, name: 'multipartFile', beforeUpload: (file: any, fileList: any) => { @@ -163,8 +163,8 @@ loadTime: any; // 货源单设置回显 }); }, multiple: false, - listType: 'picture-card', - } as SFUploadWidgetSchema, + listType: 'picture-card' + } as SFUploadWidgetSchema }, loadingPeopleVehiclesGoodsFilePath: { type: 'string', @@ -180,7 +180,7 @@ loadTime: any; // 货源单设置回显 urlReName: 'data.fullFileWatermarkPath', descriptionI18n: '人车货照片', data: { - appId: this.envSrv.env.appId, + appId: this.envSrv.env.appId }, name: 'multipartFile', beforeUpload: (file: any, fileList: any) => { @@ -202,24 +202,16 @@ loadTime: any; // 货源单设置回显 }); }, multiple: false, - listType: 'picture-card', - } as SFUploadWidgetSchema, - }, - no4: { - type: 'string', - title: '', - ui: { - widget: 'text', - }, - default: '', + listType: 'picture-card' + } as SFUploadWidgetSchema }, no7: { type: 'string', title: '', ui: { - widget: 'text', - }, - default: '', + widget: 'text' + }, + default: '' }, unloadingLadingBillFilePath: { type: 'string', @@ -235,7 +227,7 @@ loadTime: any; // 货源单设置回显 urlReName: 'data.fullFileWatermarkPath', descriptionI18n: '提货单', data: { - appId: this.envSrv.env.appId, + appId: this.envSrv.env.appId }, name: 'multipartFile', beforeUpload: (file: any, fileList: any) => { @@ -257,8 +249,8 @@ loadTime: any; // 货源单设置回显 }); }, multiple: false, - listType: 'picture-card', - } as SFUploadWidgetSchema, + listType: 'picture-card' + } as SFUploadWidgetSchema }, unloadingPeopleVehiclesGoodsFilePath: { type: 'string', @@ -274,7 +266,7 @@ loadTime: any; // 货源单设置回显 urlReName: 'data.fullFileWatermarkPath', descriptionI18n: '人车货照片', data: { - appId: this.envSrv.env.appId, + appId: this.envSrv.env.appId }, name: 'multipartFile', beforeUpload: (file: any, fileList: any) => { @@ -296,62 +288,62 @@ loadTime: any; // 货源单设置回显 }); }, multiple: false, - listType: 'picture-card', - } as SFUploadWidgetSchema, + listType: 'picture-card' + } as SFUploadWidgetSchema }, no5: { type: 'string', title: '', ui: { - widget: 'text', - }, - default: '', + widget: 'text' + }, + default: '' }, no6: { type: 'string', title: '', ui: { - widget: 'text', - }, - default: '', - }, + widget: 'text' + }, + default: '' + } }, - required: ['loadingLadingBillFilePath','unloadingLadingBillFilePath'] + required: ['loadingLadingBillFilePath', 'unloadingLadingBillFilePath'] }; this.ui = { '*': { spanLabelFixed: 100, grid: { span: 20 } }, - $unloadingLadingBillFilePath: { grid: { span: 12} }, - $unloadingPeopleVehiclesGoodsFilePath: { grid: { span: 12} }, - $loadingLadingBillFilePath: { grid: { span: 12} }, - $loadingPeopleVehiclesGoodsFilePath: { grid: { span: 12} }, - $no5: { grid: { span: 24} }, + $unloadingLadingBillFilePath: { grid: { span: 12 } }, + $unloadingPeopleVehiclesGoodsFilePath: { grid: { span: 12 } }, + $loadingLadingBillFilePath: { grid: { span: 12 } }, + $loadingPeopleVehiclesGoodsFilePath: { grid: { span: 12 } }, + $no5: { grid: { span: 24 } } }; } initData() { - this.service.request(this.service.$api_getBulkBillDetail, {id: this.id}).subscribe(res => { + this.service.request(this.service.$api_getBulkBillDetail, { id: this.id }).subscribe(res => { if (res) { this.i = res; this.billExpenses = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === 'TRA'); this.initSF(); // 对装货凭证进行初始化 - let arr : any= [] + let arr: any = []; res?.receiptFilePath.forEach((element: any, index: any) => { - arr.push( { - url: element, - status: 'done', - uid: index - }) + arr.push({ + url: element, + status: 'done', + uid: index + }); }); - this.sf4data + this.sf4data; this.listImagUrls = arr; // this.sf4data = res?.goodsInfoList?.[0] this.sf4data = { ...res, ...res?.goodsInfoList?.[0] - } + }; this.sf3data = { goodsTypeId: res?.goodsInfoList[0]?.goodsTypeId || '', goodsTypeName: res?.goodsInfoList[0]?.goodsTypeName || '', @@ -364,104 +356,102 @@ loadTime: any; // 货源单设置回显 this.changeGoodsType(this.sf3data.goodsTypeId, { label: this.sf3data.goodsTypeName, value: this.sf3data.goodsTypeId }); // 对装卸货信息进行初始化 res?.unLoadingPlaceList.forEach((element: any) => { - if(element.type === 1 || element.type === '1') { + if (element.type === 1 || element.type === '1') { const controlId = this.startInfo.length; - this.startInfo.push({ - detailedAddress: element.detailedAddress, - appUserName: element.appUserName, - contractTelephone: element.contractTelephone, - latitude: element.latitude, - longitude: element.longitude, - province: element.province, - city: element.city, - area: element.area, - type: element.type, - id: element.id - }) + this.startInfo.push({ + detailedAddress: element.detailedAddress, + appUserName: element.appUserName, + contractTelephone: element.contractTelephone, + latitude: element.latitude, + longitude: element.longitude, + province: element.province, + city: element.city, + area: element.area, + type: element.type, + id: element.id + }); this.validateForm1.addControl(`loadAddress${controlId}`, new FormControl(null, Validators.required)); this.validateForm1.addControl(`loadName${controlId}`, new FormControl(null, Validators.required)); this.validateForm1.addControl(`loadPhone${controlId}`, new FormControl(null, Validators.required)); - } else if(element.type === 2 || element.type === '2') { + } else if (element.type === 2 || element.type === '2') { const controlId = this.endInfo.length; - this.endInfo.push({ - detailedAddress: element?.detailedAddress, - appUserName: element?.appUserName, - contractTelephone: element?.contractTelephone, - latitude: element.latitude, - longitude: element.longitude, - province: element.province, - city: element.city, - area: element.area, - type: element.type, - id: element.id - }) + this.endInfo.push({ + detailedAddress: element?.detailedAddress, + appUserName: element?.appUserName, + contractTelephone: element?.contractTelephone, + latitude: element.latitude, + longitude: element.longitude, + province: element.province, + city: element.city, + area: element.area, + type: element.type, + id: element.id + }); this.validateForm1.addControl(`unloadAddress${controlId}`, new FormControl(null, Validators.required)); this.validateForm1.addControl(`unloadName${controlId}`, new FormControl(null, Validators.required)); this.validateForm1.addControl(`unloadPhone${controlId}`, new FormControl(null, Validators.required)); } }); // 对装货凭证进行初始化 - if (res.loadingLadingBillFilePath) { - this.formData = { - loadingLadingBillFilePath: [ - { - uid: 'logo', - name: 'LOGO', - status: 'done', - url: res.loadingLadingBillFilePath, - response: { - url: res.loadingLadingBillFilePath, - }, - }, - ], - loadingPeopleVehiclesGoodsFilePath: [ - { - uid: 'logo', - name: 'LOGO', - status: 'done', - url: res.loadingPeopleVehiclesGoodsFilePath, - response: { - url: res.loadingPeopleVehiclesGoodsFilePath, - }, - }, - ], - unloadingLadingBillFilePath: [ - { - uid: 'logo', - name: 'LOGO', - status: 'done', - url: res.unloadingLadingBillFilePath, - response: { - url: res.unloadingLadingBillFilePath, - }, - }, - ], - unloadingPeopleVehiclesGoodsFilePath: [ - { - uid: 'logo', - name: 'LOGO', - status: 'done', - url: res.unloadingPeopleVehiclesGoodsFilePath, - response: { - url: res.unloadingPeopleVehiclesGoodsFilePath, - }, - }, - ], - }; - } + this.formData = { + loadingLadingBillFilePath: [ + { + uid: 'logo', + name: 'LOGO', + status: 'done', + url: res?.loadingLadingBillFilePath, + response: { + url: res?.loadingLadingBillFilePath + } + } + ], + loadingPeopleVehiclesGoodsFilePath: [ + { + uid: 'logo', + name: 'LOGO', + status: 'done', + url: res?.loadingPeopleVehiclesGoodsFilePath, + response: { + url: res?.loadingPeopleVehiclesGoodsFilePath + } + } + ], + unloadingLadingBillFilePath: [ + { + uid: 'logo', + name: 'LOGO', + status: 'done', + url: res?.unloadingLadingBillFilePath, + response: { + url: res?.unloadingLadingBillFilePath + } + } + ], + unloadingPeopleVehiclesGoodsFilePath: [ + { + uid: 'logo', + name: 'LOGO', + status: 'done', + url: res?.unloadingPeopleVehiclesGoodsFilePath, + response: { + url: res?.unloadingPeopleVehiclesGoodsFilePath + } + } + ] + }; // 发车时间到车时间初始化 - this.loadTime = res.loadTime - this.unloadTime = res.unloadTime - this.dirvingMessage = res.billExpenseDetails; - // 计算里程，时间 - if (this.startInfo[0]?.area && this.endInfo[0]?.area) { - this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => { - this.totalDistance = res.distance; - this.totalTime = res.time; - }); + this.loadTime = res?.loadTime; + this.unloadTime = res?.unloadTime; + this.dirvingMessage = res?.billExpenseDetails; + // 计算里程，时间 + if (this.startInfo[0]?.area && this.endInfo[0]?.area) { + this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => { + this.totalDistance = res?.distance; + this.totalTime = res?.time; + }); + } } - } - }) + }); } goBack() { @@ -479,39 +469,66 @@ loadTime: any; // 货源单设置回显 }); this.sf3.validator({ emitError: true }); this.sf4.validator({ emitError: true }); - if (this.validateForm1.invalid || !this.sf3.valid || !this.sf4.valid ) { + if (this.validateForm1.invalid || !this.sf3.valid || !this.sf4.valid) { this.service.msgSrv.warning('请完善必填项！'); return; } - if ((this.sf4.value?.acceptWeight > this.i?.goodsInfoList?.[0]?.weight) || (this.sf4.value?.settlementWeight.settlementWeight > this.i?.goodsInfoList?.[0]?.weight) ) { + if ( + this.sf4.value?.acceptWeight > this.i?.goodsInfoList?.[0]?.weight || + this.sf4.value?.settlementWeight.settlementWeight > this.i?.goodsInfoList?.[0]?.weight + ) { this.service.msgSrv.warning('装货重量/卸货重量不能大于货物重量！'); return; } - let imgList : any= []; - if(this.listImagUrls.length > 0) { - this.listImagUrls?.forEach((res :any) => { - if(res.url) { - imgList.push(res.url) + let imgList: any = []; + if (this.listImagUrls.length > 0) { + this.listImagUrls?.forEach((res: any) => { + if (res?.url) { + imgList.push(res?.url); } - }) + }); } - if(typeof(this.unloadTime) !== 'string' ){ - var c = new Date(this.unloadTime); - this.unloadTime = c.getFullYear() + '-' + this.addPreZero(c.getMonth() + 1) + '-' + this.addPreZero(c.getDate()) + ' ' + this.addPreZero(c.getHours()) + ':' + this.addPreZero(c.getMinutes()) + ':' + this.addPreZero(c.getSeconds()) + if (typeof this.unloadTime !== 'string') { + var c = new Date(this.unloadTime); + this.unloadTime = + c.getFullYear() + + '-' + + this.addPreZero(c.getMonth() + 1) + + '-' + + this.addPreZero(c.getDate()) + + ' ' + + this.addPreZero(c.getHours()) + + ':' + + this.addPreZero(c.getMinutes()) + + ':' + + this.addPreZero(c.getSeconds()); } - if(typeof(this.loadTime) !== 'string' ) { - var c = new Date(this.loadTime); - this.loadTime = c.getFullYear() + '-' + this.addPreZero(c.getMonth() + 1) + '-' + this.addPreZero(c.getDate()) + ' ' + this.addPreZero(c.getHours()) + ':' + this.addPreZero(c.getMinutes()) + ':' + this.addPreZero(c.getSeconds()) + if (typeof this.loadTime !== 'string') { + var c = new Date(this.loadTime); + this.loadTime = + c.getFullYear() + + '-' + + this.addPreZero(c.getMonth() + 1) + + '-' + + this.addPreZero(c.getDate()) + + ' ' + + this.addPreZero(c.getHours()) + + ':' + + this.addPreZero(c.getMinutes()) + + ':' + + this.addPreZero(c.getSeconds()); } const params = { id: this.id, - unLoadingPlaceDTOList: [...this.startInfo, ...this.endInfo,], + unLoadingPlaceDTOList: [...this.startInfo, ...this.endInfo], receiptFilePath: imgList, - goodsInfoDTOList: [{ - id: this.i?.goodsInfoList?.[0].id, - goodsName: this.sf3.value?.goodsName, - ...this.sf4.value - }], + goodsInfoDTOList: [ + { + id: this.i?.goodsInfoList?.[0].id, + goodsName: this.sf3.value?.goodsName, + ...this.sf4.value + } + ], // 运费信息 // 收款人 payeeId: this.dirverPhone, @@ -524,32 +541,40 @@ loadTime: any; // 货源单设置回显 acceptVolume: this.sf4.value?.acceptVolume, settlementWeight: this.sf4.value?.settlementWeight, settlementVolume: this.sf4.value?.settlementVolume, - loadingLadingBillFilePath: this.sf.value?.loadingLadingBillFilePath?.data ? this.sf.value?.loadingLadingBillFilePath.data.fullFilePath : this.sf.value?.loadingLadingBillFilePath?.url, + loadingLadingBillFilePath: this.sf.value?.loadingLadingBillFilePath?.data + ? this.sf.value?.loadingLadingBillFilePath.data.fullFilePath + : this.sf.value?.loadingLadingBillFilePath?.url, - loadingPeopleVehiclesGoodsFilePath: this.sf.value?.loadingPeopleVehiclesGoodsFilePath?.data ? this.sf.value?.loadingPeopleVehiclesGoodsFilePath.data.fullFilePath : this.sf.value?.loadingPeopleVehiclesGoodsFilePath?.url, + loadingPeopleVehiclesGoodsFilePath: this.sf.value?.loadingPeopleVehiclesGoodsFilePath?.data + ? this.sf.value?.loadingPeopleVehiclesGoodsFilePath.data.fullFilePath + : this.sf.value?.loadingPeopleVehiclesGoodsFilePath?.url, - unloadingLadingBillFilePath: this.sf.value?.unloadingLadingBillFilePath?.data ? this.sf.value?.unloadingLadingBillFilePath.data.fullFilePath : this.sf.value?.unloadingLadingBillFilePath?.url, + unloadingLadingBillFilePath: this.sf.value?.unloadingLadingBillFilePath?.data + ? this.sf.value?.unloadingLadingBillFilePath.data.fullFilePath + : this.sf.value?.unloadingLadingBillFilePath?.url, - unloadingPeopleVehiclesGoodsFilePath: this.sf.value?.unloadingPeopleVehiclesGoodsFilePath?.data ? this.sf.value?.unloadingPeopleVehiclesGoodsFilePath.data.fullFilePath : this.sf.value?.unloadingPeopleVehiclesGoodsFilePath?.url, - } + unloadingPeopleVehiclesGoodsFilePath: this.sf.value?.unloadingPeopleVehiclesGoodsFilePath?.data + ? this.sf.value?.unloadingPeopleVehiclesGoodsFilePath.data.fullFilePath + : this.sf.value?.unloadingPeopleVehiclesGoodsFilePath?.url + }; this.service.request(this.service.$api_set_modifyBulkOrder, params).subscribe((res: any) => { - if(res) { + if (res) { this.service.msgSrv.success('修改成功！'); this.router.navigate(['/order-management/bulk/bulk-detail/', this.id]); } else { this.service.msgSrv.error(res?.msg); } - }) + }); } - addPreZero(num: any){ - if(num<10){ - return '0'+num; + addPreZero(num: any) { + if (num < 10) { + return '0' + num; } else { - return num; + return num; } - } + } // -------------------装卸货信息处理 - // 打开地图 + // 打开地图 // 打开地图 // 打开地图 openMap(type: string, index: number, address: string) { @@ -589,8 +614,8 @@ loadTime: any; // 货源单设置回显 if (this.startInfo[0]?.area && this.endInfo[0]?.area) { this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe((res: any) => { - this.totalDistance = res.distance; - this.totalTime = res.time; + this.totalDistance = res?.distance; + this.totalTime = res?.time; }); } } @@ -672,235 +697,235 @@ loadTime: any; // 货源单设置回显 } }; } -changeGoodsType(value: string, data: any) { - if (data.label === '其它') return; - const params = { - pageIndex: 1, - pageSize: 100, - configId: value - }; - this.service - .request(this.service.$api_get_config_item_page, params) - .pipe( - map(data => { - return data.records?.map((m: any) => { - return { label: m.name, value: m.id }; - }); - }) - ) - .subscribe(res => { - if (res) { - this.sf3.getProperty('/goodsNameId')!.schema.enum = res; - this.sf3.getProperty('/goodsNameId')!.widget?.reset(res); - if (this.sf3data.goodsNameId) { - this.sf3.setValue('/goodsNameId', this.sf3data.goodsNameId); + changeGoodsType(value: string, data: any) { + if (data.label === '其它') return; + const params = { + pageIndex: 1, + pageSize: 100, + configId: value + }; + this.service + .request(this.service.$api_get_config_item_page, params) + .pipe( + map(data => { + return data.records?.map((m: any) => { + return { label: m.name, value: m.id }; + }); + }) + ) + .subscribe(res => { + if (res) { + this.sf3.getProperty('/goodsNameId')!.schema.enum = res; + this.sf3.getProperty('/goodsNameId')!.widget?.reset(res); + if (this.sf3data.goodsNameId) { + this.sf3.setValue('/goodsNameId', this.sf3data.goodsNameId); + } } - } - }); -} -initSF4() { - this.schema4 = { - properties: { - weight: { - type: 'string', - title: '货物数量', - ui: { - widget: 'custom', - placeholder: '请输入', - errors: { required: '必填项' } - } - }, - carmand: { - type: 'string', - title: '用车需求', - ui: { - widget: 'custom', - placeholder: '请输入' - } - }, - drivers: { - type: 'string', - title: '承运司机', - ui: { - widget: 'custom', - placeholder: '请输入' - } - }, - weightModel: { - type: 'string', - title: '车型车长承重', - ui: { - widget: 'custom', - placeholder: '请输入' - } - }, - loadTime: { - type: 'string', - title: '发车时间', - ui: { - widget: 'custom', - placeholder: '请输入' - } - }, - unloadTime: { - type: 'string', - title: '到车时间', - ui: { - widget: 'custom', - placeholder: '请输入' - } - }, - acceptWeight: { - type: 'number', - title: '装货重量', - minimum:0, - maximum:99999, - ui: { - unit: '吨', - placeholder: '请输入', - grid: { - span: 12 - }, - hideStep: true, - } as SFNumberWidgetSchema - }, - acceptVolume: { - type: 'number', - title: '装货体积', - minimum:0, - maximum:99999, - ui: { - unit: '吨', - placeholder: '请输入', - grid: { - span: 12 - }, - hideStep: true, - } as SFNumberWidgetSchema - }, - settlementWeight: { - type: 'number', - title: '卸货重量', - minimum:0, - maximum:99999, - ui: { - unit: '吨', - placeholder: '请输入', - grid: { - span: 12 - }, - hideStep: true, - } as SFNumberWidgetSchema - }, - settlementVolume: { - type: 'number', - title: '卸货体积', - minimum:0, - maximum:99999, - ui: { - unit: '吨', - placeholder: '请输入', - grid: { - span: 12 - }, - hideStep: true, - } as SFNumberWidgetSchema - } - }, - required: ['loadTime','unloadTime'] - }; - this.ui4 = { - '*': { - spanLabelFixed: 110, - grid: { span: 24 } - }, - $weight: { - grid: { span: 24 } - }, - $carmand: { - grid: { span: 24 } - }, - $weightModel: { - spanLabelFixed: 120, - grid: { span: 12 } - }, - $drivers: { - grid: { span: 12 } - }, - $loadTime: { - grid: { span: 12 } - }, - $unloadTime: { - grid: { span: 12 } - }, - }; -} -// 处理上传图片 -handlePreview1 = async (file: NzUploadFile) => { - if (!file.url && !file.preview) { - file.preview = await getBase64(file.originFileObj!); - } - this.previewImage1 = file.url || file.preview; - this.previewVisible1 = true; -}; - -handleChange1(info: NzUploadChangeParam): void { - switch (info.file.status) { - case 'uploading': - break; - case 'done': - let fileList = [...info.fileList]; - // 2. Read from response and show file link - fileList = fileList.map((file: any) => { - if (file.response) { - file.url = file.response.data.fullFilePath; - } - return file; }); - break; - case 'error': - this.service.msgSrv.error('网络错误'); - break; } -} -beforeUpload = (file: NzUploadFile, _fileList: NzUploadFile[]) => { - return new Observable((observer: Observer) => { - const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png' || file.type === 'image/gif' || file.type === 'image/bmp'; - if (!isJpgOrPng) { - this.service.msgSrv.warning('只能上传图片!'); - observer.complete(); - return; - } - // tslint:disable-next-line: no-non-null-assertion - const isLt2M = file.size! / 1024 / 1024 < 3; - if (!isLt2M) { - this.service.msgSrv.warning('图片大小超过3兆!'); - observer.complete(); - return; - } - observer.next(isJpgOrPng && isLt2M); - observer.complete(); - }); -}; -agreement(value: any) { - if(value === '1') { - this.imges = this.i?.supplementAgreement - } else if (value === '2') { - this.imges = this.i?.supplementAgreement - } - this.isVisible = true; -} -handleCancel() { - this.isVisible = false -} -handleOK() { -this.isVisible = false -} -goDistance(elf: NzCardComponent) { - if (elf) { - elf['elementRef'].nativeElement.scrollIntoView({ behavior: 'smooth', block: 'start', inline: 'start' }); + initSF4() { + this.schema4 = { + properties: { + weight: { + type: 'string', + title: '货物数量', + ui: { + widget: 'custom', + placeholder: '请输入', + errors: { required: '必填项' } + } + }, + carmand: { + type: 'string', + title: '用车需求', + ui: { + widget: 'custom', + placeholder: '请输入' + } + }, + drivers: { + type: 'string', + title: '承运司机', + ui: { + widget: 'custom', + placeholder: '请输入' + } + }, + weightModel: { + type: 'string', + title: '车型车长承重', + ui: { + widget: 'custom', + placeholder: '请输入' + } + }, + loadTime: { + type: 'string', + title: '发车时间', + ui: { + widget: 'custom', + placeholder: '请输入' + } + }, + unloadTime: { + type: 'string', + title: '到车时间', + ui: { + widget: 'custom', + placeholder: '请输入' + } + }, + acceptWeight: { + type: 'number', + title: '装货重量', + minimum: 0, + maximum: 99999, + ui: { + unit: '吨', + placeholder: '请输入', + grid: { + span: 12 + }, + hideStep: true + } as SFNumberWidgetSchema + }, + acceptVolume: { + type: 'number', + title: '装货体积', + minimum: 0, + maximum: 99999, + ui: { + unit: '吨', + placeholder: '请输入', + grid: { + span: 12 + }, + hideStep: true + } as SFNumberWidgetSchema + }, + settlementWeight: { + type: 'number', + title: '卸货重量', + minimum: 0, + maximum: 99999, + ui: { + unit: '吨', + placeholder: '请输入', + grid: { + span: 12 + }, + hideStep: true + } as SFNumberWidgetSchema + }, + settlementVolume: { + type: 'number', + title: '卸货体积', + minimum: 0, + maximum: 99999, + ui: { + unit: '吨', + placeholder: '请输入', + grid: { + span: 12 + }, + hideStep: true + } as SFNumberWidgetSchema + } + }, + required: ['loadTime', 'unloadTime'] + }; + this.ui4 = { + '*': { + spanLabelFixed: 110, + grid: { span: 24 } + }, + $weight: { + grid: { span: 24 } + }, + $carmand: { + grid: { span: 24 } + }, + $weightModel: { + spanLabelFixed: 120, + grid: { span: 12 } + }, + $drivers: { + grid: { span: 12 } + }, + $loadTime: { + grid: { span: 12 } + }, + $unloadTime: { + grid: { span: 12 } + } + }; + } + // 处理上传图片 + handlePreview1 = async (file: NzUploadFile) => { + if (!file.url && !file.preview) { + file.preview = await getBase64(file.originFileObj!); + } + this.previewImage1 = file.url || file.preview; + this.previewVisible1 = true; + }; + + handleChange1(info: NzUploadChangeParam): void { + switch (info.file.status) { + case 'uploading': + break; + case 'done': + let fileList = [...info.fileList]; + // 2. Read from response and show file link + fileList = fileList.map((file: any) => { + if (file.response) { + file.url = file.response.data.fullFilePath; + } + return file; + }); + break; + case 'error': + this.service.msgSrv.error('网络错误'); + break; + } + } + beforeUpload = (file: NzUploadFile, _fileList: NzUploadFile[]) => { + return new Observable((observer: Observer) => { + const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png' || file.type === 'image/gif' || file.type === 'image/bmp'; + if (!isJpgOrPng) { + this.service.msgSrv.warning('只能上传图片!'); + observer.complete(); + return; + } + // tslint:disable-next-line: no-non-null-assertion + const isLt2M = file.size! / 1024 / 1024 < 3; + if (!isLt2M) { + this.service.msgSrv.warning('图片大小超过3兆!'); + observer.complete(); + return; + } + observer.next(isJpgOrPng && isLt2M); + observer.complete(); + }); + }; + agreement(value: any) { + if (value === '1') { + this.imges = this.i?.supplementAgreement; + } else if (value === '2') { + this.imges = this.i?.supplementAgreement; + } + this.isVisible = true; + } + handleCancel() { + this.isVisible = false; + } + handleOK() { + this.isVisible = false; + } + goDistance(elf: NzCardComponent) { + if (elf) { + elf['elementRef'].nativeElement.scrollIntoView({ behavior: 'smooth', block: 'start', inline: 'start' }); + } } -} // 装卸货地址互换 swapAddress() { let item = this.startInfo; @@ -917,18 +942,18 @@ goDistance(elf: NzCardComponent) { // 计算里程，时间 if (this.startInfo[0]?.area && this.endInfo[0]?.area) { this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => { - this.totalDistance = res.distance; - this.totalTime = res.time; + this.totalDistance = res?.distance; + this.totalTime = res?.time; }); } } // 获取车辆轨迹 - getTrajectory(){ + getTrajectory() { this.service.request(this.service.$api_get_getTrajectory, { id: this.id }).subscribe(res => { if (res) { - const points = res.trackArray; - let list :any[] = []; + const points = res?.trackArray; + let list: any[] = []; points?.forEach((item: any) => { list.push({ name: item.hgt, @@ -936,8 +961,8 @@ goDistance(elf: NzCardComponent) { }); }); this.mapList = list; - this.addressItems = res.cityArray; - if(this.addressItems && this.addressItems.length > 0){ + this.addressItems = res?.cityArray; + if (this.addressItems && this.addressItems.length > 0) { this.addressItems.forEach(item => { item.vinOutTime = this.getLocalTime(item.vinOutTime); }); @@ -946,12 +971,12 @@ goDistance(elf: NzCardComponent) { }); } - // 获取司机轨迹 - getDriverTrajectory(){ + // 获取司机轨迹 + getDriverTrajectory() { this.service.request(this.service.$api_get_getAppDriverPosition, { id: this.id }).subscribe(res => { if (res) { - const points = res.tracks; - let list :any[] = []; + const points = res?.tracks; + let list: any[] = []; points?.forEach((item: any) => { list.push({ name: item.hgt, @@ -959,8 +984,8 @@ goDistance(elf: NzCardComponent) { }); }); this.mapList = list; - this.addressItems = [...res.enclosureDataAppTrack]; - if(this.addressItems && this.addressItems.length > 0){ + this.addressItems = [...res?.enclosureDataAppTrack]; + if (this.addressItems && this.addressItems.length > 0) { this.addressItems.forEach(item => { item.vinOutTime = this.getLocalTime(item.gtm); item.cityName = item.appAdress; @@ -968,14 +993,14 @@ goDistance(elf: NzCardComponent) { } } }); - } - trajectoryChange(event:any){ - if(event ==='car'){ - this.getTrajectory() - }else if(event ==='driver'){ + } + trajectoryChange(event: any) { + if (event === 'car') { + this.getTrajectory(); + } else if (event === 'driver') { this.getDriverTrajectory(); } - } + } getLocalTime(time: any) { return format(new Date(parseInt(time)), 'yyyy-MM-dd HH:mm:ss'); } diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html index 679760ef..60108072 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-06 20:20:26 * @LastEditors : Shiming - * @LastEditTime : 2022-03-11 11:03:14 + * @LastEditTime : 2022-03-11 16:40:33 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -87,12 +87,12 @@ {{ i?.carModel }}/{{ i?.carLength }} {{ i?.driverName }}/{{ i?.driverPhone }}{{ i?.carNo }} {{ i?.driverCarModelLabel }},{{ i?.driverCarLengthLabel }}米,{{ i?.driverCarWeight }}吨 - + {{ i?.acceptWeight }}吨,{{ i?.acceptVolume }}方 {{ i?.acceptWeight }}吨,{{ i?.acceptVolume }}方,{{ i?.acceptNumber }}件 {{ i?.settlementWeight }}吨,{{ i?.settlementVolume }}方,{{ i?.acceptNumber }}件 @@ -138,7 +138,6 @@ -

{{i?.goodsInfoList?.[0]?.freightPrice}}{{i?.goodsInfoList?.[0]?.freightTypeLabel}}（{{ i?.goodsInfoList?.[0]?.settlementBasisLabel ? i?.goodsInfoList?.[0]?.settlementBasisLabel + '，' :' ' }}{{i?.goodsInfoList?.[0]?.ruleLabel}}）

到付 @@ -156,7 +155,6 @@
收款人：{{ i?.payeeName }}/{{ i?.payeePhone }}
- diff --git a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html index fa512f26..bb79f5ec 100644 --- a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html +++ b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-23 13:39:58 * @LastEditors : Shiming - * @LastEditTime : 2022-03-11 11:00:28 + * @LastEditTime : 2022-03-11 16:41:08 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail-change\\vehicle-detail-change.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -43,7 +43,7 @@ - + diff --git a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts index 16f9777a..ad8c312e 100644 --- a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts +++ b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-23 13:39:58 * @LastEditors : Shiming - * @LastEditTime : 2022-03-11 11:24:29 + * @LastEditTime : 2022-03-11 17:58:28 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail-change\\vehicle-detail-change.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -93,11 +93,11 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit { } ]; trajectory = 'car'; - mapList:any[] = []; //地图点位数据组 - addressItems:any[] = []; //打点地址数据组 + mapList: any[] = []; //地图点位数据组 + addressItems: any[] = []; //打点地址数据组 logColumns2: STColumn[] = [ { title: '时间', index: 'vinOutTime' }, - { title: '地点', index: 'cityName' }, + { title: '地点', index: 'cityName' } ]; constructor( private route: ActivatedRoute, @@ -204,14 +204,6 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit { listType: 'picture-card' } as SFUploadWidgetSchema }, - no4: { - type: 'string', - title: '', - ui: { - widget: 'text' - }, - default: '' - }, no7: { type: 'string', title: '', @@ -405,7 +397,6 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit { } }); // 对装货凭证进行初始化 - if (res?.loadingLadingBillFilePath) { this.formData = { loadingLadingBillFilePath: [ { @@ -425,7 +416,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit { status: 'done', url: res?.loadingPeopleVehiclesGoodsFilePath, response: { - url: res?.loadingPeopleVehiclesGoodsFilePath + url: res?.loadingPeopleVehiclesGoodsFilePath, } } ], @@ -452,7 +443,6 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit { } ] }; - } // 发车时间到车时间初始化 this.loadTime = res?.loadTime; this.unloadTime = res?.unloadTime; @@ -683,7 +673,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit { '*': { spanLabelFixed: 110, grid: { span: 12 } - }, + } }; } changeGoodsType(value: string, data: any) { @@ -821,7 +811,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit { file.preview = await getBase64(file.originFileObj!); } console.log('888888888'); - + this.previewImage1 = file.url || file.preview; this.previewVisible1 = true; }; @@ -921,60 +911,60 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit { }); } } - // 获取车辆轨迹 - getTrajectory(){ - this.service.request(this.service.$api_get_getTrajectory, { id: this.id }).subscribe(res => { - if (res) { - const points = res?.trackArray; - let list :any[] = []; - points?.forEach((item: any) => { - list.push({ - name: item.hgt, - lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))] - }); + // 获取车辆轨迹 + getTrajectory() { + this.service.request(this.service.$api_get_getTrajectory, { id: this.id }).subscribe(res => { + if (res) { + const points = res?.trackArray; + let list: any[] = []; + points?.forEach((item: any) => { + list.push({ + name: item.hgt, + lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))] }); - this.mapList = list; - this.addressItems = res?.cityArray; - if(this.addressItems && this.addressItems.length > 0){ - this.addressItems.forEach(item => { - item.vinOutTime = this.getLocalTime(item.vinOutTime); - }); - } - } - }); - } - - // 获取司机轨迹 - getDriverTrajectory(){ - this.service.request(this.service.$api_get_getAppDriverPosition, { id: this.id }).subscribe(res => { - if (res) { - const points = res?.tracks; - let list :any[] = []; - points?.forEach((item: any) => { - list.push({ - name: item.hgt, - lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))] - }); + }); + this.mapList = list; + this.addressItems = res?.cityArray; + if (this.addressItems && this.addressItems.length > 0) { + this.addressItems.forEach(item => { + item.vinOutTime = this.getLocalTime(item.vinOutTime); }); - this.mapList = list; - this.addressItems = [...res?.enclosureDataAppTrack]; - if(this.addressItems && this.addressItems.length > 0){ - this.addressItems.forEach(item => { - item.vinOutTime = this.getLocalTime(item.gtm); - item.cityName = item.appAdress; - }); - } } - }); - } - trajectoryChange(event:any){ - if(event ==='car'){ - this.getTrajectory() - }else if(event ==='driver'){ - this.getDriverTrajectory(); } - } - getLocalTime(time: any) { - return format(new Date(parseInt(time)), 'yyyy-MM-dd HH:mm:ss'); + }); + } + + // 获取司机轨迹 + getDriverTrajectory() { + this.service.request(this.service.$api_get_getAppDriverPosition, { id: this.id }).subscribe(res => { + if (res) { + const points = res?.tracks; + let list: any[] = []; + points?.forEach((item: any) => { + list.push({ + name: item.hgt, + lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))] + }); + }); + this.mapList = list; + this.addressItems = [...res?.enclosureDataAppTrack]; + if (this.addressItems && this.addressItems.length > 0) { + this.addressItems.forEach(item => { + item.vinOutTime = this.getLocalTime(item.gtm); + item.cityName = item.appAdress; + }); + } + } + }); + } + trajectoryChange(event: any) { + if (event === 'car') { + this.getTrajectory(); + } else if (event === 'driver') { + this.getDriverTrajectory(); } + } + getLocalTime(time: any) { + return format(new Date(parseInt(time)), 'yyyy-MM-dd HH:mm:ss'); + } } diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html index 506d5428..7838d45d 100644 --- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-28 14:42:03 * @LastEditors : Shiming - * @LastEditTime : 2022-03-11 10:59:57 + * @LastEditTime : 2022-03-11 16:09:47 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -132,7 +132,20 @@ - + + + + {{i?.goodsResource?.insuranceTypeLabel}} + + + {{i?.goodsResource?.goodsValue !==null?(i?.goodsResource?.goodsValue|currency)+'元':'-'}} + + + {{i?.goodsResource?.insurancePremium!==null?(i?.goodsResource?.insurancePremium |currency)+'元':'-'}} + + + + 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 e0007949..99899e08 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 @@ -64,7 +64,7 @@ export class VehicleSureArriveComponent implements OnInit { ui: { widget: 'upload', action: apiConf.fileUpload, - fileType: 'image/png,image/jpeg,image/jpg,image/gif', + accept: 'image/png,image/jpeg,image/jpg,image/gif', limit: 1, limitFileCount: 1, resReName: 'data.fullFileWatermarkPath', @@ -77,7 +77,7 @@ export class VehicleSureArriveComponent implements OnInit { beforeUpload: (file: any, fileList: any) => { return new Observable((observer: Observer) => { const isLt1M = file.size / 1024 / 1024 < 5; - const fileType = 'image/png,image/jpeg'; + const fileType = 'image/png,image/jpeg,image/jpg,image/gif'; if (fileType.indexOf(file.type) === -1) { this.service.msgSrv.warning('图片格式不正确！'); observer.complete(); @@ -103,7 +103,7 @@ export class VehicleSureArriveComponent implements OnInit { ui: { widget: 'upload', action: apiConf.fileUpload, - fileType: 'image/png,image/jpeg,image/jpg,image/gif', + accept: 'image/png,image/jpeg,image/jpg,image/gif', limit: 1, limitFileCount: 1, resReName: 'data.fullFileWatermarkPath', @@ -116,7 +116,7 @@ export class VehicleSureArriveComponent implements OnInit { beforeUpload: (file: any, fileList: any) => { return new Observable((observer: Observer) => { const isLt1M = file.size / 1024 / 1024 < 5; - const fileType = 'image/png,image/jpeg'; + const fileType = 'image/png,image/jpeg,image/jpg,image/gif'; if (fileType.indexOf(file.type) === -1) { this.service.msgSrv.warning('图片格式不正确！'); observer.complete(); @@ -149,7 +149,7 @@ export class VehicleSureArriveComponent implements OnInit { ui: { widget: 'upload', action: apiConf.fileUpload, - fileType: 'image/png,image/jpeg,image/jpg,image/gif', + accept: 'image/png,image/jpeg,image/jpg,image/gif', limit: 1, limitFileCount: 1, resReName: 'data.fullFileWatermarkPath', @@ -162,7 +162,7 @@ export class VehicleSureArriveComponent implements OnInit { beforeUpload: (file: any, fileList: any) => { return new Observable((observer: Observer) => { const isLt1M = file.size / 1024 / 1024 < 5; - const fileType = 'image/png,image/jpeg'; + const fileType = 'image/png,image/jpeg,image/jpg,image/gif'; if (fileType.indexOf(file.type) === -1) { this.service.msgSrv.warning('图片格式不正确！'); observer.complete(); @@ -187,7 +187,7 @@ export class VehicleSureArriveComponent implements OnInit { ui: { widget: 'upload', action: apiConf.fileUpload, - fileType: 'image/png,image/jpeg,image/jpg,image/gif', + accept: 'image/png,image/jpeg,image/jpg,image/gif', limit: 1, limitFileCount: 1, resReName: 'data.fullFileWatermarkPath', @@ -200,7 +200,7 @@ export class VehicleSureArriveComponent implements OnInit { beforeUpload: (file: any, fileList: any) => { return new Observable((observer: Observer) => { const isLt1M = file.size / 1024 / 1024 < 5; - const fileType = 'image/png,image/jpeg'; + const fileType = 'image/png,image/jpeg,image/jpg,image/gif'; if (fileType.indexOf(file.type) === -1) { this.service.msgSrv.warning('图片格式不正确！'); observer.complete(); @@ -251,7 +251,7 @@ export class VehicleSureArriveComponent implements OnInit { ui: { widget: 'upload', action: apiConf.fileUpload, - fileType: 'image/png,image/jpeg,image/jpg,image/gif', + accept: 'image/png,image/jpeg,image/jpg,image/gif', limit: 1, limitFileCount: 1, resReName: 'data.fullFileWatermarkPath', @@ -264,7 +264,7 @@ export class VehicleSureArriveComponent implements OnInit { beforeUpload: (file: any, fileList: any) => { return new Observable((observer: Observer) => { const isLt1M = file.size / 1024 / 1024 < 5; - const fileType = 'image/png,image/jpeg'; + const fileType = 'image/png,image/jpeg,image/jpg,image/gif'; if (fileType.indexOf(file.type) === -1) { this.service.msgSrv.warning('图片格式不正确！'); observer.complete(); @@ -290,7 +290,7 @@ export class VehicleSureArriveComponent implements OnInit { ui: { widget: 'upload', action: apiConf.fileUpload, - fileType: 'image/png,image/jpeg,image/jpg,image/gif', + accept: 'image/png,image/jpeg,image/jpg,image/gif', limit: 1, limitFileCount: 1, resReName: 'data.fullFileWatermarkPath', @@ -303,7 +303,7 @@ export class VehicleSureArriveComponent implements OnInit { beforeUpload: (file: any, fileList: any) => { return new Observable((observer: Observer) => { const isLt1M = file.size / 1024 / 1024 < 5; - const fileType = 'image/png,image/jpeg'; + const fileType = 'image/png,image/jpeg,image/jpg,image/gif'; if (fileType.indexOf(file.type) === -1) { this.service.msgSrv.warning('图片格式不正确！'); observer.complete(); @@ -336,7 +336,7 @@ export class VehicleSureArriveComponent implements OnInit { ui: { widget: 'upload', action: apiConf.fileUpload, - fileType: 'image/png,image/jpeg,image/jpg,image/gif', + accept: 'image/png,image/jpeg,image/jpg,image/gif', limit: 1, limitFileCount: 1, resReName: 'data.fullFileWatermarkPath', @@ -349,7 +349,7 @@ export class VehicleSureArriveComponent implements OnInit { beforeUpload: (file: any, fileList: any) => { return new Observable((observer: Observer) => { const isLt1M = file.size / 1024 / 1024 < 5; - const fileType = 'image/png,image/jpeg'; + const fileType = 'image/png,image/jpeg,image/jpg,image/gif'; if (fileType.indexOf(file.type) === -1) { this.service.msgSrv.warning('图片格式不正确！'); observer.complete(); @@ -374,7 +374,7 @@ export class VehicleSureArriveComponent implements OnInit { ui: { widget: 'upload', action: apiConf.fileUpload, - fileType: 'image/png,image/jpeg,image/jpg,image/gif', + accept: 'image/png,image/jpeg,image/jpg,image/gif', limit: 1, limitFileCount: 1, resReName: 'data.fullFileWatermarkPath', @@ -387,7 +387,7 @@ export class VehicleSureArriveComponent implements OnInit { beforeUpload: (file: any, fileList: any) => { return new Observable((observer: Observer) => { const isLt1M = file.size / 1024 / 1024 < 5; - const fileType = 'image/png,image/jpeg'; + const fileType = 'image/png,image/jpeg,image/jpg,image/gif'; if (fileType.indexOf(file.type) === -1) { this.service.msgSrv.warning('图片格式不正确！'); observer.complete(); 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 490d20a7..6bc299cf 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 @@ -69,7 +69,7 @@ export class VehicleSureDepartComponent implements OnInit { ui: { widget: 'upload', action: apiConf.fileUpload, - fileType: 'image/png,image/jpeg,image/jpg,image/gif', + accept: 'image/png,image/jpeg,image/jpg,image/gif', limit: 1, limitFileCount: 1, resReName: 'data.fullFileWatermarkPath', @@ -82,7 +82,7 @@ export class VehicleSureDepartComponent implements OnInit { beforeUpload: (file: any, fileList: any) => { return new Observable((observer: Observer) => { const isLt1M = file.size / 1024 / 1024 < 5; - const fileType = 'image/png,image/jpeg'; + const fileType = 'image/png,image/jpeg,image/jpg,image/gif'; if (fileType.indexOf(file.type) === -1) { this.service.msgSrv.warning('图片格式不正确！'); observer.complete(); @@ -107,7 +107,7 @@ export class VehicleSureDepartComponent implements OnInit { ui: { widget: 'upload', action: apiConf.fileUpload, - fileType: 'image/png,image/jpeg,image/jpg,image/gif', + accept: 'image/png,image/jpeg,image/jpg,image/gif', limit: 1, limitFileCount: 1, resReName: 'data.fullFileWatermarkPath', @@ -120,7 +120,7 @@ export class VehicleSureDepartComponent implements OnInit { beforeUpload: (file: any, fileList: any) => { return new Observable((observer: Observer) => { const isLt1M = file.size / 1024 / 1024 < 5; - const fileType = 'image/png,image/jpeg'; + const fileType = 'image/png,image/jpeg,image/jpg,image/gif'; if (fileType.indexOf(file.type) === -1) { this.service.msgSrv.warning('图片格式不正确！'); observer.complete(); @@ -178,7 +178,7 @@ export class VehicleSureDepartComponent implements OnInit { ui: { widget: 'upload', action: apiConf.fileUpload, - fileType: 'image/png,image/jpeg,image/jpg,image/gif', + accept: 'image/png,image/jpeg,image/jpg,image/gif', limit: 1, limitFileCount: 1, resReName: 'data.fullFileWatermarkPath', @@ -191,7 +191,7 @@ export class VehicleSureDepartComponent implements OnInit { beforeUpload: (file: any, fileList: any) => { return new Observable((observer: Observer) => { const isLt1M = file.size / 1024 / 1024 < 5; - const fileType = 'image/png,image/jpeg'; + const fileType = 'image/png,image/jpeg,image/jpg,image/gif'; if (fileType.indexOf(file.type) === -1) { this.service.msgSrv.warning('图片格式不正确！'); observer.complete(); @@ -216,7 +216,7 @@ export class VehicleSureDepartComponent implements OnInit { ui: { widget: 'upload', action: apiConf.fileUpload, - fileType: 'image/png,image/jpeg,image/jpg,image/gif', + accept: 'image/png,image/jpeg,image/jpg,image/gif', limit: 1, limitFileCount: 1, resReName: 'data.fullFileWatermarkPath', @@ -229,7 +229,7 @@ export class VehicleSureDepartComponent implements OnInit { beforeUpload: (file: any, fileList: any) => { return new Observable((observer: Observer) => { const isLt1M = file.size / 1024 / 1024 < 5; - const fileType = 'image/png,image/jpeg'; + const fileType = 'image/png,image/jpeg,image/jpg,image/gif'; if (fileType.indexOf(file.type) === -1) { this.service.msgSrv.warning('图片格式不正确！'); observer.complete(); diff --git a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html index e75cee2f..425c6b1b 100644 --- a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html @@ -1,7 +1,7 @@ {{i?.acceptWeight}}吨,{{i?.acceptVolume}}方,{{i?.acceptNumber}}件 @@ -158,7 +158,6 @@
收款人：{{ i?.payee?.name }}/{{ i?.payee?.phone }}/{{ i?.payee?.idNo }}
 --> -

{{i?.goodsInfos?.[0]?.freightPrice}}{{i?.goodsInfos?.[0]?.freightTypeLabel}}（{{ i?.goodsInfos?.[0]?.settlementBasisLabel ? i?.goodsInfos?.[0]?.settlementBasisLabel + '，' :' ' }}{{i?.goodsInfos?.[0]?.ruleLabel}}）

到付 @@ -176,7 +175,6 @@
收款人：{{ i?.payee?.name }}/{{ i?.payee?.phone }}/{{ i?.payee?.idNo }}
- 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 413c4a2f..422c36b5 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 @@