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

src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html

@@ -42,6 +42,9 @@
     <ng-template st-row="amount" let-item let-index="index">
       <div class="text-right">{{item?.amount | currency :' '}}</div>
     </ng-template>
+    <ng-template st-row="total" let-item let-index="index">
+      <div class="text-right">{{item?.amount | currency :' '}}</div>
+    </ng-template>
   </st>
 </nz-card>
 <ng-template #extraTemplate>
@@ -52,6 +55,5 @@
     </div>
     <button nz-button nzType="primary" (click)="upload()">上传</button>
     <button nz-button nzType="primary" (click)="recall()">撤回</button>
-    <button nz-button nzType="primary" (click)="uploadSetting()">上传设置</button>
   </div>
 </ng-template>

src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts

@@ -102,26 +102,12 @@ export class DatatableFundReportingComponent implements OnInit {
             placeholder: '请输入',
           },
         },
-        enterpriseInfoId: {
+        resourceCode1: {
-          title: '网络货运人',
-          type: 'string',
-          ui: {
-            placeholder: '请选择',
-            widget: 'select',
-            asyncData: () => this.shipperSrv.getNetworkFreightForwarder({}, false),
-
-            allowClear: true
-          }
-        },
-        externalResourceCode: {
-          title: '货主',
           type: 'string',
+          title: '流水单号',
           ui: {
             placeholder: '请输入',
-            visibleIf: {
+          },
-              _$expand: (value: boolean) => value,
-            },
-          }
         },
         driverName: {
           title: '承运司机',
@@ -143,6 +129,17 @@ export class DatatableFundReportingComponent implements OnInit {
             },
           }
         },
+        carNo1: {
+          title: '车队长',
+          type: 'string',
+          maxLength: 9,
+          ui: {
+            placeholder: '请输入',
+            visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
+          }
+        },
         serviceType: {
           title: '上传状态',
           type: 'string',
@@ -169,6 +166,41 @@ export class DatatableFundReportingComponent implements OnInit {
             },
           }
         },
+        enterpriseInfoId: {
+          title: '网络货运人',
+          type: 'string',
+          ui: {
+            placeholder: '请选择',
+            widget: 'select',
+            asyncData: () => this.shipperSrv.getNetworkFreightForwarder({}, false),
+
+            allowClear: true
+          }
+        },
+        externalResourceCode: {
+          title: '货主',
+          type: 'string',
+          ui: {
+            placeholder: '请输入',
+            visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
+          }
+        },
+
+
+        createTime1: {
+          title: '交易时间',
+          type: 'string',
+          ui: {
+            widget: 'sl-from-to',
+            type: 'date',
+            format: 'yyyy-MM-dd',
+            visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
+          } as SFDateWidgetSchema,
+        },
         createTime: {
           title: '上传时间',
           type: 'string',
@@ -181,75 +213,6 @@ export class DatatableFundReportingComponent implements OnInit {
             },
           } as SFDateWidgetSchema,
         },
