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

2022-04-01 16:42:21 +08:00
parent 6863464467 8f1565e920
commit 6bb5695f56
26 changed files with 203 additions and 146 deletions
--- a/.gitignore
+++ b/.gitignore
@ -25,6 +25,7 @@ scripts/var.less

 # IDE - VSCode
 .vscode/*
+.vscode
 !.vscode/settings.json
 !.vscode/tasks.json
 !.vscode/launch.json
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -1,3 +1,3 @@
 {
-    "compile-hero.disable-compile-files-on-did-save-code": false
+    "compile-hero.disable-compile-files-on-did-save-code": true
 }
--- a/proxy.conf.js
+++ b/proxy.conf.js
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2022-01-18 09:51:21
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-31 14:02:38
+ * @LastEditTime : 2022-04-01 14:41:31
 * @FilePath     : \\tms-obc-web\\proxy.conf.js
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 */
@ -20,7 +20,17 @@ module.exports = {
  // }
  '//api': {
    target: {
-      host: 'tms-api-dev.eascs.com',
+      host: 'tms-api-test.eascs.com',
+      protocol: 'https:',
+      port: 443
+    },
+    secure: false,
+    changeOrigin: true,
+    logLevel: 'debug'
+  },
+  '//sascs': {
+    target: {
+      host: 'sascs-tj-tms-test.obs.cn-south-1.myhuaweicloud.com',
      protocol: 'https:',
      port: 443
    },
--- a/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.html
+++ b/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.html
@ -9,7 +9,7 @@
 <nz-card>
    <nz-row [nzGutter]="16">
        <nz-col [nzXl]="9" [nzLg]="8" [nzSm]="12">
-            <nz-statistic [nzValue]="params?.ltdName+'('+(params?.bankType===1?'平安':'浦发')+')'"
+            <nz-statistic [nzValue]="params?.ltdName+'('+(params?.bankType==='1'?'平安':'浦发')+')'"
                [nzTitle]="params.name+'('+params.phone+')'" [nzValueStyle]="{'font-size':'16px','font-weight':'bold'}"
                class="bold">
            </nz-statistic>
--- a/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts
+++ b/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts
@ -35,7 +35,8 @@ export class DriverAccountDetailComponent implements OnInit {
      ltdId: this.params.ltdId,
      projectId: this.params.projectId,
      enterpriseId: this.params.enterpriseId,
-      roleId: this.params.roleId
+      roleId: this.params.roleId,
+      bankType: this.params.bankType,
    });
    if (this.sf) {
      Object.assign(requestOptions.body, {
@ -59,6 +60,7 @@ export class DriverAccountDetailComponent implements OnInit {
        roleId: this.params.roleId,
        pageIndex: this.st.pi,
        pageSize: this.st.ps,
+        bankType: this.params.bankType,
        createTime: {
          start: this.sf?.value?.createTime?.[0] || '',
          end: this.sf?.value?.createTime?.[1] || ''
@ -162,13 +164,13 @@ export class DriverAccountDetailComponent implements OnInit {

  private initST(): STColumn[] {
    return [
-      { title: '交易时间', index: 'createTime', type: 'date' },
-      { title: '流水号', index: 'channelPaySn' },
-      { title: '交易类型', index: 'tradeTypeLabel', className: 'text-center' },
-      { title: '交易单号', index: 'businessNumber' },
-      { title: '订单号', index: 'orderSn' },
-      { title: '运单号', index: 'transportSn' },
-      { title: '收支类型', index: 'incomeTypeLabel', className: 'text-center' },
+      { title: '交易时间', index: 'createTime', type: 'date', width: 150 },
+      { title: '流水号', index: 'channelPaySn', width: 170 },
+      { title: '交易类型', index: 'tradeTypeLabel', className: 'text-center', width: 150 },
+      { title: '交易单号', index: 'businessNumber' , width: 190},
+      { title: '订单号', index: 'orderSn' , width: 190},
+      { title: '运单号', index: 'transportSn', width: 190 },
+      { title: '收支类型', index: 'incomeTypeLabel', className: 'text-center', width: 150 },
      {
        title: '交易金额',
        index: 'amount',
@ -185,9 +187,9 @@ export class DriverAccountDetailComponent implements OnInit {
        className: 'text-right',
        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.accountBalance }) }
      },
-      { title: '付款方', index: 'payName'},
-      { title: '收款方', index: 'payeeName' },
-      { title: '备注', index: 'tradeContent' },
+      { title: '付款方', index: 'payName', width: 150},
+      { title: '收款方', index: 'incomeName', width: 150 },
+      { title: '备注', index: 'tradeContent' , width: 150},
    ];
  }
 }
--- a/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.html
+++ b/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.html
@ -9,7 +9,7 @@
 <nz-card>
    <nz-row [nzGutter]="16">
        <nz-col [nzXl]="9" [nzLg]="8" [nzSm]="12">
-            <nz-statistic [nzValue]="params.ltdName+'('+(params.bankType===1?'平安':'浦发')+')'"
+            <nz-statistic [nzValue]="params.ltdName+'('+(params.bankType==='1'?'平安':'浦发')+')'"
                [nzTitle]="params.tenantName" [nzValueStyle]="{'font-size':'16px','font-weight':'bold'}" class="bold">
            </nz-statistic>
        </nz-col>
--- a/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts
+++ b/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts
@ -221,7 +221,7 @@ export class FreightAccountDetailComponent implements OnInit {
        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.accountBalance }) }
      },
      { title: '付款方', index: 'payName' , width: 170},
-      { title: '收款方', index: 'payeeName', width: 170 },
+      { title: '收款方', index: 'incomeName', width: 170 },
      { title: '备注', index: 'tradeContent', width: 170 }
    ];
  }
--- a/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.html
+++ b/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.html
@ -1,4 +1,4 @@
-<page-header-wrapper [title]="'开票订单明细'" [logo]="logo">
+<page-header-wrapper [title]="'平台账户明细'" [logo]="logo">
    <ng-template #logo>
        <button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
            <i nz-icon nzType="left" nzTheme="outline"></i>
