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

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

@@ -233,7 +233,7 @@ export class insuranceManagementListComponent implements OnInit {
           title: '所属项目',
           ui: {
             widget: 'select',
-            placeholder: '请选择',
+            placeholder: '请先选择货主',
             visibleIf: {
               _$expand: (value: boolean) => value
             },

src/app/routes/order-management/components/bulk/bulk.component.ts

@@ -220,7 +220,7 @@ export class OrderManagementBulkComponent implements OnInit {
           title: '所属项目',
           ui: {
             widget: 'select',
-            placeholder: '请选择',
+            placeholder: '请先选择货主',
             visibleIf: {
               _$expand: (value: boolean) => value
             },
@@ -392,7 +392,7 @@ export class OrderManagementBulkComponent implements OnInit {
     };
     this.uiView = { '*': { spanLabelFixed: 80, grid: { span: 12, gutter: 4 } } };
   }
-  // 获取城市列表
+  // 获取所属项目
   getRegionCode(regionCode: any) {
     console.log(regionCode);
     return this.service

src/app/routes/order-management/components/complaint/complaint.component.ts

@@ -103,6 +103,18 @@ export class OrderManagementComplaintComponent implements OnInit {
           type: 'string',
           title: '投诉单号',
         },
+        complaintCause: {
+          title: '投诉原因',
+          type: 'string',
+          ui: {
+            widget: 'dict-select',
+            params: { dictKey: 'complaint:cause' },
+            containsAllLabel: true,
+            visibleIf: {
+              _$expand: (value: boolean) => value
+            }
+          } as SFSelectWidgetSchema
+        },
         complainantTime: {
           title: '投诉时间',
           type: 'string',
@@ -124,14 +136,14 @@ export class OrderManagementComplaintComponent implements OnInit {
     this.columns = [
       {
         title: '投诉单号',
-        width: '170px',
+        width: '200px',
         fixed: 'left',
         className: 'text-center',
         render: 'complaintCode'
       },
       {
         title: '运单号',
-        width: '170px',
+        width: '200px',
         className: 'text-center',
         index: 'wayBillCode'
       },
@@ -161,6 +173,12 @@ export class OrderManagementComplaintComponent implements OnInit {
         width: '200px',
         index:'handlePartyLabel'
       },
+      {
+        title: '处理时间',
+        className: 'text-center',
+        width: '200px',
+        index:'handleTime'
+      },
       {
         title: '处理结果',
         className: 'text-center',

src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts

@@ -179,7 +179,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
           title: '所属项目',
           ui: {
             widget: 'select',
-            placeholder: '请选择',
+            placeholder: '请先选择货主',
             visibleIf: {
               _$expand: (value: boolean) => value
             },

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-03-22 17:54:50
+ * @LastEditTime : 2022-03-23 19:43:26
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\receipts-audit\\receipts-audit.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -59,8 +59,8 @@
       [scroll]="{ x: '2000px' }"
       [data]="service.$api_get_billExamine_page"
       [columns]="columns"
-      [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
+      [req]="{  process: beforeReq }"
-      [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+      [res]="{ reName: { list: 'data.records', total: 'data.total' } , process: afterRes}"
       [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
       [loading]="false"
     >

src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
-import { STColumn, STComponent } from '@delon/abc/st';
+import { STColumn, STComponent, STRequestOptions } from '@delon/abc/st';
 import { SFComponent, SFDateWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
 import { ModalHelper, _HttpClient } from '@delon/theme';
 import { NzModalService } from 'ng-zorro-antd/modal';
@@ -30,6 +30,7 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
   @ViewChild('st') private readonly st!: STComponent;
   @ViewChild('sf', { static: false }) sf!: SFComponent;
   columns: STColumn[] = [];
+  loading: boolean = true;
   resourceStatus: any;
   tabs = {
     receivedQuantity: 0,
@@ -62,6 +63,34 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
       }
     };
   }
+  beforeReq = (requestOptions: STRequestOptions) => {
+    const a: any = {};
+    if (this.resourceStatus) {
+      a.auditStatus = this.resourceStatus;
+    }
+    const params: any = Object.assign({}, this.sf?.value || {});
+    delete params._$expand;
+    if (this.sf) {
+      Object.assign(requestOptions.body, {
+        ...a,
+      ...params,
+      createTime: {
+        start: this.sf?.value?.createTime?.[0] || '',
+        end: this.sf?.value?.createTime?.[1] || ''
+      }
+      });
+    }
+    this.loading = true;
+    return requestOptions;
+  };
+  afterRes = (data: any[], rawData?: any) => {
+    console.log(data)
+    this.loading = false
+    return data.map(item => ({
+      ...item,
+      // disabled: item.billStatus !== '4' 
+    }));
+  };
   get selectedRows() {
     return this.st?.list.filter(item => item.checked) || [];
   }
@@ -143,6 +172,9 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
               } else {
                 return of([]);
               }
+            },
+            change: (q: any) => {
+              this.getRegionCode(q);
             }
           } as SFSelectWidgetSchema
         },
@@ -151,14 +183,11 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
           title: '所属项目',
           ui: {
             widget: 'select',
-            placeholder: '请选择',
+            placeholder: '请先选择货主',
-            allowClear: true,
-            asyncData: () => this.service.getEnterpriseProject(),
             visibleIf: {
               _$expand: (value: boolean) => value
-            }
+            },
-          },
+          } as SFSelectWidgetSchema
-          default: ''
         },
         loadingPlace: {
           type: 'string',
@@ -498,4 +527,25 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
         })
     });
   }
