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

2022-01-12 21:28:51 +08:00
parent 7235c826e0 df8c32b0eb
commit 6d8cf857fb
7 changed files with 60 additions and 44 deletions
--- 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
@ -1,7 +1,7 @@
 <!--
 * @Author: your name
 * @Date: 2021-12-03 15:31:52
- * @LastEditTime: 2022-01-05 16:36:39
+ * @LastEditTime: 2022-01-12 17:46:09
 * @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
@ -174,19 +174,17 @@
 <nz-card nzTitle="补充信息">
  <sv-container>
    <sv label="是否回单">
-      {{i?.goodsResource?.stateReceipt ?'是':'否'}}
+      {{ i?.supplementaryInformationVO?.stateReceipt === 1 ? '是' : '否' }}
    </sv>
    <sv label="回单类型">
-      {{i?.goodsResource?.receiptTypeLabel}}
-    </sv>
-    <sv label="联系人">
-      {{i?.goodsResource?.receiptUserId}} / {{i?.supplementaryInformationVO?.phon}}
+      {{ i?.supplementaryInformationVO?.receiptType === '1' ? '电子回单' : '纸质回单' }}
    </sv>
+    <sv label="联系人"> {{ i?.supplementaryInformationVO?.receiptUserName }} / {{ i?.supplementaryInformationVO?.phon }} </sv>
    <sv label="所在地区">
-      {{i?.goodsResource?.receiptAddress}}
+      {{ i?.supplementaryInformationVO?.area }}
    </sv>
    <sv label="详细地址">
-      {{i?.goodsResource?.receiptAddress}}
+      {{ i?.supplementaryInformationVO?.address }}
    </sv>
  
  </sv-container>
--- a/src/app/routes/order-management/components/bulk/bulk.component.html
+++ b/src/app/routes/order-management/components/bulk/bulk.component.html
@ -43,9 +43,9 @@
  <nz-tab [nzTitle]="'全部'"></nz-tab>
  <nz-tab [nzTitle]="'待发车('+tabs?.stayQuantity+')'"></nz-tab>
  <nz-tab [nzTitle]="'运输中('+tabs?.receivedQuantity+')'"></nz-tab>
-  <nz-tab [nzTitle]="'待签收('+tabs?.cancelQuantity+')'"></nz-tab>
-  <nz-tab [nzTitle]="'已完成'"></nz-tab>
-  <nz-tab [nzTitle]="'已取消'"></nz-tab>
+  <nz-tab [nzTitle]="'待签收('+tabs?.signQuantity+')'"></nz-tab>
+  <nz-tab [nzTitle]="'已完成('+tabs?.compolatelQuantity+')'"></nz-tab>
+  <nz-tab [nzTitle]="'已取消('+tabs?.cancelQuantity+')'"></nz-tab>
 </nz-tabset>
  <div style="margin-top: 15px;">
    <st
--- a/src/app/routes/order-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/order-management/components/bulk/bulk.component.ts
@ -59,7 +59,9 @@ export class OrderManagementBulkComponent implements OnInit {
 tabs = {
  cancelQuantity: 0,
  receivedQuantity: 0,
-  stayQuantity: 0
+  stayQuantity: 0,
+  signQuantity: 0,
+  compolatelQuantity: 0,
 };
  constructor(
    public service: OrderManagementService,
@ -99,6 +101,10 @@ tabs = {
        } else if (element.billStatusLabel === '待接单') {
          this.tabs.receivedQuantity = element.quantity
        } else if (element.billStatusLabel === '待签收') {
+          this.tabs.signQuantity = element.quantity
+        } else if (element.billStatusLabel === '已完成') {
+          this.tabs.compolatelQuantity = element.quantity
+        } else if (element.billStatusLabel === '已取消') {
          this.tabs.cancelQuantity = element.quantity
        } 
       });