@ -7,7 +7,7 @@
 </page-header-wrapper>

 <nz-card>
-    <h3 class="font-weight-bold">天津怡亚通物流科技有限公司（浦发银行）</h3>
+    <h3 class="font-weight-bold">{{params?.ltdName}}</h3>
    <nz-row [nzGutter]="16">
        <nz-col [nzXl]="4" [nzLg]="8" [nzSm]="12">
            <nz-statistic [nzValue]="((info.availableBalance |currency:' ') || 0)+'元'" nzTitle="平台账户余额"
--- a/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.ts
+++ b/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.ts
@ -221,7 +221,7 @@ export class PlatformAccountDetailComponent implements OnInit {
        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.accountBalance }) }
      },
      { title: '付款方', index: 'payName', className: 'text-center', width: 150 },
-      { title: '收款方', index: 'payeeName', className: 'text-center', width: 150 },
+      { title: '收款方', index: 'incomeName', className: 'text-center', width: 150 },
      { title: '备注', index: 'tradeContent', className: 'text-center', width: 150 }
    ];
  }
--- a/src/app/routes/financial-management/components/platform-account/platform-account.component.ts
+++ b/src/app/routes/financial-management/components/platform-account/platform-account.component.ts
@ -187,7 +187,7 @@ export class PlatformAccountComponent implements OnInit {
            text: '查看明细',
            click: item =>
              this.router.navigate(['/financial-management/platform-account/detail/' + item.id], {
-                queryParams: { ltdId: item.ltdId, bankType: item.bankType }
+                queryParams: { ltdId: item.ltdId, bankType: item.bankType, ltdName: `${item.ltdName}(${item.bankTypeLabel})` }
              })
          }
        ]
--- a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html
+++ b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2021-12-24 16:58:02
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-11 16:40:47
+ * @LastEditTime : 2022-04-01 10:58:50
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail-change\\bulk-detail-change.component.html
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@ -33,8 +33,8 @@
        <sv label="货主">{{ i?.goodsResource?.shipperAppUserName }} </sv>
        <sv label="所属项目">{{i?.goodsResource?.enterpriseProjectName}}</sv>
        <sv label="服务类型">{{i?.goodsResource?.serviceTypeLabel}}</sv>
-        <sv label="录单员">{{i?.createUserName}} /{{i?.createUserPhone}} </sv>
-        <sv label="调度员">{{i?.goodsResource?.dispatchName}}/{{i?.goodsResource?.dispatchPhone}} </sv>
+        <sv label="录单员">{{i?.createUserName}} {{  i?.createUserPhone ? "/" + i?.createUserPhone : ''}} </sv>
+        <sv label="调度员">{{i?.goodsResource?.dispatchName}}{{  i?.goodsResource?.dispatchPhone ? "/" + i?.goodsResource?.dispatchPhone : ''}} </sv>
     </div>
     <nz-tabset style="margin-top: 15px;">
      <nz-tab nzTitle="装卸货信息" (nzClick)="goDistance(distannce1)">
@ -236,10 +236,10 @@
        </ng-template>

        <ng-template sf-template="carmand" let-item let-ui="ui">
-          {{ i?.carModel }}/{{ i?.carLength }}
+          {{ i?.carModel }}{{  i?.carLength ? "/" +  i?.carLength : ''}}
        </ng-template>
        <ng-template sf-template="drivers" let-item let-ui="ui">
-          {{i?.driverName}}/{{i?.driverPhone}}/{{i?.carNo}}
+          {{i?.driverName}}{{ i?.driverPhone ? "/" +  i?.driverPhone : ''}}{{  i?.carNo ? "/" +  i?.carNo : ''}}
        </ng-template>
        <ng-template sf-template="weightModel" let-item let-ui="ui">
          {{ i?.driverCarModelLabel }},{{ i?.driverCarLengthLabel }}米,{{ i?.driverCarWeight }}吨 
@ -275,7 +275,7 @@
      附加费{{ i?.totalSurcharge | currency }}，附加费率{{ (i?.totalRate * 100).toFixed(2)}}%）
    </div>
  </div>
-  <div>车队长：{{ i?.payeeName }}/{{ i?.payeePhone }}</div>
+  <div>车队长：{{ i?.payeeName }}{{ i?.payeePhone ? "/" +  i?.payeePhone : ''}}</div>
 </nz-card>


--- 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-03-30 17:39:43
+ * @LastEditTime : 2022-04-01 10:56:13
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@ -43,8 +43,8 @@
        <sv label="货主">{{ i?.goodsResource?.shipperAppUserName }} </sv>
        <sv label="所属项目">{{ i?.goodsResource?.enterpriseProjectName }}</sv>
        <sv label="服务类型">{{ i?.goodsResource?.serviceTypeLabel }}</sv>
-        <sv label="录单员">{{ i?.createUserName }} /{{ i?.createUserPhone }} </sv>
-        <sv label="调度员">{{ i?.goodsResource?.dispatchName }}/{{ i?.goodsResource?.dispatchPhone }} </sv>
+        <sv label="录单员">{{ i?.createUserName }} {{   i?.createUserPhone ? "/" +  i?.createUserPhone : ''}} </sv>
+        <sv label="调度员">{{ i?.goodsResource?.dispatchName }}{{  i?.goodsResource?.dispatchPhone ? "/" + i?.goodsResource?.dispatchPhone : ''}} </sv>
        <sv label="货源编号">{{ i?.goodsResource?.resourceCode }} </sv>
        <sv label="运单号">{{ i?.wayBill?.wayBillCode }}</sv>
        <sv label="承诺付款天数">{{ i?.goodsResource?.paymentDays }}</sv>
@ -83,8 +83,8 @@
  </sv-container>
  <sv-container col="2">
    <sv label="货物数量"> {{i?.goodsInfoList?.[0]?.weight}}吨,{{i?.goodsInfoList?.[0]?.volume}}方,{{i?.goodsInfoList?.[0]?.number}}件 </sv>