-        createTime1: {
-          title: '运单生成时间',
-          type: 'string',
-          ui: {
-            widget: 'sl-from-to',
-            type: 'date',
-            format: 'yyyy-MM-dd',
-            visibleIf: {
-              _$expand: (value: boolean) => value,
-            },
-          } as SFDateWidgetSchema,
-        },
-        createTime2: {
-          title: '发货时间',
-          type: 'string',
-          ui: {
-            widget: 'sl-from-to',
-            type: 'date',
-            format: 'yyyy-MM-dd',
-            visibleIf: {
-              _$expand: (value: boolean) => value,
-            },
-          } as SFDateWidgetSchema,
-        },
-        createTime3: {
-          title: '收货时间',
-          type: 'string',
-          ui: {
-            widget: 'sl-from-to',
-            type: 'date',
-            format: 'yyyy-MM-dd',
-            visibleIf: {
-              _$expand: (value: boolean) => value,
-            },
-          } as SFDateWidgetSchema,
-        },
-
-        loadingPlace: {
-          title: '车辆轨迹',
-          type: 'string',
-          enum: [
-            { label: '全部', value: '' },
-            { label: '有', value: '1' },
-            { label: '无', value: '0' }
-          ],
-          ui: {
-            placeholder: '请选择',
-            widget: 'select',
-            visibleIf: {
-              _$expand: (value: boolean) => value,
-            },
-          }
-        },
-        loadingPlace1: {
-          title: '司机轨迹',
-          type: 'string',
-          enum: [
-            { label: '全部', value: '' },
-            { label: '有', value: '1' },
-            { label: '无', value: '0' }
-          ],
-          ui: {
-            placeholder: '请选择',
-            widget: 'select',
-            visibleIf: {
-              _$expand: (value: boolean) => value,
-            },
-          }
-        },
       },
     };
     this.ui = {
@@ -264,10 +227,9 @@ export class DatatableFundReportingComponent implements OnInit {
   initST() {
     this.columns = [
       { title: '', type: 'checkbox', className: 'text-center', width: '60px', },
-      { title: '订单状态', render: 'orderStatus', className: 'text-center', width: '120px', },
+      { title: '上传状态', render: 'orderStatus', className: 'text-center', width: '120px', },
-      { title: '司机状态', render: 'driverStatus', className: 'text-center', width: '120px', },
-      { title: '车辆状态', render: 'carStatus', className: 'text-center', width: '120px', },
       { title: '本地校验', render: 'localValid', className: 'text-center', width: '120px', },
+      { title: '流水单号', render: 'freightDetails', className: 'text-center', width: '150px', },
       {
         title: '订单号',
         render: 'billComplianceVOS',
@@ -282,28 +244,19 @@ export class DatatableFundReportingComponent implements OnInit {
         className: 'text-center',
         width: '180px',
       },
-      { title: '统一社会信用代码', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
+      { title: '实际承运人名称', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
-      { title: '业务类型', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '120px' },
+      { title: '实际承运人证件号码', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '120px' },
-      { title: '运单生成时间', render: 'goodsInfoVOList', className: 'text-center', width: '180px' },
+      { title: '车牌号', render: 'goodsInfoVOList', className: 'text-center', width: '180px' },
-      { title: '发货时间', render: 'driver', className: 'text-center', width: '180px' },
+      { title: '车牌颜色', render: 'driver', className: 'text-center', width: '180px' },
-      { title: '收货时间', render: 'payeeName', className: 'text-center', width: '180px' },
+      { title: '总金额', render: 'amount', className: 'text-center', width: '250px' },
-      { title: '托运人名称', render: 'transportInfo', className: 'text-center', width: '250px' },
+
-      { title: '托运人统一社会信用代码', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
+      { title: '付款方式', render: 'payeeName', className: 'text-center', width: '180px' },
-      { title: '装货地址', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '200px' },
+      { title: '车队长', render: 'transportInfo', className: 'text-center', width: '250px' },
-      { title: '收货方名称', render: 'driver', className: 'text-center', width: '150px' },
+      { title: '收款账户', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
-      { title: '收货地址', render: 'payeeName', className: 'text-center', width: '150px' },
+      { title: '收款银行', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '200px' },
-      { title: '运费金额', render: 'amount', className: 'text-center', width: '250px' },
+      { title: '银行流水号', render: 'driver', className: 'text-center', width: '150px' },
-      { title: '车牌号', render: 'payeeName', className: 'text-center', width: '150px' },
+      { title: '实际支付金额', render: 'total', className: 'text-center', width: '150px' },
-      { title: '车牌颜色', render: 'transportInfo', className: 'text-center', width: '250px' },
+      { title: '交易时间', render: 'payeeName', className: 'text-center', width: '150px' },
-      { title: '司机姓名', render: 'payeeName', className: 'text-center', width: '150px' },
-      { title: '司机手机号码', render: 'transportInfo', className: 'text-center', width: '200px' },
-      { title: '司机身份证号', render: 'payeeName', className: 'text-center', width: '150px' },
-      { title: '货物信息', render: 'transportInfo', className: 'text-center', width: '180px' },
-      { title: '实际承运人名称', render: 'payeeName', className: 'text-center', width: '150px' },
-      { title: '实际承运人证件号码', render: 'transportInfo', className: 'text-center', width: '200px' },
-      { title: '实际承运人道路运输许可证号', render: 'payeeName', className: 'text-center', width: '150px' },
-      { title: '车辆轨迹', render: 'transportInfo', className: 'text-center', width: '250px' },
-      { title: '司机轨迹', render: 'payeeName', className: 'text-center', width: '150px' },
       { title: '上传次数', render: 'transportInfo', className: 'text-center', width: '150px' },
       { title: '上传时间', render: 'transportInfo', className: 'text-center', width: '180px' },
     ];
@@ -320,12 +273,21 @@ export class DatatableFundReportingComponent implements OnInit {
       this.openWainingModal('请选择需要撤回的数据');
       return;
     }
-
+    this.modal.confirm({
-    this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => {
+      nzTitle: '撤回提示',
-      if (res) {
+      nzContent: ' 撤回后可以重新上传，重新上传会覆盖已上传数据，确定要撤回？',
-        this.search();
+      nzOkText: '确定',
+      nzCancelText: '取消',
+      nzOnOk: () => {
+        this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => {
+          if (res) {
+            this.service.msgSrv.success('撤销成功');
+            this.search();
+          }
+        })
       }
-    })
+    });
+
 
   }
 
@@ -375,6 +337,12 @@ export class DatatableFundReportingComponent implements OnInit {
       this.openWainingModal('请选择需要上传的数据');
       return;
     }
+    this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => {
+      if (res) {
+        this.service.msgSrv.success('上传成功');
+        this.search();
+      }
+    })
   }
 
 

src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts

@@ -320,12 +320,20 @@ export class DatatableOrderReportingComponent implements OnInit {
       this.openWainingModal('请选择需要撤回的数据');
       return;
     }
-
+    this.modal.confirm({
-    this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => {
+      nzTitle: '撤回提示',
-      if (res) {
+      nzContent: ' 撤回后可以重新上传，重新上传会覆盖已上传数据，确定要撤回？',
-        this.search();
+      nzOkText: '确定',
+      nzCancelText: '取消',
+      nzOnOk: () => {
+        this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => {
+          if (res) {
+            this.service.msgSrv.success('撤销成功');
+            this.search();
+          }
+        })
       }
-    })
+    });
 
   }
 
@@ -375,6 +383,12 @@ export class DatatableOrderReportingComponent implements OnInit {
       this.openWainingModal('请选择需要上传的数据');
       return;
     }
+    this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => {
+      if (res) {
+        this.service.msgSrv.success('上传成功');
+        this.search();
+      }
+    })
   }