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:
wangshiming
2022-03-09 17:12:02 +08:00
parent 7bc18f6469 4dd7acb53a
commit 14d38960b8
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts
View File

@ -130,12 +130,7 @@ export class InvoiceDetailComponent implements OnInit {
projectId: {
type: 'string',
title: '所属项目',
ui: {
widget: 'select',
placeholder: '请选择',
allowClear: true,
asyncData: () => this.service.getEnterpriseProject()
},
ui: { widget: 'select', placeholder: '请选择', allowClear: true, asyncData: () => this.service.getEnterpriseProject() },
default: ''
}
}
@ -158,7 +153,7 @@ export class InvoiceDetailComponent implements OnInit {
width: 120,
type: 'widget',
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: this.type ==='2'?record.billkpmoney: record.billkpnotax }) }
widget: { type: 'currency-chy', params: ({ record }) => ({ value: this.type === '2' ? record.billkpmoney : record.billkpnotax }) }
},
{
title: '运输费',
@ -190,7 +185,7 @@ export class InvoiceDetailComponent implements OnInit {
private initCostSF(): SFSchema {
return {
properties: {
billHId: {
billHCode: {
type: 'string',
title: '订单号',
ui: {

5
src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html
View File

@ -30,7 +30,10 @@
<ng-container *ngSwitchCase="1">
<nz-input-group [nzAddOnAfter]="item.remark?.afterLable" style="width: 155px;"
class="ml-md mr-xl">
<input type="number" [min]="0" max="999" [(ngModel)]="item.itemValue" placeholder="请输入" />
<nz-input-number [(ngModel)]="item.itemValue" [nzMin]="item.remark?.min"
[nzPrecision]="item.remark?.precision" [nzMax]="item.remark?.max"
nzPlaceHolder="请输入" style="width: 120px;"></nz-input-number>
<!-- <input type="number" nz-input [(ngModel)]="item.itemValue" placeholder="请输入"/> -->
</nz-input-group>
</ng-container>
<!-- 0-1单选框 -->

5
src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts
View File

@ -50,6 +50,11 @@ export class DynamicSettingH5Component implements OnInit {
if (this.configList?.length < 0) {
return;
}
// 配置校验
if (this.configList.find((config: any) => !config.itemValue && config.requiredField)) {
this.service.msgSrv.warning('请填写必填项');
return;
}
let params = [...this.configList];
params = params.map((item: any) => {
if (item.itemType == 9) {