-    <sv label="用车需求">{{ i?.carModel }}/{{ i?.carLength }} </sv>
-    <sv label="承运司机"> {{ i?.driverName }}/{{ i?.driverPhone }}{{ i?.carNo }} </sv>
+    <sv label="用车需求">{{ i?.carModel }}{{ i?.carLength ? "/" + i?.carLength : ''}} </sv>
+    <sv label="承运司机"> {{ i?.driverName }}{{i?.driverPhone ? "/" + i?.driverPhone : ''}}{{ i?.carNo ? "/" + i?.carNo : ''}} </sv>
    <sv label="车型车长载重"> {{ i?.driverCarModelLabel }},{{ i?.driverCarLengthLabel }}米,{{ i?.driverCarWeight }}吨 </sv>
    <!-- <sv label="计划装货时间">
      {{ i?.loadPlanTime }}
@ -114,7 +114,7 @@
              <div class="handling-info-icon loading-bg">装</div>
              <div class="info">
                <h4>装货地：{{ item?.province }}{{ item.city }}{{ item.area }}{{ item.detailedAddress }}</h4>
-                <p>联系人：{{ item.appUserName }}/{{ item.contractTelephone }}</p>
+                <p>联系人：{{ item.appUserName }}{{  item.contractTelephone ? "/" + item.contractTelephone : '' }}</p>
              </div>
            </div>
          </div>
@ -127,7 +127,7 @@
              <div class="handling-info-icon unloaing-bg">卸</div>
              <div class="info">
                <h4>卸货地：{{ item?.province }}{{ item.city }}{{ item.area }}{{ item.detailedAddress }}</h4>
-                <p>联系人：{{ item.appUserName }}/{{ item.contractTelephone }}</p>
+                <p>联系人：{{ item.appUserName }}{{   item.contractTelephone ? "/" + item.contractTelephone : ''}}</p>
              </div>
            </div>
          </div>
@ -156,7 +156,7 @@
      附加费{{ i?.totalSurcharge | currency }}，附加费率{{ (i?.totalRate * 100).toFixed(2)}}%）
    </div>
  </div>
-  <div>车队长：{{ i?.payeeName }}/{{ i?.payeePhone }}</div>
+  <div>车队长：{{ i?.payeeName }}{{   i?.payeePhone ? "/" +  i?.payeePhone : ''}}</div>
 </nz-card>

 <nz-card nzTitle="附件信息" #distannce4>
--- a/src/app/routes/order-management/components/bulk/bulk.component.html
+++ b/src/app/routes/order-management/components/bulk/bulk.component.html
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2022-01-12 10:52:50
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-07 11:12:57
+ * @LastEditTime : 2022-04-01 10:52:51
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk\\bulk.component.html
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@ -76,13 +76,13 @@
        <div *ngIf="item?.unloadTime">卸 | {{ item?.unloadTime }}</div>
      </ng-template>
      <ng-template st-row="driverName" let-item let-index="index">
-        <div> {{ item?.driverName }}/{{ item?.driverPhone }}/{{ item?.carNo }} </div>
+        <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 }} </div>
+        <div> {{ item?.payeeName }}{{ item?.payeePhone ? "/" + item?.payeePhone : ''  }} </div>
      </ng-template>
      <ng-template st-row="createUserName" let-item let-index="index">
-        <div> {{ item?.createUserName }}/{{ item?.createUserPhone }} </div>
+        <div> {{ item?.createUserName }}{{  item?.createUserPhone ? "/" + item?.createUserPhone : '' }} </div>
      </ng-template>
      <ng-template st-row="billCode" let-item let-index="index">
        <a [routerLink]="'bulk-detail/' + item.id">{{ item.billCode }}</a>
--- a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html
+++ b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2022-01-12 10:52:50
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-29 14:28:39
+ * @LastEditTime : 2022-04-01 10:59:54
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\compliance-audit\\compliance-audit.component.html
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@ -81,10 +81,10 @@
        <div *ngIf="item?.unloadingTime">卸 | {{ item?.unloadingTime }}</div>
      </ng-template>
      <ng-template st-row="driverName" let-item let-index="index">
-        <div> {{ item?.driverName }}/{{ item?.driverPhone }}/{{ item?.carNo }} </div>
+        <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 }} </div>
+        <div> {{ item?.payeeName }}{{ item?.payeePhone ? "/" + item?.payeePhone : '' }} </div>
      </ng-template>
      <ng-template st-row="billCode" let-item let-index="index">
        <a *ngIf="item.billType == '1'" [routerLink]="'/order-management/vehicle/vehicle-detail/' + item.id">{{ item.billCode }}</a>
--- 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-03-25 13:44:11
+ * @LastEditTime : 2022-04-01 11:00:38
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\receipts-audit\\receipts-audit.component.html
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@ -92,10 +92,10 @@
        <div *ngIf="item?.unloadingTime">卸 | {{ item?.unloadingTime }}</div>
      </ng-template>
      <ng-template st-row="driverName" let-item let-index="index">
-        <div> {{ item?.driverName }}/{{ item?.driverPhone }}/{{ item?.carNo }} </div>
+        <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 }} </div>
+        <div> {{ item?.payeeName }}{{item?.payeePhone ? "/" + item?.payeePhone : '' }} </div>
      </ng-template>
      <ng-template st-row="billCode" let-item let-index="index">
        <!-- <div>{{ item.billCode }}</div> -->
--- 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
@ -397,25 +397,25 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
          {
            text: '生成电子单据',
            click: _record => this.generate(_record, 2),
-            iif: item => item.auditStatus == '1',
+            iif: item =>  !item?.loadingElectronicsLadingBillFilePath,
            acl: { ability: ['ORDER-RECEIPTS-electronicBillingOne'] },
          },
          {
            text: '通过',
            click: _record => this.sign(_record),
-            iif: item => item.auditStatus == '1',
+            iif: item =>  !item?.loadingElectronicsLadingBillFilePath,
            acl: { ability: ['ORDER-RECEIPTS-billAuditPassBatch'] },
          },
          {
            text: '修改',
            click: _record => this.modification(_record),
-            iif: item => item.auditStatus == '1',
+            iif: item =>   !item?.loadingElectronicsLadingBillFilePath,
            acl: { ability: ['ORDER-RECEIPTS-updateBillExamine'] },
          },
          {
            text: '查看凭证',
            click: _record => this.generate(_record, 3),
-            iif: item => item.auditStatus == '2',
+            iif: item => item?.loadingElectronicsLadingBillFilePath,
            acl: { ability: ['ORDER-RECEIPTS-view'] },
          },
        ]
