From 03af0d2dfb8fbea4a4191e7549847052454555db Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Thu, 13 Jan 2022 17:10:40 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bulk-publish/bulk-publish.component.html  |  7 ++--
 .../bulk-publish/bulk-publish.component.less  | 10 +++++-
 .../bulk-release-publish.component.html       |  8 ++---
 .../bulk-release-publish.component.less       |  9 +++++
 .../onecar-publish.component.html             | 36 ++++++++++---------
 .../onecar-publish.component.less             |  7 ++++
 .../onecar-publish.component.ts               | 12 +++++--
 .../release-publish.component.html            | 29 +++++++--------
 .../release-publish.component.ts              | 12 +++++--
 9 files changed, 83 insertions(+), 47 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 99b00b53..677576ae 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
@@ -217,7 +217,7 @@
         </ng-template>
         <ng-template sf-template="paymentDays" let-i let-ui="ui">
           <div nz-row>
-            <div class="align-center" style="width: 350px;">
+            <div class="align-center2"  style="width: 350px;">
               <div nz-col nzSpan="12">
                 <nz-input-number
                   [(ngModel)]="i.value"
@@ -225,11 +225,10 @@
                   [nzMin]="1"
                   [nzMax]="30"
                   [nzStep]="1"
-                  style="width: 150px;"
                 ></nz-input-number>
               </div>
-              <div nz-col nzSpan="6">
-                <span>天内支付运费</span>
+              <div >
+                <span>&nbsp;&nbsp; 天内支付运费</span>
               </div>
             </div>
           </div>
diff --git a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.less b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.less
index f95432e8..5c1b8cab 100644
--- a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.less
+++ b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.less
@@ -15,8 +15,16 @@
   align-items: center;
   justify-content: center;
 }
-
+.align-center2 {
+  display: flex;
+  align-items: center;
+}
 #container {
   width: 300px;
   height: 180px;
 }
+:host {
+  ::ng-deep {
+    nz-input-number{width: 100%;}
+  }
+}
\ No newline at end of file
diff --git a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html
index 6b7df2d5..cb996e6d 100644
--- a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html
+++ b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html
@@ -165,13 +165,13 @@
         </ng-template>
         <ng-template sf-template="paymentDays" let-i let-ui="ui">
           <div nz-row>
-            <div class="align-center" style="width: 350px;">
+            <div class="align-center2" style="width: 350px;">
               <div nz-col nzSpan="12">
-                <nz-input-number [ngModel]="i.value" style="width: 150px;" [nzMin]="1" [nzMax]="30" [nzStep]="1"
+                <nz-input-number [ngModel]="i.value"  [nzMin]="1" [nzMax]="30" [nzStep]="1"
                   (ngModelChange)="i.setValue($event)" nzPlaceHolder="请输入1-30"></nz-input-number>
               </div>
-              <div nz-col nzSpan="6">
-                <span>天内支付运费</span>
+              <div >
+                <span>&nbsp;&nbsp; 天内支付运费</span>
               </div>
             </div>
           </div>
diff --git a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.less b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.less
index f95432e8..3349938f 100644
--- a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.less
+++ b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.less
@@ -15,8 +15,17 @@
   align-items: center;
   justify-content: center;
 }
+.align-center2 {
+  display: flex;
+  align-items: center;
+}
 
 #container {
   width: 300px;
   height: 180px;
 }
+:host {
+  ::ng-deep {
+    nz-input-number{width: 100%;}
+  }
+}
\ No newline at end of file
diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html
index 2200caf8..e5c11f1f 100644
--- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html
+++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html
@@ -205,22 +205,24 @@
   <ng-template #template1>推荐投保，填写货值自动估保费，司机接单后不可退保。详见<a>《投保告知》</a></ng-template>
   <div nz-row>
     <div nz-col nzSpan="12">
