Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

Browse Source
This commit is contained in:
Taric Xin
2022-03-11 10:59:52 +08:00
parent 64ac472716 bacba43fd2
commit 2d98e91e02
8 changed files with 68 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2021-12-23 13:39:58 * @Date : 2021-12-23 13:39:58
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-03-08 14:59:55 * @LastEditTime : 2022-03-11 10:19:38
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail-change\\vehicle-detail-change.component.html * @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. * Copyright (C) 2022 huzhenhong. All rights reserved.
--> -->
@ -33,14 +33,18 @@
<sv label="货主">{{ i?.goodsResource?.shipperAppUserName }} </sv> <sv label="货主">{{ i?.goodsResource?.shipperAppUserName }} </sv>
<sv label="所属项目">{{ i?.goodsResource?.enterpriseProjectName }}</sv> <sv label="所属项目">{{ i?.goodsResource?.enterpriseProjectName }}</sv>
<sv label="服务类型">{{ i?.goodsResource?.serviceTypeLabel }}</sv> <sv label="服务类型">{{ i?.goodsResource?.serviceTypeLabel }}</sv>
<sv label="录单员">{{ i?.createUserName }} /{{ i?.createUserPhone }} </sv> <sv label="录单员">{{ i?.createUserName || i?.goodsResource?.createUserName }} /{{ i?.createUserPhone || i?.goodsResource?.createUserPhone }} </sv>
<sv label="调度员">{{ i?.goodsResource?.dispatchName }}/{{ i?.goodsResource?.dispatchPhone }} </sv> <sv label="调度员">{{ i?.goodsResource?.dispatchName }}/{{ i?.goodsResource?.dispatchPhone }} </sv>
<sv label="外部订单号">{{ i?.externalBillCode }}</sv>
<sv label="货源编号">{{ i?.resourceCode }} </sv>
<sv label="运单号">{{ i?.wayBillId }}</sv>
<sv label="承诺付款天数">{{ i?.goodsResource?.dispatchName }}</sv>
</div> </div>
<nz-tabset style="margin-top: 15px"> <nz-tabset style="margin-top: 15px">
<nz-tab nzTitle="装卸货信息" (nzClick)="goDistance(distannce1)"> </nz-tab> <nz-tab nzTitle="装卸货信息" (nzClick)="goDistance(distannce1)"> </nz-tab>
<nz-tab nzTitle="基本信息" (nzClick)="goDistance(distannce2)"> </nz-tab> <nz-tab nzTitle="基本信息" (nzClick)="goDistance(distannce2)"> </nz-tab>
<nz-tab nzTitle="运费信息" (nzClick)="goDistance(distannce3)"> </nz-tab> <!-- <nz-tab nzTitle="运费信息" (nzClick)="goDistance(distannce3)"> </nz-tab> -->
<nz-tab nzTitle="附件信息" (nzClick)="goDistance(distannce4)"> </nz-tab> <nz-tab nzTitle="附件信息" (nzClick)="goDistance(distannce4)"> </nz-tab>
<nz-tab nzTitle="轨迹信息" (nzClick)="goDistance(distannce5)"> </nz-tab> <nz-tab nzTitle="轨迹信息" (nzClick)="goDistance(distannce5)"> </nz-tab>
</nz-tabset> </nz-tabset>
@ -223,17 +227,17 @@
{{ i?.driverCarModelLabel }},{{ i?.driverCarLengthLabel }}米,{{ i?.driverCarWeight }}吨 {{ i?.driverCarModelLabel }},{{ i?.driverCarLengthLabel }}米,{{ i?.driverCarWeight }}吨
</ng-template> </ng-template>
<ng-template sf-template="loadPlanTime" let-item let-ui="ui"> <ng-template sf-template="loadTime" let-item let-ui="ui">
<nz-date-picker nzShowTime nzFormat="yyyy-MM-dd HH:mm:ss" [(ngModel)]="loadTime"></nz-date-picker> <nz-date-picker nzShowTime nzFormat="yyyy-MM-dd HH:mm:ss" [(ngModel)]="loadTime"></nz-date-picker>
</ng-template> </ng-template>
<ng-template sf-template="unloadPlanTime" let-item let-ui="ui"> <ng-template sf-template="unloadTime" let-item let-ui="ui">
<nz-date-picker nzShowTime nzFormat="yyyy-MM-dd HH:mm:ss" [(ngModel)]="unloadTime"></nz-date-picker> <nz-date-picker nzShowTime nzFormat="yyyy-MM-dd HH:mm:ss" [(ngModel)]="unloadTime"></nz-date-picker>
</ng-template> </ng-template>
</sf> </sf>
</nz-card> </nz-card>
<nz-card nzTitle="运费信息" #distannce3> <nz-card nzTitle="运费信息" #distannce3>
<st #st [data]="i?.billExpenseDetails" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }"> <st #st [data]="billExpenses" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
<ng-template st-row="price" let-item let-index="index"> <ng-template st-row="price" let-item let-index="index">
{{ item.price | currency }} {{ item.price | currency }}
</ng-template> </ng-template>
@ -243,7 +247,7 @@
</st> </st>
<div> <div>
总计：<span style="color: #da001b; font-size: 18px">{{ i?.totalAmount | currency }}</span> （运费{{ i?.totalFreight | currency }}， 总计：<span style="color: #da001b; font-size: 18px">{{ i?.totalAmount | currency }}</span> （运费{{ i?.totalFreight | currency }}，
附加费{{ i?.totalSurcharge | currency }}，附加费率{{ (i?.totalRate * 100).toFixed(2) }}%） 附加费{{ i?.totalSurcharge | currency }}，附加费率{{ (i?.totalRate * 100).toFixed(2)}}% ）
</div> </div>
<div>收款人：{{ i?.payeeName }}/{{ i?.payeePhone }}</div> <div>收款人：{{ i?.payeeName }}/{{ i?.payeePhone }}</div>
</nz-card> </nz-card>
@ -295,11 +299,11 @@
<div style="margin-top: 8px">请上传图片</div> <div style="margin-top: 8px">请上传图片</div>
</div> </div>
</nz-upload> </nz-upload>
<nz-modal [nzVisible]="previewVisible1" [nzContent]="modalContent" [nzFooter]="null" (nzOnCancel)="previewVisible1 = false"> <!-- <nz-modal [nzVisible]="previewVisible1" [nzContent]="modalContent" [nzFooter]="null" (nzOnCancel)="previewVisible1 = false">
<ng-template #modalContent> <ng-template #modalContent>
<img [src]="previewImage1" [ngStyle]="{ width: '100%' }" /> <img [src]="previewImage1" [ngStyle]="{ width: '100%' }" />
</ng-template> </ng-template>
</nz-modal> </nz-modal> -->
</sv> </sv>
<sv label="备注"> <sv label="备注">
{{ i?.goodsResource?.remarks }} {{ i?.goodsResource?.remarks }}