@ -491,8 +491,10 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
      nzFooter: null
    });
    modalRef.afterClose.subscribe((result: any) => {
-      this.st.load(1);
-      this.getGoodsSourceStatistical()
+      if(result) {
+        this.st.load();
+        this.getGoodsSourceStatistical()
+      }
    });
  }
  // 通过
@ -544,23 +546,14 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
      nzTitle: `<b>已选择${this.selectedRows.length}条订单，确认批量生成电子单据吗？</b>`,
      nzContent: `<b>确认后单据不可修改，请谨慎操作。</b>`,
      nzOnOk: () =>
-        // this.service.request(this.service.$api_get_cancelAnOrder, { ids: params }).subscribe(res => {
-        //   if (res === true) {
-        //     this.service.msgSrv.success('操作成功！');
-        //     this.st?.reload(1);
-        //     this.getGoodsSourceStatistical();
-        //     this.initST();
-        //   }
-        //   this.st?.reload(1);
+           {
+            this.service.downloadFile(this.service.$api_createBillTakeGoods,params)
+            this.service.downloadFile(this.service.$api_createBillDischargeGoods,params)
+            this.service.msgSrv.success('生成成功！');
+             this.st?.reload()
        //   this.getGoodsSourceStatistical();
-        // })
-    {   
-       this.service.downloadFile(this.service.$api_createBillTakeGoods,{billIds: params.join(',')})
-
-       
-       this.service.downloadFile(this.service.$api_createBillDischargeGoods,{billIds: params.join(',')})}
-        
-    });
+       }
+      })
  }
   // 获取所属项目
   getRegionCode(regionCode: any) {
--- 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-03-24 19:53:19
+ * @LastEditTime : 2022-04-01 11:02:21
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\risk\\risk.component.html
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@ -84,10 +84,10 @@
        </div>
      </ng-template>
      <ng-template st-row="driverName" let-item let-index="index">
-        <div> {{ item?.driverName }}/{{ item?.driverPhone }} </div>
+        <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 }} </div>
+        <div> {{ item?.payeeName }}{{ item?.payeePhone ? "/" + item?.payeePhone : ''  }} </div>
      </ng-template>
      <ng-template st-row="freightDetails" let-item let-index="index">
        <div *ngIf="item.freightDetails.length > 0">
@ -97,8 +97,8 @@
      <ng-template st-row="goodsInfoVOList" let-item let-index="index">
        <div *ngFor="let i of item?.goodsInfoVOList">
          <p>货物名称：{{ i?.goodsName }}</p>
-          <p>重量/体积：{{ i?.weight }}吨/{{ i?.volume }}方</p>
-          <p>车型/车长：{{ i?.carModelLabel }}/ {{ i?.carLengthLabel }}</p>
+          <p>重量/体积：{{ i?.weight ? i?.weight + '吨' : '' }}{{  i?.volume ? "/" + i?.volume + '方' : ''}}</p>
+          <p>车型/车长：{{ i?.carModelLabel }} {{ i?.carLengthLabel ? "/" + i?.carLengthLabel : ''}}</p>
        </div>
      </ng-template>
    </st>
--- a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html
+++ b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2021-12-23 13:39:58
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-23 14:46:17
+ * @LastEditTime : 2022-04-01 11:08:44
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail-change\\vehicle-detail-change.component.html
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@ -32,8 +32,10 @@
        <sv label="货主">{{ i?.goodsResource?.shipperAppUserName }} </sv>
        <sv label="所属项目">{{ i?.goodsResource?.enterpriseProjectName }}</sv>
        <sv label="服务类型">{{ i?.goodsResource?.serviceTypeLabel }}</sv>
-        <sv label="录单员">{{ i?.createUserName || i?.goodsResource?.createUserName }} /{{ i?.createUserPhone || i?.goodsResource?.createUserPhone }} </sv>
-        <sv label="调度员">{{ i?.goodsResource?.dispatchName }}/{{ i?.goodsResource?.dispatchPhone }} </sv>
+        <sv label="录单员">{{ i?.createUserName }} {{ i?.createUserPhone ? '/' + i?.createUserPhone : '' }} </sv>
+        <sv label="调度员"
+          >{{ i?.goodsResource?.dispatchName }}{{ i?.goodsResource?.dispatchPhone ? '/' + i?.goodsResource?.dispatchPhone : '' }}
+        </sv>
        <sv label="外部订单号">{{ i?.externalBillCode }}</sv>
        <sv label="货源编号">{{ i?.goodsResource?.resourceCode }} </sv>
        <sv label="运单号">{{ i?.wayBillId }}</sv>
@ -216,10 +218,10 @@
        </ng-template>

        <ng-template sf-template="carmand" let-item let-ui="ui">
-          {{ i?.carModel }}/{{ i?.carLength }}
+          {{ i?.carModel }}{{ i?.carLength ? '/' + i?.carLength : '' }}
        </ng-template>
        <ng-template sf-template="drivers" let-item let-ui="ui">
-          {{i?.driverName}}/{{i?.driverPhone}}/{{i?.carNo}}
+          {{ i?.driverName }}{{i?.driverPhone ? "/" + i?.driverPhone : ''}}{{ i?.carNo ? "/" + i?.carNo : ''}} 
        </ng-template>

        <ng-template sf-template="weightModel" let-item let-ui="ui">
@ -251,7 +253,7 @@
    总计：<span style="color: #da001b; font-size: 18px">{{ i?.totalAmount | currency }}</span> （运费{{ i?.totalFreight | currency }}，
    附加费{{ i?.totalSurcharge | currency }}，附加费率{{ (i?.totalRate * 100).toFixed(2)}}% ）
  </div>