-      <sf #sf5 [schema]="schema5" [formData]="sf5data" [button]="'none'" [ui]="ui5">
+      <sf #sf5 [schema]="schema5" [button]="'none'" [ui]="ui5" [formData]="sf5data">
         <ng-template sf-template="goodsValue" let-i let-ui="ui">
           <div class="align-center">
-            <input nz-input [ngModel]="i.value" (ngModelChange)="i.setValue($event)" />
-            <span style="padding: 0 12px" nz-tooltip [nzTooltipTitle]="template2"
-              ><i nz-icon nzType="exclamation-circle" nzTheme="outline" style="color: #1890ff"></i
-            ></span>
-            <ng-template #template2
-              >注意事项：<br />
-
-              ①请仔细阅读《投保告知》<br />
-
-              ②港澳台、西藏不在投保范围内，不予承保<br />
-
-              ③保价费最低收费2元，请按真实货值填写，录入的所有信息必须确保真实，不如实录入的内容，不承担对应赔偿责任。</ng-template
-            >
+            <nz-input-number [ngModel]="i.value" [nzMin]="50000" [nzMax]="3000000" [nzStep]="0.01"
+              (ngModelChange)="i.setValue($event)" nzPlaceHolder="请输入50000-3000000之间数值"></nz-input-number>
+          </div>
+        </ng-template>
+        <ng-template sf-template="insureInfo" let-i let-ui="ui">
+          <div class="align-center">
+            <input nz-input placeholder="保价费金额" [ngModel]="i.value" [disabled]="true" />
+            <span style="padding: 0 12px" nz-tooltip [nzTooltipTitle]="template2" nzTooltipPlacement="bottom"><i nz-icon
+                nzType="exclamation-circle" nzTheme="outline" style="color: #1890ff"></i></span>
+            <ng-template #template2>
+              <p>注意事项:</p>
+              <p>①请仔细阅读《投保告知》</p>
+              <p>②港澳台、西藏不在投保范围内，不予承保</p>
+              <p>③保价费最低收费2元，请按真实货值填写，录入的所有信息必须确保真实，不如实录入的内容，不承担对应赔偿责任。</p>
+            </ng-template>
           </div>
         </ng-template>
       </sf>
@@ -228,6 +230,7 @@
   </div>
 </nz-card>
 
+
 <nz-card>
   <div class="card-title">补充信息</div>
   <div nz-row>
@@ -263,13 +266,12 @@
                   [nzMin]="1"
                   [nzMax]="30"
                   [nzStep]="1"
-                  style="width: 150px"
                   (ngModelChange)="i.setValue($event)"
                   nzPlaceHolder="请输入1-30"
                 ></nz-input-number>
               </div>
-              <div nz-col nzSpan="8">
-                <span>天内支付运费</span>
+              <div >
+                <span>&nbsp;&nbsp; 天内支付运费</span>
               </div>
             </div>
           </div>
diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.less b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.less
index f95432e8..92e2ff57 100644
--- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.less
+++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.less
@@ -20,3 +20,10 @@
   width: 300px;
   height: 180px;
 }
+
+
+:host {
+  ::ng-deep {
+    nz-input-number{width: 100%;}
+  }
+}
\ No newline at end of file
diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts
index 50bb1a77..1c55029f 100644
--- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts
+++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts
@@ -358,8 +358,14 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
           type: 'string',
           title: '货物价值',
           ui: {
-            widget: 'custom',
-            placeholder: '请输入'
+            widget: 'custom'
+          }
+        },
+        insureInfo: {
+          type: 'string',
+          title: '',
+          ui: {
+            widget: 'custom'
           }
         }
       },
@@ -368,7 +374,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
     this.ui5 = {
       '*': {
         spanLabelFixed: 90,
-        grid: { span: 24 }
+        grid: { span: 12 }
       }
     };
   }
