From bdd3b9cc3b3b880d998bfb89c0189ef42282e453 Mon Sep 17 00:00:00 2001
From: 1107302052 <1107302052@qq.com>
Date: Fri, 18 Mar 2022 00:34:45 +0800
Subject: [PATCH] 'fixbug'

---
 .../bulk-publish/bulk-publish.component.html         |  7 +++----
 .../bulk-publish/bulk-publish.component.ts           | 12 +++++++++++-
 .../services/supply-management.service.ts            |  5 +++++
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html
index 8b82b607..7e3d5937 100644
--- a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html
+++ b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html
@@ -126,13 +126,12 @@
       <sf #sf4 [schema]="schema4" [formData]="sf4data" [button]="'none'" [ui]="ui4">
         <ng-template sf-template="freightPrice" let-i let-ui="ui">
           <nz-input-group [nzAddOnAfter]="addOnAfterTemplate">
-            <nz-input-number [ngModel]="i.value" (ngModelChange)="i.setValue($event)" [nzMin]="1" style="width: 100%"></nz-input-number>
+            <nz-input-number [nzMax]="99999" [nzMin] ="0" nzPlaceHolder="请输入" type="number" [ngModel]="i.value"
+            (ngModelChange)="i.setValue($event)" [nzPrecision]="2" style="width: 100%;"></nz-input-number>
           </nz-input-group>
           <ng-template #addOnAfterTemplate>
             <nz-select [ngModel]="sf4.value.freightType" (ngModelChange)="sf4.setValue('/freightType', $event)">
-              <nz-option nzLabel="元/吨" nzValue="1"></nz-option>
-              <nz-option nzLabel="元/方" nzValue="2"></nz-option>
-              <nz-option nzLabel="元/车" nzValue="3"></nz-option>
+              <nz-option [nzValue]="item.value" [nzLabel]="item.label" *ngFor="let item of freightTypeOptions"> </nz-option>
             </nz-select>
           </ng-template>
         </ng-template>
diff --git a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts
index 80830828..438f255a 100644
--- a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts
+++ b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts
@@ -41,6 +41,8 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
   totalTime = 0.0; //路程总时间
   currentGoodsTypeName: any;
   enterpriseProjectIds: any;
+  freightTypeOptions: any;
+  ruleOptions: any;
   id = this.route.snapshot.params.id; // 传参id
   // // 单位
   startInfo: any = [];
@@ -104,6 +106,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
     this.initSF4();
     this.initSF6();
     this.initdata();
+    this.initDict();
     this.getLimitvalue();
   }
   initSF1() {
@@ -301,7 +304,6 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
           },
           default: '1'
         },
-
         rule: {
           type: 'string',
           title: '',
@@ -531,6 +533,14 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
       Number(this.sf7?.value?.prePay) +
       Number(this.sf7?.value?.receiptPay) +
       Number(this.sf7?.value?.toPay);
+  }
+    initDict() {
+    this.service.getDictByKey('freight:type').subscribe(res => {
+      this.freightTypeOptions = res;
+    });
+    this.service.getDictByKey('goodresource:rounding:rules').subscribe(res => {
+      this.ruleOptions = res;
+    });
   }
   // 获取城市列表
   getRegionCode(regionCode: any) {
diff --git a/src/app/routes/supply-management/services/supply-management.service.ts b/src/app/routes/supply-management/services/supply-management.service.ts
index 166c3390..1a69f9cd 100644
--- a/src/app/routes/supply-management/services/supply-management.service.ts
+++ b/src/app/routes/supply-management/services/supply-management.service.ts
@@ -175,4 +175,9 @@ export class SupplyManagementService extends BaseService {
   $api_asyncExportWholeList = '/api/sdc/goodsResourceOperate/asyncExportWholeList';
   // 根据货主ID查询合同签署属性
   public $api_getContractAtr = '/api/mdc/cuc/enterpriseInfo/cargoOwner/getContractAtr';
+
+  getDictByKey(dictKey: string) {
+    const params = { dictKey: dictKey };
+    return this.request(this.$api_getDictValue, params);
+  }
 }