-  <div>车队长：{{ i?.payeeName }}/{{ i?.payeePhone }}</div>
+  <div>车队长：{{ i?.payeeName }}{{   i?.payeePhone ? "/" +  i?.payeePhone : ''}}</div>
 </nz-card>

 <nz-card nzTitle="附件信息" #distannce4>
--- 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-03-30 09:36:23
+ * @LastEditTime : 2022-04-01 11:06:21
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@ -15,24 +15,26 @@
    </button>
  </ng-template>
  <ng-template #headerContent>
-    <div  nz-row>
+    <div nz-row>
      <button nz-button nzType="primary" nzSize="small" nzDanger>{{ i?.billStatusLabel }}</button>
      <h4 class="ml-md" style="font-size: 18px">订单号: {{ i?.billCode }}</h4>
    </div>
    <div nz-row style="display: flex; justify-content: end" class="mb-xs">
-      <div nz-col >
+      <div nz-col>
        <button
          (click)="cancellation()"
          nz-button
          *ngIf="i.billStatus == '4' || i.billStatus == '5' || i.billStatus == '2' || i.billStatus == '3' || i.billStatus == '1'"
-          acl  [acl-ability]="['ORDER-VEHICLE-DETAIL-cancelAnOrder']"
+          acl
+          [acl-ability]="['ORDER-VEHICLE-DETAIL-cancelAnOrder']"
          >取消订单</button
        >
        <button
          nz-button
          (click)="changeOrder()"
          *ngIf="i.billStatus == '4' || i.billStatus == '5' || i.billStatus == '2' || i.billStatus == '3'"
-          acl  [acl-ability]="['ORDER-VEHICLE-DETAIL-modifyOrder']"
+          acl
+          [acl-ability]="['ORDER-VEHICLE-DETAIL-modifyOrder']"
          >修改订单</button
        >
      </div>
@ -43,8 +45,10 @@
        <sv label="货主">{{ i?.goodsResource?.shipperAppUserName }} </sv>
        <sv label="所属项目">{{ i?.goodsResource?.enterpriseProjectName }}</sv>
        <sv label="服务类型">{{ i?.goodsResource?.serviceTypeLabel }}</sv>
-        <sv label="录单员">{{ i?.createUserName || i?.goodsResource?.createUserName }} /{{ i?.createUserPhone || i?.goodsResource?.createUserPhone }} </sv>
-        <sv label="调度员">{{ i?.goodsResource?.dispatchName }}/{{ i?.goodsResource?.dispatchPhone }} </sv>
+        <sv label="录单员">{{ i?.createUserName }} {{ i?.createUserPhone ? '/' + i?.createUserPhone : '' }} </sv>
+        <sv label="调度员"
+          >{{ i?.goodsResource?.dispatchName }}{{ i?.goodsResource?.dispatchPhone ? '/' + i?.goodsResource?.dispatchPhone : '' }}
+        </sv>
        <sv label="外部订单号">{{ i?.externalBillCode }}</sv>
        <sv label="货源编号">{{ i?.goodsResource?.resourceCode }} </sv>
        <sv label="运单号">{{ i?.wayBill?.wayBillCode }}</sv>
@ -66,9 +70,13 @@
    <div style="width: 60%; margin: 0 auto">
       
      <nz-steps [nzCurrent]="i?.scheduleVOList?.length + 1" nzLabelPlacement="vertical">
-        <nz-step *ngFor="let item of i?.scheduleVOList" [nzTitle]="item.state" [nzSubtitle]="item.stateTime"
+        <nz-step
+          *ngFor="let item of i?.scheduleVOList"
+          [nzTitle]="item.state"
+          [nzSubtitle]="item.stateTime"
          [nzDescription]="item.cancelReason ? '取消原因：' + item.cancelReason : ''"
-          [nzStatus]="item.displayStatus === 'SHOW' ? 'finish' : 'wait'"></nz-step>
+          [nzStatus]="item.displayStatus === 'SHOW' ? 'finish' : 'wait'"
+        ></nz-step>
      </nz-steps>
    </div>
  </div>
@ -86,8 +94,8 @@
  </sv-container>
  <sv-container col="2">
    <sv label="货物数量"> {{i?.goodsInfoList?.[0]?.weight}}吨,{{i?.goodsInfoList?.[0]?.volume}}方,{{i?.goodsInfoList?.[0]?.number}}件 </sv>
-    <sv label="用车需求">{{ i?.carModel }}/{{ i?.carLength }} </sv>
-    <sv label="承运司机"> {{ i?.driverName }}/{{ i?.driverPhone }}/{{ i?.carNo }} </sv>
+    <sv label="用车需求">{{ i?.carModel }}{{ i?.carLength ? '/' + i?.carLength : '' }}</sv>
+    <sv label="承运司机"> {{ i?.driverName }}{{ i?.driverPhone ? '/' + i?.driverPhone : '' }}{{ i?.carNo ? '/' + i?.carNo : '' }} </sv>
    <sv label="车型车长载重"> {{ i?.driverCarModelLabel }},{{ i?.driverCarLengthLabel }}米,{{ i?.driverCarWeight }}吨 </sv>
  </sv-container>
  <div class="mt-md">
@ -108,7 +116,7 @@
              <div class="handling-info-icon loading-bg">装</div>
              <div class="info">
                <h4>装货地：{{ item?.province }}{{ item.city }}{{ item.area }}{{ item.detailedAddress }}</h4>
-                <p>联系人：{{ item.appUserName }}/{{ item.contractTelephone }}</p>
+                <p>联系人：{{ item.appUserName }}{{ item.contractTelephone ? '/' + item.contractTelephone : '' }}</p>
              </div>
            </div>
          </div>
@ -122,7 +130,7 @@
              <div class="handling-info-icon unloaing-bg">卸</div>
              <div class="info">
                <h4>卸货地：{{ item?.province }}{{ item.city }}{{ item.area }}{{ item.detailedAddress }}</h4>