+   // 获取所属项目
+   getRegionCode(regionCode: any) {
+    console.log(regionCode);
+    return this.service
+      .request(this.service.$api_get_enterprise_project, { id: regionCode })
+      .pipe(
+        map(res =>
+          res.map((item: any) => ({
+            label: item.projectName,
+            value: item.id
+          }))
+        )
+      )
+      .subscribe(res => {
+        this.sf.getProperty('/enterpriseProjectId')!.schema.enum = res;
+        this.sf.getProperty('/enterpriseProjectId')!.widget.reset(res);
+        // if (this.enterpriseProjectIds) {
+        //   this.sf1.setValue('/enterpriseProjectId', this.enterpriseProjectIds);
+        // }
+      });
+  }
 }

src/app/routes/order-management/components/risk-detail/risk-detail.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-16 10:19:08
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-22 18:08:04
+ * @LastEditTime : 2022-03-23 19:12:19
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\risk-detail\\risk-detail.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -21,8 +21,8 @@
     <sv label="申诉状态">
       <span >{{i?.representationsStatusLabel}}</span>
     </sv>
-    <sv label="承运司机">{{i?.driverName ? i?.driverName + '/': ''}} {{i?.driverPhoneNumber ?i?.driverPhoneNumber + '/': '' }}  {{i?.carId}}</sv>
+    <sv label="承运司机">{{i?.driverName ? i?.driverName + '/': ''}} {{i?.driverPhone ?i?.driverPhone + '/': '' }}  {{i?.carId}}</sv>
-    <sv label="车队长"> {{i?.payeeName ? i?.payeeName+ '/' : ''}}{{i?.payeePhoneNumber}} </sv>
+    <sv label="车队长"> {{i?.carCaptainName ? i?.carCaptainName+ '/' : ''}}{{i?.carCaptainPhone}} </sv>
     <sv label="装货时间">{{i?.loadTime}}</sv>
     <sv label="卸货时间">{{i?.unloadTime}}</sv>
     <sv label="装货地">{{i?.loadingPlace}}</sv>

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-03-22 09:42:03
+ * @LastEditTime : 2022-03-23 19:45:45
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\risk\\risk.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -59,8 +59,8 @@
       [scroll]="{ x: '2000px' }"
       [data]="service.$api_get_listRiskPage"
       [columns]="columns"