@ -383,43 +389,43 @@ tabs = {
      { title: '', type: 'checkbox', width: '50px', className: 'text-center' },
      {
        title: '订单号',
-        width: '100px',
+        width: '180px',
        className: 'text-center',
        render: 'billCode'
      },
      {
        title: '运费明细',
-        width: '100px',
+        width: '200px',
        className: 'text-center',
        render: 'mybidDetailInfo',
      },
-      { title: '网络货运人', index: 'enterpriseInfoName', width: '120px', className: 'text-center' },
+      { title: '网络货运人', index: 'enterpriseInfoName', width: '180px', className: 'text-center' },
      { title: '托运人', index: 'enterpriseProjectName', width: '120px', className: 'text-center' },
-      { title: '关联运单号', index: 'wayBillCode', width: '120px', className: 'text-center' },
-      { title: '货源编号', index: 'resourceCode', width: '120px', className: 'text-center' },
-      { title: '装货地', index: 'loadingAddressArr', width: '120px', className: 'text-center' },
+      { title: '关联运单号', index: 'wayBillCode', width: '180px', className: 'text-center' },
+      { title: '货源编号', index: 'resourceCode', width: '180px', className: 'text-center' },
+      { title: '装货地', index: 'loadingAddressArr', width: '180px', className: 'text-center' },
      {
        title: '卸货地',
        className: 'text-center',
-        width: '120px',
+        width: '180px',
        index: 'unloadingAddressArr'
      },
      {
        title: '货物信息',
        className: 'text-center',
-        width: '120px',
+        width: '180px',
        render: 'goodsName'
      }, {
        title: '运费单价',
        className: 'text-center',
-        width: '120px',
+        width: '180px',
        index: 'freightPrice'
      },
      {
        title: '接单数量',
        className: 'text-center',
        index: 'goodsNumber',
-        width: '100px',
+        width: '180px',
      },
      {
        title: '结算重量',
@ -441,12 +447,13 @@ tabs = {
      },
      {
        title: '装卸货时间',
-        width: '170px',
+        width: '180px',
        className: 'text-center',
        render: 'loadingTime'
      },
      {
        title: '创建时间',
+        width: '180px',
        className: 'text-center',
        index: 'createTime',
      },
--- a/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.html
+++ b/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.html
@ -1,7 +1,7 @@
 <!--
 * @Author: your name
 * @Date: 2021-12-16 10:19:08
- * @LastEditTime: 2022-01-12 17:10:31
+ * @LastEditTime: 2022-01-12 18:52:22
 * @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\risk-detail\risk-detail.component.html
@ -33,10 +33,10 @@
  <nz-timeline-item *ngFor="let i of datailList?.processNodeVOS; let id = index" >
    <div class="p mt-sm">{{i?.nodeNameLabel}}</div>
    <p>
-      <span class="p-line">{{i?.time}}</span>
+      {{i?.timeLabel}}：<span class="p-line">{{i?.time}}</span>
    </p>
    <p >
-       <span class="p-line">{{i?.result}}</span>
+      {{i?.resultLabel}}：<span class="p-line">{{i?.result}}</span>
    </p>
  </nz-timeline-item>
 </nz-timeline>
--- 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-12 17:33:24
+ * @LastEditTime: 2022-01-12 17:45:57
 * @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
@ -165,17 +165,17 @@
 <nz-card nzTitle="补充信息">
  <sv-container>
    <sv label="是否回单">
-      {{i?.goodsResource?.stateReceipt ?'是':'否'}}
+      {{ i?.supplementaryInformationVO?.stateReceipt === 1 ? '是' : '否' }}
    </sv>
    <sv label="回单类型">
-      {{ i?.goodsResource?.receiptType === '1' ? '电子回单' : '纸质回单' }}
+      {{ i?.supplementaryInformationVO?.receiptType === '1' ? '电子回单' : '纸质回单' }}
    </sv>
-    <sv label="联系人"> {{ i?.goodsResource?.receiptUserName }} / {{ i?.goodsResource?.phon }} </sv>
+    <sv label="联系人"> {{ i?.supplementaryInformationVO?.receiptUserName }} / {{ i?.supplementaryInformationVO?.phon }} </sv>
    <sv label="所在地区">
-      {{ i?.goodsResource?.area }}
+      {{ i?.supplementaryInformationVO?.area }}
    </sv>
    <sv label="详细地址">
-      {{ i?.goodsResource?.address }}
+      {{ i?.supplementaryInformationVO?.address }}
    </sv>

  </sv-container>
--- 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-12 13:30:48
+ * @LastEditTime: 2022-01-12 18:29:04
 * @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
@ -43,9 +43,9 @@
  <nz-tab [nzTitle]="'全部'"></nz-tab>
  <nz-tab [nzTitle]="'待发车('+tabs?.stayQuantity+')'"></nz-tab>
  <nz-tab [nzTitle]="'运输中('+tabs?.receivedQuantity+')'"></nz-tab>
-  <nz-tab [nzTitle]="'待签收('+tabs?.cancelQuantity+')'"></nz-tab>
-  <nz-tab [nzTitle]="'已完成'"></nz-tab>
-  <nz-tab [nzTitle]="'已取消'"></nz-tab>
+  <nz-tab [nzTitle]="'待签收('+tabs?.signQuantity+')'"></nz-tab>
+  <nz-tab [nzTitle]="'已完成('+tabs?.compolatelQuantity+')'"></nz-tab>
+  <nz-tab [nzTitle]="'已取消('+tabs?.cancelQuantity+')'"></nz-tab>
 </nz-tabset>
  <div style="margin-top: 15px;">
    <st
@ -73,14 +73,14 @@
        <span>{{item?.goodsNumber ? item?.goodsNumber + '吨' : '' }}</span>
      </div>
    </ng-template>
-       <!-- 运费明细 -->
-       <!-- <ng-template st-row="mybidDetailInfo" let-item let-index="index">
-        <div *ngFor="let i of item?.mybidDetailInfo">
-          <div></div>
+     <!-- 我的出价 -->
+     <ng-template st-row="mybidInfo" let-item let-index="index" class="temp_p">
+      <div *ngIf="item.mybidInfo?.length > 0">
+        <p *ngFor="let data of item?.mybidInfo"> {{ data?.expenseName }}：￥{{ data?.price | number:'0.2-2' }} </p>
      </div>
-      </ng-template> -->
+    </ng-template>
      <ng-template st-row="mybidDetailInfo" let-item let-index="index">
-        <div *ngIf="item.mybidDetailInfo.length > 0">
+        <div *ngIf="item.mybidDetailInfo?.length > 0">
          <p *ngFor="let data of item.mybidDetailInfo">
            {{ data.expenseName }}：{{ data.price }}
            <span style="color: #f59a63">{{ data.paymentStatusLabel }}</span>
--- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts
@ -60,7 +60,9 @@ export class OrderManagementVehicleComponent implements OnInit {
 tabs = {
  cancelQuantity: 0,
  receivedQuantity: 0,
-  stayQuantity: 0
+  stayQuantity: 0,
+  signQuantity: 0,
+  compolatelQuantity: 0,
 };
 resourceStatus: any;
  constructor(
@ -113,6 +115,10 @@ resourceStatus: any;
        } else if (element.billStatusLabel === '待接单') {
          this.tabs.receivedQuantity = element.quantity
        } else if (element.billStatusLabel === '待签收') {
+          this.tabs.signQuantity = element.quantity
+        } else if (element.billStatusLabel === '已完成') {
+          this.tabs.compolatelQuantity = element.quantity
+        } else if (element.billStatusLabel === '已取消') {
          this.tabs.cancelQuantity = element.quantity
        } 
       });
@ -342,6 +348,11 @@ resourceStatus: any;
        className: 'text-center',
        render: 'billCode'
      },
+      {
+        title: '我的出价',
+        width: '150px',
+        render: 'mybidInfo'
+      },
      {
        title: '运费明细',
        width: '200px',