diff --git a/src/app/routes/supply-management/components/release-publish/release-publish.component.html b/src/app/routes/supply-management/components/release-publish/release-publish.component.html
index a6d2bf86..9262cdc9 100644
--- a/src/app/routes/supply-management/components/release-publish/release-publish.component.html
+++ b/src/app/routes/supply-management/components/release-publish/release-publish.component.html
@@ -233,21 +233,19 @@
   </div>
   <ng-template #template1>推荐投保，填写货值自动估保费，司机接单后不可退保。详见<a>《投保告知》</a></ng-template>
   <div nz-row>
-    <div nz-col nzSpan="8">
+    <div nz-col nzSpan="12">
       <sf #sf5 [schema]="schema5" [button]="'none'" [ui]="ui5" [formData]="sf5data">
         <ng-template sf-template="goodsValue" let-i let-ui="ui">
           <div class="align-center">
-            <nz-input-number
-              [ngModel]="i.value"
-              [nzMin]="50000"
-              [nzMax]="3000000"
-              [nzStep]="0.01"
-              (ngModelChange)="i.setValue($event)"
-              nzPlaceHolder="请输入50000-3000000之间数值，保留2位小数"
-            ></nz-input-number>
-            <span style="padding: 0 12px" nz-tooltip [nzTooltipTitle]="template2" nzTooltipPlacement="bottom"
-              ><i nz-icon nzType="exclamation-circle" nzTheme="outline" style="color: #1890ff"></i
-            ></span>
+            <nz-input-number [ngModel]="i.value" [nzMin]="50000" [nzMax]="3000000" [nzStep]="0.01"
+              (ngModelChange)="i.setValue($event)" nzPlaceHolder="请输入50000-3000000之间数值"></nz-input-number>
+          </div>
+        </ng-template>
+        <ng-template sf-template="insureInfo" let-i let-ui="ui">
+          <div class="align-center">
+            <input nz-input placeholder="保价费金额" [ngModel]="i.value" [disabled]="true" />
+            <span style="padding: 0 12px" nz-tooltip [nzTooltipTitle]="template2" nzTooltipPlacement="bottom"><i nz-icon
+                nzType="exclamation-circle" nzTheme="outline" style="color: #1890ff"></i></span>
             <ng-template #template2>
               <p>注意事项:</p>
               <p>①请仔细阅读《投保告知》</p>
@@ -260,7 +258,6 @@
     </div>
   </div>
 </nz-card>
-
 <nz-card>
   <div class="card-title">补充信息</div>
   <div nz-row>
@@ -290,7 +287,7 @@
         <ng-template sf-template="total" let-i let-ui="ui">￥{{ i.value }}</ng-template>
         <ng-template sf-template="paymentDays" let-i let-ui="ui">
           <div nz-row>
-            <div class="align-center">
+            <div class="align-center" style="width: 300px">
               <div nz-col nzSpan="16">
                 <nz-input-number
                   [ngModel]="i.value"
@@ -301,8 +298,8 @@
                   nzPlaceHolder="请输入1-30"
                 ></nz-input-number>
               </div>
-              <div nz-col nzSpan="8">
-                <span>天内支付运费</span>
+              <div >
+                <span>&nbsp;&nbsp; 天内支付运费</span>
               </div>
             </div>
           </div>
diff --git a/src/app/routes/supply-management/components/release-publish/release-publish.component.ts b/src/app/routes/supply-management/components/release-publish/release-publish.component.ts
index db94a528..755d6bf3 100644
--- a/src/app/routes/supply-management/components/release-publish/release-publish.component.ts
+++ b/src/app/routes/supply-management/components/release-publish/release-publish.component.ts
@@ -376,13 +376,21 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
           ui: {
             widget: 'custom'
           }
+        },
+        insureInfo: {
+          type: 'string',
+          title: '',
+          ui: {
+            widget: 'custom'
+          }
         }
-      }
+      },
+      required: ['goodsValue']
     };
     this.ui5 = {
       '*': {
         spanLabelFixed: 90,
-        grid: { span: 24 }
+        grid: { span: 12 }
       }
     };
   }