82
src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts
View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2021-12-23 13:39:58 * @Date : 2021-12-23 13:39:58
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-03-08 16:12:17 * @LastEditTime : 2022-03-11 10:21:33
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail-change\\vehicle-detail-change.component.ts * @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. * Copyright (C) 2022 huzhenhong. All rights reserved.
*/ */
@ -52,6 +52,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
dirverPhone: any; // 货源单设置回显 dirverPhone: any; // 货源单设置回显
dirverBankCard: any; // 货源单设置回显 dirverBankCard: any; // 货源单设置回显
listImagUrls: any[] = []; // 货源单设置回显 listImagUrls: any[] = []; // 货源单设置回显
billExpenses: any[] = []; //运费信息表格信息
dirvingMessage = []; dirvingMessage = [];
attObj: any; attObj: any;
totalObj: any; totalObj: any;
@ -120,10 +121,9 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
this.initData(); this.initData();
this.initSF3(); this.initSF3();
this.initSF4(); this.initSF4();
this.initSF();
} }
initSF() { initSF() {
console.log(this.i);
console.log(this.i.billStatus == '4' || this.i.billStatus == '3');
this.schema = { this.schema = {
properties: { properties: {
loadingLadingBillFilePath: { loadingLadingBillFilePath: {
@ -332,22 +332,22 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
initData() { initData() {
this.service.request(this.service.$api_get_getWholeBillDetail, { id: this.id }).subscribe(res => { this.service.request(this.service.$api_get_getWholeBillDetail, { id: this.id }).subscribe(res => {
console.log(res); console.log(res);
console.log(JSON.stringify(res));
if (res) { if (res) {
this.i = res; this.i = res;
this.approvalLsit = res.scheduleVOList; // this.initSF();
this.attObj = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === 'ATT')[0]; this.approvalLsit = res?.scheduleVOList;
this.totalObj = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === 'TOTAL')[0]; this.billExpenses = this.i?.billExpenseDetails?.filter(
(data: any) => data.expenseCode === 'PRE' || data.expenseCode === 'RECE' || data.expenseCode === 'BACK'
);
this.approvalLsit.map((item: any, key: any) => { this.approvalLsit.map((item: any, key: any) => {
console.log(item);
if (item.displayStatus === 'HIDE') { if (item.displayStatus === 'HIDE') {
delete this.approvalLsit[key]; delete this?.approvalLsit?.[key];
} }
}); });
this.initSF();
// 对装货凭证进行初始化 // 对装货凭证进行初始化
let arr: any = []; let arr: any = [];
res?.receiptFilePath.forEach((element: any, index: any) => { res?.receiptFilePath.forEach((element: any, index: any) => {
console.log(index);
arr.push({ arr.push({
url: element, url: element,
status: 'done', status: 'done',
@ -365,7 +365,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
if (this.sf3data.goodsTypeName === '其它') { if (this.sf3data.goodsTypeName === '其它') {
this.sf3data.goodsName1 = res?.goodsInfoList[0]?.goodsName || ''; this.sf3data.goodsName1 = res?.goodsInfoList[0]?.goodsName || '';
} }
this.changeGoodsType(this.sf3data.goodsTypeId, { label: this.sf3data.goodsTypeName, value: this.sf3data.goodsTypeId }); this.changeGoodsType(this.sf3data?.goodsTypeId, { label: this.sf3data?.goodsTypeName, value: this.sf3data?.goodsTypeId });
// 对装卸货信息进行初始化 // 对装卸货信息进行初始化
res?.unLoadingPlaceList.forEach((element: any) => { res?.unLoadingPlaceList.forEach((element: any) => {
if (element.type === 1 || element.type === '1') { if (element.type === 1 || element.type === '1') {
@ -405,16 +405,16 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
} }
}); });
// 对装货凭证进行初始化 // 对装货凭证进行初始化
if (res.loadingLadingBillFilePath) { if (res?.loadingLadingBillFilePath) {
this.formData = { this.formData = {
loadingLadingBillFilePath: [ loadingLadingBillFilePath: [
{ {
uid: 'logo', uid: 'logo',
name: 'LOGO', name: 'LOGO',
status: 'done', status: 'done',
url: res.loadingLadingBillFilePath, url: res?.loadingLadingBillFilePath,
response: { response: {
url: res.loadingLadingBillFilePath url: res?.loadingLadingBillFilePath
} }
} }
], ],
@ -423,9 +423,9 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
uid: 'logo', uid: 'logo',
name: 'LOGO', name: 'LOGO',
status: 'done', status: 'done',
url: res.loadingPeopleVehiclesGoodsFilePath, url: res?.loadingPeopleVehiclesGoodsFilePath,
response: { response: {
url: res.loadingPeopleVehiclesGoodsFilePath url: res?.loadingPeopleVehiclesGoodsFilePath
} }
} }
], ],
@ -434,9 +434,9 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
uid: 'logo', uid: 'logo',
name: 'LOGO', name: 'LOGO',
status: 'done', status: 'done',
url: res.unloadingLadingBillFilePath, url: res?.unloadingLadingBillFilePath,
response: { response: {
url: res.unloadingLadingBillFilePath url: res?.unloadingLadingBillFilePath
} }
} }
], ],
@ -445,23 +445,23 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
uid: 'logo', uid: 'logo',
name: 'LOGO', name: 'LOGO',
status: 'done', status: 'done',
url: res.unloadingPeopleVehiclesGoodsFilePath, url: res?.unloadingPeopleVehiclesGoodsFilePath,
response: { response: {
url: res.unloadingPeopleVehiclesGoodsFilePath url: res?.unloadingPeopleVehiclesGoodsFilePath
} }
} }
] ]
}; };
} }
// 发车时间到车时间初始化 // 发车时间到车时间初始化
this.loadTime = res.loadTime; this.loadTime = res?.loadTime;
this.unloadTime = res.unloadTime; this.unloadTime = res?.unloadTime;
this.dirvingMessage = res.billExpenseDetails; this.dirvingMessage = res?.billExpenseDetails;
// 计算里程，时间 // 计算里程，时间
if (this.startInfo?.[0]?.area && this.endInfo?.[0]?.area) { if (this.startInfo?.[0]?.area && this.endInfo?.[0]?.area) {
this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => { this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => {
this.totalDistance = res.distance; this.totalDistance = res?.distance;
this.totalTime = res.time; this.totalTime = res?.time;
}); });
} }
} }
@ -480,8 +480,8 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
let imgList: any = []; let imgList: any = [];
if (this.listImagUrls.length > 0) { if (this.listImagUrls.length > 0) {
this.listImagUrls?.forEach((res: any) => { this.listImagUrls?.forEach((res: any) => {
if (res.url) { if (res?.url) {
imgList.push(res.url); imgList.push(res?.url);
} }
}); });
} }
@ -515,9 +515,6 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
':' + ':' +
this.addPreZero(c.getSeconds()); this.addPreZero(c.getSeconds());
} }
console.log('dirvingMessage=>>>>>>' + this.dirvingMessage);
console.log(this.dirvingMessage);
console.log(this.st._data);
const params = { const params = {
id: this.id, id: this.id,
unLoadingPlaceDTOList: [...this.startInfo, ...this.endInfo], unLoadingPlaceDTOList: [...this.startInfo, ...this.endInfo],
@ -554,9 +551,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
? this.sf.value?.unloadingPeopleVehiclesGoodsFilePath.data.fullFilePath ? this.sf.value?.unloadingPeopleVehiclesGoodsFilePath.data.fullFilePath
: this.sf.value?.unloadingPeopleVehiclesGoodsFilePath?.url : this.sf.value?.unloadingPeopleVehiclesGoodsFilePath?.url
}; };
console.log(params);
this.service.request(this.service.$api_set_modifyWholeOrder, params).subscribe((res: any) => { this.service.request(this.service.$api_set_modifyWholeOrder, params).subscribe((res: any) => {
console.log(res);
if (res) { if (res) {
this.service.msgSrv.success('修改成功！'); this.service.msgSrv.success('修改成功！');
this.router.navigate(['/order-management/vehicle/vehicle-detail/', this.id], { relativeTo: this.ar }); this.router.navigate(['/order-management/vehicle/vehicle-detail/', this.id], { relativeTo: this.ar });
@ -575,9 +570,6 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
// -------------------装卸货信息处理 // -------------------装卸货信息处理
// 打开地图 // 打开地图
openMap(type: string, index: number, address: string) { openMap(type: string, index: number, address: string) {
console.log(type);
console.log(index);
const modalRef = this.modalService.create({ const modalRef = this.modalService.create({
nzTitle: '', nzTitle: '',
nzComponentParams: { selectedAddress: address }, nzComponentParams: { selectedAddress: address },
@ -611,8 +603,8 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
if (this.startInfo[0]?.area && this.endInfo[0]?.area) { if (this.startInfo[0]?.area && this.endInfo[0]?.area) {
this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe((res: any) => { this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe((res: any) => {
this.totalDistance = res.distance; this.totalDistance = res?.distance;
this.totalTime = res.time; this.totalTime = res?.time;
}); });
} }
} }
@ -828,6 +820,8 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
if (!file.url && !file.preview) { if (!file.url && !file.preview) {
file.preview = await getBase64(file.originFileObj!); file.preview = await getBase64(file.originFileObj!);
} }
console.log('888888888');
this.previewImage1 = file.url || file.preview; this.previewImage1 = file.url || file.preview;
this.previewVisible1 = true; this.previewVisible1 = true;
}; };
@ -839,7 +833,6 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
case 'done': case 'done':
let fileList = [...info.fileList]; let fileList = [...info.fileList];
// 2. Read from response and show file link // 2. Read from response and show file link
console.log(fileList);
fileList = fileList.map((file: any) => { fileList = fileList.map((file: any) => {
if (file.response) { if (file.response) {
file.url = file.response.data.fullFilePath; file.url = file.response.data.fullFilePath;
@ -890,7 +883,6 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
elf['elementRef'].nativeElement.scrollIntoView({ behavior: 'smooth', block: 'start', inline: 'start' }); elf['elementRef'].nativeElement.scrollIntoView({ behavior: 'smooth', block: 'start', inline: 'start' });
// elf['elementRef'].nativeElement.className = 'target-fix' // elf['elementRef'].nativeElement.className = 'target-fix'
} }
console.log(elf);
} }
// 装卸货地址互换 // 装卸货地址互换
swapAddress() { swapAddress() {
@ -924,8 +916,8 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
// 计算里程，时间 // 计算里程，时间
if (this.startInfo[0]?.area && this.endInfo[0]?.area) { if (this.startInfo[0]?.area && this.endInfo[0]?.area) {
this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => { this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => {
this.totalDistance = res.distance; this.totalDistance = res?.distance;
this.totalTime = res.time; this.totalTime = res?.time;
}); });
} }
} }
@ -933,7 +925,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
getTrajectory(){ getTrajectory(){
this.service.request(this.service.$api_get_getTrajectory, { id: this.id }).subscribe(res => { this.service.request(this.service.$api_get_getTrajectory, { id: this.id }).subscribe(res => {
if (res) { if (res) {
const points = res.trackArray; const points = res?.trackArray;
let list :any[] = []; let list :any[] = [];
points?.forEach((item: any) => { points?.forEach((item: any) => {
list.push({ list.push({
@ -942,7 +934,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
}); });
}); });
this.mapList = list; this.mapList = list;
this.addressItems = res.cityArray; this.addressItems = res?.cityArray;
if(this.addressItems && this.addressItems.length > 0){ if(this.addressItems && this.addressItems.length > 0){
this.addressItems.forEach(item => { this.addressItems.forEach(item => {
item.vinOutTime = this.getLocalTime(item.vinOutTime); item.vinOutTime = this.getLocalTime(item.vinOutTime);
@ -956,7 +948,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
getDriverTrajectory(){ getDriverTrajectory(){
this.service.request(this.service.$api_get_getAppDriverPosition, { id: this.id }).subscribe(res => { this.service.request(this.service.$api_get_getAppDriverPosition, { id: this.id }).subscribe(res => {
if (res) { if (res) {
const points = res.tracks; const points = res?.tracks;
let list :any[] = []; let list :any[] = [];
points?.forEach((item: any) => { points?.forEach((item: any) => {
list.push({ list.push({
@ -965,7 +957,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
}); });
}); });
this.mapList = list; this.mapList = list;
this.addressItems = [...res.enclosureDataAppTrack]; this.addressItems = [...res?.enclosureDataAppTrack];
if(this.addressItems && this.addressItems.length > 0){ if(this.addressItems && this.addressItems.length > 0){
this.addressItems.forEach(item => { this.addressItems.forEach(item => {
item.vinOutTime = this.getLocalTime(item.gtm); item.vinOutTime = this.getLocalTime(item.gtm);

4
src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2021-12-15 13:17:42 * @Date : 2021-12-15 13:17:42
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-03-09 15:24:55 * @LastEditTime : 2022-03-11 09:53:23
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\confir-receipt\\confir-receipt.component.html * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\confir-receipt\\confir-receipt.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
--> -->
@ -33,7 +33,7 @@
</st> </st>
</sv> </sv>
<sv label="司机车辆"> <sv label="司机车辆">
<div>{{ dataInfo?.driverName|| '-' }} / {{dataInfo?.driverTelephone || '-' }}/ {{ dataInfo?.carNo || '-' }}</div> <div>{{ dataInfo?.driverName|| '-' }} / {{dataInfo?.driverPhone || '-' }}/ {{ dataInfo?.carNo || '-' }}</div>
</sv> </sv>
<sv label="收款人"> <sv label="收款人">
<div>{{ i?.payeeName || '-'}} / {{ i?.payeePhone || '-'}}</div> <div>{{ i?.payeeName || '-'}} / {{ i?.payeePhone || '-'}}</div>

4
src/app/routes/supply-management/model/import-supply/import-supply.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2021-12-03 11:10:14 * @Date : 2021-12-03 11:10:14
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-03-07 11:03:11 * @LastEditTime : 2022-03-11 10:35:44
* @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\model\\import-supply\\import-supply.component.html * @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\model\\import-supply\\import-supply.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
--> -->
@ -12,7 +12,7 @@
<sf #sf mode="edit" [schema]="schema" [ui]="ui" button="none"> <sf #sf mode="edit" [schema]="schema" [ui]="ui" button="none">
<ng-template sf-template="fileName" let-me let-ui="ui" let-schema="schema"> <ng-template sf-template="fileName" let-me let-ui="ui" let-schema="schema">
<nz-input-group [nzSuffix]="inputClearTpl"> <nz-input-group [nzSuffix]="inputClearTpl">
<input type="text" readonly nz-input [(ngModel)]="me.formProperty.value" placeholder="请上传文件" /> <input type="text" readonly nz-input [(ngModel)]="me.formProperty.value" placeholder="请点击下方按钮上传文件" />
</nz-input-group> </nz-input-group>
<ng-template #inputClearTpl> <ng-template #inputClearTpl>
<i nz-icon class="ant-input-clear-icon" nzTheme="fill" nzType="close-circle" *ngIf="me.formProperty.value" <i nz-icon class="ant-input-clear-icon" nzTheme="fill" nzType="close-circle" *ngIf="me.formProperty.value"

2
src/app/routes/supply-management/model/import-supply/import-supply.component.ts
View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2022-03-01 15:13:03 * @Date : 2022-03-01 15:13:03
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-03-07 13:50:55 * @LastEditTime : 2022-03-11 10:33:44
* @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\model\\import-supply\\import-supply.component.ts * @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\model\\import-supply\\import-supply.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
*/ */

2
src/app/routes/sys-setting/components/network-freight/new/new.component.ts
View File

@ -626,7 +626,7 @@ export class NetworkFreightNewComponent implements OnInit {
} }
} }
}, },
required: ['website', 'bankAccount'] required: ['website', 'costRate']
}; };
} }
} }

7
src/app/routes/vehicle/components/audit/detail/detail.component.ts
View File

@ -140,7 +140,6 @@ export class VehicleComponentsAuditDetailComponent implements OnInit, OnDestroy
} }
save() { save() {
this.isEdit = false;
this.detailData.driverLicenseRegisterTime = EADateUtil.yearToDate(this.detailData?.driverLicenseRegisterTime); this.detailData.driverLicenseRegisterTime = EADateUtil.yearToDate(this.detailData?.driverLicenseRegisterTime);
this.detailData.driverLicenseEndTime = EADateUtil.yearToDate(this.detailData?.driverLicenseEndTime); this.detailData.driverLicenseEndTime = EADateUtil.yearToDate(this.detailData?.driverLicenseEndTime);
@ -150,9 +149,15 @@ export class VehicleComponentsAuditDetailComponent implements OnInit, OnDestroy
this.detailData.roadTransportStartTime = EADateUtil.yearToDate(this.detailData?.roadTransportStartTime); this.detailData.roadTransportStartTime = EADateUtil.yearToDate(this.detailData?.roadTransportStartTime);
this.detailData.roadTransportEndTime = EADateUtil.yearToDate(this.detailData?.roadTransportEndTime); this.detailData.roadTransportEndTime = EADateUtil.yearToDate(this.detailData?.roadTransportEndTime);
console.log(this.detailData.roadTransportStartTime)
if((this.detailData.roadTransportStartTime > this.detailData.roadTransportEndTime) || (this.detailData.driverLicenseRegisterTime > this.detailData.driverLicenseEndTime)) {
this.service.msgSrv.error('发证日期起始不能大于结束日期！')
return;
}
this.service.request(this.service.$api_get_update_audit, this.detailData).subscribe(res => { this.service.request(this.service.$api_get_update_audit, this.detailData).subscribe(res => {
if (res) { if (res) {
this.getDetailList(); this.getDetailList();
this.isEdit = false;
this.service.msgSrv.success('修改成功！'); this.service.msgSrv.success('修改成功！');
} }
}); });

7
src/app/routes/vehicle/components/list/detail/detail.component.ts
View File

@ -249,7 +249,6 @@ export class VehicleComponentsListDetailComponent implements OnInit {
} }
save() { save() {
this.isEdit = false;
console.log(this.detailData); console.log(this.detailData);
this.detailData.driverLicenseRegisterTime = EADateUtil.yearToDate(this.detailData?.driverLicenseRegisterTime); this.detailData.driverLicenseRegisterTime = EADateUtil.yearToDate(this.detailData?.driverLicenseRegisterTime);
@ -261,10 +260,16 @@ export class VehicleComponentsListDetailComponent implements OnInit {
this.detailData.roadTransportEndTime = EADateUtil.yearToDate(this.detailData?.roadTransportEndTime); this.detailData.roadTransportEndTime = EADateUtil.yearToDate(this.detailData?.roadTransportEndTime);
console.log(this.detailData); console.log(this.detailData);
console.log(this.detailData.roadTransportStartTime)
if((this.detailData.roadTransportStartTime > this.detailData.roadTransportEndTime) || (this.detailData.driverLicenseRegisterTime > this.detailData.driverLicenseEndTime)) {
this.service.msgSrv.error('发证日期起始不能大于结束日期！')
return;
}
this.service.request(this.service.$api_get_update, this.detailData).subscribe(res => { this.service.request(this.service.$api_get_update, this.detailData).subscribe(res => {
console.log(res); console.log(res);
if (res) { if (res) {
this.getDetailList(); this.getDetailList();
this.isEdit = false;
this.service.msgSrv.success('修改成功！'); this.service.msgSrv.success('修改成功！');
} }
}); });