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

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "tms-obc-web",
-  "version": "0.0.0",
+  "version": "1.0.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

src/app/routes/datatable/components/dataindex/dataindex.component.html

@@ -43,12 +43,12 @@
   </div>
 </div>
 <div nz-row [nzGutter]="16">
-  <div nz-col class="gutter-row" [nzSpan]="12">
+  <div nz-col class="gutter-row" [nzSpan]="9">
     <nz-card [nzTitle]="'订单类型比例'">
       <g2-custom #g2custom delay="100"></g2-custom>
     </nz-card>
   </div>
-  <div nz-col class="gutter-row" [nzSpan]="12">
+  <div nz-col class="gutter-row" [nzSpan]="15">
     <nz-card [nzTitle]="'大区业绩完成情况'">
       <!-- <g2-timeline [data]="chartData" [titleMap]="{ y1: '订单金额（元）', y2: '' }" [height]="200" mask="MM月DD日"
         [slider]="false"></g2-timeline> -->
@@ -57,7 +57,7 @@
   </div>
 </div>
 <div nz-row [nzGutter]="16">
-  <div nz-col class="gutter-row" [nzSpan]="12">
+  <div nz-col class="gutter-row" [nzSpan]="9">
     <nz-card [nzTitle]="'运单直付比例'">
       <!-- <g2-pie #pie title="销售额" subTitle="销售额" [total]="total" [valueFormat]="format" [data]="salesPieData" height="294"
         (clickItem)="handleClick($event)" [lineWidth]="10">
@@ -65,9 +65,10 @@
       <g2-custom #BillDirectProportion delay="100"></g2-custom>
     </nz-card>
   </div>
-  <div nz-col class="gutter-row" [nzSpan]="12">
+  <div nz-col class="gutter-row" [nzSpan]="15">
     <nz-card [nzTitle]="'业绩完成情况'">
-      <g2-bar  [data]="salesData" (clickItem)="handleClick($event)" height="400"></g2-bar>
+      <!-- <g2-bar  [data]="salesData" (clickItem)="handleClick($event)" height="400"></g2-bar> -->
+      <g2-custom #SaleProportion delay="100"></g2-custom>
 
     </nz-card>
   </div>

src/app/routes/datatable/components/dataindex/dataindex.component.ts

@@ -9,6 +9,8 @@ import { G2TimelineClickItem, G2TimelineData } from '@delon/chart/timeline';
 import { CurrencyPipe } from '@angular/common';
 import { LOGS } from '_mock';
 import { G2CustomComponent } from '@delon/chart/custom';
