批量审核

2022-01-18 15:21:33 +08:00
parent f6ccc1285c
commit e3ffe66a67
15 changed files with 92 additions and 67 deletions
--- a/src/app/routes/order-management/components/bulk/bulk.component.html
+++ b/src/app/routes/order-management/components/bulk/bulk.component.html
@ -1,7 +1,7 @@
 <!--
 * @Author: your name
 * @Date: 2021-12-03 11:10:14
- * @LastEditTime: 2022-01-18 11:30:15
+ * @LastEditTime: 2022-01-18 14:43:58
 * @LastEditors: Please set LastEditors
 * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 * @FilePath: \tms-obc-web\src\app\routes\supply-management\components\vehicle\vehicle.component.html
@ -67,6 +67,16 @@
      <div *ngIf="item?.loadingTime">装 | {{item?.loadingTime}}</div>
      <div *ngIf="item?.unloadingTime">卸 | {{item?.unloadingTime}}</div>
    </ng-template>
+    <ng-template st-row="driverName" let-item let-index="index">
+      <div>
+        {{item?.driverName}}/{{item?.driverPhone}}
+      </div>
+      </ng-template>
+      <ng-template st-row="payeeName" let-item let-index="index">
+      <div>
+        {{item?.payeeName}}/{{item?.payeePhone}}
+      </div>
+      </ng-template>
    <ng-template st-row="billCode" let-item let-index="index">
      <a [routerLink]="'/order-management/bulk-detail/'+item.id">{{item.billCode}}</a>
      <div>
--- a/src/app/routes/order-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/order-management/components/bulk/bulk.component.ts
@ -445,7 +445,7 @@ tabs = {
        render: 'mybidDetailInfo',
      },
      { title: '网络货运人', index: 'enterpriseInfoName', width: '220px', className: 'text-left' },
-      { title: '货主', index: 'enterpriseProjectName', width: '220px', className: 'text-left' },
+      { title: '货主', index: 'shipperAppUserName', width: '220px', className: 'text-left' },
      { title: '所属项目', index: 'enterpriseProjectName', width: '220px', className: 'text-left' },
      { title: '关联运单号', index: 'wayBillCode', width: '180px', className: 'text-left' },
      { title: '货源编号', index: 'resourceCode', width: '180px', className: 'text-left' },
@ -482,14 +482,16 @@ tabs = {
      {
        title: '承运司机',
        className: 'text-left',
+        width: '180px',
        index: 'driverName',
-        width: '150px',
+        render: 'driverName'
      },
      {
        title: '收款人',
        className: 'text-left',
+        width: '180px',
        index: 'payeeName',
-        width: '150px',
+        render: 'payeeName',
      },
      {
        title: '装卸货时间',
--- 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
@ -1,7 +1,7 @@
 <!--
 * @Author: your name
 * @Date: 2021-12-03 15:31:52
- * @LastEditTime: 2022-01-13 20:33:22
+ * @LastEditTime: 2022-01-18 14:41:30
 * @LastEditors: Please set LastEditors
 * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 * @FilePath: \tms-obc-web\src\app\routes\order-management\components\vehicle-detail\vehicle-detail.component.html
@ -131,12 +131,17 @@

 <nz-card nzTitle="运费信息"  #distannce3>
  <st #st [data]="i?.billExpenseDetails" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
-
+    <ng-template st-row="price" let-item let-index="index">
+      {{ item.price | currency}}
+    </ng-template>
+    <ng-template st-row="surcharge" let-item let-index="index">
+      {{ item.surcharge | currency}}
+    </ng-template>
  </st>
  <div>
-    总计：<span style="color: #da001b; font-size: 18px">{{ totalObj?.price | currency: '￥' }}</span> （运费￥{{
-      totalObj?.price - attObj?.price
-    }}，附加运费￥{{ attObj?.price }}，附加费率{{ (attObj?.price / totalObj?.price) * 100 | number: '0.2-2' }}%）
+    总计：<span style="color: #da001b; font-size: 18px">{{ totalObj?.price | currency }}</span> （运费{{
+      totalObj?.price - attObj?.price | currency
+    }}，附加运费{{ attObj?.price | currency}}，附加费率{{ (attObj?.price / totalObj?.price) * 100 | number: '0.2-2' }}%）
  </div>
  <div>收款人：{{ i?.payeeName }}/{{ i?.payeePhone }}</div>
 </nz-card>
--- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts
+++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts
@ -2,7 +2,7 @@ import { ViewChild } from '@angular/core';
 /*
 * @Author: your name
 * @Date: 2021-12-03 15:31:52
- * @LastEditTime: 2022-01-13 14:19:10
+ * @LastEditTime: 2022-01-18 14:41:28
 * @LastEditors: Please set LastEditors
 * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 * @FilePath: \tms-obc-web\src\app\routes\order-management\components\vehicle-detail\vehicle-detail.component.ts
@ -35,9 +35,9 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
  isVisible = false;
  logColumns: STColumn[] = [
    { title: '款项', index: 'costName' },
-    { title: '总费用（元）', index: 'price' },
-    { title: '协议金额（元）', index: 'price' },
-    { title: '附加费（元）', index: 'surcharge' },
+    { title: '总费用（元）', index: 'price',render: 'price' },
+    { title: '协议金额（元）', index: 'price',render: 'price' },
+    { title: '附加费（元）', index: 'surcharge', render: 'surcharge'},
    { title: '附加费率（%）', index: 'paymentMethodRate' },
    { title: '支付时间', index: ' paymentTime' },
    {
--- a/src/app/routes/order-management/components/vehicle/vehicle.component.html
+++ b/src/app/routes/order-management/components/vehicle/vehicle.component.html
@ -1,7 +1,7 @@
 <!--
 * @Author: your name
 * @Date: 2021-12-03 11:10:14
- * @LastEditTime: 2022-01-17 17:50:57
+ * @LastEditTime: 2022-01-18 14:38:28
 * @LastEditors: Please set LastEditors
 * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 * @FilePath: \tms-obc-web\src\app\routes\supply-management\components\vehicle\vehicle.component.html
@ -99,18 +99,12 @@
    </ng-template>
    <ng-template st-row="driverName" let-item let-index="index">
    <div>
-      {{item?.driverName}}
-    </div>
-    <div>
-      {{item?.driverPhone}}
+      {{item?.driverName}}/{{item?.driverPhone}}
    </div>
    </ng-template>
    <ng-template st-row="payeeName" let-item let-index="index">
    <div>
-      {{item?.payeeName}}
-    </div>
-    <div>
-      {{item?.payeePhone}}
+      {{item?.payeeName}}/{{item?.payeePhone}}
    </div>
    </ng-template>
    <ng-template st-row="loadingTime" let-item let-index="index">
--- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts
@ -429,14 +429,14 @@ resourceStatus: any;
      }, {
        title: '承运司机',
        className: 'text-left',
-        width: '120px',
+        width: '180px',
        render: 'driverName'
      },
      {
        title: '收款人',
        className: 'text-left',
        render: 'payeeName',
-        width: '150px',
+        width: '180px',
      },
      {
        title: '装卸货时间',