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-25 10:28:40 +08:00
parent 1c19b82296
commit 51b9cb6973
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts
View File

@ -5,7 +5,7 @@ import { OnChanges } from '@angular/core';
* @Author : Shiming * @Author : Shiming
* @Date : 2022-01-05 11:01:55 * @Date : 2022-01-05 11:01:55
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-03-30 10:45:19 * @LastEditTime : 2022-04-25 10:28:10
* @FilePath : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\contract-template-detail\\contract-template-detail.component.ts * @FilePath : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\contract-template-detail\\contract-template-detail.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
*/ */
@ -96,8 +96,6 @@ export class ContractManagementTemplateTextComponent implements OnInit {
{ label: '运单合同', value: '3' }, { label: '运单合同', value: '3' },
{ label: '运单补充协议', value: '4' }, { label: '运单补充协议', value: '4' },
{ label: '委托代收合同', value: '5' }, { label: '委托代收合同', value: '5' },
{ label: '电子提货单', value: '10' },
{ label: '电子卸货单', value: '11' },
]; ];
this.sf.getProperty('/contractType')!.schema.enum = this.Types; this.sf.getProperty('/contractType')!.schema.enum = this.Types;
this.sf.getProperty('/contractType')!.widget.reset(this.Types); this.sf.getProperty('/contractType')!.widget.reset(this.Types);
@ -178,7 +176,7 @@ export class ContractManagementTemplateTextComponent implements OnInit {
} }
} }
}, },
required: ['templateName', 'templateType'] required: ['templateName', 'templateType','contractType']
}; };
this.ui = { this.ui = {
'*': { '*': {

2
src/app/routes/sys-setting/components/close-account/close-account.component.html
View File

@ -16,7 +16,7 @@
<sf #sf [schema]="schema" [ui]="ui" [mode]="'search'" [loading]="false" (formSubmit)="st?.load(1)" <sf #sf [schema]="schema" [ui]="ui" [mode]="'search'" [loading]="false" (formSubmit)="st?.load(1)"
(formReset)="resetSF()"></sf> (formReset)="resetSF()"></sf>
</div> </div>
edit
<!-- 查询字段大于3个时，根据展开状态调整布局 --> <!-- 查询字段大于3个时，根据展开状态调整布局 -->
<ng-container *ngIf="queryFieldCount > 4"> <ng-container *ngIf="queryFieldCount > 4">
<div nz-col [nzSpan]="_$expand ? 24 : 18"> <div nz-col [nzSpan]="_$expand ? 24 : 18">

4
src/app/routes/sys-setting/components/close-account/close-account.component.ts
View File

@ -187,6 +187,10 @@ this.ui2 = { '*': { spanLabelFixed: 120, grid: { span: 24 } } };
console.log(res) console.log(res)
if(res) { if(res) {
this.formData = res; this.formData = res;
const List: any = [];
List.push({ label: res.enterpriseName, value: res.id });
this.sfFre.getProperty('/enterpriseId')!.schema.enum = List;
this.sfFre.getProperty('/enterpriseId')!.widget.reset(List);
} }
}) })
this.edit = true; this.edit = true;