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

2022-02-24 16:53:18 +08:00
parent 24596c388d 68806a8d60
commit 4bf8e47206
16 changed files with 66 additions and 39 deletions
--- a/src/app/routes/insurance-management/components/list/list.component.ts
+++ b/src/app/routes/insurance-management/components/list/list.component.ts
@ -412,12 +412,12 @@ export class insuranceManagementListComponent implements OnInit {
      {
        title: '货主',
        className: 'text-left',
-        width: '180px',
+        width: '250px',
        index: 'shipperAppUserName'
      },
      {
        title: '所属项目',
-        width: '200px',
+        width: '250px',
        className: 'text-left',
        index: 'enterpriseProjectName'
      },
--- a/src/app/routes/order-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/order-management/components/bulk/bulk.component.ts
@ -412,9 +412,9 @@ export class OrderManagementBulkComponent implements OnInit {
        className: 'text-right',
        render: 'mybidDetailInfo'
      },
-      { title: '网络货运人', index: 'enterpriseInfoName', width: '220px', className: 'text-left' },
-      { title: '货主', index: 'shipperAppUserName', width: '220px', className: 'text-left' },
-      { title: '所属项目', index: 'enterpriseProjectName', width: '220px', className: 'text-left' },
+      { title: '网络货运人', index: 'enterpriseInfoName', width: '250px', className: 'text-left' },
+      { title: '货主', index: 'shipperAppUserName', width: '250px', className: 'text-left' },
+      { title: '所属项目', index: 'enterpriseProjectName', width: '250px', className: 'text-left' },
      { title: '关联运单号', index: 'wayBillCode', width: '180px', className: 'text-left' },
      { title: '货源编号', index: 'resourceCode', width: '180px', className: 'text-left' },
      { title: '装货地', index: 'loadingAddressArr', width: '180px', className: 'text-left' },
@ -477,7 +477,7 @@ export class OrderManagementBulkComponent implements OnInit {
      {
        title: '操作',
        fixed: 'right',
-        width: '120px',
+        width: '130px',
        className: 'text-left',
        buttons: [
          {
--- a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html
+++ b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2022-01-12 10:52:50
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-21 20:16:13
+ * @LastEditTime : 2022-02-24 15:57:34
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\receipts-audit\\receipts-audit.component.html
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@ -68,14 +68,24 @@
        {{ item.freightPrice | currency }}
      </ng-template>
      <ng-template st-row="loadingLadingBillFilePath" let-item let-index="index">
-        <div>
-          <span><img style="height: 60px; padding-right: 5px" [src]="item.loadingLadingBillFilePath" alt="" /></span>
-          <span><img style="height: 60px" [src]="item.loadingPeopleVehiclesGoodsFilePath" alt="" /></span>
+        <div class="imgBox">
+          <div *ngIf="item.loadingLadingBillFilePath">
+            <app-imagelist style="width: 40px" [imgList]="[item.loadingLadingBillFilePath]"> </app-imagelist>
+          </div>
+          <div *ngIf="item.loadingPeopleVehiclesGoodsFilePath">
+            <app-imagelist style="width: 40px" [imgList]="[item.loadingPeopleVehiclesGoodsFilePath]"> </app-imagelist>
+          </div>
        </div>
      </ng-template>
      <ng-template st-row="unloadingLadingBillFilePath" let-item let-index="index">
-        <span><img style="height: 60px; padding-right: 5px" [src]="item.unloadingLadingBillFilePath" alt="" /></span>
-        <span><img style="height: 60px" [src]="item.unloadingPeopleVehiclesGoodsFilePath" alt="" /></span>
+        <div class="imgBox">
+        <div *ngIf="item.unloadingLadingBillFilePath">
+          <app-imagelist style="width: 40px" [imgList]="[item.unloadingLadingBillFilePath]"> </app-imagelist>
+        </div>
+        <div *ngIf="item.unloadingPeopleVehiclesGoodsFilePath">
+          <app-imagelist style="width: 40px" [imgList]="[item.unloadingPeopleVehiclesGoodsFilePath]"> </app-imagelist>
+        </div>
+        </div>
      </ng-template>
      <ng-template st-row="loadingTime" let-item let-index="index">
        <div *ngIf="item?.loadingTime">装 | {{ item?.loadingTime }}</div>
--- a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.less
+++ b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.less
@ -10,4 +10,13 @@
          line-height:32px; 
          background-color: #d7d7d7;
     }
- }
+     ::ng-deep {
+        .imgBox {
+          display: flex;
+          img {
+              width: 60px !important; 
+          }
+      }
+      }
+ }
+ 
--- a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts
+++ b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts
@ -277,9 +277,9 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
        className: 'text-right',
        render: 'mybidDetailInfo'
      },
-      { title: '网络货运人', index: 'enterpriseInfoName', width: '220px', className: 'text-left' },
-      { title: '货主', index: 'shipperAppUserName', width: '220px', className: 'text-left' },
-      { title: '所属项目', index: 'enterpriseProjectName', width: '220px', className: 'text-left' },
+      { title: '网络货运人', index: 'enterpriseInfoName', width: '250px', className: 'text-left' },
+      { title: '货主', index: 'shipperAppUserName', width: '250px', className: 'text-left' },
+      { title: '所属项目', index: 'enterpriseProjectName', width: '250px', className: 'text-left' },
      { title: '货源编号', index: 'resourceCode', width: '180px', className: 'text-left' },
      { title: '装货地', index: 'loadingAddressArr', width: '180px', className: 'text-left' },
      {
--- a/src/app/routes/order-management/components/risk/risk.component.ts
+++ b/src/app/routes/order-management/components/risk/risk.component.ts
@ -249,7 +249,7 @@ export class OrderManagementRiskComponent implements OnInit {
        index: 'abnormalCause'
      },
      { title: '托运人', index: 'shipperName', width: '200px', className: 'text-left' },
-      { title: '网络货运人', index: 'enterpriseInfoName', width: '220px', className: 'text-left' },
+      { title: '网络货运人', index: 'enterpriseInfoName', width: '250px', className: 'text-left' },
      {
        title: '运费明细',
        className: 'text-right',
@ -295,7 +295,7 @@ export class OrderManagementRiskComponent implements OnInit {
      {
        title: '运输信息',
        className: 'text-left',
-        width: '200px',
+        width: '280px',
        render: 'timeer'
      },
      {
--- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts
@ -365,8 +365,8 @@ resourceStatus: any;
        className: 'text-right',
        render: 'mybidDetailInfo',
      },
-      { title: '网络货运人', index: 'enterpriseInfoName', width: '220px', className: 'text-left' },
-      { title: '货主', index: 'shipperAppUserName', width: '220px', className: 'text-left' },
+      { title: '网络货运人', index: 'enterpriseInfoName', width: '250px', className: 'text-left' },
+      { title: '货主', index: 'shipperAppUserName', width: '250px', className: 'text-left' },
      { title: '关联运单号', index: 'wayBillCode', width: '170px', className: 'text-left' },
      { title: '货源编号', index: 'resourceCode', width: '170px', className: 'text-left' },
      { title: '装货地', index: 'loadingAddressArr', width: '180px', className: 'text-left' },
@ -408,7 +408,7 @@ resourceStatus: any;
      {
        title: '操作',
        fixed: 'right',
-        width: '120px',
+        width: '130px',
        className: 'text-left',
        buttons: [
         
--- a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts
+++ b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts
@ -140,7 +140,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
          }
        },
        deadlineTime: {
-          title: '截止日期',
+          title: '有效期',
          type: 'string',
          format: 'date-time',
          ui: {
@ -156,7 +156,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
            },
            validator: (val) => {
                if( new Date(val) <new Date()){
-                  return [{ keyword: 'validTime', message: '截止日期需大于当前时间' }];
+                  return [{ keyword: 'validTime', message: '有效期时间需大于当前时间' }];
                }
                return [];
            },
--- a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts
+++ b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts
@ -163,7 +163,7 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit {
          }
        },
        deadlineTime: {
-          title: '截止日期',
+          title: '有效期',
          type: 'string',
          format: 'date-time',
          ui: {
@ -179,7 +179,7 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit {
            },
            validator: (val) => {
                if( new Date(val) <new Date()){
-                  return [{ keyword: 'validTime', message: '截止日期需大于当前时间' }];
+                  return [{ keyword: 'validTime', message: '有效期时间需大于当前时间' }];
                }
                return [];
            },
--- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts
+++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts
@ -826,7 +826,6 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
      nzContent: TranAgreementComponent,
      nzWidth: 900,
      nzFooter: null,
-      nzComponentParams: { type: 'next' }
    });
    modalRef.afterClose.subscribe(result => {
      if (result) {
--- a/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.html
+++ b/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.html
@ -1,6 +1,5 @@
-
-<h2 >
-  委托运输协议
+<h2 style="text-align: center;">
+  {{ agreement?.agreementName }}
 </h2>
 <div *nzModalFooter>
  <button nz-button nzType="primary" (click)="handleOk()" >我已阅读并同意签署</button>
--- a/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.ts
+++ b/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.ts
@ -4,12 +4,13 @@
 * @Author       : Shiming
 * @Date         : 2022-01-06 15:01:40
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-01-18 17:29:05
+ * @LastEditTime : 2022-02-24 16:24:32
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\tran-agreement\\tran-agreement.component.ts
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 */
 import { Component } from '@angular/core';
 import { NzModalRef } from 'ng-zorro-antd/modal';
+import { SupplyManagementService } from '../../services/supply-management.service';

@Component({
  selector: 'publish-goods-tran-agreement',
@ -18,11 +19,19 @@ import { NzModalRef } from 'ng-zorro-antd/modal';
 })
 export class TranAgreementComponent {
  
-  type: any;
-  constructor(private modal: NzModalRef) {
+  agreement:any;
+  constructor(private modal: NzModalRef,public service: SupplyManagementService,) {
    
  }

+  ngOnInit() {
+    this.service.request(this.service.$api_getAgreementInfoByType,{type:'6'}).subscribe((res) => {
+      if (res) {
+        this.agreement = res;
+      }
+    });
+  }
+
  handleOk(){
    this.modal.close(true);
  }
--- a/src/app/routes/supply-management/services/supply-management.service.ts
+++ b/src/app/routes/supply-management/services/supply-management.service.ts
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2021-12-03 11:10:14
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-17 16:58:46
+ * @LastEditTime : 2022-02-24 16:23:02
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\supply-management\\services\\supply-management.service.ts
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 */
@ -111,7 +111,8 @@ export class SupplyManagementService extends BaseService {
  public $api_getOperationLogRecordsList = '/api/mdc/pbc/operationLogRecords/getOperationLogRecordsList';
  // 获取数据字典
  $api_getDictValue = `/api/mdc/pbc/dictItems/getDictValue`;
-
+   // 获取协议信息
+   public $api_getAgreementInfoByType = '/api/mdc/pbc/agreementInfo/getAgreementInfoByType';
  /**
   * 获取车型、车长字典数据
   * @returns
--- a/src/app/routes/vehicle/components/list/list.component.ts
+++ b/src/app/routes/vehicle/components/list/list.component.ts
@ -199,7 +199,7 @@ export class VehicleComponentsListComponent implements OnInit {
      // { title: '', type: 'checkbox', className: 'text-center' },
      { title: '车牌号', width: '150px', className: 'text-center', index: 'carNo' },
      { title: '车牌颜色', width: '150px', className: 'text-center', index: 'carNoColorLabel' },
-      { title: '车型-车长-载重', width: '150px', className: 'text-center', render: 'carLength' },
+      { title: '车型-车长-载重', width: '180px', className: 'text-center', render: 'carLength' },
      {
        title: '运营状态',
        width: '150px',
@ -238,7 +238,7 @@ export class VehicleComponentsListComponent implements OnInit {
          3: { text: '已到期', color: 'error' }
        }
      },
-      { title: '所有人', width: '150px', className: 'text-center', index: 'carOwner' },
+      { title: '所有人', width: '200px', className: 'text-center', index: 'carOwner' },
      { title: '是否挂靠', width: '150px', className: 'text-center', render: 'isSelf' },
      { title: '挂靠协议', width: '150px', className: 'text-center', render: 'approvalAuditStatus' },
      // { title: '是否已备案', className: 'text-center', render: 'putOnRecord', },
--- a/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.ts
+++ b/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.ts
@ -33,8 +33,8 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
  columns: STColumn[] = [
    { title: '异常编号', index: 'exceptionCode',width: '180px',className: 'text-left', },
    { title: '关联运单号', index: 'wayBillCode',width: '180px',className: 'text-left', },
-    { title: '网络货运人', index: 'enterpriseInfoName',width: '220px',className: 'text-left', },
-    { title: '货主', index: 'shipperAppUserName' ,width: '220px',className: 'text-left',},
+    { title: '网络货运人', index: 'enterpriseInfoName',width: '250px',className: 'text-left', },
+    { title: '货主', index: 'shipperAppUserName' ,width: '250px',className: 'text-left',},
    { title: '装货地', index: 'loadingAddressArr' ,width: '220px',className: 'text-left',},
    { title: '卸货地', index: 'unloadingAddressArr' ,width: '220px',className: 'text-left',},
    { title: '承运司机', index: 'driver' ,width: '250px',className: 'text-left',},
--- a/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts
@ -304,7 +304,7 @@ export class WaybillManagementVehicleComponent implements OnInit {
      {
        title: '货物信息',
        className: 'text-left',
-        width: '180px',
+        width: '250px',
        render: 'goodsInfos'
      },
      {