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

2022-04-08 14:08:58 +08:00
parent 2a75dc0dc5 0874aad6a5
commit 81a4684a2c
6 changed files with 76 additions and 27 deletions
--- a/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.ts
+++ b/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.ts
@ -37,7 +37,9 @@ export class DatatableBusiindexComponent implements OnInit {
    { title: '客户预存款', index: 'czcgje', className: 'text-right', type: 'widget', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.czcgje }) } },
    { title: '业绩量', index: 'yisje', className: 'text-center' },
    { title: '已收附加费', index: 'yisfjf', className: 'text-right', type: 'widget', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.yisfjf }) } },
-    { title: '平均附加费率', index: 'fjfl', className: 'text-center' },
+    { title: '平均附加费率', index: 'fjfl', className: 'text-center',format: (item)=> {
+      return item.fjfl + '%'
+    } },
    { title: '已开票金额', index: 'ykpje', className: 'text-right', type: 'widget', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.ykpje }) } },
  ];
  /**
--- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html
+++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2021-12-06 20:20:26
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-08 11:42:40
+ * @LastEditTime : 2022-04-08 14:06:21
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@ -225,7 +225,6 @@
 <nz-card *ngIf="!route?.snapshot?.queryParams?.sts && abnormalList.length > 0">
  <nz-tabset >
    <nz-tab nzTitle="风险异常检测">
-      <button nz-button nzType="primary"[disabled]="">申 诉</button>
      <div>
        您的订单可能存在交易风险，请及时提交申诉材料，提交成功后，平台将及时完成审核并通知您!
      </div>
--- a/src/app/routes/order-management/components/risk/risk.component.html
+++ b/src/app/routes/order-management/components/risk/risk.component.html
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2022-01-12 10:52:50
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-01 11:02:21
+ * @LastEditTime : 2022-04-08 13:51:12
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\risk\\risk.component.html
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@ -86,8 +86,12 @@
      <ng-template st-row="driverName" let-item let-index="index">
        <div> {{ item?.driverName }}{{  item?.driverPhone ? "/" + item?.driverPhone : '' }}{{   item?.carNo ? "/" + item?.carNo : ''}} </div>
      </ng-template>
-      <ng-template st-row="payeeName" let-item let-index="index">
-        <div> {{ item?.payeeName }}{{ item?.payeePhone ? "/" + item?.payeePhone : ''  }} </div>
+      <ng-template st-row="payeeName" let-item>
+        <div *ngIf="item?.driverId !== item?.payeeId">
+          <div>{{item.payeeName}}</div>
+          <div>{{item.payeePhone}}</div>
+        </div>
+        <div *ngIf="item?.driverId === item?.payeeId">-</div>
      </ng-template>
      <ng-template st-row="freightDetails" let-item let-index="index">
        <div *ngIf="item.freightDetails.length > 0">
--- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html
+++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2021-12-28 14:42:03
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-06 15:39:20
+ * @LastEditTime : 2022-04-08 14:06:27
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@ -249,7 +249,6 @@
 <nz-card *ngIf="!route?.snapshot?.queryParams?.sts && abnormalList.length > 0">
  <nz-tabset>
    <nz-tab nzTitle="风险异常检测">
-      <button nz-button nzType="primary" [disabled]="">申 诉</button>
      <div> 您的订单可能存在交易风险，请及时提交申诉材料，提交成功后，平台将及时完成审核并通知您! </div>
      <div>如果您的运单没有问题，可以提出申诉，并提供相关资料，我们将24小时内审核反馈</div>
      <ul *ngFor="let item of abnormalList">
--- a/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.html
+++ b/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.html
@ -1,4 +1,14 @@
 <!--
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-03-23 14:24:05
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-04-08 14:04:13
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\bulk\\confir-receipt\\confir-receipt.component.html
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+-->
+货物单价<!--
 * @Description  : 
 * @Version      : 1.0
 * @Author       : Shiming
@ -18,7 +28,7 @@ nzMessage="签收后不可再修改运费，请确保运费等信息准确无误
 <sv-container col="1">
  <sv label="货物单价">
    <span>
-      {{detailList?.goodsInfoVO?.freightPrice}} {{detailList?.goodsInfoVO?.freightTypeLabel}}
+      {{detailList?.freightPrice}} {{detailList?.freightTypeLabel}}
     </span>
  </sv>
  <sv label="结算依据">
--- a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts
+++ b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts
@ -91,9 +91,6 @@ export class TaxManagementIndividualCollectComponent implements OnInit {
            placeholder: '请选择',
            widget: 'select',
            containsAllLabel: true,
-            visibleIf: {
-              _$expand: (value: boolean) => value
-            }
          },
          default: ''
        },
@ -109,20 +106,17 @@ export class TaxManagementIndividualCollectComponent implements OnInit {
          type: 'string',
          enum: [
            { value: '', label: '全部' },
-            { value: '0', label: '否' },
-            { value: '1', label: '是' }
+            { value: false, label: '否' },
+            { value: true, label: '是' }
          ],
          ui: {
            placeholder: '请选择',
            widget: 'select',
            containsAllLabel: true,
-            visibleIf: {
-              _$expand: (value: boolean) => value
-            }
          },
          default: ''
        },
-        createTime: {
+        skss: {
          title: '税款所属期',
          type: 'string',
          ui: {
@ -134,7 +128,7 @@ export class TaxManagementIndividualCollectComponent implements OnInit {
            }
          } as SFDateWidgetSchema
        },
-        createTime3: {
+        sbrq: {
          title: '申报日期',
          type: 'string',
          ui: {
@ -182,7 +176,14 @@ export class TaxManagementIndividualCollectComponent implements OnInit {
          '3': { text: '不通过', color: 'error' }
        }
      },
-      { title: '是否逾期', index: 'overdueStatus', className: 'text-center', width: '120px', type: 'enum', enum: { '0': '否', '1': '是' } },
+      {
+        title: '是否逾期',
+        index: 'overdueStatus',
+        className: 'text-center',
+        width: '120px',
+        type: 'enum',
+        enum: { false: '否', true: '是' }
+      },
      {
        title: '税款所属期起',
        index: 'skssqq',
@ -197,12 +198,46 @@ export class TaxManagementIndividualCollectComponent implements OnInit {
        width: '180px'
      },
      { title: '纳税人识别号', index: 'nsrsbh', className: 'text-center', width: '200px' },
-      { title: '税率', index: 'sl', className: 'text-center', width: '150px' },
-      { title: '申报人数', index: 'sbrs', className: 'text-center', width: '150px' },
-      { title: '应税收入', index: 'yssr', className: 'text-center', width: '150px' },
-      { title: '应纳税额', index: 'ynse', className: 'text-center', width: '180px' },
-      { title: '累计已缴纳税额', index: 'ljyjnse', className: 'text-center', width: '150px' },
-      { title: '本期应补退税额', index: 'bqybtse', className: 'text-center', width: '150px' },
+      {
+        title: '税率',
+        index: 'sl',
+        className: 'text-right',
+        width: '150px',
+        format: item => `${item.sl ? ((item.sl as number) * 100).toFixed(2) : 0}%`
+      },
+      { title: '申报人数', index: 'sbrs', className: 'text-right', width: '150px' },
+      {
+        title: '应税收入',
+        index: 'yssr',
+        className: 'text-right',
+        width: '150px',
+        type: 'widget',
+        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.yssr }) }
+      },
+      {
+        title: '应纳税额',
+        index: 'ynse',
+        className: 'text-right',
+        width: '180px',
+        type: 'widget',
+        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.ynse }) }
+      },
+      {
+        title: '累计已缴纳税额',
+        index: 'ljyjnse',
+        className: 'text-center',
+        width: '150px',
+        type: 'widget',
+        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.ljyjnse }) }
+      },
+      {
+        title: '本期应补退税额',
+        index: 'bqybtse',
+        className: 'text-center',
+        width: '150px',
+        type: 'widget',
+        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.bqybtse }) }
+      },
      { title: '申报日期', index: 'sbrq', className: 'text-center', width: '150px' }
    ];
  }
@ -233,7 +268,7 @@ export class TaxManagementIndividualCollectComponent implements OnInit {
  }

  selectChange(item: any) {
-    this.selectedIndex = item?.name || '';
+    this.selectedIndex = item?.value || '';
    setTimeout(() => {
      this.st.load(1);
    });