+import { G2BarData } from '@delon/chart/bar';
+import { GeometryLabelCfg } from '@antv/g2/lib/interface';
 
 @Component({
   selector: 'app-datatable-dataindex',
@@ -20,6 +22,7 @@ export class DatatableDataindexComponent implements OnInit {
   @ViewChild('g2custom', { static: false }) g2custom!: G2CustomComponent;
   @ViewChild('RegionalPerforman', { static: false }) RegionalPerforman!: G2CustomComponent;
   @ViewChild('BillDirectProportion', { static: false }) BillDirectProportion!: G2CustomComponent;
+  @ViewChild('SaleProportion', { static: false }) SaleProportion!: G2CustomComponent;
   salesData: any[] = [];
 
   totalAdvanceDeposit: { totalAmount: string; list: G2MiniAreaData[] } = { totalAmount: '0', list: this.genData() };
@@ -94,6 +97,7 @@ export class DatatableDataindexComponent implements OnInit {
     this.service.request(this.service.$api_get_bill_payment_amount).subscribe(res => {
       if (res) {
         this.salesData = this.formatBarData(res);
+        this.initBiaxialChart(this.SaleProportion['el'].nativeElement as any, this.salesData);
       }
     });
   }
@@ -267,6 +271,11 @@ export class DatatableDataindexComponent implements OnInit {
     }
   }
 
+  /**
+   * 构建大区业绩完成情况柱折双轴图
+   * @param el
+   * @param data
+   */
   private initRegionalPerformanceChart(el: HTMLElement, data: DataPerformanceTrendVO[]) {
     const chart = new Chart({
       container: el,
@@ -319,6 +328,65 @@ export class DatatableDataindexComponent implements OnInit {
     chart.render();
   }
 
+  /**
+   * 构建业绩完成情况柱折双轴图
+   * @param el
+   * @param data
+   */
+  private initBiaxialChart(el: HTMLElement, data: any[]) {
+    const chart = new Chart({
+      container: el,
+      autoFit: true,
+      height: 400
+    });
+    chart.data(data);
+    // 设置坐标轴
+    chart.scale({
+      pre: { alias: '同期业绩完成率', min: 0, max: 1, formatter: val => val * 100 + '%' },
+      pre2: { alias: '业绩完成率', min: 0, max: 1, formatter: val => val * 100 + '%' },
+      quantity: { alias: '业绩量 (万)', min: 0, max: 1000000 }
+    });
+    // 设置
+    chart.legend({
+      custom: true,
+      items: [
+        { value: 'quantity', name: '业绩量 (万)', marker: { symbol: 'hyphen', style: { stroke: '#3182bd', r: 15, lineWidth: 5 } } },
+        { value: 'pre2', name: '业绩完成率', marker: { symbol: 'hyphen', style: { stroke: '#fdae6b', r: 15, lineWidth: 5 } } },
+        { value: 'pre', name: '同期业绩完成率', marker: { symbol: 'hyphen', style: { stroke: '#ff4d4f', r: 15, lineWidth: 5 } } }
+      ]
+    });
+    chart.axis('pre', {
+      grid: null,
+      title: null,
+      label: {
+        formatter: val => +val * 100 + '%'
+      }
+    });
+    chart.axis('pre2', false);
+    chart.tooltip({
+      shared: true
+    });
+    chart.interval().position('time*quantity').label('quantity').color('#3182bd');
+    chart
+      .line()
+      .position('time*pre')
+      .label('pre', val => ({ content: (val * 100).toFixed(0) + '%' }))
+      .color('#ff4d4f')
+      .size(3);
+    chart.point().position('time*pre').color('#ff4d4f').size(3).shape('circle');
+    chart
+      .line()
+      .position('time*pre2')
+      .label('pre2', val => ({ content: (val * 100).toFixed(0) + '%' }))
+      .color('#fdae6b')
+      .size(3);
+    chart.point().position('time*pre2').color('#fdae6b').size(3).shape('circle');
+
+    chart.interaction('active-region');
+    chart.removeInteraction('legend-filter'); // 自定义图例，移除默认的分类图例筛选交互
+    chart.render();
+  }
+
   private formatMiniAreaData(data: DataTotalVO) {
     return {
       totalAmount: `${this.currency.transform(data.totalAmount || 0)}万`,
@@ -329,6 +397,11 @@ export class DatatableDataindexComponent implements OnInit {
     };
   }
 
+  /**
+   * 初始化饼图数据格式
+   * @param data
+   * @returns
+   */
   private formatCoordinateData(data: DataBillTypeProportion[]): any[] {
     const total = data.map(item => item.quantity).reduce((pre, next) => pre + next);
     const rs: any[] = [];
@@ -344,9 +417,11 @@ export class DatatableDataindexComponent implements OnInit {
 
   private formatBarData(data: DataPerformanceTrendVO[]): any[] {
     return data.map(item => ({
-      x: item.time,
+      time: item.time,
-      y: item.quantity,
+      quantity: item.quantity,
-      color: '#f50'
+      color: undefined,
+      pre: Math.floor(Math.random() * 100) / 100,
+      pre2: Math.floor(Math.random() * 100) / 100
     }));
   }
 
@@ -356,7 +431,7 @@ export class DatatableDataindexComponent implements OnInit {
     for (let i = 0; i < 20; i += 1) {
       res.push({
         x: format(new Date(beginDay + 1000 * 60 * 60 * 24 * i), 'yyyy-MM-dd'),
-        y: Math.floor(Math.random() * 100) + 10
+        y: Math.floor(Math.random() * 1)
       });
     }
     return res;

src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-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>

src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts

@@ -133,7 +133,7 @@ export class DriverAccountDetailComponent implements OnInit {
             nzShowTime: true
           } as SFDateWidgetSchema
         },
-        transactionNumber: {
+        channelPaySn: {
           type: 'string',
           title: '流水号',
           ui: {
@@ -142,7 +142,7 @@ export class DriverAccountDetailComponent implements OnInit {
         },
         businessNumber: {
           type: 'string',
-          title: '关联单号',
+          title: '交易单号',
           ui: {
             placeholder: '请输入'
           }

src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.html

@@ -1,4 +1,14 @@
-<page-header-wrapper [title]="'开票订单明细'" [logo]="logo">
+<!--
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-04-06 10:57:56
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-04-21 16:41:13
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\freight-account\\freight-account-detail\\freight-account-detail.component.html
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+-->
+<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>
@@ -40,7 +50,7 @@
         </div>
         <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
             <button nz-button nzType="primary" [nzLoading]="service.http.loading"
-                (click)="st?.load(1);loadInfo();">查询</button>
+                (click)="st?.load(1);">查询</button>
             <button nz-button (click)="resetSF()">重置</button>
             <button nz-button (click)="exportList()"> 导出</button>
             <button nz-button nzType="link" (click)="expandToggle()">

src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts

@@ -46,7 +46,7 @@ export class FreightAccountDetailComponent implements OnInit {
         }
       });
     }
-    this.loadStatistics(requestOptions.body);
+    // this.loadStatistics(requestOptions.body);
     return requestOptions;
   };
 
@@ -153,34 +153,45 @@ export class FreightAccountDetailComponent implements OnInit {
             placeholder: '请输入'
           }
         },
+        // tradeType: {
+        //   type: 'string',
+        //   title: '交易类型',
+        //   enum: [
+        //     { label: '全部', value: '' },
+        //     { label: '整车订单退款', value: '1' },
+        //     { label: '整车订单支付', value: '2' },
+        //     { label: '提现失败退回', value: '3' },
+        //     { label: '提现', value: '4' },
+        //     { label: '充值', value: '5' },
+        //     { label: '运货订单结算F', value: '5' }
+        //   ],
+        //   ui: {
+        //     widget: 'select',
+        //     placeholder: '请选择',
+        //     visibleIf: {
+        //       expand: (value: boolean) => value
+        //     }
+        //   },
+        //   default: ''
+        // },
         tradeType: {
           type: 'string',
           title: '交易类型',
-          enum: [
-            { label: '全部', value: '' },
-            { label: '整车订单退款', value: '1' },
-            { label: '整车订单支付', value: '2' },
-            { label: '提现失败退回', value: '3' },
-            { label: '提现', value: '4' },
-            { label: '充值', value: '5' },
-            { label: '运货订单结算F', value: '5' }
-          ],
           ui: {
-            widget: 'select',
+            widget: 'dict-select',
-            placeholder: '请选择',
+            params: { dictKey: 'trade:type' },
             visibleIf: {
               expand: (value: boolean) => value
-            }
+            },
-          },
+          } as SFSelectWidgetSchema
-          default: ''
         },
         incomeType: {
           type: 'string',
           title: '收支类型',
           enum: [
             { label: '全部', value: '' },
-            { label: '收入', value: '1' },
+            { label: '收入', value: '2' },
-            { label: '支出', value: '2' }
+            { label: '支出', value: '1' }
           ],
           ui: {
             widget: 'select',
@@ -191,18 +202,28 @@ export class FreightAccountDetailComponent implements OnInit {
           },
           default: ''
         },
-        projectId: {
+        projectName: {
-          title: '所属项目',
           type: 'string',
-          default: '',
+          title: '所属项目',
           ui: {
-            widget: 'select',
+            placeholder: '请输入',
             visibleIf: {
               expand: (value: boolean) => value
-            },
+            }
-            asyncData: () => this.service.getEnterpriseProject()
+          }
-          } as SFSelectWidgetSchema
         }
+        // projectId: {
+        //   title: '所属项目',
+        //   type: 'string',
+        //   default: '',
+        //   ui: {
+        //     widget: 'select',
+        //     visibleIf: {
+        //       expand: (value: boolean) => value
+        //     },
+        //     asyncData: () => this.service.getEnterpriseProject()
+        //   } as SFSelectWidgetSchema
+        // }
       }
     };
   }
@@ -212,6 +233,7 @@ export class FreightAccountDetailComponent implements OnInit {
       { title: '交易时间', index: 'createTime', type: 'date', width: 170 },
       { title: '流水号', index: 'transactionNumber', width: 170 },
       { title: '交易类型', index: 'tradeTypeLabel', className: 'text-center', width: 140 },
+      { title: '收支类型', index: 'tradeTypeLabel', className: 'text-center', width: 140 },
       { title: '交易单号', index: 'businessNumber', width: 170 },
       { title: '订单号', index: 'orderSn', width: 170 },
       { title: '运单号', index: 'transportSn', width: 170 },

src/app/routes/financial-management/components/payable-order/payable-order-detail/payable-order-detail.component.ts

@@ -83,6 +83,7 @@ export class PayableOrderDetailComponent implements OnInit {
    */
   resetSF() {
     this.sf.reset();
+    this._$expand = false;
   }
 
   /**
@@ -123,10 +124,7 @@ export class PayableOrderDetailComponent implements OnInit {
             widget: 'select',
             placeholder: '请选择',
             allowClear: true,
-            asyncData: () => this.service.getCloseAccount(),
+            asyncData: () => this.service.getCloseAccount()
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
           },
           default: ''
         },

src/app/routes/financial-management/components/payable-order/payable-order.component.html

@@ -38,8 +38,7 @@
                 [ui]="{ '*': { spanLabelFixed: 110,grid: { lg: 8, md: 12, sm: 12, xs: 24 } }}" [compact]="true"
                 [button]="'none'"></sf>
         </div>
-        <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right"
+        <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
-            [class.expend-options]="_$expand">
             <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
             <button nz-button [disabled]="false" (click)="resetSF()">重置</button>
             <!-- <button nz-button [disabled]="false"> 导出</button>

src/app/routes/financial-management/components/payment-record/payment-record.component.ts

@@ -150,9 +150,9 @@ export class PaymentRecordComponent implements OnInit {
           type: 'string',
           title: '车队长收款',
           enum: [
-            { label: '全部', value: '' },
+            {label: '全部', value: ''},
-            { label: '否', value: '0' },
+            {label: '是', value: '1'},
-            { label: '是', value: '1' }
+            {label: '否', value: '2'}
           ],
           ui: {
             widget: 'select',

src/app/routes/financial-management/components/receivable-order/receivable-order-detail/receivable-order-detail.component.ts

@@ -68,6 +68,7 @@ export class ReceivableOrderDetailComponent implements OnInit {
    */
   resetSF() {
     this.sf.reset();
+    this._$expand = false;
   }
 
   /**

src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-05 20:15:41
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-01-18 17:17:19
+ * @LastEditTime : 2022-04-21 10:15:49
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\withdrawals-record\\withdrawals-detail\\withdrawals-detail.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -16,7 +16,7 @@
     </ng-template>
 </page-header-wrapper>
 
-<nz-card [nzLoading]="service.http.loading">
+<nz-card >
     <nz-alert nzType="info" nzMessage="提现信息" class="mb-md"></nz-alert>
     <div se-container [labelWidth]="130">
         <se label="网络货运人">

src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts

@@ -140,39 +140,41 @@ export class WithdrawalsDetailComponent implements OnInit {
             hidden: true
           }
         },
-        billHCode: {
+        orderPaymentCode: {
           type: 'string',
           title: '支付编号',
           ui: {
             placeholder: '请输入'
           }
         },
-        billHCod1e: {
+        billCode: {
           type: 'string',
           title: '订单号',
           ui: {
             placeholder: '请输入'
           }
         },
-        billHCo1de: {
+        resourceCode: {
           type: 'string',
           title: '货源编号',
           ui: {
             placeholder: '请输入'
           }
         },
-        billHC1ode: {
+        serviceType: {
           type: 'string',
           title: '服务类型',
           ui: {
-            widget: 'select',
+            widget: 'dict-select',
+            params: { dictKey: 'service:type' },
             placeholder: '请选择',
             visibleIf: {
               expand: (value: boolean) => value
             }
-          }
+          },
+          default: ''
         },
-        billHCo11de: {
+        driverName: {
           type: 'string',
           title: '承运司机',
           ui: {
@@ -182,7 +184,7 @@ export class WithdrawalsDetailComponent implements OnInit {
             }
           }
         },
-        billHCo111de: {
+        driverLicensePlate: {
           type: 'string',
           title: '车牌号',
           ui: {
@@ -192,7 +194,7 @@ export class WithdrawalsDetailComponent implements OnInit {
             }
           }
         },
-        billHC1o11de: {
+        captain: {
           type: 'string',
           title: '收款人',
           ui: {
@@ -202,9 +204,14 @@ export class WithdrawalsDetailComponent implements OnInit {
             }
           }
         },
-        billHC1o111de: {
+        isCaptain: {
           type: 'string',
           title: '车队长收款',
+          enum: [
+            {label: '全部', value: ''},
+            {label: '是', value: '1'},
+            {label: '否', value: '2'}
+          ],
           ui: {
             widget: 'select',
             placeholder: '请选择',

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-04-15 09:58:12
+ * @LastEditTime : 2022-04-21 15:33:31
  * @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.
 -->
@@ -282,8 +282,8 @@
 
 
 
-<nz-card>
+<nz-card #distannce5>
-  <p class="detail_title" #distannce5><span>|</span> 轨迹信息</p>
+  <p class="detail_title" ><span>|</span> 轨迹信息</p>
   <div nz-row>
     <div nz-col [nzSpan]="24">
       <amap-path-simplifier [mapWidth]="'100%'" [mapHeight]="'600px'" [mapList]="mapList">

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-04-15 09:58:13
+ * @LastEditTime : 2022-04-21 15:33:15
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -204,8 +204,8 @@
   </sv-container>
 </nz-card>
 
-<nz-card>
+<nz-card #distannce5>
-  <p class="detail_title" #distannce5><span>|</span> 轨迹信息</p>
+  <p class="detail_title" ><span>|</span> 轨迹信息</p>
   <div nz-row>
     <div nz-col [nzSpan]="24">
       <amap-path-simplifier [mapWidth]="'100%'" [mapHeight]="'600px'" [mapList]="mapList" [pois]="pois">
@@ -230,7 +230,7 @@
       </div>
       <div>如果您的运单没有问题，可以提出申诉，并提供相关资料，我们将24小时内审核反馈</div>
       <ul *ngFor="let item of abnormalList">
-        <li style="color: red;">系统识别:{{item?.complianceTypeName}}</li>
+        <li style="color: red;">系统识别:{{item?.complianceName}}</li>
         <li style="color: red;">{{item?.determineDetails}}</li>
       </ul>
      </div>

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?.loadingElectronicsLadingBillFilePath,
+            iif: item =>  !item?.loadingElectronicsLadingBillFilePath || !item?.unloadingElectronicsLadingBillFilePath,
             acl: { ability: ['ORDER-RECEIPTS-electronicBillingOne'] },
           },
           {
             text: '通过',
             click: _record => this.sign(_record),
-            iif: item =>  !item?.loadingElectronicsLadingBillFilePath,
+            iif: item =>  !item?.loadingElectronicsLadingBillFilePath || !item?.unloadingElectronicsLadingBillFilePath,
             acl: { ability: ['ORDER-RECEIPTS-billAuditPassBatch'] },
           },
           {
             text: '修改',
             click: _record => this.modification(_record),
-            iif: item =>   !item?.loadingElectronicsLadingBillFilePath,
+            iif: item =>   !item?.loadingElectronicsLadingBillFilePath || !item?.unloadingElectronicsLadingBillFilePath,
             acl: { ability: ['ORDER-RECEIPTS-updateBillExamine'] },
           },
           {
             text: '查看凭证',
             click: _record => this.generate(_record, 3),
-            iif: item => item?.loadingElectronicsLadingBillFilePath,
+            iif: item => item?.loadingElectronicsLadingBillFilePath && item?.unloadingElectronicsLadingBillFilePath,
             acl: { ability: ['ORDER-RECEIPTS-view'] },
           },
         ]

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-04-15 10:07:20
+ * @LastEditTime : 2022-04-21 15:33:42
  * @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.
 -->
@@ -316,8 +316,8 @@
   </sv-container>
 </nz-card>
 
-<nz-card>
+<nz-card #distannce5>
-  <p class="detail_title" #distannce5><span>|</span> 轨迹信息</p>
+  <p class="detail_title" ><span>|</span> 轨迹信息</p>
   <div nz-row>
     <div nz-col [nzSpan]="24">
       <amap-path-simplifier [mapWidth]="'100%'" [mapHeight]="'600px'" [mapList]="mapList">

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-04-15 09:56:50
+ * @LastEditTime : 2022-04-21 17:03:50
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -205,8 +205,8 @@
   </sv-container>
 </nz-card>
 
-<nz-card>
+<nz-card  #distannce5>
-  <p class="detail_title" #distannce5><span>|</span> 轨迹信息</p>
+  <p class="detail_title"><span>|</span> 轨迹信息</p>
   <div nz-row>
     <div nz-col [nzSpan]="24">
       <amap-path-simplifier [mapWidth]="'100%'" [mapHeight]="'600px'" [mapList]="mapList" [pois]="pois">
@@ -229,7 +229,7 @@
         <div> 您的订单可能存在交易风险，请及时提交申诉材料，提交成功后，平台将及时完成审核并通知您! </div>
         <div>如果您的运单没有问题，可以提出申诉，并提供相关资料，我们将24小时内审核反馈</div>
         <ul *ngFor="let item of abnormalList">
-          <li style="color: red;">系统识别:{{ item?.complianceTypeName }}</li>
+          <li style="color: red;">系统识别:{{ item?.complianceName }}</li>
           <li style="color: red;">{{ item?.determineDetails }}</li>
         </ul>
       </div>

src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-15 13:17:42
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-01 15:48:01
+ * @LastEditTime : 2022-04-21 14:41:44
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\audit\\voucher-view\\voucher-view.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -12,11 +12,13 @@
 <sf #sf mode="edit" [schema]="schema" [ui]="ui" [formData]="formData" button="none">
   <ng-template sf-template="no0" let-me let-ui="ui" let-schema="schema">
     <div style="color: #1890FF" >
-      <div (click)="openlaod(1)">电子装货单</div>
+      <div (click)="openlaod(1)">电子装货单 <span style="color: red;">
+        {{datas?.loadingElectronicsLadingBillFilePath ? '已签署' :'未签署'}}
+      </span></div>
     </div>
   </ng-template>
   <ng-template sf-template="no6" let-me let-ui="ui" let-schema="schema">
-    <div style="color: #1890FF" (click)="openlaod(2)">电子卸货单</div>
+    <div style="color: #1890FF" (click)="openlaod(2)">电子卸货单<span style="color: red;"> {{datas?.unloadingElectronicsLadingBillFilePath ? '已签署' :'未签署'}}</span></div>
   </ng-template>
 </sf>
 </div>

src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts

@@ -1,4 +1,3 @@
-
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { DatePipe } from '@angular/common';
 import {
@@ -16,7 +15,7 @@ import {
 import { apiConf } from '@conf/api.conf';
 import { _HttpClient } from '@delon/theme';
 import { NzMessageService } from 'ng-zorro-antd/message';
-import { NzModalRef } from 'ng-zorro-antd/modal';
+import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal';
 import { Observable, Observer } from 'rxjs';
 import { EAEnvironmentService } from '@shared';
 import { OrderManagementService } from '../../../services/order-management.service';
@@ -29,7 +28,6 @@ import format from 'date-fns/format';
   providers: [DatePipe]
 })
 export class orderManagementVoucherViewComponent implements OnInit {
-  record: any = {};
   i: any;
   loadPDF: string = '';
   formData: any;
@@ -42,20 +40,26 @@ export class orderManagementVoucherViewComponent implements OnInit {
   @ViewChild('sf', { static: false }) sf!: SFComponent;
   schema: SFSchema = {};
   ui: SFUISchema = {};
-  constructor(private modal: NzModalRef, private msgSrv: NzMessageService, public http: _HttpClient, public service: OrderManagementService, private datePipe: DatePipe, private envSrv: EAEnvironmentService,) { }
+  constructor(
+    private modal: NzModalRef,
+    private msgSrv: NzMessageService,
+    public http: _HttpClient,
+    public service: OrderManagementService,
+    private datePipe: DatePipe,
+    private envSrv: EAEnvironmentService,
+    private modalService: NzModalService
+  ) {}
 
   ngOnInit(): void {
-    // console.log(this.i)
+    console.log(this.i);
-    this.initData()
+    this.initData();
     this.i.time = this.i.loadingTime;
     this.initSF();
   }
   initSF() {
-    console.log(this.Status)
+    console.log(this.Status);
     if (this.Status == 1) {
-
       this.schema = {
-
         properties: {
           loadingLadingBillFilePath: {
             type: 'string',
@@ -72,9 +76,9 @@ export class orderManagementVoucherViewComponent implements OnInit {
               data: {
                 appId: this.envSrv.env.appId,
                 content: [
-                  `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
+                  `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
-                  `上传位置:${this.record?.loadingAddressArr[0]}`,
+                  `上传位置:${this.i?.loadingAddressArr[0]}`,
-                  `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
+                  `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`
                 ],
                 position: '2',
                 fontSize: '100'
@@ -99,8 +103,8 @@ export class orderManagementVoucherViewComponent implements OnInit {
                 });
               },
               multiple: false,
-              listType: 'picture-card',
+              listType: 'picture-card'
-            } as SFUploadWidgetSchema,
+            } as SFUploadWidgetSchema
           },
           loadingPeopleVehiclesGoodsFilePath: {
             type: 'string',
@@ -117,9 +121,9 @@ export class orderManagementVoucherViewComponent implements OnInit {
               data: {
                 appId: this.envSrv.env.appId,
                 content: [
-                  `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
+                  `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
-                  `上传位置:${this.record?.loadingAddressArr[0]}`,
+                  `上传位置:${this.i?.loadingAddressArr[0]}`,
-                  `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
+                  `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`
                 ],
                 position: '2',
                 fontSize: '100'
@@ -144,16 +148,16 @@ export class orderManagementVoucherViewComponent implements OnInit {
                 });
               },
               multiple: false,
-              listType: 'picture-card',
+              listType: 'picture-card'
-            } as SFUploadWidgetSchema,
+            } as SFUploadWidgetSchema
           },
           no4: {
             type: 'string',
             title: '',
             ui: {
-              widget: 'text',
+              widget: 'text'
             },
-            default: '单张大小不超过5M，支持.jpg、.jpeg和 .png格式',
+            default: '单张大小不超过5M，支持.jpg、.jpeg和 .png格式'
           },
           unloadingLadingBillFilePath: {
             type: 'string',
@@ -170,9 +174,9 @@ export class orderManagementVoucherViewComponent implements OnInit {
               data: {
                 appId: this.envSrv.env.appId,
                 content: [
-                  `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
+                  `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
-                  `上传位置:${this.record?.unloadingAddressArr[0]}`,
+                  `上传位置:${this.i?.unloadingAddressArr[0]}`,
-                  `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
+                  `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`
                 ],
                 position: '2',
                 fontSize: '100'
@@ -197,8 +201,8 @@ export class orderManagementVoucherViewComponent implements OnInit {
                 });
               },
               multiple: false,
-              listType: 'picture-card',
+              listType: 'picture-card'
-            } as SFUploadWidgetSchema,
+            } as SFUploadWidgetSchema
           },
           unloadingPeopleVehiclesGoodsFilePath: {
             type: 'string',
@@ -215,9 +219,9 @@ export class orderManagementVoucherViewComponent implements OnInit {
               data: {
                 appId: this.envSrv.env.appId,
                 content: [
-                  `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
+                  `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
-                  `上传位置:${this.record?.unloadingAddressArr[0]}`,
+                  `上传位置:${this.i?.unloadingAddressArr[0]}`,
-                  `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
+                  `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`
                 ],
                 position: '2',
                 fontSize: '100'
@@ -242,11 +246,16 @@ export class orderManagementVoucherViewComponent implements OnInit {
                 });
               },
               multiple: false,
-              listType: 'picture-card',
+              listType: 'picture-card'
-            } as SFUploadWidgetSchema,
+            } as SFUploadWidgetSchema
           }
         },
-        required: ['loadingLadingBillFilePath', 'loadingPeopleVehiclesGoodsFilePath', 'unloadingLadingBillFilePath', 'unloadingPeopleVehiclesGoodsFilePath']
+        required: [
+          'loadingLadingBillFilePath',
+          'loadingPeopleVehiclesGoodsFilePath',
+          'unloadingLadingBillFilePath',
+          'unloadingPeopleVehiclesGoodsFilePath'
+        ]
       };
     } else {
       this.schema = {
@@ -255,8 +264,8 @@ export class orderManagementVoucherViewComponent implements OnInit {
             type: 'string',
             title: '',
             ui: {
-              widget: 'custom',
+              widget: 'custom'
-            },
+            }
           },
           loadingLadingBillFilePath: {
             type: 'string',
@@ -274,9 +283,9 @@ export class orderManagementVoucherViewComponent implements OnInit {
               data: {
                 appId: this.envSrv.env.appId,
                 content: [
-                  `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
+                  `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
-                  `上传位置:${this.record?.loadingAddressArr[0]}`,
+                  `上传位置:${this.i?.loadingAddressArr[0]}`,
-                  `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
+                  `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`
                 ],
                 position: '2',
                 fontSize: '100'
@@ -301,8 +310,8 @@ export class orderManagementVoucherViewComponent implements OnInit {
                 });
               },
               multiple: false,
-              listType: 'picture-card',
+              listType: 'picture-card'
-            } as SFUploadWidgetSchema,
+            } as SFUploadWidgetSchema
           },
           loadingPeopleVehiclesGoodsFilePath: {
             type: 'string',
@@ -320,9 +329,9 @@ export class orderManagementVoucherViewComponent implements OnInit {
               data: {
                 appId: this.envSrv.env.appId,
                 content: [
-                  `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
+                  `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
-                  `上传位置:${this.record?.loadingAddressArr[0]}`,
+                  `上传位置:${this.i?.loadingAddressArr[0]}`,
-                  `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
+                  `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`
                 ],
                 position: '2',
                 fontSize: '100'
@@ -347,24 +356,24 @@ export class orderManagementVoucherViewComponent implements OnInit {
                 });
               },
               multiple: false,
-              listType: 'picture-card',
+              listType: 'picture-card'
-            } as SFUploadWidgetSchema,
+            } as SFUploadWidgetSchema
           },
 
           no4: {
             type: 'string',
             title: '',
             ui: {
-              widget: 'text',
+              widget: 'text'
             },
-            default: '单张大小不超过5M，支持.jpg、.jpeg和 .png格式',
+            default: '单张大小不超过5M，支持.jpg、.jpeg和 .png格式'
           },
           no6: {
             type: 'string',
             title: '',
             ui: {
-              widget: 'custom',
+              widget: 'custom'
-            },
+            }
           },
           unloadingLadingBillFilePath: {
             type: 'string',
@@ -382,9 +391,9 @@ export class orderManagementVoucherViewComponent implements OnInit {
               data: {
                 appId: this.envSrv.env.appId,
                 content: [
-                  `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
+                  `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
-                  `上传位置:${this.record?.unloadingAddressArr[0]}`,
+                  `上传位置:${this.i?.unloadingAddressArr[0]}`,
-                  `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
+                  `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`
                 ],
                 position: '2',
                 fontSize: '100'
@@ -409,8 +418,8 @@ export class orderManagementVoucherViewComponent implements OnInit {
                 });
               },
               multiple: false,
-              listType: 'picture-card',
+              listType: 'picture-card'
-            } as SFUploadWidgetSchema,
+            } as SFUploadWidgetSchema
           },
           unloadingPeopleVehiclesGoodsFilePath: {
             type: 'string',
@@ -428,9 +437,9 @@ export class orderManagementVoucherViewComponent implements OnInit {
               data: {
                 appId: this.envSrv.env.appId,
                 content: [
-                  `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
+                  `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
-                  `上传位置:${this.record?.unloadingAddressArr[0]}`,
+                  `上传位置:${this.i?.unloadingAddressArr[0]}`,
-                  `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
+                  `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`
                 ],
                 position: '2',
                 fontSize: '100'
@@ -455,11 +464,16 @@ export class orderManagementVoucherViewComponent implements OnInit {
                 });
               },
               multiple: false,
-              listType: 'picture-card',
+              listType: 'picture-card'
-            } as SFUploadWidgetSchema,
+            } as SFUploadWidgetSchema
           }
         },
-        required: ['loadingLadingBillFilePath', 'loadingPeopleVehiclesGoodsFilePath', 'unloadingLadingBillFilePath', 'unloadingPeopleVehiclesGoodsFilePath']
+        required: [
+          'loadingLadingBillFilePath',
+          'loadingPeopleVehiclesGoodsFilePath',
+          'unloadingLadingBillFilePath',
+          'unloadingPeopleVehiclesGoodsFilePath'
+        ]
       };
     }
     this.ui = {
@@ -470,42 +484,42 @@ export class orderManagementVoucherViewComponent implements OnInit {
       $unloadingLadingBillFilePath: { grid: { span: 12 } },
       $unloadingPeopleVehiclesGoodsFilePath: { grid: { span: 12 } },
       $loadingLadingBillFilePath: { grid: { span: 12 } },
-      $loadingPeopleVehiclesGoodsFilePath: { grid: { span: 12 } },
+      $loadingPeopleVehiclesGoodsFilePath: { grid: { span: 12 } }
     };
   }
   save(value: any): void {
     if (!this.sf.valid) {
-      this.service.msgSrv.warning('必填项为空！')
+      this.service.msgSrv.warning('必填项为空！');
       return;
     }
-    console.log(value)
+    console.log(value);
     const params = {
       id: this.i?.id,
       loadingLadingBillFilePath: value?.loadingLadingBillFilePath?.data?.fullFilePath,
       loadingPeopleVehiclesGoodsFilePath: value?.loadingPeopleVehiclesGoodsFilePath?.data?.fullFilePath,
       unloadingLadingBillFilePath: value?.unloadingLadingBillFilePath?.data?.fullFilePath,
-      unloadingPeopleVehiclesGoodsFilePath: value?.unloadingPeopleVehiclesGoodsFilePath?.data?.fullFilePath,
+      unloadingPeopleVehiclesGoodsFilePath: value?.unloadingPeopleVehiclesGoodsFilePath?.data?.fullFilePath
-    }
+    };
-    console.log(params)
+    console.log(params);
-    this.service.request(this.service.$api_get_updateBillExamine, params).subscribe((res) => {
+    this.service.request(this.service.$api_get_updateBillExamine, params).subscribe(res => {
       if (res) {
-        this.service.msgSrv.success('修改成功！')
+        this.service.msgSrv.success('修改成功！');
         this.modal.destroy(true);
       }
-    })
+    });
   }
   sure() {
     const params = [this.i?.id];
-    this.service.downloadFile(this.service.$api_createBillTakeGoods, params)
+    this.service.downloadFile(this.service.$api_createBillTakeGoods, params);
-    this.service.downloadFile(this.service.$api_createBillDischargeGoods, params)
+    this.service.downloadFile(this.service.$api_createBillDischargeGoods, params);
-    this.service.msgSrv.success('生成电子单据成功！')
+    this.service.msgSrv.success('生成电子单据成功！');
     this.modal.destroy(true);
   }
   //  确认到车界面信息(两个只能看的图片)
   initData() {
-    this.service.request(this.service.$api_get_getCredentials, { id: this.i?.id }).subscribe((res) => {
+    this.service.request(this.service.$api_get_getCredentials, { id: this.i?.id }).subscribe(res => {
-      console.log(res)
+      console.log(res);
-      this.datas = res
+      this.datas = res;
       if (res.unloadingLadingBillFilePath) {
         this.formData = {
           loadingLadingBillFilePath: [
@@ -515,9 +529,9 @@ export class orderManagementVoucherViewComponent implements OnInit {
               status: 'done',
               url: res.loadingLadingBillFilePath,
               response: {
-                url: res.loadingLadingBillFilePath,
+                url: res.loadingLadingBillFilePath
-              },
+              }
-            },
+            }
           ],
           loadingPeopleVehiclesGoodsFilePath: [
             {
@@ -526,9 +540,9 @@ export class orderManagementVoucherViewComponent implements OnInit {
               status: 'done',
               url: res.loadingPeopleVehiclesGoodsFilePath,
               response: {
-                url: res.loadingPeopleVehiclesGoodsFilePath,
+                url: res.loadingPeopleVehiclesGoodsFilePath
-              },
+              }
-            },
+            }
           ],
           unloadingLadingBillFilePath: [
             {
@@ -537,9 +551,9 @@ export class orderManagementVoucherViewComponent implements OnInit {
               status: 'done',
               url: res.unloadingLadingBillFilePath,
               response: {
-                url: res.unloadingLadingBillFilePath,
+                url: res.unloadingLadingBillFilePath
-              },
+              }
-            },
+            }
           ],
           unloadingPeopleVehiclesGoodsFilePath: [
             {
@@ -548,33 +562,112 @@ export class orderManagementVoucherViewComponent implements OnInit {
               status: 'done',
               url: res.unloadingPeopleVehiclesGoodsFilePath,
               response: {
-                url: res.unloadingPeopleVehiclesGoodsFilePath,
+                url: res.unloadingPeopleVehiclesGoodsFilePath
-              },
+              }
-            },
+            }
-          ],
+          ]
         };
       }
-    })
+    });
   }
   close(): void {
     this.modal.destroy(true);
   }
   openlaod(value: any) {
     if (value === 1) {
-      const a = document.createElement('a');
+      // 逻辑： 先判断电子提货单是否已生成，文件为空则触发签署文件，再查询是否签署成功，成功则退出，刷新页面，再次点击为预览
-      a.href = this.datas?.loadingElectronicsLadingBillFilePath;
+      let time = 10;
-      document.body.appendChild(a);
+      setInterval(function () {
-      console.log(document.body.contains(a))
+        time -= 1;
-      a.click(); //点击下载
+      }, 1000); 
-      document.body.removeChild(a); //下载完成移除元素
+      const modal = this.modalService.success({
+        nzTitle: '电子装货单签署中！',
+        nzContent: `
+        请等待${time}秒后自动关闭
+        `
+      });
+      if (!this.datas?.loadingElectronicsLadingBillFilePath) {
+        this.service.request(this.service.$api_createBillTakeGoods, [this.datas?.id]).subscribe(res => {
+          if (res) {
+            switch (res[0]?.esignFlowStatus) {
+              case 1:
+              case '1':
+                setTimeout(() => {
+                  this.service.request(this.service.$api_getBillTakeEsignFile, [this.datas?.id]).subscribe(res => {
+                    if (res[0]?.esignFlowStatus == '2') {
+                      this.service.msgSrv.success('电子装货单已生效！');
+                      this.modal.destroy(true);
+                    }
+                  });
+                  modal.destroy();
+                }, 10000);
+                return;
+              case 2:
+                modal.destroy();
+                return;
+              case '13':
+              case 13:
+                this.service.msgSrv.error('签署异常!');
+                modal.destroy();
+                return;
+            }
+          }
+        });
+      } else {
+        const a = document.createElement('a');
+        a.href = this.datas?.loadingElectronicsLadingBillFilePath;
+        document.body.appendChild(a);
+        a.click(); //点击下载
+        document.body.removeChild(a); //下载完成移除元素
+      }
     } else {
-      const a = document.createElement('a');
+      // 逻辑： 先判断电子提货单是否已生成，文件为空则触发签署文件，再查询是否签署成功，成功则退出，刷新页面，再次点击为预览
-      a.href = this.datas?.unloadingElectronicsLadingBillFilePath;
+      let time = 10;
-      document.body.appendChild(a);
+      setInterval(function () {
-      console.log(document.body.contains(a))
+        time -= 1;
-      a.click(); //点击下载
+      }, 1000); //反复执行函数本身
-      document.body.removeChild(a); //下载完成移除元素
+      const modal = this.modalService.success({
-    }
+        nzTitle: '电子卸货单签署中！',
+        nzContent: `
+     请等待${time}秒后自动关闭
+     `
+      });
+      if (!this.datas?.unloadingElectronicsLadingBillFilePath) {
+        this.service.request(this.service.$api_createBillDischargeGoods, [this.datas?.id]).subscribe(res => {
+          if (res) {
+            switch (res[0]?.esignFlowStatus) {
+              case 1:
+              case '1':
+                setTimeout(() => {
+                  this.service.request(this.service.$api_getBillDischargeEsignFile, [this.datas?.id]).subscribe(res => {
+                    if (res[0]?.esignFlowStatus == '2') {
+                      this.service.msgSrv.success('电子卸货单已生效！');
+                      this.modal.destroy(true);
+                    }
+                  });
+                  modal.destroy();
+                }, 10000);
 
+                return;
+              case 2:
+                modal.destroy();
+
+                return;
+              case '13':
+              case 13:
+                this.service.msgSrv.error('签署异常!');
+                modal.destroy();
+                return;
+            }
+          }
+        });
+      } else {
+        const a = document.createElement('a');
+        a.href = this.datas?.unloadingElectronicsLadingBillFilePath;
+        document.body.appendChild(a);
+        a.click(); //点击下载
+        document.body.removeChild(a); //下载完成移除元素
+      }
+    }
   }
 }

src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.ts

@@ -499,7 +499,7 @@ export class VehicleSureArriveComponent implements OnInit {
       });
     } else {
       if (!value?.time) {
-        this.service.msgSrv.warning('装货时间为空！');
+        this.service.msgSrv.warning('卸货时间为空！');
         return;
       }
       if (!this.data?.volume) {

src/app/routes/order-management/services/order-management.service.ts

@@ -204,10 +204,21 @@ export class OrderManagementService extends ShipperBaseService {
   $api_abnormalWarning_asyncExport = `/api/sdc/abnormalWarning/asyncExport`;
   //  异步导出投诉管理导出
   $api_asyncExportComplaintListDrv = `/api/sdc/complaint/operate/asyncExportComplaintListDrv`;
-    //操作日志
+  //操作日志
-    public $api_get_log_list = `/api/mdc/pbc/operationLogRecords/getOperationLogRecordsList`;
+  public $api_get_log_list = `/api/mdc/pbc/operationLogRecords/getOperationLogRecordsList`;
-      // 查看补充协议
+  // 查看补充协议
   public $api_getSupplementaryAgreement = `/api/sdc/billShipper/getSupplementaryAgreement`;
+
+
+  // 获取电子提货单签章附件
+  public $api_getBillTakeEsignFile = `/api/sdc/billOperate/getBillTakeEsignFile`;
+  // 获取电子卸货单签章附件
+  public $api_getBillDischargeEsignFile = `/api/sdc/billOperate/getBillDischargeEsignFile`;
+
+  // // 生成卸货单
+  // public $api_createBillDischargeGoods = `/api/sdc/billOperate/createBillDischargeGoods`;
+  // // 生成提货单
+  // public $api_createBillTakeGoods = `/api/sdc/billOperate/createBillTakeGoods`;
   /**
    * 根据企业ID，获取企业历史网络货运人
    * @returns

src/app/routes/partner/partner-list/components/index/partner-list.component.html

@@ -58,7 +58,7 @@
         <textarea rows="3" nz-input [(ngModel)]="cannelItem.remark"></textarea>
       </se>
       <se label="一并转移的客户">
-        <p style="margin-top: 8px">已选（0）</p>
+        <p style="margin-top: 8px">已选（{{selectedRows?.length}}）</p>
         <st #rest [data]="service.$api_get_enterprice_rel_list" [columns]="[
         { title: '', index: 'key', type: 'checkbox' },
         { title: '客户名称', index: 'enterpriceName' }

src/app/routes/partner/partner-list/components/index/partner-list.component.ts

@@ -379,12 +379,13 @@ export class PartnerListComponent {
     return [
       {
         title: '合伙人名称',
-        index: 'contactName',
+        index: 'enterpriseName',
-        width: 180
+        width: 180,
+        format: item => (item.partnerType ? `${item.enterpriseName || item.contactName}` : '')
       },
       { title: '付款编码', index: 'payCode', width: 160 },
       { title: '邀请码', index: 'invitationCode', className: 'text-center', width: 130 },
-      { title: '企业管理员', index: 'adminName', width: 150 },
+      { title: '企业管理员', index: 'contactName', width: 150, format: item => (item.partnerType ? `${item.contactName}` : '') },
       { title: '手机号', index: 'contactMobile', className: 'text-center', width: 150 },
       { title: '类型', index: 'partnerType', className: 'text-center', width: 130, type: 'enum', enum: { 1: '企业', 2: '个人' } },
       { title: '注册渠道', index: 'source', type: 'enum', enum: { 1: '合伙人注册', 2: '平台添加' }, width: 130 },

src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html

@@ -123,7 +123,7 @@
     </sv>
     <sv label="身份证有效期" col="1">
       <nz-date-picker [(ngModel)]="detailData.adminUserInfo.validStartTime" [nzDisabled]="!isEdit" nzPlaceHolder=" "
-        [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''" style="width: 100px" class="calendar">
+        [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''" style="width: 140px" class="calendar">
       </nz-date-picker>
       -
       <ng-container
@@ -131,7 +131,7 @@
         <label style="padding-left: 11px">长期</label>
       </ng-container>
       <nz-date-picker [(ngModel)]="detailData.adminUserInfo.validEndTime" [nzDisabled]="!isEdit" nzPlaceHolder=" "
-        [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''" style="width: 100px" class="calendar">
+        [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''" style="width: 140px" class="calendar">
       </nz-date-picker>
       <ng-container *ngIf="isEdit">
         <label nz-checkbox [ngModel]="!!!detailData.adminUserInfo.validEndTime"
@@ -214,7 +214,7 @@
     </sv>
     <sv label="身份证有效期" col="1">
       <nz-date-picker [(ngModel)]="detailData.legalPersonIdentity.validStartTime" [nzDisabled]="!isEdit"
-        nzPlaceHolder=" " [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''" style="width: 100px"
+        nzPlaceHolder=" " [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''" style="width: 140px"
         class="calendar"></nz-date-picker>
       -
       <ng-container
@@ -222,7 +222,7 @@
         <label style="padding-left: 11px">长期</label>
       </ng-container>
       <nz-date-picker [(ngModel)]="detailData.legalPersonIdentity.validEndTime" [nzDisabled]="!isEdit" nzPlaceHolder=" "
-        [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''" style="width: 100px" class="calendar">
+        [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''" style="width: 140px" class="calendar">
       </nz-date-picker>
       <ng-container *ngIf="isEdit">
         <label nz-checkbox [ngModel]="!!!detailData.legalPersonIdentity.validEndTime"

src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.html

@@ -97,7 +97,7 @@
     </sv>
     <sv label="身份证有效期" col="1">
       <nz-date-picker [(ngModel)]="detailData.adminUserInfo.validStartTime" [nzDisabled]="!isEdit" nzPlaceHolder=" "
-        [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''" style="width: 100px" class="calendar">
+        [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''" style="width: 140px" class="calendar">
       </nz-date-picker>
       -
       <ng-container
@@ -105,7 +105,7 @@
         <label style="padding-left: 11px">长期</label>
       </ng-container>
       <nz-date-picker [(ngModel)]="detailData.adminUserInfo.validEndTime" [nzDisabled]="!isEdit" nzPlaceHolder=" "
-        [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''" style="width: 100px" class="calendar">
+        [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''" style="width: 140px" class="calendar">
       </nz-date-picker>
       <ng-container *ngIf="isEdit">
         <label nz-checkbox [ngModel]="!!!detailData.adminUserInfo.validEndTime"

src/app/routes/partner/partner-list/services/partner-list.service.ts

@@ -31,7 +31,7 @@ export class PartnerListService extends ShipperBaseService {
   // 查询合伙人修改渠道渠道销售记录
   $api_get_personal_channel_list = '/api/mdc/partnerChannelRelLog/list/page';
   // 查询客户关系列表-不分页
-  $api_get_enterprice_rel_list = '/api/mdc/EnterpriseRelLog/list';
+  $api_get_enterprice_rel_list = '/api/mdc/enterpriseRelLog/list';
   // 校验合伙人是否可修改渠道销售 true:可以修改 false：不可以修改
   $api_check_partenr_change_channel = '/api/mdc/partner/updateChannelCheck';
   // 根据手机号查询实名信息

src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts

@@ -928,10 +928,15 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
       this.service.msgSrv.warning('起终点相同，请重新选择装卸货地址！');
       return;
     }
-    if (this.validateForm1.value.loadingTime < new Date()) {
+    let date1 = this.validateForm1.value.loadingTime
+    let date2 = new Date()
+    let min = date1.getMinutes()
+    date1.setMinutes(min+10)
+    if (date1 < date2 ) {
       this.service.msgSrv.warning('装货时间必须大于当前时间！');
       return;
     }
+    
     if (this.validateForm1.value.loadingTime > this.validateForm1.value.unloadingTime) {
       this.service.msgSrv.warning('装货时间不能大于卸货时间！');
       return;

src/app/routes/supply-management/components/release-publish/release-publish.component.ts

@@ -892,7 +892,11 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
       this.service.msgSrv.warning('起终点相同，请重新选择装卸货地址！');
       return;
     }
-    if (this.validateForm1.value.loadingTime < new Date()) {
+    let date1 = this.validateForm1.value.loadingTime
+    let date2 = new Date()
+    let min = date1.getMinutes()
+    date1.setMinutes(min+10)
+    if (date1 < date2 ) {
       this.service.msgSrv.warning('装货时间必须大于当前时间！');
       return;
     }

src/app/routes/sys-setting/components/basic-setting/basic-setting.component.ts

@@ -12,7 +12,7 @@ import { Component, OnInit, ViewChild } from '@angular/core';
 import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
 import { dateTimePickerUtil } from '@delon/util';
 import { SystemService } from '../../services/system.service';
-
+const NOJSONTYPE = new Set([8, 12, 13]);
 @Component({
   selector: 'app-basic-setting',
   templateUrl: './basic-setting.component.html',
@@ -49,7 +49,7 @@ export class BasicSettingComponent implements OnInit {
         res = res.map(item => ({
           ...item,
           remark: item.remark ? JSON.parse(item.remark) : null,
-          itemValue: item?.itemValue ? (item?.itemType !== 8 ? JSON.parse(item?.itemValue) : item?.itemValue) : item?.itemValue,
+          itemValue: item?.itemValue ? (NOJSONTYPE.has(item?.itemType) ? item?.itemValue : JSON.parse(item?.itemValue)) : item?.itemValue,
           itemData: item.itemData ? JSON.parse(item.itemData) : item.itemData
         }));
         const hiddenType = res.find(item => item.itemType === 7 || item.itemType === 999);

src/app/routes/sys-setting/components/network-freight/new/new.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-02-17 15:01:33
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-20 16:21:58
+ * @LastEditTime : 2022-04-20 17:10:30
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\sys-setting\\components\\network-freight\\new\\new.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -20,6 +20,14 @@
         <div class="pa2"> <app-imagelist style="height: 102px;" [imgList]="['./assets/images/company.png']"></app-imagelist></div>
       </div>
     </ng-template>
+    <ng-template sf-template="legalPersonIdentityVO/tipsY" let-me let-ui="ui" let-schema="schema">
+      <div class="pr" style="height: 0;">
+        <dl >
+          请上传道运证照片，支持JPG、PNG格式，文件小于5M。蓝牌绿牌车辆，可不用传道运证
+        </dl>
+        <div class="pa"> <app-imagelist style="height: 152px;" [imgList]="['./assets/images/road.png']"></app-imagelist></div>
+      </div>
+    </ng-template>
     <ng-template sf-template="title1" let-me let-ui="ui" let-schema="schema">
       <div class="form-title">企业基本信息</div>
     </ng-template>
@@ -39,8 +47,7 @@
     <ng-template sf-template="legalPersonIdentityVO/title3" let-me let-ui="ui" let-schema="schema">
       <div class="form-title" style="margin-top: 40px;margin-left: -180px;">道运证信息</div>
     </ng-template>
-    <ng-template sf-template="roadImg" let-me let-ui="ui" let-schema="schema">
+    <ng-template sf-template="legalPersonIdentityVO/roadImg" let-me let-ui="ui" let-schema="schema">
-      
       <img height="104" src="./assets/images/road.png" class="borderImg" />
   </ng-template>
     <ng-template sf-template="legalPersonIdentityVO/tipsC" let-me let-ui="ui" let-schema="schema">

src/app/routes/sys-setting/components/network-freight/new/new.component.ts

@@ -52,7 +52,8 @@ export class NetworkFreightNewComponent implements OnInit {
   sf1FormData: any = {
     legalPersonIdentityVO: {
       certificatePhotoFrontWatermark: '',
-      certificatePhotoBackWatermark: ''
+      certificatePhotoBackWatermark: '',
+      roadTransportPhotoWatermark: ''
     }
   };
   subText = '确认新增';
@@ -85,13 +86,6 @@ export class NetworkFreightNewComponent implements OnInit {
       spanLabelFixed: 100,
       grid: { xxl: 6, xl: 6, lg: 4, md: 6 }
     },
-    $roadTransportPhotoWatermark: {
-      grid: { span: 12 },
-    },
-    $roadImg: {
-      grid: { span: 4 },
-      class: 'setCustom'
-    },
   };
 
   constructor(private router: Router, public service: SystemService, private route: ActivatedRoute) {}
@@ -607,12 +601,12 @@ export class NetworkFreightNewComponent implements OnInit {
             },
             title3: { title: '', type: 'string', ui: { widget: 'custom', offsetControl: 6 } },
             roadTransportPhoto: { title: '', type: 'string', ui: { hidden: true } },
+            tipsY: { title: '', type: 'string', ui: { widget: 'custom', offsetControl: 6 } },
             roadTransportPhotoWatermark: {
               type: 'string',
               title: '道运证照片',
               ui: {
                 ...IMAGECONFIG,
-                descriptionI18n: '请上传道运证照片，支持JPG、PNG格式，文件小于5M。蓝牌绿牌车辆，可不用传道运证',
                 change: args => {
                   if (args.type === 'success') {
                     console.log(args);
@@ -623,14 +617,6 @@ export class NetworkFreightNewComponent implements OnInit {
                 }
               } as SFUploadWidgetSchema
             },
-            // roadImg: {
-            //   title: '',
-            //   type: 'boolean',
-            //   // enum: [{ label: '长期', value: true }],
-            //   ui: {
-            //     widget: 'custom'
-            //   }
-            // },
             roadTransportLicenceNo: {
               title: '经营许可证号',
               type: 'string',

src/app/routes/sys-setting/components/role-management/edit/edit.component.ts

@@ -64,6 +64,7 @@ export class SettingRoleEditComponent implements OnInit {
     const params = {
       id: this.params.id
     };
+console.log(this.params.infoUrl)
     this.service.request(this.params.infoUrl, params).subscribe(res => {
       if (res) {
         this.roleInfoData = res;

src/app/routes/sys-setting/components/role-management/menu/menu.component.ts

@@ -57,10 +57,15 @@ export class SettingMenuComponent implements OnInit, OnChanges {
       });
   }
   addAuthority(origin: { id: any; all: any }, node: { buttonInfoList: any[] }, item?: { checked: any; functionButtonId: any }) {
+    console.log(origin,node);
+    
     if (this.authority?.length && this.authority.filter(authItem => authItem.authorityId === origin.id).length) {
       // 判断此菜单权限是否已经存在权限列表中
       // 当前操作菜单id存在权限列表里
       this.authority.forEach(menuItem => {
+        console.log(menuItem);
+        console.log(item);
+        
         if (menuItem.authorityId === origin.id) {
           menuItem.buttonAuthorityIds = menuItem.buttonAuthorityIds || []; // 防止属性不存在，给属性指定数据类型
           if (item) {
@@ -312,6 +317,8 @@ export class SettingMenuComponent implements OnInit, OnChanges {
       if (res) {
         origin.buttonInfoList = res;
         origin.all = false;
+        console.log(origin);
+        
         // 判断此菜单下是否已有此按钮权限
         this.againGetBtn(id, origin);
       }

src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts

@@ -77,23 +77,6 @@ export class TaxManagementIndividualCollectComponent implements OnInit {
     this.schema = {
       properties: {
         _$expand: { type: 'boolean', ui: { hidden: true } },
-        declareStatus: {
-          title: '申报状态',
-          type: 'string',
-          enum: [
-            { value: '', label: '全部' },
-            { value: '0', label: '待申报' },
-            { value: '1', label: '待审核' },
-            { value: '2', label: '已通过' },
-            { value: '3', label: '不通过' }
-          ],
-          ui: {
-            placeholder: '请选择',
-            widget: 'select',
-            containsAllLabel: true
-          },
-          default: ''
-        },
         overdueStatus: {
           title: '是否逾期',
           type: 'string',

src/app/routes/tax-management/components/individual-income/individual-income.component.ts

@@ -96,26 +96,26 @@ export class TaxManagementIndividualIncomeComponent implements OnInit {
             placeholder: '请输入证件号码'
           }
         },
-        declareStatus: {
+        // declareStatus: {
-          title: '申报状态',
+        //   title: '申报状态',
-          type: 'string',
+        //   type: 'string',
-          enum: [
+        //   enum: [
-            { value: '', label: '全部' },
+        //     { value: '', label: '全部' },
-            { value: '0', label: '待申报' },
+        //     { value: '0', label: '待申报' },
-            { value: '1', label: '待审核' },
+        //     { value: '1', label: '待审核' },
-            { value: '2', label: '已通过' },
+        //     { value: '2', label: '已通过' },
-            { value: '3', label: '不通过' }
+        //     { value: '3', label: '不通过' }
-          ],
+        //   ],
-          ui: {
+        //   ui: {
-            placeholder: '请选择',
+        //     placeholder: '请选择',
-            widget: 'select',
+        //     widget: 'select',
-            containsAllLabel: true,
+        //     containsAllLabel: true,
-            visibleIf: {
+        //     visibleIf: {
-              _$expand: (value: boolean) => value
+        //       _$expand: (value: boolean) => value
-            }
+        //     }
-          },
+        //   },
-          default: ''
+        //   default: ''
-        },
+        // },
         // declareStatu1s: {
         //   title: '申报结果',
         //   type: 'string',

src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.html

@@ -19,67 +19,32 @@
 </nz-card>
 <nz-card>
   <nz-tabset [nzTabBarExtraContent]="extraTemplate" *ngIf="tabs.length>0">
-
     <nz-tab *ngFor="let tab of tabs" [nzTitle]="tab.name" (nzSelect)="selectChange(tab)">
     </nz-tab>
   </nz-tabset>
   <!-- 数据列表 -->
-  <st #st [scroll]="{x:'1200px'}" [data]="service.$api_getTaxOrderPage_page" [columns]="columns"
+  <st #st [scroll]="{x:'1200px'}" [data]="service.$api_getInvoiceReport_page" [columns]="columns"
     [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
     [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
     [page]="{ show: true, showSize: true, pageSizes: [10,20, 50, 100] }" [loading]="service.http.loading">
     <ng-template st-row="putStatus" let-item let-index="index">
       <!-- <a (click)="viewAuditResult(item)" *ngIf="item?.billStatus === '2'">{{item?.billStatusLabel}}</a> -->
-      <span *ngIf="item?.putStatus == '0'">待上传</span>
+      <span *ngIf="item?.uploadSts == '1'">待上传</span>
-      <span *ngIf="item?.putStatus == '1'">已上传</span>
+      <span *ngIf="item?.uploadSts == '3'">已上传</span>
-      <span *ngIf="item?.putStatus == '3'">上传中</span>
+      <span *ngIf="item?.uploadSts == '2'">上传中</span>
-      <span  *ngIf="item?.putStatus == '2'" style="color: red;" (click)="unnormal(item)">上传异常</span>
+      <span  *ngIf="item?.uploadSts == '4'" style="color: red;" (click)="unnormal(item)">上传异常</span>
     </ng-template>
     <ng-template st-row="invoiceNO" let-item let-index="index">
-      <a href="/">{{item.billCode}}</a>
+      <a href="/">{{item.invoiceno}}</a>
     </ng-template>
-    <ng-template st-row="checkStatus" let-item let-index="index">
+    <ng-template st-row="artoname" let-item let-index="index">
-      <!-- <a (click)="viewAuditResult(item)" *ngIf="item?.billStatus === '2'">{{item?.billStatusLabel}}</a> -->
+      <a href="/">{{item.artoname}}</a>
-      <span *ngIf="item?.checkStatus == '0'">校验中</span>
-      <span *ngIf="item?.checkStatus == '1'">通过</span>
-      <!-- <span  *ngIf="item?.checkStatus == '2'" style="color: red;" (click)="unnormal(item)">不通过</span> -->
-      <span  *ngIf="item?.checkStatus == '2'" style="color: red;" (click)="viewResult(item)">不通过</span>
-
     </ng-template>
-    <ng-template st-row="driverName" let-item let-index="index">
+    <ng-template st-row="billHCode" let-item let-index="index">
-      <div> {{ item?.driverName }}{{  item?.driverPhone ? "/" + item?.driverPhone : '' }} </div>
+      <a href="/">{{item.billHCode}}</a>
     </ng-template>
-    <!-- <ng-template st-row="localValid" let-item let-index="index">
+    <ng-template st-row="invoiceType" let-item let-index="index">
-      <a (click)="viewResult(item)" *ngIf="item?.billStatus === '2'">{{item?.billStatusLabel}}</a>
+      <span>增值税专用发票</span>
-      <span *ngIf="item?.billStatus !== '2'">{{item?.billStatusLabel}}</span>
-    </ng-template> -->
-    <ng-template st-row="loadingPicture" let-item let-index="index">
-      <div class="imgBox">
-        <div *ngIf="item.loadingPicture">
-          <app-imagelist style="width: 60px" [imgList]="[item.loadingPicture]"> </app-imagelist>
-        </div>
-      </div>
-    </ng-template>
-    <ng-template st-row="unloadPicture" let-item let-index="index">
-      <div class="imgBox">
-        <div *ngIf="item.unloadPicture">
-          <app-imagelist style="width: 40px" [imgList]="[item.unloadPicture]"> </app-imagelist>
-        </div>
-      </div>
-    </ng-template>
-    <ng-template st-row="loadingLadingBill" let-item let-index="index">
-      <div class="imgBox">
-        <div *ngIf="item.loadingLadingBill">
-          <app-imagelist style="width: 40px" [imgList]="[item.loadingLadingBill]"> </app-imagelist>
-        </div>
-      </div>
-    </ng-template>
-    <ng-template st-row="signatureForm" let-item let-index="index">
-      <div class="imgBox">
-        <div *ngIf="item.signatureForm">
-          <app-imagelist style="width: 40px" [imgList]="[item.signatureForm]"> </app-imagelist>
-        </div>
-      </div>
     </ng-template>
     <ng-template st-row="orderAmount" let-item let-index="index">
       <div class="text-right">{{item?.orderAmount | currency }}</div>
@@ -92,7 +57,7 @@
       已选择
       <strong class="text-red">{{ selectedRows.length }}</strong> 条数据
     </div>
-    <button *ngIf="selectedIndex === '0' || selectedIndex === '2'" nz-button nzType="primary" (click)="upload()">上传</button>
+    <button *ngIf="selectedIndex === '1' || selectedIndex === '4'" nz-button nzType="primary" (click)="upload()">上传</button>
-    <button *ngIf="selectedIndex === '1' || selectedIndex === '3'" nz-button nzType="primary" (click)="recall()">撤回</button>
+    <button *ngIf="selectedIndex === '2' || selectedIndex === '3'" nz-button nzType="primary" (click)="recall()">撤回</button>
   </div>
 </ng-template>

src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.ts

@@ -1,16 +1,10 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { STColumn, STComponent, STData } from '@delon/abc/st';
-import { SFComponent, SFDateWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
+import { SFComponent, SFDateWidgetSchema, SFSchema, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
 import { ShipperBaseService } from '@shared';
 import { NzModalService } from 'ng-zorro-antd/modal';
-import { of } from 'rxjs';
-import { map } from 'rxjs/operators';
 import { TaxManagementService } from '../../services/tax-management.service';
-import { TaxManagementInvoiceUploadSettingComponent } from './upload-setting/upload-setting.component';
-import { TaxManagementInvoiceVerifyResultComponent } from './verify-result/verify-result.component';
-// import { DatatableReportingUploadSettingComponent } from '../upload-setting/upload-setting.component';
-// import { DatatableReportingVerifyResultComponent } from '../verify-result/verify-result.component';
 
 @Component({
   selector: 'app-tax-management-invoice-reporting',
@@ -27,13 +21,13 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
   tabType!: string;
   isLoading: boolean = false;
   tabs: any[] = [
-    { name: '待上传', value: '0' },
+    { name: '待上传', value: '1' },
-    { name: '上传中', value: '3' },
+    { name: '上传中', value: '2' },
-    { name: '已上传', value: '1' },
+    { name: '已上传', value: '3' },
-    { name: '异常', value: '2' },
+    { name: '异常', value: '4' },
     { name: '全部', value: '' }
   ];
-  selectedIndex = '0'; //选择的项目
+  selectedIndex = ''; //选择的项目
   serviceTel = '';
   constructor(
     public service: TaxManagementService,
@@ -56,9 +50,7 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
    * 查询参数
    */
   get reqParams() {
-    const params = Object.assign({}, this.sf?.value || {}, {
+    const params = Object.assign({}, this.sf?.value || {});
-      putStatus: this.selectedIndex,
-    });
     delete params._$expand;
     return { ...params };
   }
@@ -101,25 +93,25 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
     this.schema = {
       properties: {
         _$expand: { type: 'boolean', ui: { hidden: true } },
-        putStatus: {
+        // uploadSts: {
-          title: '上传状态',
+        //   title: '上传状态',
-          type: 'string',
+        //   type: 'string',
-          default: 0,
+        //   default: '1',
-          enum: [
+        //   enum: [
-            { label: '全部', value: 0 },
+        //     { label: '全部', value: '' },
-            { label: '待上传', value: 1 },
+        //     { label: '待上传', value: '1'},
-            { label: '上传中', value: 2 },
+        //     { label: '上传中', value: '2' },
-            { label: '已上传', value: 3 },
+        //     { label: '已上传', value: '3' },
-            { label: '异常', value: 4 }
+        //     { label: '异常', value: '4' }
-          ],
+        //   ],
 
-          ui: {
+        //   ui: {
-            placeholder: '请选择',
+        //     placeholder: '请选择',
-            widget: 'select',
+        //     widget: 'select',
-            allowClear: true
+        //     allowClear: true
-          }
+        //   }
-        },
+        // },
-        networkTransporter: {
+        ltdId: {
           type: 'string',
           title: '网络货运人',
           ui: {
@@ -129,7 +121,7 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
             asyncData: () => this.shipperservice.getNetworkFreightForwarder()
           }
         },
-        hrto: {
+        arto: {
           type: 'string',
           title: '购买方',
           ui: {
@@ -139,14 +131,13 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
             asyncData: () => this.service.getCRMCustomerId()
           }
         },
-        billCode: {
+        billHCode: {
-          title: '订单号', type: 'string', ui: {
+          title: '订单号', type: 'string',
-            placeholder: '请输入', visibleIf: {
+          ui: {
-              _$expand: (value: boolean) => value
+            placeholder: '请输入'
-            }
           }
         },
-        recentlyPutTime: {
+        invoicedate: {
           title: '开票日期',
           type: 'string',
           ui: {
@@ -158,7 +149,7 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
             },
           } as SFDateWidgetSchema,
         },
-        orderPayTime: {
+        uoloadDate: {
           title: '上传日期',
           type: 'string',
           ui: {
@@ -170,7 +161,7 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
             },
           } as SFDateWidgetSchema,
         },
-        wayBillCode: {
+        invoiceno: {
           type: 'string',
           title: '发票号码',
           ui: {
@@ -180,7 +171,7 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
             }
           },
         },
-        wayBillCode1: {
+        invoiceno2: {
           type: 'string',
           title: '发票代码',
           ui: {
@@ -217,31 +208,31 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
   initST() {
     this.columns = [
       { title: '', type: 'checkbox', className: 'text-center', width: '60px', },
-      { title: '上传状态', render: 'putStatus', className: 'text-center', width: '120px', },
+      { title: '上传状态', render: 'uploadSts', className: 'text-center', width: '120px', },
-      { title: '发票类型', render: 'checkStatus', className: 'text-center', width: '120px', },
+      { title: '发票类型', render: 'invoiceType', className: 'text-center', width: '120px', },
       {
         title: '发票号码',
-        index: 'billCode',
+        index: 'invoiceno',
         render: 'invoiceNO',
         className: 'text-center',
         width: '150px',
       },
-      { title: '发票代码', index: 'wayBillCode', className: 'text-center', width: '150px', },
+      { title: '发票代码', index: 'invoiceno2', className: 'text-center', width: '150px', },
       {
         title: '网络货运人',
-        index: 'networkTransporterName',
+        index: 'ltdName',
         className: 'text-center',
         width: '180px',
       },
-      { title: '购买方企业名称', index: 'loadingAddress', render: 'loadingPlace', className: 'text-center', width: '200px' },
+      { title: '购买方企业名称', index: 'artoname', render: 'artoname', className: 'text-center', width: '200px' },
-      { title: '购买方统一社会信用代码', index: 'loadingDetailedAddress', render: 'loadingPlace', className: 'text-center', width: '200px' },
+      { title: '购买方统一社会信用代码', index: 'artotaxno', className: 'text-center', width: '200px' },
-      { title: '订单号', index: 'unloadAddress', render: 'dischargePlace', className: 'text-center', width: '120px' },
+      { title: '订单号', index: 'billHCode', render: 'billHCode', className: 'text-center', width: '120px' },
-      { title: '货物名称', index: 'unloadDetailedAddress', className: 'text-center', width: '180px' },
+      { title: '货物名称', index: 'goodsinfo', className: 'text-center', width: '180px' },
-      { title: '价税合计', index: 'shipperName', className: 'text-center', width: '180px' },
+      { title: '价税合计', index: 'vatmoney', className: 'text-center', width: '180px' },
-      { title: '开票日期', index: 'shipperProvinceCode', className: 'text-center', width: '180px' },
+      { title: '开票日期', index: 'invoicedate', className: 'text-center', width: '180px' },
-      { title: '发票所属月份', index: 'recordTime', className: 'text-center', width: '250px' },
+      { title: '发票所属月份', index: 'invoicemonth', className: 'text-center', width: '250px' },
-      { title: '发票状态', index: 'wayBillCreateTime', className: 'text-center', width: '200px' },
+      { title: '发票状态', index: 'sts', className: 'text-center', width: '200px' },
-      { title: '上传日期', index: 'loadTime', className: 'text-center', width: '200px' },
+      { title: '上传日期', index: 'uoloadDate', className: 'text-center', width: '200px' },
     ];
   }
 
@@ -349,24 +340,6 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
     });
   }
 
-  // appeal(item: any) {
-  //   const modalRef = this.modal.create({
-  //     nzTitle: '申诉',
-  //     nzWidth: '40%',
-  //     nzContent: CtcAppealComponent,
-  //     nzComponentParams: {
-  //       i: item,
-  //       status: 'add'
-  //     },
-  //     nzFooter: null
-  //   });
-  //   modalRef.afterClose.subscribe(res => {
-  //     if (res) {
-  //       this.search({ representationsStatus: '' });
-  //     }
-  //   })
-  // }
-
   /**
    * 上传
    */
@@ -388,45 +361,6 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
   }
 
 
-  /**
-   *
-   * @param params 上传设置
-   */
-  uploadSetting() {
-    const modalRef = this.modal.create({
-      nzTitle: '税务上传设置',
-      nzWidth: 600,
-      nzContent: TaxManagementInvoiceUploadSettingComponent,
-      nzComponentParams: {},
-      nzFooter: null
-    });
-    modalRef.afterClose.subscribe(res => {
-      if (res) {
-        this.st.load();
-      }
-    })
-  }
-
-  /**
-   * 查看校验结果
-   */
-  viewResult(item: any) {
-    const modalRef = this.modal.create({
-      nzTitle: '本地校验结果',
-      nzWidth: 1200,
-      nzContent: TaxManagementInvoiceVerifyResultComponent,
-      nzComponentParams: {
-        record: item
-      },
-      nzFooter: null
-    });
-    modalRef.afterClose.subscribe(res => {
-      if (res) {
-        this.st.load();
-      }
-    })
-  }
-
   /**
    * 查看监管审核结果
    */

src/app/routes/tax-management/components/invoice-reporting/upload-setting/upload-setting.component.html

@@ -1,8 +0,0 @@
-<nz-spin [nzSpinning]="!i"></nz-spin>
-<sf *ngIf="i" #sf mode="edit" [schema]="schema" [ui]="ui" [formData]="i" button="none">
-  <div class="modal-footer">
-    <button nz-button type="button" (click)="close()">取消</button>
-    <button nz-button type="submit" nzType="primary" (click)="save(sf.value)" [disabled]="!sf.valid"
-      [nzLoading]="service.http.loading">修改</button>
-  </div>
-</sf>

src/app/routes/tax-management/components/invoice-reporting/upload-setting/upload-setting.component.ts

@@ -1,110 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { SFSchema, SFUISchema } from '@delon/form';
-import { NzModalRef } from 'ng-zorro-antd/modal';
-import { TaxManagementService } from '../../../services/tax-management.service';
-
-
-@Component({
-  selector: 'app-datatable-invoice-upload-setting',
-  templateUrl: './upload-setting.component.html',
-})
-export class TaxManagementInvoiceUploadSettingComponent implements OnInit {
-  record: any = {};
-  i: any = {};
-  schema!: SFSchema;
-  ui!: SFUISchema;
-
-  constructor(
-    private modal: NzModalRef,
-    public service: TaxManagementService
-  ) { }
-
-  ngOnInit(): void {
-    this.initSF();
-    // this.loadData();
-  }
-
-  /**
- * 初始化查询表单
- */
-  initSF() {
-    this.schema = {
-      properties: {
-        no: {
-          type: 'string',
-          title: '订单数据',
-          enum: [
-            {
-              label: '手动上传',
-              value: '1'
-            },
-            {
-              label: '自动上传',
-              value: '2'
-            }
-          ],
-          description: '开启自动上传后，订单将在支付完成且风险单校验通过后自动上传',
-          ui: {
-            widget: 'radio',
-
-          }
-        },
-        owner: {
-          type: 'string',
-          title: '资金数据',
-          enum: [
-            {
-              label: '手动上传',
-              value: '1'
-            },
-            {
-              label: '自动上传',
-              value: '2'
-            }
-          ],
-          description: '开启自动上传后，订单将在支付完成且风险单校验通过后自动上传',
-          ui: {
-            widget: 'radio',
-
-          }
-        },
-      },
-      required: ['owner', 'no'],
-    }
-    this.ui = {
-      '*': {
-        spanLabelFixed: 100,
-        grid: { span: 24 },
-      },
-    };
-  }
-
-  /**
-   * 获取设置数据
-   */
-  loadData() {
-    this.service.request(this.service.$api_get_upload_setting, {}).subscribe(res => {
-      if (res) {
-        this.i = res;
-
-      }
-    })
-  }
-
-  /**
-   * 修改
-   * @param value
-   */
-  save(value: any): void {
-    this.service.request(this.service.$api_upload_setting_save, { ...value }).subscribe(res => {
-      if (res) {
-        this.service.msgSrv.success('保存成功');
-        this.modal.close(true);
-      }
-    })
-  }
-
-  close(): void {
-    this.modal.destroy();
-  }
-}

src/app/routes/tax-management/components/invoice-reporting/verify-result/verify-result.component.html

@@ -1,30 +0,0 @@
-<div nz-row>
-  <div style="width: 10%">
-    <nz-tabset [nzTabPosition]="'left'" style="height: 100%">
-      <nz-tab [nzTitle]="item?.name" *ngFor="let item of tabs" (nzSelect)="selectTab(item)"></nz-tab>
-    </nz-tabset>
-  </div>
-  <div style="width: 90%">
-    <st
-      #st
-      [scroll]="{ x: '1000px', y: '600px' }"
-      [data]="service.$api_get_getTaxFieldCheckList"
-      [columns]="columns"
-      [req]="{  process: beforeReq }"
-      [res]="{ reName: { list: 'data', total: 'data' } , process: afterRes}"
-      [page]="{ show: false }"
-      [loading]="false"
-      [bordered]="true"
-    >
-      <ng-template st-row="freightDetails" let-item>
-        <div *ngFor="let item of item.freightDetails">
-          <div>{{ item.expenseName }}:{{ item.price | currency }} </div>
-        </div>
-      </ng-template>
-    </st>
-  </div>
-</div>
-<div class="modal-footer">
-  <button nz-button type="button" (click)="close()">取消</button>
-  <button nz-button type="submit" nzType="primary" (click)="update()" [nzLoading]="service.http.loading">修改</button>
-</div>

src/app/routes/tax-management/components/invoice-reporting/verify-result/verify-result.component.ts

@@ -1,139 +0,0 @@
-import { Component, OnInit, ViewChild } from '@angular/core';
-import { Router } from '@angular/router';
-import { STColumn, STComponent, STRequestOptions } from '@delon/abc/st';
-import { SFSchema } from '@delon/form';
-import { ModalHelper, _HttpClient } from '@delon/theme';
-import { NzModalRef } from 'ng-zorro-antd/modal';
-import { TaxManagementService } from '../../../services/tax-management.service';
-
-@Component({
-  selector: 'app-tax-management-Invoice-reporting-verify-result',
-  templateUrl: './verify-result.component.html',
-})
-export class TaxManagementInvoiceVerifyResultComponent implements OnInit {
-  searchSchema: SFSchema = {
-    properties: {
-      no: {
-        type: 'string',
-        title: '编号'
-      }
-    }
-  };
-  @ViewChild('st') private readonly st!: STComponent;
-  columns: STColumn[] = [];
-  record: any = {}
-  subjectType: string = '0';
-  tabs: any[] = [
-    { name: '平台信息', value: '0' },
-    { name: '货主信息', value: '1' },
-    { name: '司机信息', value: '2' },
-    { name: '订单信息', value: '3' },
-  ];
-
-  // get reqParams() {
-  //   console.log(this.subjectType);
-  //   const params ={
-  //     subjectId: this.record?.shipperId,
-  //     subjectType: this.subjectType,
-  //   }
-  //   return params;
-  // }
-  beforeReq = (requestOptions: STRequestOptions) => {let a: string = '';
-    switch (this.subjectType) {
-      case '0':
-      a = this.record?.networkTransporterId;
-      break
-      case '1':
-      a = this.record?.shipperId;
-      break
-      case '2':
-      a = this.record?.driverId;
-      break
-      case '3':
-      a = this.record?.wayBillId;
-      break
-    }
-      Object.assign(requestOptions.body, {
-            subjectId: a ,
-            subjectType: this.subjectType,
-      });
-    return requestOptions;
-  };
-  afterRes = (data: any[], rawData?: any) => {
-    console.log(data)
-    return data.map(item => ({
-      ...item,
-    }));
-  };
-  constructor(public service: TaxManagementService, private modalRef: NzModalRef, public router: Router) {
-  }
-
-  ngOnInit(): void {
-    console.log(this.record);
-    
-    this.initST();
-  }
-
-  /**
- * 初始化数据列表
- */
-  initST() {
-    this.columns = [
-      { title: '序号', type: 'no', className: 'text-center', width: '60px', },
-      { title: '校验字段', index: 'checkFieldName', className: 'text-center', width: '120px', },
-      {
-        title: '是否必填',
-        index: 'requiredStatus',
-        className: 'text-center',
-        width: '100px',
-        type: 'enum',
-        enum: {
-          0: '否',
-          1: '是'
-        }
-      },
-      { title: '上传值', index: 'fieldValue', className: 'text-center', width: '150px', },
-      {
-        title: '本地校验', index: 'checkStatus', className: 'text-center', width: '100px',
-        type: 'enum',
-        enum: {
-          0: '校验中',
-          1: '通过',
-          2: '不通过'
-        }
-      },
-      { title: '错误内容', index: 'remark', className: 'text-center', width: '150px', },
-    ]
-  }
-
-
-  add(): void {
-    // this.modal
-    //   .createStatic(FormEditComponent, { i: { id: 0 } })
-    //   .subscribe(() => this.st.reload());
-  }
-
-  selectTab(e: any) {
-    setTimeout(() => {
-      console.log(e?.value);
-      
-      this.subjectType = e?.value;
-      console.log(this.subjectType);
-      this.st.load(1);
-    })
-  }
-
-  update() {
-    if (this.record?.billType === '1') {
-      window.open(location.origin + `/#/order-management/vehicle-detailChange/${this.record?.id}`)
-
-    } else if (this.record.billType === '2') {
-      window.open(location.origin + `/#/order-management/bulk-detailChange/${this.record?.id}`);
-    }
-  }
-  close(): void {
-    this.modalRef.destroy();
-  }
-
-
-}

src/app/routes/tax-management/services/tax-management.service.ts

@@ -56,6 +56,7 @@ export class TaxManagementService extends ShipperBaseService {
   $api_async_export_order_reporting_list = ``; // 导出订单上报
   $api_get_upload_setting = ``; // 修改上传设置
   $api_upload_setting_save = ``; // 修改上传设置
+  $api_getInvoiceReport_page = '/api/sdc/invoiceUploadInfo/list/page';
   constructor(public injector: Injector) {
     super(injector);
   }

src/app/routes/tax-management/taxmanagement.module.ts

@@ -14,8 +14,6 @@ import { TaxManagementIndividualCollectComponent } from './components/individual
 import { TaxManagementIndividualDeclareComponent } from './components/individual-declare/individual-declare.component';
 import { TaxManagementIndividualIncomeComponent } from './components/individual-income/individual-income.component';
 import { TaxManagementInvoiceReportingComponent } from './components/invoice-reporting/invoice-reporting.component';
-import { TaxManagementInvoiceUploadSettingComponent } from './components/invoice-reporting/upload-setting/upload-setting.component';
-import { TaxManagementInvoiceVerifyResultComponent } from './components/invoice-reporting/verify-result/verify-result.component';
 import { TaxManagementOrderReportingComponent } from './components/order-reporting/order-reporting.component';
 import { TaxManagementUploadSettingComponent } from './components/order-reporting/upload-setting/upload-setting.component';
 import { TaxManagementOrderVerifyResultComponent } from './components/order-reporting/verify-result/verify-result.component';
@@ -29,9 +27,7 @@ const COMPONENTS: Type<void>[] = [
   TaxManagementIndividualIncomeComponent,
   TaxManagementIndividualCollectComponent,
   TaxManagementIndividualDeclareComponent,
-  TaxManagementInvoiceReportingComponent,
+  TaxManagementInvoiceReportingComponent
-  TaxManagementInvoiceUploadSettingComponent,
-  TaxManagementInvoiceVerifyResultComponent
 ]
 
 

src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts

@@ -404,7 +404,7 @@ export class CancellationInvoiceComponent implements OnInit {
           },
           {
             text: '手工开票<br>',
-            iif: item => item.sts != '3',
+            iif: item => item.sts != '3' && item.sts != '4' ,
             click: item => this.requestedAction(item)
           }
           // {

src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html

@@ -108,7 +108,7 @@
         <ng-template st-row="vatmoney" let-item let-index="index">
           {{ item.billLTypeLabel }}: {{ item.vatmoney |currency }}
         </ng-template>
-      </st>vatmoney
+      </st>
     </nz-tab>
     <nz-tab nzTitle="发票明细">
       <st #invoiceST [data]="service.$api_get_invoice_details" [columns]="invoiceColumns" size="small" bordered="true"

src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts

@@ -185,7 +185,7 @@ export class InvoiceDetailComponent implements OnInit {
   private initOrderST(): STColumn[] {
     return [
       { title: '订单号', index: 'billHCode', width: 180 },
-      { title: '订单完成日期', index: 'billTime', type: 'date', width: 150 },
+      { title: '订单完成日期', index: 'billfinTime', type: 'date', width: 150 },
       { title: '所属项目', index: 'projectIdName', width: 180 },
       { title: '订单类型', index: 'billTypeLabel', width: 120 },
       { title: '装货地', index: 'loadingfrom', width: 200 },

src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts

@@ -298,7 +298,7 @@ export class InvoiceRequestedDetailComponent implements OnInit {
     return [
       { title: '', index: 'key', type: 'checkbox' },
       { title: '订单号', render: 'billHCode', width: 170 },
-      { title: '订单完成日期', index: 'billTime', type: 'date', width: 150 },
+      { title: '订单完成日期', index: 'billfinTime', type: 'date', width: 150 },
       { title: '开票状态', index: 'vatappStsLabel', width: 100 },
       { title: '所属项目', index: 'projectIdName', width: 140 },
       { title: '订单类型', index: 'billType', width: 100, type: 'enum', enum: { 1: '整车', 2: '大宗' } },

src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-12-23 16:50:17
- * @LastEditTime : 2022-01-26 10:36:10
+ * @LastEditTime : 2022-04-21 13:57:43
  * @LastEditors  : Shiming
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\ticket-management\\components\\invoice-requested\\requested-invoice-modal\\requested-invoice-modal.component.ts
@@ -86,7 +86,7 @@ export class RequestedInvoiceModalComponent {
     return [
       { title: '', index: 'key', type: 'checkbox' },
       { title: '订单号', index: 'billHCode', width: 150 },
-      { title: '订单完成日期', index: 'billTime', type: 'date', width: 150 },
+      { title: '订单完成日期', index: 'billfinTime', type: 'date', width: 150 },
       { title: '所属项目', index: 'projectIdName', width: 250 },
       { title: '订单类型', index: 'billTypeName', width: 90 },
       { title: '装货地', index: 'loadingfrom', width: 250 },

src/app/routes/usercenter/components/freight/freight-config/freight-config.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-02-17 20:24:17
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-24 17:04:41
+ * @LastEditTime : 2022-04-21 15:28:21
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\usercenter\\components\\freight\\freight-config\\freight-config.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -24,10 +24,10 @@
       <button nz-button nzType="primary" [disabled]="false" acl (click)="exportList()"
         [acl-ability]="['USERCENTER-FREIGHT-LIST-export']">导出</button>
       <button nz-button [disabled]="false" (click)="resetSF()">重置</button>
-      <button nz-button nzType="link" (click)="expandToggle()">
+      <!-- <button nz-button nzType="link" (click)="expandToggle()">
         {{ !_$expand ? '展开' : '收起' }}
         <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
-      </button>
+      </button> -->
     </div>
   </div>
 </nz-card>

src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts

@@ -228,25 +228,6 @@ export class FreightConfigComponent implements OnInit {
             asyncData: () => this.shipperservice.getNetworkFreightForwarder()
           }
         },
-        goodsSurchargeRatio: {
-          title: '货源单费率',
-          type: 'string',
-          ui: {
-            placeholder: '请输入',
-            showRequired: false
-          }
-        },
-        contractSurchargeRatio: {
-          title: '合同单费率',
-          type: 'string',
-          ui: {
-            placeholder: '请输入',
-            showRequired: false,
-            visibleIf: {
-              _$expand: (value: boolean) => value
-            }
-          }
-        },
         createTime: {
           title: '注册时间',
           type: 'string',
@@ -255,9 +236,6 @@ export class FreightConfigComponent implements OnInit {
             format: 'yyyy-MM-dd',
             placeholder: '请选择',
             nzShowTime: true,
-            visibleIf: {
-              _$expand: (value: boolean) => value
-            }
           } as SFDateWidgetSchema
         }
       }

src/app/routes/usercenter/components/freight/list/detail/detail.component.html

@@ -153,7 +153,7 @@
       </ng-template>
     </sv>
     <sv label="统一社会信用代码">
-      <ng-container *ngIf="detailData?.approvalStatus===10; else unifiedSocialCreditCodeelseTemplate">
+      <ng-container *ngIf="isEdit; else unifiedSocialCreditCodeelseTemplate">
         <input nz-input type="text" [(ngModel)]="detailData.unifiedSocialCreditCode" [readonly]="!isEdit"
           [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
       </ng-container>

src/app/routes/usercenter/components/freight/user/user.component.ts

@@ -197,6 +197,8 @@ export class FreightComponentsUserComponent implements OnInit {
 
   private initST(): STColumn[] {
     return [
+      { title: '企业名称', className: 'text-center', index: 'enterpriseName' },
+      { title: '项目名称', className: 'text-center', index: 'projectName' },
       { title: '用户姓名', className: 'text-center', index: 'name' },
       { title: '手机号', className: 'text-center', index: 'telephone' },
       { title: '身份证件号', className: 'text-center', index: 'certificateNumber' },

src/app/routes/usercenter/services/usercenter.service.ts

@@ -48,7 +48,7 @@ export class UsermanageService extends ShipperBaseService {
   $api_update_enter_newowork_batch = '/api/mdc/cuc/enterpriseInfo/operate/updatnNetworkTransporter';
 
   // 货主员工列表(运营后台)
-  $api_get_user_list = '/api/mdc/cuc/userApp/getShipperUserList';
+  $api_get_user_list = '/api/mdc/cuc/userApp/getShipperUserInfoList';
   // 冻结或恢复员工
   $api_lock_staff = '/api/mdc/cuc/userApp/freezeOrResumeStaff';
   // 冻结或恢复应用用户

src/app/routes/vehicle/components/audit/audit.component.html

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-11-29 15:22:34
- * @LastEditTime : 2022-01-26 16:15:02
+ * @LastEditTime : 2022-04-20 17:06:02
  * @LastEditors  : Shiming
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\vehicle\\components\\audit\\audit.component.html
@@ -53,7 +53,7 @@
     [res]="{ reName: { list: 'data.records', total: 'data.total' }, process: dataProcess }"
     [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [loading]="false">
     <ng-template st-row="carLength" let-item let-index="index">
-      <div>{{item?.carModelLabel}}-{{item?.carLengthLabel? item?.carLengthLabel + '米' : ''}}-{{ item?.carLoad?
+      <div>{{item?.carModel}}-{{item?.carLengthLabel? item?.carLengthLabel + '米' : ''}}-{{ item?.carLoad?
         item?.carLoad + '吨' : ''}}</div>
     </ng-template>
     <ng-template st-row="isSelf" let-item let-index="index">

src/app/routes/vehicle/components/audit/detail/detail.component.html

@@ -53,10 +53,12 @@
       </nz-select>
     </sv>
     <sv label="车型">
-      <nz-select [(ngModel)]="detailData.carModel" [nzPlaceHolder]="isEdit?'':'-'" [nzBorderless]="!isEdit"
+      <!-- <nz-select [(ngModel)]="detailData.carModel" [nzPlaceHolder]="isEdit?'':'-'" [nzBorderless]="!isEdit"
         [nzShowArrow]="isEdit" [nzDisabled]="!isEdit">
         <nz-option *ngFor="let i of contencarModel" [nzLabel]="i.label" [nzValue]="i.value"></nz-option>
-      </nz-select>
+      </nz-select> -->
+      <input nz-input type="text" [(ngModel)]="detailData.carModel" [readonly]="!isEdit"
+      [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
     </sv>
     <sv label="车长">
       <nz-select [(ngModel)]="detailData.carLength" [nzPlaceHolder]="isEdit?'':'-'" [nzBorderless]="!isEdit"

src/app/routes/vehicle/components/audit/detail/detail.component.ts

@@ -79,7 +79,6 @@ export class VehicleComponentsAuditDetailComponent implements OnInit, OnDestroy
           {
             text: '上传协议',
             click: _record => this.updateEvaluate(_record),
-            iif: item => item.auditStatusEnum == -1
           }
         ]
       }

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 11:10:14
- * @LastEditTime : 2022-03-28 11:15:15
+ * @LastEditTime : 2022-04-21 17:09:45
  * @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\\vehicle.component.html
@@ -29,7 +29,7 @@
       <div nz-col [nzSpan]="_$expand ? 24 : 18">
         <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
       </div>
-      <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.expend-options]="_$expand" class="text-right">
+      <div nz-col [nzSpan]="_$expand ? 24 : 6" class="text-right">
         <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="search()"  acl  [acl-ability]="['WAYBILL-VEHICLE-search']">查询</button>
         <button nz-button nzType="primary" [disabled]="false"  acl  [acl-ability]="['WAYBILL-VEHICLE-export']" (click)="exprot()">导出</button>
         <button nz-button [disabled]="false" (click)="resetSF()">重置</button>

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

@@ -1,8 +1,16 @@
-:host ::ng-deep{
+
-    p{
+    :host ::ng-deep{
-        margin-bottom: 0
+        ::ng-deep nz-range-picker{
-    }
+            width: 100%;
-    ::ng-deep nz-range-picker{
+        }
-        width: 100%;
+        p{
-    }
+           margin-bottom: 0
-}
+       }
+        .left_btn {
+             width: 50px;
+            height: 32px; 
+             padding-left: 8px;
+             line-height:32px; 
+             background-color: #d7d7d7;
+        }
+    }

src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html

@@ -109,6 +109,40 @@
                                             *ngFor="let re of item.remark"></nz-option>
                                     </nz-select>
                                 </ng-container>
+                                <!-- 图片上传 -->
+                                <ng-container *ngSwitchCase="12">
+                                    <div>
+                                        <nz-upload class="avatar-uploader" [nzAction]="service.$api_upload_url"
+                                            [nzName]="'multipartFile'" nzName="avatar" nzListType="picture-card"
+                                            [nzShowUploadList]="false" (nzChange)="uploadChange($event,item)">
+                                            <ng-container *ngIf="!item.itemValue">
+                                                <i class="upload-icon" nz-icon
+                                                    [nzType]="service.http.loading ? 'loading' : 'plus'"></i>
+                                                <div class="ant-upload-text">上传</div>
+                                            </ng-container>
+                                            <div style="width: 102px;height: 102px;display: flex;align-items: center;justify-content: center;"
+                                                *ngIf="item.itemValue" (click)="$event.cancelBubble = true">
+                                                <img nz-image [nzSrc]="item.itemValue"
+                                                    style="max-width: 102px;max-height: 102px;" />
+                                            </div>
+                                        </nz-upload>
+                                        <p>支持
+                                            <ng-container *ngFor="let item of item.remark?.format">
+                                                {{item}},
+                                            </ng-container>
+                                            格式，文件小于{{item.remark?.size || 2}}M（建议尺寸
+                                            {{item.remark?.width || 750}}px * {{item.remark?.height|| 1622}}px）。
+                                            <a *ngIf="item.remark?.caseImage"
+                                                (click)="showImg(item.remark?.caseImage)">查看示例</a>
+                                        </p>
+                                    </div>
+                                </ng-container>
+                                <!-- 文本域 -->
+                                <ng-container *ngSwitchCase="13">
+                                    <textarea rows="4" nz-input [(ngModel)]="item.itemValue" style="width: 400px;"
+                                        [maxlength]="item.remark?.maxLength"
+                                        [placeholder]="item.remark?.placeholder || ''"></textarea>
+                                </ng-container>
                                 <!-- 开关选项 -->
                                 <ng-container *ngSwitchCase="999">
                                     <ng-content select="custom-element"></ng-content>

src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts

@@ -10,6 +10,9 @@
  */
 import { Component, OnInit, EventEmitter, Input, Output } from '@angular/core';
 import { BaseService } from '@shared';
+import { NzImageService } from 'ng-zorro-antd/image';
+import { NzUploadFile } from 'ng-zorro-antd/upload';
+import { of } from 'rxjs';
 
 const JSONTYPE = new Set([5, 6, 9, 999]);
 @Component({
@@ -37,7 +40,7 @@ export class DynamicSettingH5Component implements OnInit {
   @Input()
   itemValue = 'itemValue';
   listUrls: any;
-  constructor(public service: BaseService) {}
+  constructor(public service: BaseService, private nzImageService: NzImageService) {}
 
   ngOnInit() {}
 
@@ -84,5 +87,17 @@ export class DynamicSettingH5Component implements OnInit {
     });
     this.saveEvent.emit(params);
   }
+
+  uploadChange(info: { file: NzUploadFile; type?: string }, item: any): void {
+    switch (info.type) {
+      case 'success':
+        item.itemValue = info.file.response.data.fullFilePath;
+        break;
+    }
+  }
+
+  showImg(url: any) {
+    this.nzImageService.preview([{ src: url }]);
+  }
 }
 // [0]?.response?.data.fullFilePath

src/app/shared/services/business/shipper-base.service.ts

@@ -343,14 +343,14 @@ export class ShipperBaseService extends BaseService {
    * @returns
    */
   getChannel(params = {}, containerAll = false) {
-    return this.request(this.$api_get_channel, params, 'POST').pipe(
+    return this.request(this.$api_get_channel, params).pipe(
       map(res => {
         if (res) {
           const obj = [];
           if (containerAll) {
             obj.push({ label: '全部', value: '' });
           }
-          return [...obj, ...res.map((m: any) => ({ label: `${m.employeeVO?.empName}/${m.employeeVO?.mobile}`, value: m.id }))];
+          return [...obj, ...res.map((m: any) => ({ label: `${m.name}/${m.telephone}`, value: m.id }))];
         } else {
           return [];
         }