From 0d12b0bfa1437c2f61e4bcb20ba308732e995508 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Mon, 7 Mar 2022 17:27:43 +0800
Subject: [PATCH] fix bug

---
 .../bulk-detail-change.component.ts           |   3 +-
 .../vehicle-detail-change.component.ts        |   3 +-
 .../onecar-publish.component.html             |  74 +++----------
 .../release-publish.component.html            | 102 ++++++------------
 4 files changed, 51 insertions(+), 131 deletions(-)

diff --git a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts
index 8de03795..337fa6ce 100644
--- a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts
+++ b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-24 16:58:02
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-04 14:15:21
+ * @LastEditTime : 2022-03-07 17:26:41
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail-change\\bulk-detail-change.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -495,7 +495,6 @@ loadTime: any; // 货源单设置回显
     this.service.request(this.service.$api_set_modifyBulkOrder, params).subscribe((res: any) => {
       if(res) {
         this.service.msgSrv.success('修改成功！');
-        this.router.navigate(['/order-management/bulk']);
       } else {
         this.service.msgSrv.error(res?.msg);
       }
diff --git a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts
index 49a3a278..bdeac811 100644
--- a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts
+++ b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-23 13:39:58
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-04 10:48:50
+ * @LastEditTime : 2022-03-07 17:27:38
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail-change\\vehicle-detail-change.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -545,7 +545,6 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
       console.log(res);
       if (res) {
         this.service.msgSrv.success('修改成功！');
-        this.router.navigate(['/order-management/vehicle']);
       } else {
         this.service.msgSrv.error(res?.msg);
       }
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 a3fc1b2d..23ed8a52 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
@@ -177,6 +177,7 @@
     <ng-template #endInconTemp1><i nz-icon nzType="environment" nzTheme="outline"></i></ng-template>
   </form>
 </nz-card>
+
 <nz-card>
   <div class="card-title">货物信息</div>
   <div nz-row>
@@ -187,47 +188,32 @@
   <sf #sf4 [schema]="schema4" [button]="'none'" [ui]="ui4" [formData]="sf4data">
     <ng-template sf-template="weight" let-i let-ui="ui">
       <nz-input-group [nzAddOnAfter]="'吨'">
-        <input
-          nz-input
-          type="number"
-          [ngModel]="i.value"
-          min="0"
-          step="0.01"
-          (ngModelChange)="i.setValue($event)"
-          placeholder="总重量，必填"
-          oninput="if(value>99999)value=99999;if(value<0)value=0"
-        />
+        <input nz-input type="number" [ngModel]="i.value" min="0" step="0.01" (ngModelChange)="i.setValue($event)"
+          placeholder="总重量，必填" oninput="if(value>99999)value=99999;if(value<0)value=0" />
       </nz-input-group>
     </ng-template>
     <ng-template sf-template="volume" let-i let-ui="ui">
       <nz-input-group [nzAddOnAfter]="'方'">
-        <input
-          nz-input
-          type="number"
-          [ngModel]="i.value"
-          min="0"
-          step="0.01"
-          (ngModelChange)="i.setValue($event)"
-          placeholder="体积"
-          oninput="if(value>99999)value=99999;if(value<0)value=0"
-        />
+        <input nz-input type="number" [ngModel]="i.value" min="0" step="0.01" (ngModelChange)="i.setValue($event)"
+          placeholder="体积" oninput="if(value>99999)value=99999;if(value<0)value=0" />
       </nz-input-group>
     </ng-template>
     <ng-template sf-template="number" let-i let-ui="ui">
       <nz-input-group [nzAddOnAfter]="'件'">
-        <input
-          nz-input
-          type="number"
-          [ngModel]="i.value"
-          min="0"
-          (ngModelChange)="i.setValue($event)"
-          placeholder="车次"
-          oninput="if(value>99999)value=99999;if(value<0)value=0"
-        />
+        <input nz-input type="number" [ngModel]="i.value" min="0" (ngModelChange)="i.setValue($event)" placeholder="件数"
+          oninput="if(value>99999)value=99999;if(value<0)value=0" />
       </nz-input-group>
     </ng-template>
+    <ng-template sf-template="goodsValue" let-i let-ui="ui">
+      <div class="align-center">
+        <nz-input-number [ngModel]="i.value" [nzMin]="50000" [nzMax]="2000000" [nzStep]="0.01"
+          (ngModelChange)="i.setValue($event);getInsurersPrice()" nzPlaceHolder="请输入50000-2000000之间数值">
+        </nz-input-number>
+      </div>
+    </ng-template>
   </sf>
 </nz-card>
+
 <nz-card>
   <div class="card-title">服务信息</div>
   <div nz-row>
@@ -239,34 +225,8 @@
         <ng-template sf-template="freeInsurance2" let-i let-ui="ui">
           <nz-alert nzType="warning" [nzMessage]="template1" nzShowIcon></nz-alert>
         </ng-template>
-        <ng-template #template1>推荐投保，填写货值自动估保费，司机接单后不可退保。详见<a target="_blank" [queryParams]="{ type: 10 }" [routerLink]="['/agreement']">《投保告知》</a></ng-template>
-        <ng-template sf-template="goodsValue" let-i let-ui="ui">
-          <div class="align-center">
-            <nz-input-number
-              [ngModel]="i.value"
-              [nzMin]="50000"
-              [nzMax]="2000000"
-              [nzStep]="0.01"
-              (ngModelChange)="i.setValue($event);getInsurersPrice()"
-              nzPlaceHolder="请输入50000-2000000之间数值"
-            ></nz-input-number>
-          </div>
-        </ng-template>
-        <ng-template sf-template="insurancePremium" 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>③最低保费12元/每单；单次运输保额仅限200万元以内；</p>
-              <p>④本保险只限于货物起运前投保，起运后投保无效，保险人不负赔偿责任;</p>
-            </ng-template>
-          </div>
-        </ng-template>
+        <ng-template #template1>香港、澳门、台湾、西藏、新疆不予承保，单次运输保额仅限200万元以内，详见<a target="_blank" [queryParams]="{ type: 10 }"
+            [routerLink]="['/agreement']">《投保告知》</a></ng-template>
       </sf>
     </div>
   </div>
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 5b61cda9..7423108d 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
@@ -180,55 +180,43 @@
   </form>
 </nz-card>
 
+
 <nz-card>
   <div class="card-title">货物信息</div>
   <div nz-row>
-    <div nz-col nzSpan="24">
+    <div nz-col nzSpan="16">
       <sf #sf3 [schema]="schema3" [button]="'none'" [ui]="ui3" [formData]="sf3data"></sf>
-      <sf #sf4 [schema]="schema4" [button]="'none'" [ui]="ui4" [formData]="sf4data">
-        <ng-template sf-template="weight" let-i let-ui="ui">
-          <nz-input-group [nzAddOnAfter]="'吨'">
-            <input
-              nz-input
-              type="number"
-              [ngModel]="i.value"
-              min="0"
-              step="0.01"
-              (ngModelChange)="i.setValue($event)"
-              placeholder="总重量，必填"
-            />
-          </nz-input-group>
-        </ng-template>
-        <ng-template sf-template="volume" let-i let-ui="ui">
-          <nz-input-group [nzAddOnAfter]="'方'">
-            <input
-              nz-input
-              type="number"
-              [ngModel]="i.value"
-              min="0"
-              step="0.01"
-              (ngModelChange)="i.setValue($event)"
-              placeholder="总体积"
-            />
-          </nz-input-group>
-        </ng-template>
-        <ng-template sf-template="number" let-i let-ui="ui">
-          <nz-input-group [nzAddOnAfter]="'车'">
-            <input
-              nz-input
-              type="number"
-              [ngModel]="i.value"
-              min="0"
-              step="0.01"
-              (ngModelChange)="i.setValue($event)"
-              placeholder="总车次"
-            />
-          </nz-input-group>
-        </ng-template>
-      </sf>
     </div>
   </div>
+  <sf #sf4 [schema]="schema4" [button]="'none'" [ui]="ui4" [formData]="sf4data">
+    <ng-template sf-template="weight" let-i let-ui="ui">
+      <nz-input-group [nzAddOnAfter]="'吨'">
+        <input nz-input type="number" [ngModel]="i.value" min="0" step="0.01" (ngModelChange)="i.setValue($event)"
+          placeholder="总重量，必填" oninput="if(value>99999)value=99999;if(value<0)value=0" />
+      </nz-input-group>
+    </ng-template>
+    <ng-template sf-template="volume" let-i let-ui="ui">
+      <nz-input-group [nzAddOnAfter]="'方'">
+        <input nz-input type="number" [ngModel]="i.value" min="0" step="0.01" (ngModelChange)="i.setValue($event)"
+          placeholder="体积" oninput="if(value>99999)value=99999;if(value<0)value=0" />
+      </nz-input-group>
+    </ng-template>
+    <ng-template sf-template="number" let-i let-ui="ui">
+      <nz-input-group [nzAddOnAfter]="'件'">
+        <input nz-input type="number" [ngModel]="i.value" min="0" (ngModelChange)="i.setValue($event)" placeholder="件数"
+          oninput="if(value>99999)value=99999;if(value<0)value=0" />
+      </nz-input-group>
+    </ng-template>
+    <ng-template sf-template="goodsValue" let-i let-ui="ui">
+      <div class="align-center">
+        <nz-input-number [ngModel]="i.value" [nzMin]="50000" [nzMax]="2000000" [nzStep]="0.01"
+          (ngModelChange)="i.setValue($event);getInsurersPrice()" nzPlaceHolder="请输入50000-2000000之间数值">
+        </nz-input-number>
+      </div>
+    </ng-template>
+  </sf>
 </nz-card>
+
 <nz-card>
   <div class="card-title">服务信息</div>
   <div nz-row>
@@ -240,34 +228,8 @@
         <ng-template sf-template="freeInsurance2" let-i let-ui="ui">
           <nz-alert nzType="warning" [nzMessage]="template1" nzShowIcon></nz-alert>
         </ng-template>
-        <ng-template #template1>推荐投保，填写货值自动估保费，司机接单后不可退保。详见<a target="_blank" [queryParams]="{ type: 10 }" [routerLink]="['/agreement']">《投保告知》</a></ng-template>
-        <ng-template sf-template="goodsValue" let-i let-ui="ui">
-          <div class="align-center">
-            <nz-input-number
-              [ngModel]="i.value"
-              [nzMin]="50000"
-              [nzMax]="2000000"
-              [nzStep]="0.01"
-              (ngModelChange)="i.setValue($event);getInsurersPrice()"
-              nzPlaceHolder="请输入50000-2000000之间数值"
-            ></nz-input-number>
-          </div>
-        </ng-template>
-        <ng-template sf-template="insurancePremium" 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>③最低保费12元/每单；单次运输保额仅限200万元以内；</p>
-              <p>④本保险只限于货物起运前投保，起运后投保无效，保险人不负赔偿责任;</p>
-            </ng-template>
-          </div>
-        </ng-template>
+        <ng-template #template1>香港、澳门、台湾、西藏、新疆不予承保，单次运输保额仅限200万元以内，详见<a target="_blank" [queryParams]="{ type: 10 }"
+            [routerLink]="['/agreement']">《投保告知》</a></ng-template>
       </sf>
     </div>
   </div>