解决冲突

src/app/routes/contract-management/components/contract-template-frame/contract-template-frame.component.ts

@@ -49,7 +49,7 @@ export class ContractManagementTemplateFrameComponent implements OnInit {
  */
   get reqParams() {
     return {
-      templateType: 'MX',
+      templateType: 'kj',
       ...this.sf?.value,
     };
   }

src/app/routes/contract-management/components/contract-template/contract-template.component.ts

@@ -49,7 +49,7 @@ export class ContractManagementTemplateDetailComponent implements OnInit {
  */
   get reqParams() {
     return {
-      templateType: 'KJ',
+      templateType: 'MX',
       ...this.sf?.value,
     };
   }

src/app/routes/order-management/components/risk/risk.component.ts

@@ -246,7 +246,7 @@ export class OrderManagementRiskComponent implements OnInit {
         title: '异常信息',
         width: '200px',
         className: 'text-left',
-        index: 'abnormalCause'
+        index: 'billComplianceVOS'
       },
       { title: '托运人', index: 'shipperName', width: '200px', className: 'text-left' },
       { title: '网络货运人', index: 'enterpriseInfoName', width: '250px', className: 'text-left' },

src/app/routes/order-management/services/order-management.service.ts

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-03 15:31:52
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-22 14:48:17
+ * @LastEditTime : 2022-02-24 20:20:23
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\services\\order-management.service.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -138,7 +138,7 @@ export class OrderManagementService extends ShipperBaseService {
 
 
     // 查询规则抽查列表
-  public $api_get_listCompliancePage = '/api/sdc/billOperate/listCompliancePage';
+  public $api_get_listCompliancePage = '/api/sdc/BillComplianceSpotCheck/list/Page';
     // 规则抽查审批
   public $api_get_updateBillByCompliance = '/api/sdc/billOperate/updateBillByCompliance';
     // 获取规则抽查分类统计

src/app/shared/components/insurance-table/insurance-table.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-25 20:18:52
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-24 19:31:19
+ * @LastEditTime : 2022-02-25 10:29:05
  * @FilePath     : \\tms-obc-web\\src\\app\\shared\\components\\insurance-table\\insurance-table.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -48,25 +48,33 @@
                             <div >
                                     <label style="width: 65px;text-align: right;"> {{item.startKm}}</label>
                                     <label>-</label>
+                                 
                                     <nz-input-number [ngModel]="item.endKm" (ngModelChange)="changeEndKm($event,i)" [nzMin]="0"
                                         [nzFormatter]="formatterDollar" nzSize="small">
                                     </nz-input-number>（含）
+                               
                             </div>
                         </div>
                   
                     </td>
                     <td nzWidth="220px" nzAlign="center" >
-                        <div style="display: flex;align-items: center;justify-content: center;" >
+                        <div style="    margin-left: 26%">
-                            <nz-input-number [(ngModel)]="item.baseInsuranceRate" [nzMin]="0" nzSize="small" style="width: 55px;"
+                            <nz-input-group [nzAddOnAfter]="addOnAfterTemplate2">
-                                class="ml-sm mr-sm">
+                            <nz-input-number [(ngModel)]="item.baseInsuranceRate" [nzMin]="0" nzSize="small" 
+                               >
                             </nz-input-number>
+                        </nz-input-group>
+                        <ng-template #addOnAfterTemplate2>
+                            <span >%</span>
+                        </ng-template>
                         </div>
                     </td>
                     <td nzWidth="220px" nzAlign="center" >
-                        <div style="display: flex;align-items: center;justify-content: center;">
+                        <div style="    margin-left: 26%">
-                            <nz-input-number [(ngModel)]="item.blanketInsuranceRate" [nzMin]="0" nzSize="small" style="width: 55px;"
+                            <nz-input-group [nzAddOnAfter]="addOnAfterTemplate2">
-                                class="ml-sm mr-sm">
+                            <nz-input-number [(ngModel)]="item.blanketInsuranceRate" [nzMin]="0" nzSize="small" >
                             </nz-input-number>
+                        </nz-input-group>
                         </div>
                     </td>
                     <td nzWidth="60px" nzAlign="center" nzRight>

src/app/shared/components/insurance-table/insurance-table.component.less

@@ -10,5 +10,10 @@
         .ant-input-number-handler-wrap {
             display: none;
         }
+        
     }
+    .ant-input-group {
+        display: -webkit-inline-box !important; 
+    }
+    
 }