-                <p>联系人：{{ item.appUserName }}/{{ item.contractTelephone }}</p>
+                <p>联系人：{{ item.appUserName }}{{ item.contractTelephone ? '/' + item.contractTelephone : '' }}</p>
              </div>
            </div>
          </div>
@ -135,25 +143,24 @@
 <nz-card nzTitle="服务信息">
  <sv-container>
    <sv label="服务包">
-      {{i?.goodsResource?.insuranceTypeLabel}}
+      {{ i?.goodsResource?.insuranceTypeLabel }}
    </sv>
    <sv label="货物价值">
-      {{i?.goodsResource?.goodsValue !==null?(i?.goodsResource?.goodsValue|currency)+'元':'-'}}
+      {{ i?.goodsResource?.goodsValue !== null ? (i?.goodsResource?.goodsValue | currency) + '元' : '-' }}
    </sv>
    <sv label="服务包费用">
-      {{i?.goodsResource?.insurancePremium!==null?(i?.goodsResource?.insurancePremium |currency)+'元':'-'}}
+      {{ i?.goodsResource?.insurancePremium !== null ? (i?.goodsResource?.insurancePremium | currency) + '元' : '-' }}
    </sv>
  </sv-container>
 </nz-card>

-
 <nz-card nzTitle="运费信息" #distannce3>
  <st #st [data]="billExpenses" [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="prices" let-item let-index="index">
-      {{ item.price + item.surcharge  | currency }}
+      {{ item.price + item.surcharge | currency }}
    </ng-template>
    <ng-template st-row="surcharge" let-item let-index="index">
      {{ item.surcharge | currency }}
@ -161,16 +168,16 @@
  </st>
  <div>
    总计：<span style="color: #da001b; font-size: 18px">{{ i?.totalAmount | currency }}</span> （运费{{ i?.totalFreight | currency }}，
-    附加费{{ i?.totalSurcharge | currency }}，附加费率{{ (i?.totalRate * 100).toFixed(2)}}% ）
+    附加费{{ i?.totalSurcharge | currency }}，附加费率{{ (i?.totalRate * 100).toFixed(2) }}% ）
  </div>
-  <div>车队长：{{ i?.payeeName }}/{{ i?.payeePhone }}</div>
+  <div>车队长：{{ i?.payeeName }}{{ i?.payeePhone ? '/' + i?.payeePhone : '' }}</div>
 </nz-card>

 <nz-card nzTitle="附件信息" #distannce4>
  <sv-container>
    <sv label="协议附件">
-      <a *ngIf = "i?.contractContent?.contractContent" (click)="agreement('1')">查看附件</a> &nbsp;&nbsp;&nbsp;&nbsp;
-      <a *ngIf = "i?.supplementContent?.contractContent" (click)="agreement('2')">补充协议</a>
+      <a *ngIf="i?.contractContent?.contractContent" (click)="agreement('1')">查看附件</a> &nbsp;&nbsp;&nbsp;&nbsp;
+      <a *ngIf="i?.supplementContent?.contractContent" (click)="agreement('2')">补充协议</a>
    </sv>
  </sv-container>
  <sv-container col="2" class="mt-md">
@ -190,7 +197,9 @@
    <sv label="回单类型" *ngIf="i?.supplementaryInformationVO?.stateReceipt">
      {{ i?.supplementaryInformationVO?.receiptType === '1' ? '电子回单' : '纸质回单' }}
    </sv>
-    <sv label="联系人" *ngIf="i?.supplementaryInformationVO?.stateReceipt">  {{ i?.supplementaryInformationVO?.receiptUserName }} / {{ i?.supplementaryInformationVO?.phon }} </sv>
+    <sv label="联系人" *ngIf="i?.supplementaryInformationVO?.stateReceipt">
+      {{ i?.supplementaryInformationVO?.receiptUserName }} / {{ i?.supplementaryInformationVO?.phon }}
+    </sv>
    <sv label="所在地区" *ngIf="i?.supplementaryInformationVO?.stateReceipt">
      {{ i?.supplementaryInformationVO?.area }}
    </sv>
@ -213,12 +222,20 @@
    <nz-card nzTitle="轨迹信息" style="width: 100%" [nzExtra]="extraTemplate" #distannce5>
      <div nz-row>
        <div nz-col [nzSpan]="12">
-          <st [scroll]="{y: '500px'}" style="min-height: 600px;" #st [data]="addressItems" [columns]="logColumns2" [ps]="0" [page]="{ show: false, showSize: false }">
+          <st
+            [scroll]="{ y: '500px' }"
+            style="min-height: 600px"
+            #st
+            [data]="addressItems"
+            [columns]="logColumns2"
+            [ps]="0"
+            [page]="{ show: false, showSize: false }"
+          >
          </st>
        </div>
        <div nz-col [nzSpan]="12">
          <amap-path-simplifier [mapWidth]="'100%'" [mapHeight]="'600px'" [mapList]="mapList" [pois]="pois"></amap-path-simplifier>
-        </div> 
+        </div>
      </div>
    </nz-card>
    <ng-template #extraTemplate>
@ -230,36 +247,39 @@
  </div>
 </nz-card>
 <nz-card *ngIf="!route?.snapshot?.queryParams?.sts && abnormalList.length > 0">
-  <nz-tabset >
+  <nz-tabset>
    <nz-tab nzTitle="风险异常检测">
-      <button nz-button nzType="primary"[disabled]="">申 诉</button>
-      <div>
-        您的订单可能存在交易风险，请及时提交申诉材料，提交成功后，平台将及时完成审核并通知您!
-      </div>
+      <button nz-button nzType="primary" [disabled]="">申 诉</button>
+      <div> 您的订单可能存在交易风险，请及时提交申诉材料，提交成功后，平台将及时完成审核并通知您! </div>
      <div>如果您的运单没有问题，可以提出申诉，并提供相关资料，我们将24小时内审核反馈</div>
      <ul *ngFor="let item of abnormalList">
-        <li>系统识别:{{item?.complianceTypeName}}</li>
-        <li>{{item?.determineDetails}}，您可在企业端提交申诉材料或联系客服。</li>
+        <li>系统识别:{{ item?.complianceTypeName }}</li>
+        <li>{{ item?.determineDetails }}，您可在企业端提交申诉材料或联系客服。</li>
        <li>2021-11-07 03:20:15</li>
      </ul>
    </nz-tab>
    <nz-tab nzTitle="异常预警">