-      [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
+      [req]="{  process: beforeReq }"
-      [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+      [res]="{ reName: { list: 'data.records', total: 'data.total' } , process: afterRes}"
       [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
       [loading]="false"
     >

src/app/routes/order-management/components/risk/risk.component.ts

@@ -1,7 +1,7 @@
 import { registerLocaleData } from '@angular/common';
 import { Router } from '@angular/router';
 import { Component, OnInit, ViewChild } from '@angular/core';
-import { STColumn, STComponent } from '@delon/abc/st';
+import { STColumn, STComponent, STRequestOptions } from '@delon/abc/st';
 import { SFComponent, SFDateWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
 import { ModalHelper, _HttpClient } from '@delon/theme';
 import { ShipperBaseService } from '@shared';
@@ -21,6 +21,7 @@ export class OrderManagementRiskComponent implements OnInit {
   schema: SFSchema = {};
   schemaView: SFSchema = {};
   auditMany = false;
+  loading: boolean = true;
   auditId: any;
   auditIdR: any;
   isVisibleRE = false;
@@ -47,14 +48,6 @@ export class OrderManagementRiskComponent implements OnInit {
    * 查询参数
    */
   get reqParams() {
-    // const a:any = {};
-    // if(this.resourceStatus) {
-    //   a.representationsStatus = this.resourceStatus
-    // }
-    // return {
-    //   ...a,
-    //   ...this.sf?.value,
-    // };
     const a: any = {};
     if (this.resourceStatus) {
       a.representationsStatus = this.resourceStatus
@@ -70,6 +63,34 @@ export class OrderManagementRiskComponent implements OnInit {
       },
     };
   }
+  beforeReq = (requestOptions: STRequestOptions) => {
+    const a: any = {};
+    if (this.resourceStatus) {
+      a.representationsStatus = this.resourceStatus
+    }
+    const params: any = Object.assign({}, this.sf?.value || {});
+    delete params._$expand;
+    if (this.sf) {
+      Object.assign(requestOptions.body, {
+        ...a,
+        ...params,
+        createTime: {
+          start: this.sf?.value?.createTime?.[0] || '',
+          end: this.sf?.value?.createTime?.[1] || '',
+        },
+      });
+    }
+    this.loading = true;
+    return requestOptions;
+  };
+  afterRes = (data: any[], rawData?: any) => {
+    console.log(data)
+    this.loading = false
+    return data.map(item => ({
+      ...item,
+      disabled: item.auditStatus !== '1' 
+    }));
+  };
   search() {
     this.st?.load(1);
     this.getGoodsSourceStatistical()

src/app/routes/order-management/components/vehicle/vehicle.component.ts

@@ -237,7 +237,7 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme
           title: '所属项目',
           ui: {
             widget: 'select',
-            placeholder: '请选择'
+            placeholder: '请先选择货主',
           } as SFSelectWidgetSchema
         },
         loadingPlace: {

src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.ts

@@ -1,15 +1,15 @@
 /*
- * @Description  : 
+ * @Description  :
  * @Version      : 1.0
  * @Author       : Shiming
  * @Date         : 2022-02-24 20:19:51
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-10 10:27:21
+ * @LastEditTime : 2022-03-23 19:57:34
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\tran-agreement\\tran-agreement.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
 /*
- * @Description  : 
+ * @Description  :
  * @Version      : 1.0
  * @Author       : Shiming
  * @Date         : 2022-01-06 15:01:40
@@ -28,111 +28,136 @@ import { SupplyManagementService } from '../../services/supply-management.servic
   styleUrls: ['./tran-agreement.component.less']
 })
 export class TranAgreementComponent {
-  enterpriseInfo:any; // 网络货运人
+  enterpriseInfo: any; // 网络货运人
-  type:any;
+  type: any;
   object: any;
-  agreement:any;
+  agreement: any;
-  envCache:any;
+  envCache: any;
-  shipperName:any;
+  shipperName: any;
-  constructor(private modal: NzModalRef,public service: SupplyManagementService,) {
+  constructor(private modal: NzModalRef, public service: SupplyManagementService) {}
-    
-  }
 
   ngOnInit() {
-    console.log(this.object)
+    console.log(this.object);
-   // 获取托运人承运人信息
+    // 获取托运人承运人信息
-   this.service.request(this.service.$api_getContractAtr,{id:this.object?.shipperAppUserId}).subscribe(res => {
+    this.service.request(this.service.$api_getContractAtr, { id: this.object?.shipperAppUserId }).subscribe(res => {
-    if (res) {
+      if (res) {
-      this.enterpriseInfo = res
+        this.enterpriseInfo = res;
-      this.getContent();
+        this.getContent();
-    }
+      }
-  });
+    });
-
- 
   }
 
   getContent() {
-    let params:any;
+    let params: any;
-    if(this.type ==='onecar'){
+    if (this.type === 'onecar') {
-
-     params = {
-      contractType:'1',
-      resourceType: '1',
-      signingObject: '1',
-      templateType: 'MX',
-      parametersDTO: {
-        contractCode:'',
-        shipperLegalPersonName:this.enterpriseInfo.legalPersonName || '', //托运法定代表人
-        carrierLegalPersonName:this.enterpriseInfo.netLegalPersonName || '', //承运法定代表人
-        shipperName:this?.shipperName || '', //托运人
-        carrierName:this.object?.enterpriseInfoName || '', //承运人
-        consignorInfo: `${this.object?.unLoadingPlaceDTOList[0]?.appUserName || ''}  ${this.object?.unLoadingPlaceDTOList[0]?.contractTelephone || ''}`, // 发货信息
-        consignorAddress: this.object?.unLoadingPlaceDTOList[0].detailedAddress || '', // 发货地址
-        consignorDate: this.object?.loadingTime || '', // 发货时间
-        consigneeInfo: `${this.object?.unLoadingPlaceDTOList[this.object?.unLoadingPlaceDTOList.length-1].appUserName}  ${this.object?.unLoadingPlaceDTOList[this.object?.unLoadingPlaceDTOList.length-1].contractTelephone}`, // 收货信息
-        consigneeDate: this.object?.unloadingTime || '', // 收货时间
-        consigneeAddress: this.object?.unLoadingPlaceDTOList[this.object?.unLoadingPlaceDTOList.length-1].detailedAddress || '', // 收货地址
-        goodsName:this.object?.goodsInfoDTOList[0].goodsName || '', // 货物名称
-        shippingType:'整车运输',
-        consignmentVolume:`${this.object?.goodsInfoDTOList[0]?.weight || '-'}吨/${this.object?.goodsInfoDTOList[0]?.volume || '-'}方/${this.object?.goodsInfoDTOList[0]?.number || '-'}件`, //托运量
-        transporterInfo:'', //运输方信息
-        freightAmount:this.object?.total || '', // 订单运费金额（元)
-        pre:this.object?.expenseDTOList?.filter((item:any) => item.expenseCode === 'PRE')[0].price || '', //预付
-        rece:this.object?.expenseDTOList?.filter((item:any) => item.expenseCode === 'RECE')[0].price || '',// 到付
-        back:this.object?.expenseDTOList?.filter((item:any) => item.expenseCode === 'BACK')[0].price || '', // 回单付
-        lunarKnot:0,
-        total:this.object?.subtotal || '', // 合计（元)
-        paymentTime:`到货后${this.object?.paymentDays || ''}天`, // 承诺支付运费时间
-        year:new Date().getFullYear() || '', // 签约年份
-        month:new Date().getMonth()+1 || '', // 签约月份
-        day:new Date().getDate() || '', // 签约日期
-      }
-      }
-    } else if(this.type ==='bulk'){ 
       params = {
-        contractType:'1',
+        contractType: '1',
+        resourceType: '1',
+        signingObject: '1',
+        templateType: 'MX',
+        parametersDTO: {
+          contractCode: '',
+          shipperLegalPersonName: this.enterpriseInfo.legalPersonName || '', //托运法定代表人
+          carrierLegalPersonName: this.enterpriseInfo.netLegalPersonName || '', //承运法定代表人
+          shipperName: this?.shipperName || '', //托运人
+          carrierName: this.object?.enterpriseInfoName || '', //承运人
+          consignorInfo: `${this.object?.unLoadingPlaceDTOList[0]?.appUserName || ''}  ${
+            this.object?.unLoadingPlaceDTOList[0]?.contractTelephone || ''
+          }`, // 发货信息
+          consignorAddress: this.object?.unLoadingPlaceDTOList[0].detailedAddress || '', // 发货地址
+          consignorDate: this.object?.loadingTime || '', // 发货时间
+          consigneeInfo: `${this.object?.unLoadingPlaceDTOList[this.object?.unLoadingPlaceDTOList.length - 1].appUserName}  ${
+            this.object?.unLoadingPlaceDTOList[this.object?.unLoadingPlaceDTOList.length - 1].contractTelephone
+          }`, // 收货信息
+          consigneeDate: this.object?.unloadingTime || '', // 收货时间
+          consigneeAddress: this.object?.unLoadingPlaceDTOList[this.object?.unLoadingPlaceDTOList.length - 1].detailedAddress || '', // 收货地址
+          goodsName: this.object?.goodsInfoDTOList[0].goodsName || '', // 货物名称
+          shippingType: '整车运输',
+          consignmentVolume: `${this.object?.goodsInfoDTOList[0]?.weight || '-'}吨/${this.object?.goodsInfoDTOList[0]?.volume || '-'}方/${
+            this.object?.goodsInfoDTOList[0]?.number || '-'
+          }件`, //托运量
+          transporterInfo: '', //运输方信息
+          freightAmount: this.object?.total || '', // 订单运费金额（元)
+          pre: this.object?.expenseDTOList?.filter((item: any) => item.expenseCode === 'PRE')[0].price || '', //预付
+          rece: this.object?.expenseDTOList?.filter((item: any) => item.expenseCode === 'RECE')[0].price || '', // 到付
+          back: this.object?.expenseDTOList?.filter((item: any) => item.expenseCode === 'BACK')[0].price || '', // 回单付
+          lunarKnot: 0,
+          total: this.object?.subtotal || '', // 合计（元)
+          paymentTime: `到货后${this.object?.paymentDays || ''}天`, // 承诺支付运费时间
+          year: new Date().getFullYear() || '', // 签约年份
+          month: new Date().getMonth() + 1 || '', // 签约月份
+          day: new Date().getDate() || '' // 签约日期
+        }
+      };
+    } else if (this.type === 'bulk') {
+      params = {
+        contractType: '1',
         resourceType: '2',
         signingObject: '1',
         templateType: 'MX',
         parametersDTO: {
-          contractCode:'',
+          contractCode: '',
-          shipperName:this?.shipperName || '', //托运人
+          shipperName: this?.shipperName || '', //托运人
-          carrierName:this.object?.enterpriseInfoName || '', //承运人
+          carrierName: this.object?.enterpriseInfoName || '', //承运人
-          shipperLegalPersonName:this.enterpriseInfo.legalPersonName || '', //托运法定代表人
+          shipperLegalPersonName: this.enterpriseInfo.legalPersonName || '', //托运法定代表人
-          carrierLegalPersonName:this.enterpriseInfo.netLegalPersonName || '', //承运法定代表人
+          carrierLegalPersonName: this.enterpriseInfo.netLegalPersonName || '', //承运法定代表人
-          consignorInfo: `${this.object.unLoadingPlaceDTOList[0]?.appUserName || ''}  ${this.object.unLoadingPlaceDTOList[0]?.contractTelephone || ''}`, // 发货信息
+          consignorInfo: `${this.object.unLoadingPlaceDTOList[0]?.appUserName || ''}  ${
+            this.object.unLoadingPlaceDTOList[0]?.contractTelephone || ''
+          }`, // 发货信息
           consignorAddress: this.object.unLoadingPlaceDTOList[0].detailedAddress, // 发货地址
           consignorDate: '', // 发货时间
-          consigneeInfo: `${this.object.unLoadingPlaceDTOList[this.object.unLoadingPlaceDTOList.length-1]?.appUserName || ''}  ${this.object.unLoadingPlaceDTOList[this.object.unLoadingPlaceDTOList.length-1]?.contractTelephone || ''}`, // 收货信息
+          consigneeInfo: `${this.object.unLoadingPlaceDTOList[this.object.unLoadingPlaceDTOList.length - 1]?.appUserName || ''}  ${
+            this.object.unLoadingPlaceDTOList[this.object.unLoadingPlaceDTOList.length - 1]?.contractTelephone || ''
+          }`, // 收货信息
           consigneeDate: '', // 收货时间
-          consigneeAddress: this.object.unLoadingPlaceDTOList[this.object.unLoadingPlaceDTOList.length-1]?.detailedAddress || '', // 收货地址
+          consigneeAddress: this.object.unLoadingPlaceDTOList[this.object.unLoadingPlaceDTOList.length - 1]?.detailedAddress || '', // 收货地址
-          goodsName:this.object.goodsInfoDTOList[0]?.goodsName || '', // 货物名称
+          goodsName: this.object.goodsInfoDTOList[0]?.goodsName || '', // 货物名称
-          shippingType:'大宗运输',
+          shippingType: '大宗运输',
-          consignmentVolume:`${this.object?.goodsInfoDTOList?.[0]?.weight|| '-'}吨/${this.object?.goodsInfoDTOList?.[0]?.volume || '-'}方/${this.object.goodsInfoDTOList?.[0]?.number || '-'}车`, //托运量
+          consignmentVolume: `${this.object?.goodsInfoDTOList?.[0]?.weight || '-'}吨/${
-          transporterInfo:'', //运输方信息
+            this.object?.goodsInfoDTOList?.[0]?.volume || '-'
-          freightAmount:'', // 订单运费金额（元)
+          }方/${this.object.goodsInfoDTOList?.[0]?.number || '-'}车`, //托运量
-          pre:'', //预付
+          transporterInfo: '', //运输方信息
-          rece:'',// 到付
+          freightAmount: '', // 订单运费金额（元)
-          back:'',// 回单付
+          pre: '', //预付
-          lunarKnot:'',
+          rece: '', // 到付
-          total:'', // 合计（元)
+          back: '', // 回单付
-          paymentTime:`到货后${this.object?.paymentDays || ''}天`, // 承诺支付运费时间
+          lunarKnot: '',
-          year:new Date().getFullYear() || '', // 签约年份
+          total: '', // 合计（元)
-          month:new Date().getMonth()+1 || '', // 签约月份
+          paymentTime: `到货后${this.object?.paymentDays || ''}天`, // 承诺支付运费时间
-          day:new Date().getDate() || '', // 签约日期
+          year: new Date().getFullYear() || '', // 签约年份
-        },
+          month: new Date().getMonth() + 1 || '', // 签约月份
-      }
+          day: new Date().getDate() || '' // 签约日期
+        }
+      };
     }
-        console.log(params)
+    if (params.parametersDTO.freightAmount) {
-    this.service.request(this.service.$api_getContractContent,params).subscribe((res) => {
+      params.parametersDTO.freightAmount = this.toThousands(params.parametersDTO.freightAmount);
+    }
+    if (params.parametersDTO.pre) {
+      params.parametersDTO.pre = this.toThousands(params.parametersDTO.pre);
+    }
+    if (params.parametersDTO.rece) {
+      params.parametersDTO.rece = this.toThousands(params.parametersDTO.rece);
+    }
+    if (params.parametersDTO.back) {
+      params.parametersDTO.back = this.toThousands(params.parametersDTO.back);
+    }
+    if (params.parametersDTO.total) {
+      params.parametersDTO.total = this.toThousands(params.parametersDTO.total);
+    }
+    console.log(params);
+    this.service.request(this.service.$api_getContractContent, params).subscribe(res => {
       if (res) {
         this.agreement = res.contractContent;
       }
     });
   }
-  handleOk(){
+
+  toThousands(num: any) {
+    let str = num.toString();
+    return '￥' + str.replace(/(\d)(?=(?:\d{3})+$)/g, '$1,');
+  }
+  handleOk() {
     this.modal.close(true);
   }
-
-  
 }

src/app/routes/supply-management/components/vehicle/vehicle.component.ts

@@ -425,7 +425,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
           title: '所属项目',
           ui: {
             widget: 'select',
-            placeholder: '请选择',
+            placeholder: '请先选择货主',
             visibleIf: {
               _$expand: (value: boolean) => value
             }

src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.ts

@@ -152,7 +152,7 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
           title: '所属项目',
           ui: {
             widget: 'select',
-            placeholder: '请选择',
+            placeholder: '请先选择货主',
             visibleIf: {
               _$expand: (value: boolean) => value
             }

src/app/routes/waybill-management/components/vehicle/vehicle.component.ts

@@ -116,7 +116,7 @@ export class WaybillManagementVehicleComponent implements OnInit {
           title: '所属项目',
           ui: {
             widget: 'select',
-            placeholder: '请选择',
+            placeholder: '请先选择货主',
             visibleIf: {
               _$expand: (value: boolean) => value
             },