From 2320ab09600515780f8ad712da4e5d3daf6be25b Mon Sep 17 00:00:00 2001
From: Taric Xin <LincolnLin@swireproperties.com>
Date: Wed, 9 Mar 2022 16:53:58 +0800
Subject: [PATCH] edit

---
 .../components/invoice-detail/invoice-detail.component.ts    | 3 +--
 .../dynamic-setting-h5/dynamic-setting-h5.component.html     | 5 ++++-
 .../dynamic-setting-h5/dynamic-setting-h5.component.ts       | 5 +++++
 3 files changed, 10 insertions(+), 3 deletions(-)

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..cb979a7c 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
@@ -131,7 +131,6 @@ export class InvoiceDetailComponent implements OnInit {
           type: 'string',
           title: '所属项目',
           ui: {
-            widget: 'select',
             placeholder: '请选择',
             allowClear: true,
             asyncData: () => this.service.getEnterpriseProject()
@@ -190,7 +189,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 06381609..39d50c0d 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 @@
                                 <ng-container *ngSwitchCase="1">
                                     <nz-input-group [nzAddOnAfter]="item.remark?.afterLable" style="width: 155px;"
                                         class="ml-md mr-xl">
-                                        <input type="number" nz-input [(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单选框 -->
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) {