-      <st  #st [data]="addressItems" [columns]="logColumns2" [ps]="0" [page]="{ show: false, showSize: false }">
-      </st>
+      <st #st [data]="addressItems" [columns]="logColumns2" [ps]="0" [page]="{ show: false, showSize: false }"> </st>
    </nz-tab>
    <nz-tab nzTitle="操作日志">
-      <st  #st [data]="addressItems" [columns]="logColumns2" [ps]="0" [page]="{ show: false, showSize: false }">
-      </st>
+      <st #st [data]="addressItems" [columns]="logColumns2" [ps]="0" [page]="{ show: false, showSize: false }"> </st>
    </nz-tab>
  </nz-tabset>
 </nz-card>
-<nz-modal [(nzVisible)]="isVisible"   nzWidth="1000px"  [nzFooter]="nzModalFooter" [nzTitle]="modalTitle"  (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel()">
+<nz-modal
+  [(nzVisible)]="isVisible"
+  nzWidth="1000px"
+  [nzFooter]="nzModalFooter"
+  [nzTitle]="modalTitle"
+  (nzOnOk)="handleOK()"
+  (nzOnCancel)="handleCancel()"
+>
  <ng-container *nzModalContent>
    <div *ngIf="!modalcontent">暂无附件信息</div>
    <div [innerHTML]="modalcontent"></div>
  </ng-container>
  <ng-template #nzModalFooter>
    <button nz-button nzType="primary" (click)="handleOK()" [disabled]="">取消</button>
-    <button nz-button nzType="default" (click)="handleCancel()">确定  </button>
+    <button nz-button nzType="default" (click)="handleCancel()">确定 </button>
  </ng-template>
 </nz-modal>
--- a/src/app/routes/order-management/components/vehicle/vehicle.component.html
+++ b/src/app/routes/order-management/components/vehicle/vehicle.component.html
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2022-01-12 10:52:50
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-31 16:05:06
+ * @LastEditTime : 2022-04-01 11:03:39
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle\\vehicle.component.html
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@ -69,7 +69,7 @@
        </div>
      </ng-template>
      <ng-template st-row="createUserName" let-item let-index="index">
-        <div> {{ item?.createUserName }}/{{ item?.createUserPhone }} </div>
+        <div> {{ item?.createUserName }}{{  item?.createUserPhone ? "/" + item?.createUserPhone : ''  }} </div>
      </ng-template>
      <!-- <ng-template st-row="mybidDetailInfo" let-item let-index="index">
        <div *ngIf="item.mybidDetailInfo.length > 0">
--- a/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.html
+++ b/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.html
@ -4,23 +4,19 @@
 * @Author       : Shiming
 * @Date         : 2021-12-15 13:17:42
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-21 20:25:47
+ * @LastEditTime : 2022-04-01 15:48:01
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\audit\\voucher-view\\voucher-view.component.html
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
 <div class="sfBox" [ngClass]="Status !== 1 ? 'hideBtn' : ''">
 <sf #sf mode="edit" [schema]="schema" [ui]="ui" [formData]="formData" button="none">
-  <ng-template sf-template="weight" let-me let-ui="ui" let-schema="schema">
-    <div style="display: flex">
-      <nz-input-number [(ngModel)]="data.weight" [nzMin]="1" [nzMax]="10" [nzStep]="1"></nz-input-number>
-      <div class="left_btn">吨</div>
+  <ng-template sf-template="no0" let-me let-ui="ui" let-schema="schema">
+    <div style="color: #1890FF" >
+      <div (click)="openlaod(1)">电子装货单</div>
    </div>
  </ng-template>
-  <ng-template sf-template="volume" let-me let-ui="ui" let-schema="schema">
-    <div style="display: flex">
-      <nz-input-number [(ngModel)]="data.volume" [nzMin]="1" [nzMax]="10" [nzStep]="1"></nz-input-number>
-      <div class="left_btn">方</div>
-    </div>
+  <ng-template sf-template="no6" let-me let-ui="ui" let-schema="schema">
+    <div style="color: #1890FF" (click)="openlaod(2)">电子卸货单</div>
  </ng-template>
 </sf>
 </div>
--- a/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts
+++ b/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts
@ -30,7 +30,9 @@ import { OrderManagementService } from '../../../services/order-management.servi
 export class orderManagementVoucherViewComponent implements OnInit {
  record: any = {};
  i: any;
+  loadPDF: string = '';
  formData: any;
+  datas: any;
  Status: any;
  data: any ={
    weight: 0,
@ -52,6 +54,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
    if(this.Status == 1) {

    this.schema = {
+    
      properties: {
        loadingLadingBillFilePath: {
          type: 'string',
@ -217,9 +220,15 @@ export class orderManagementVoucherViewComponent implements OnInit {
      required: ['loadingLadingBillFilePath', 'loadingPeopleVehiclesGoodsFilePath','unloadingLadingBillFilePath','unloadingPeopleVehiclesGoodsFilePath' ]
    };
  }else {
-    console.log('只读')
    this.schema = {
      properties: {
+        no0: {
+          type: 'string',
+          title: '',
+          ui: {
+            widget: 'custom',
+           },
+        },
        loadingLadingBillFilePath: {
          type: 'string',
          title: '装货凭证',
@ -298,6 +307,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
            listType: 'picture-card',
          } as SFUploadWidgetSchema,
        },
+
        no4: {
          type: 'string',
          title: '',
@ -306,6 +316,13 @@ export class orderManagementVoucherViewComponent implements OnInit {
           },
           default: '单张大小不超过5M，支持.jpg、.jpeg和 .png格式',
        },
+        no6: {
+          type: 'string',
+          title: '',
+          ui: {
+            widget: 'custom',
+           },
+        },
        unloadingLadingBillFilePath: {
          type: 'string',
          title: '卸货凭证',
@ -421,18 +438,17 @@ export class orderManagementVoucherViewComponent implements OnInit {
      })
  }
  sure() {
-    const params = [this.i.id];
-   this.service.request(this.service.$api_get_billAuditPass, params).subscribe((res) => {
-     if(res) {
-       this.service.msgSrv.success('生成电子单据成功！')
-        this.modal.destroy(true);
-     }
-   })
+    const params = [this.i?.id];
+   this.service.downloadFile(this.service.$api_createBillTakeGoods,params)
+   this.service.downloadFile(this.service.$api_createBillDischargeGoods,params)
+   this.service.msgSrv.success('生成电子单据成功！')
+   this.modal.destroy(true);
  }
    //  确认到车界面信息(两个只能看的图片)
  initData() {
    this.service.request(this.service.$api_get_getCredentials, { id : this.i?.id}).subscribe((res) => {
      console.log(res)
+      this.datas = res
    if (res.unloadingLadingBillFilePath) {
    this.formData = {
          loadingLadingBillFilePath: [
@ -486,5 +502,22 @@ export class orderManagementVoucherViewComponent implements OnInit {
  close(): void {
    this.modal.destroy(true);
  }
-
+  openlaod(value: any) {
+    if(value === 1) {
+      const a = document.createElement('a');
+      a.href = this.datas?.loadingElectronicsLadingBillFilePath;
+      document.body.appendChild(a);
+      console.log(document.body.contains(a))
+      a.click(); //点击下载
+      document.body.removeChild(a); //下载完成移除元素
+    } else {
+      const a = document.createElement('a');
+      a.href = this.datas?.unloadingElectronicsLadingBillFilePath;
+      document.body.appendChild(a);
+      console.log(document.body.contains(a))
+      a.click(); //点击下载
+      document.body.removeChild(a); //下载完成移除元素
+    }
+   
+  }
 }
--- a/src/app/routes/partner/partner-list/components/index/partner-list.component.ts
+++ b/src/app/routes/partner/partner-list/components/index/partner-list.component.ts
@ -25,7 +25,7 @@ export class PartnerListComponent {

  @ViewChild('editTemplate', { static: true })
  editTemplate: any;
-  templateId: any;
+  templateId: any;   
  templates: any[] = [];

  @ViewChild('editCannel', { static: true })
--- a/src/app/routes/supply-management/components/bulk/bulk.component.html
+++ b/src/app/routes/supply-management/components/bulk/bulk.component.html
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2022-01-12 10:52:50
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-25 16:51:13
+ * @LastEditTime : 2022-04-01 11:09:23
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\bulk\\bulk.component.html
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@ -76,7 +76,7 @@
      [loading]="false"
    >
    <ng-template st-row="createUserName" let-item let-index="index">
-      <div> {{ item?.createUserName }}/{{ item?.createUserPhone }} </div>
+      <div> {{ item?.createUserName }}{{   item?.createUserPhone ? '/' + item?.createUserPhone : ''}} </div>
    </ng-template>
      <!--运费单价  -->
      <ng-template st-row="freightPrice" let-item let-index="index">
--- a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html
+++ b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html
@ -1,7 +1,7 @@
 <!--
 * @Author: your name
 * @Date: 2021-12-03 15:31:52
- * @LastEditTime : 2022-03-30 17:16:40
+ * @LastEditTime : 2022-04-01 11:12:17
 * @LastEditors  : Shiming
 * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\vehicle-detail\\vehicle-detail.component.html
@ -29,7 +29,7 @@
        <sv label="货主">{{ i?.shippername }} </sv>
        <sv label="所属项目">{{i?.enterpriseProjectName}}</sv>
        <sv label="服务类型">{{i?.serviceTypeLabel}}</sv>
-        <sv label="调度员">{{i?.dispatchName}} /{{i?.dispatchPhone}}</sv>
+        <sv label="调度员">{{i?.dispatchName}}{{ i?.dispatchPhone ? '/' + i?.dispatchPhone : '' }}</sv>
        <sv label="货源编号">{{ i?.resourceCode }} </sv>
        <sv label="承诺付款天数">{{ i?.paymentDays }}</sv>
     </div>
@ -78,10 +78,10 @@
      {{i?.goodsInfos?.[0]?.carModelLabel}}{{ i?.goodsInfos?.[0]?.carLength ? '/' + i?.goodsInfos?.[0]?.carLength + '米': ''}}
    </sv>
    <sv label="承运司机">
-      {{i?.driverVo?.name}}/{{i?.driverVo?.phone}}
+      {{i?.driverVo?.name}}{{ i?.driverVo?.phone ? '/' + i?.driverVo?.phone : ''}}
    </sv>
    <sv label="车型车长载重">
-      {{i?.carVO?.carModelLabel}},{{i?.carVO?.carLengthLabel}}米,{{i?.carVO?.carLoad ? i?.carVO?.carLoad +'吨': ''}}
+      {{ i?.carVO?.carModelLabel ? i?.carVO?.carModelLabel +',': ''}}{{ i?.carVO?.carLengthLabel ? i?.carVO?.carLengthLabel +'米,': ''}}{{i?.carVO?.carLoad ? i?.carVO?.carLoad +'吨': ''}}
    </sv>
    <sv label="计划装货时间">
      {{i?.loadingTime}}
--- a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts
+++ b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts
@ -1,7 +1,7 @@
 /*
 * @Author: your name
 * @Date: 2021-12-03 15:31:52
- * @LastEditTime : 2022-04-01 10:49:30
+ * @LastEditTime : 2022-04-01 11:11:14
 * @LastEditors  : Shiming
 * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\vehicle-detail\\vehicle-detail.component.ts
@ -26,7 +26,7 @@ import { WaybillManagementServe } from '../../services/waybill-management.servic
 export class WaybillManagementVehicleDetailComponent implements OnInit, OnDestroy {
  id = this.route.snapshot.params.id;
  MapList: any[] = [];
-  trajectory = 'car';
+  trajectory = 'car'; 
  mapList: any[] = []; //地图点位数据组
  addressItems: any[] = []; //打点地址数据组
  i: any;