Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

src/app/routes/insurance-management/components/list/list.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-12 10:52:50
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-17 10:12:21
+ * @LastEditTime : 2022-02-17 11:13:43
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\insurance-management\\components\\list\\list.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -76,6 +76,9 @@
       <ng-template st-row="premium" let-item let-index="index">
         {{ item.premium | currency }}
       </ng-template>
+      <ng-template st-row="processMessage" let-item let-index="index">
+        {{ item.processResult == '2' ? item.processMessage : ''  }}
+      </ng-template>
       <ng-template st-row="driverName" let-item let-index="index">
         <div> {{ item?.driverName }}/{{ item?.driverTelephone }}/{{ item?.carNo }} </div>
       </ng-template>

src/app/routes/insurance-management/components/list/list.component.ts

@@ -426,7 +426,7 @@ export class insuranceManagementListComponent implements OnInit {
         title: '失败原因',
         width: '180px',
         className: 'text-left',
-        index: 'processMessage'
+        render: 'processMessage',
         // processResult=2
       },
       {

src/app/routes/sys-setting/components/network-freight/network-freight.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-24 15:54:08
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-14 14:39:47
+ * @LastEditTime : 2022-02-17 11:19:04
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\sys-setting\\components\\network-freight\\network-freight.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -46,6 +46,11 @@
 </nz-card>
 
 <nz-card class="content-box">
+    <!-- 工具栏 -->
+    <div class="toolbar" style="float: right;
+    padding-bottom: 15px;">
+      <button nz-button nzType="primary" >新增</button>
+    </div>
   <st
     #st
     [scroll]="{ x: '2000px' }"
@@ -55,6 +60,36 @@
     [loading]="service.http.loading"
     (change)="stChange($event)"
   >
+    <ng-template st-row="costRate" let-item let-index="index">
+      <div>{{item?.costRate ? item?.costRate + '%' : '' }}</div>
+    </ng-template>
+    <ng-template st-row="goodsSurchargeRatio" let-item let-index="index">
+      <div>货源单：{{item?.goodsSurchargeRatio ? item?.goodsSurchargeRatio + '%' : '' }}</div>
+      <div>合同单：{{item?.contractSurchargeRatio ? item?.contractSurchargeRatio + '%' : '' }}</div>
+    </ng-template>
+    <ng-template st-row="ticketEnable" let-item let-index="index">
+      <div>{{item?.ticketEnable ? '已开启' : '未开启' }}</div>
+    </ng-template>
+    <ng-template st-row="insuranceEnable" let-item let-index="index">
+      <div>{{item?.insuranceEnable ? '已开启' : '未开启' }}</div>
+    </ng-template>
+    <ng-template st-row="pinganEnable" let-item let-index="index">
+      <div>{{item?.pinganEnable ? '已开启' : '未开启' }}</div>
+    </ng-template>
+    <ng-template st-row="pufaEnable" let-item let-index="index">
+      <div>{{item?.pufaEnable ? '已开启' : '未开启' }}</div>
+    </ng-template>
+    <ng-template st-row="pinganAccountEnable" let-item let-index="index">
+      <div>{{item?.pinganAccountEnable ? '已开启' : '未开启'  }}</div>
+      <div>{{item?.pinganAccountEnable ? item?.pinganAccount : ''  }}</div>
+    </ng-template>
+    <ng-template st-row="pufaAccountEnable" let-item let-index="index">
+      <div>{{item?.pufaAccountEnable ? '已开启' : '未开启'  }}</div>
+      <div>{{item?.pufaAccountEnable ? item?.pufaAccount : ''  }}</div>
+    </ng-template>
+    <ng-template st-row="invoiceEnable" let-item let-index="index">
+      <div>{{item?.invoiceEnable ? '已开启' : '未开启'  }}</div>
+    </ng-template>
     <ng-template st-row="bankName" let-item let-index="index">
       <a href="javascript:;" (click)="setMakeInvoice()">开通子账户</a>
     </ng-template>

src/app/routes/sys-setting/components/network-freight/network-freight.component.ts

@@ -47,51 +47,51 @@ export class NetworkFreightComponent implements OnInit {
     { 
       title: '成立日期',
       width: '150px',
-      index: 'createTime'
+      index: 'enterpriseRegistrationTime'
     },
     { 
       title: '成本费率',
       width: '150px',
-      render: 'electronicInvoiceAccount'
+      render: 'costRate'
      },
     { 
       title: '附加费率',
       width: '150px',
-      render: 'etcAccount'
+      render: 'goodsSurchargeRatio'
      },
     { 
       title: '云开票',
       width: '150px',
-      render: 'electronicContractAccount' 
+      render: 'ticketEnable' 
     },
     { 
       title: '保险',
       width: '150px',
-      render: 'electronicContractAccount' 
+      render: 'insuranceEnable' 
     },
     { 
       title: '平安银行',
       width: '150px',
-      render: 'bankName' },
+      render: 'pinganEnable' },
     { 
       title: '浦发银行',
       width: '150px',
-      render: 'virtualAccount'
+      render: 'pufaEnable'
      },
     { 
       title: '平安电子账户',
       width: '150px',
-      render: 'virtualAccount'
+      render: 'pinganAccountEnable'
      },
     { 
       title: '浦发电子账户',
       width: '150px',
-      render: 'virtualAccount'
+      render: 'pufaAccountEnable'
      },
     { 
       title: '开票开关',
       width: '150px',
-      render: 'virtualAccount'
+      render: 'invoiceEnable'
      },
     {
       title: '操作',
@@ -101,7 +101,7 @@ export class NetworkFreightComponent implements OnInit {
       buttons: [
         {
           text: '基础设置',
-          click: item => this.settingAction(item)
+          click: item => this.ticket(item)
         },
         {
           text: '财务设置',
@@ -117,7 +117,7 @@ export class NetworkFreightComponent implements OnInit {
         },
         {
           text: '系统配置',
-          click: item => this.ticket(item)
+          click: item => this.settingAction(item)
         },
         // {
         //   text: '合同设置',