车辆对接

This commit is contained in:
wangshiming
2022-01-06 20:52:20 +08:00
parent e4bb40839c
commit 2068a1d723
6 changed files with 46 additions and 27 deletions

View File

@ -1,7 +1,7 @@
<!--
* @Author: your name
* @Date: 2022-01-05 11:01:55
* @LastEditTime: 2022-01-06 10:23:19
* @LastEditTime: 2022-01-06 20:47:40
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\contract-management\components\contract-template-detail\contract-template-detail.component.html
@ -15,9 +15,9 @@
</ng-template>
<ng-template #headerContent>
<div nz-row style="display: flex; justify-content: end;">
<div nz-col >
<button nz-button nzSize="large" nzType="default" (click)="cancel()">取消</button>
<button class="ml-lg" nz-button nzSize="large" nzType="primary" (click)="save()">保存</button>
<div nz-col *ngIf="isUpdate">
<button nz-button nzSize="default" nzType="default" (click)="cancel()">取消</button>
<button class="ml-lg" nz-button nzSize="default" nzType="primary" (click)="save()">保存</button>
</div>
</div>
</ng-template>
@ -32,18 +32,18 @@
<div nz-col nzSpan="20" style="overflow: scroll">
<nz-card class="card-height" *ngIf="!isUpdate">
<div class="mb-md">
<div></div>
<div>{{detailList?.templateName}}</div>
</div>
<div [innerHTML]="templateHTML | safehtml"></div>
<div [innerHTML]="detailList?.templateContent | safehtml"></div>
</nz-card>
<nz-card class="card-height" *ngIf="isUpdate">
<div nz-row nzGutter="8">
<div nz-col nzSpan="24">
<input nz-input placeholder="请输入合同标题" [(ngModel)]="title" />
<div class="title" style="width: 100%;">
<input style="width: 100%;" nz-input placeholder="请输入合同标题" [(ngModel)]="detailList.templateName" />
</div>
<div nz-col nzSpan="24" style="margin-top: 15px;">
<sf #sf2 mode="edit" [schema]="schema2" [ui]="{ '*': { spanLabelFixed: 10, grid: { span: 24 }} }"
<sf #sf2 mode="edit" [formData]="sfdata2" [schema]="schema2" [ui]="{ '*': { spanLabelFixed: 10, grid: { span: 24 }} }"
button="none"> </sf>
</div>
</div>

View File

@ -0,0 +1,4 @@
.title {
padding-right: 4px;
padding-left: 14px !important;
}

View File

@ -1,7 +1,8 @@
import { Router } from '@angular/router';
/*
* @Author: your name
* @Date: 2022-01-05 11:01:55
* @LastEditTime: 2022-01-06 19:27:02
* @LastEditTime: 2022-01-06 20:49:42
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\contract-management\components\contract-template-detail\contract-template-detail.component.ts
@ -32,7 +33,8 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
private nzModalService: NzModalService,
public service: ContractManagementService,
public route: ActivatedRoute,
private datePipe: DatePipe
private datePipe: DatePipe,
private router: Router
) {}
textStatus = '新建模板'
@ViewChild('sf', { static: false }) sf!: SFComponent;
@ -41,24 +43,29 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
schema2: SFSchema = {};
ui!: SFUISchema;
sfdata: any;
sfdata2: any;
title: any;
templateHTML: any;
detailList: any = {
templateName: ''
};
isUpdate = false;
ngOnInit() {
this.initSF()
this.initSF2()
if(this.route.snapshot.queryParams.status == 1) {
console.log('进来了吗')
// 新建
this.isUpdate = true;
} else if(this.route.snapshot.queryParams.status == 2) {
// 编辑
this.textStatus = '编辑模板';
this.isUpdate =false;
this.isUpdate =true;
this.initData(this.service.$api_get_contractTemplate)
}else if(this.route.snapshot.queryParams.status == 3) {
// 编辑
this.textStatus = '查看模板';
this.isUpdate =false;
this.initData(this.service.$api_get_contractTemplate)
}
console.log(this.route.snapshot.params.id)
@ -138,9 +145,18 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
}
};
}
initData(url: string) {
this.service.request(url, {id: this.route.snapshot.params.id}).subscribe((res) => {
console.log(res)
if(res) {
this.detailList = res;
this.sfdata = res;
this.sfdata2 = res;
}
})
}
cancel() {
window.history.go(-1)
}
save () {
@ -151,12 +167,13 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
const params = {
...this.sf.value,
...this.sf2.value,
title: this.title
templateTitle: this.title
}
this.service.request(this.service.$api_save_contractTemplate, params).subscribe((res: any) => {
console.log(res)
if(res) {
this.service.msgSrv.success("保存成功!")
this.router.navigate(['/contract-management/template'])
}
})
}

View File

@ -1,7 +1,7 @@
<!--
* @Author: your name
* @Date: 2021-12-03 11:10:14
* @LastEditTime: 2022-01-06 10:19:10
* @LastEditTime: 2022-01-06 20:38:46
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\supply-management\components\vehicle\vehicle.component.html
@ -56,7 +56,7 @@
[loading]="service.http.loading"
>
<ng-template st-row="templateName" let-item let-index="index">
<a (click)="view(item)">{{item.complaintCode}}</a>
<a (click)="view(item)">{{item.templateName}}</a>
</ng-template>
</st>
</div>

View File

@ -231,12 +231,11 @@ export class OrderManagementTemplateComponent implements OnInit {
this.modal.confirm({
nzTitle: '<i>删除确认</i>',
nzOnOk: () =>
// this.service.delMany(ids).subscribe(res => {
// if (res === true) {
// this.service.msgSrv.success('删除成功!');
// }
// })
console.log(value)
this.service.request(this.service.$api_deletebatch_contractTemplate,value.id).subscribe(res => {
if (res) {
this.service.msgSrv.success('删除成功!');
}
})
});
}
}

View File

@ -1032,14 +1032,13 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
// };
this.sf6data = {
stateReceipt: res?.supplementaryInformationVO?.stateReceipt,
receiptType: res?.supplementaryInformationVO?.receiptType || '',
receiptAddressId: res?.supplementaryInformationVO?.receiptAddressId || '',
receiptType: res?.receiptType || '',
receiptAddressId: res?.receiptAddressId || '',
receiptUserName: res?.supplementaryInformationVO?.receiptUserName || '',
area: res?.supplementaryInformationVO?.area || '',
phon: res?.supplementaryInformationVO?.phon || '',
address: res?.supplementaryInformationVO?.address || '',
remarks: res?.supplementaryInformationVO?.remarks || '',
id: res?.supplementaryInformationVO?.id
};
// if (this.PageStatus === '整车修改') {
// this.sf6data.id = res?.supplementaryInformationVO?.id