diff --git a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts index 43a99ec8..86afcd02 100644 --- a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts +++ b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts @@ -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: { diff --git a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html index 2936fbff..4243f024 100644 --- a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html +++ b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html @@ -30,7 +30,10 @@ - + + diff --git a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts index d26ddfed..79c6db38 100644 --- a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts +++ b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts @@ -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) {