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

fix bug

Browse Source
This commit is contained in:
wangshiming
2022-04-29 10:21:53 +08:00
parent dc8ec1a68a
commit 88e4ac5fab
4 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/routes/sys-setting/components/network-freight/network-freight.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-24 15:54:08
* @LastEditors : Shiming
* @LastEditTime : 2022-03-24 11:10:44
* @LastEditTime : 2022-04-29 10:20:21
* @FilePath : \\tms-obc-web\\src\\app\\routes\\sys-setting\\components\\network-freight\\network-freight.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -48,7 +48,7 @@
<nz-card class="content-box">
<!-- 工具栏 -->
<div class="toolbar" style="float: right; padding-bottom: 15px">
<button nz-button nzType="primary" (click)="creat()">新增</button>
<button nz-button nzType="primary" (click)="creat()" acl [acl-ability]="['SYSTEM-NETWORK-FREIGHT-ADD']">新增</button>
</div>
<st
#st

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

@ -129,24 +129,29 @@ export class NetworkFreightComponent implements OnInit {
{ type: 'divider' },
{
text: '基础设置<br>',
click: item => this.creat(item)
click: item => this.creat(item),
acl: { ability: ['SYSTEM-NETWORK-FREIGHT-basicSetting'] },
},
{
text: '财务设置<br>',
click: item => this.ticket(item)
click: item => this.ticket(item),
acl: { ability: ['SYSTEM-NETWORK-FREIGHT-finanical'] },
},
{
text: '充值账户<br>',
click: item => this.settingPay(item)
click: item => this.settingPay(item),
acl: { ability: ['SYSTEM-NETWORK-FREIGHT-TOPUP'] },
},
{
text: '应用设置<br>',
click: item => this.settingApp(item)
click: item => this.settingApp(item),
acl: { ability: ['SYSTEM-NETWORK-FREIGHT-APPLY'] },
},
{
text: '系统配置<br>',
click: item => this.settingAction(item)
click: item => this.settingAction(item),
acl: { ability: ['SYSTEM-NETWORK-FREIGHT-SYSTEMCONFIG'] },
},
// {
// text: '合同设置',

27
src/app/routes/sys-setting/components/network-freight/new/new.component.html
View File

@ -8,7 +8,12 @@
* @FilePath : \\tms-obc-web\\src\\app\\routes\\sys-setting\\components\\network-freight\\new\\new.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<page-header-wrapper [title]="TabText"></page-header-wrapper>
<page-header-wrapper [title]="TabText" [logo]="logo">
<ng-template #logo>
<button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
<i nz-icon nzType="left" nzTheme="outline"></i>
</button> </ng-template
></page-header-wrapper>
<nz-card>
<sf #sf1 [ui]="ui" [schema]="schema1" [formData]="sf1FormData" [button]="'none'">
<ng-template sf-template="tipsS" let-me let-ui="ui" let-schema="schema">
@ -17,15 +22,13 @@
<dt>正面照</dt>
<dd>示例</dd>
</dl>
<div class="pa2"> <app-imagelist style="height: 102px;" [imgList]="['./assets/images/company.png']"></app-imagelist></div>
<div class="pa2"> <app-imagelist style="height: 102px" [imgList]="['./assets/images/company.png']"></app-imagelist></div>
</div>
</ng-template>
<ng-template sf-template="legalPersonIdentityVO/tipsY" let-me let-ui="ui" let-schema="schema">
<div class="pr" style="height: 0;">
<dl >
请上传道运证照片，支持JPG、PNG格式，文件小于5M。蓝牌绿牌车辆，可不用传道运证
</dl>
<div class="pa"> <app-imagelist style="height: 152px;" [imgList]="['./assets/images/road.png']"></app-imagelist></div>
<div class="pr" style="height: 0">
<dl> 请上传道运证照片，支持JPG、PNG格式，文件小于5M。蓝牌绿牌车辆，可不用传道运证 </dl>
<div class="pa"> <app-imagelist style="height: 152px" [imgList]="['./assets/images/road.png']"></app-imagelist></div>
</div>
</ng-template>
<ng-template sf-template="title1" let-me let-ui="ui" let-schema="schema">
@ -42,14 +45,14 @@
</ng-template>
<ng-template sf-template="legalPersonIdentityVO/title2" let-me let-ui="ui" let-schema="schema">
<div class="form-title" style="margin-top: 40px;margin-left: -180px;">营业执照法人信息</div>
<div class="form-title" style="margin-top: 40px; margin-left: -180px">营业执照法人信息</div>
</ng-template>
<ng-template sf-template="legalPersonIdentityVO/title3" let-me let-ui="ui" let-schema="schema">
<div class="form-title" style="margin-top: 40px;margin-left: -180px;">道运证信息</div>
<div class="form-title" style="margin-top: 40px; margin-left: -180px">道运证信息</div>
</ng-template>
<ng-template sf-template="legalPersonIdentityVO/roadImg" let-me let-ui="ui" let-schema="schema">
<img height="104" src="./assets/images/road.png" class="borderImg" />
</ng-template>
</ng-template>
<ng-template sf-template="legalPersonIdentityVO/tipsC" let-me let-ui="ui" let-schema="schema">
<div class="pr">
<div>请上传身份证原件的高清照片，若上传复印件，则需申请人签字；</div>
@ -83,7 +86,7 @@
</sf>
<div style="padding-left: 379px">
<button nz-button type="button" nzType="primary" (click)="submitForm()">{{subText}}</button>
<button nz-button type="button" nzType="primary" (click)="submitForm()">{{ subText }}</button>
<button nz-button (click)="goBack()">返回</button>
</div>
</nz-card>
</nz-card>

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

@ -180,14 +180,8 @@ export class NetworkFreightNewComponent implements OnInit {
if (this.sf1.value.isLoingDate) {
this.sf1.value.operatingEndTime = '';
}
console.log(this.sf1.value);
console.log(this.sf1.valid);
console.log(this.sf?.value);
console.log(this.sf.valid);
const sfVlaue = this.sf1.value;
const params: any = {};
console.log(this.sf1.value);
Object.assign(params, {
...this.sf?.value,
enterpriseInfoDTO: {
@ -203,7 +197,6 @@ export class NetworkFreightNewComponent implements OnInit {
roadTransportLicenceNo: this.sf1.value.legalPersonIdentityVO.roadTransportLicenceNo, //道路运输照片
});
delete params.enterpriseInfoDTO.legalPersonIdentityVO;
console.log(params);
params.enterpriseInfoDTO.enterpriseAddressCode = this.sf1.value?.enterpriseAddressCode?.[2];
if (this.route.snapshot.params.id !== 'undefined') {
params.id = this.route.snapshot.params.id;