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

proxy.conf.js

@@ -20,7 +20,7 @@ module.exports = {
   // }
   '//api': {
     target: {
-      host: 'tms-api-dev.eascs.com',
+      host: 'tms-api-test.eascs.com',
       protocol: 'https:',
       port: 443
     },

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

@@ -165,7 +165,9 @@ export class DriverAccountDetailComponent implements OnInit {
       { title: '交易时间', index: 'createTime', type: 'date' },
       { title: '流水号', index: 'channelPaySn' },
       { title: '交易类型', index: 'tradeTypeLabel', className: 'text-center' },
-      { title: '关联单号', index: 'businessNumber' },
+      { title: '交易单号', index: 'businessNumber' },
+      { title: '订单号', index: 'orderSn' },
+      { title: '运单号', index: 'transportSn' },
       { title: '收支类型', index: 'incomeTypeLabel', className: 'text-center' },
       {
         title: '交易金额',
@@ -182,7 +184,10 @@ export class DriverAccountDetailComponent implements OnInit {
         type: 'widget',
         className: 'text-right',
         widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.accountBalance }) }
-      }
+      },
+      { title: '付款方', index: 'payName'},
+      { title: '收款方', index: 'payeeName' },
+      { title: '备注', index: 'tradeContent' },
     ];
   }
 }

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

@@ -164,7 +164,7 @@ export class DriverAccountComponent implements OnInit {
       { title: '司机姓名', width: 140, index: 'name' },
       { title: '证件号码', width: 140, index: 'idNo' },
       { title: '手机号', width: 140, index: 'phone' },
-      { title: '网络货运人', width: 140, index: 'ltdName' },
+      { title: '网络货运人', width: 180, index: 'ltdName' },
       { title: '银行类型', width: 120, index: 'bankTypeLabel' },
       { title: '虚拟账户', width: 140, index: 'virtualAccount' },
       {
@@ -186,13 +186,14 @@ export class DriverAccountComponent implements OnInit {
       {
         title: '本月累计提现金额',
         index: 'withdrawBalance',
-        width: 150,
+        width: 160,
         type: 'widget',
         className: 'text-right',
         widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.withdrawBalance }) }
       },
       { title: '账户总余额', render: 'availableBalance', className: 'text-right', width: 180 },
       { title: '创建时间', index: 'createTime', type: 'date', width: 150 },
+      { title: '状态', index: 'stateDeletedLabel', width: 120 },
       {
         title: '操作',
         width: 120,

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

@@ -190,7 +190,8 @@ export class RechargeRecordComponent implements OnInit {
                 rmYll: item.roleId,
                 snglFlgCd: item.paySerialNumber2,
                 bussType: '06',
-                ltdId: item.ltdId
+                ltdId: item.ltdId,
+                accountType: item.accountType
               })
           }
         ]

src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts

@@ -253,7 +253,8 @@ export class TransactionFlowComponent {
                 rmYll: item.roleId,
                 snglFlgCd: item.channelPaySn,
                 bussType: item.tradeType === '7' ? '05' : item.tradeType === '8' ? '06' : '07',
-                ltdId: item.ltdId
+                ltdId: item.ltdId,
+                accountType: item.accountType
               })
           }
         ]

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

@@ -99,7 +99,8 @@ export class WithdrawalsDetailComponent implements OnInit {
       rmYll: this.formData.userId,
       snglFlgCd: this.formData.coreSerNo,
       bussType: '06',
-      ltdId: this.formData.ltdId
+      ltdId: this.formData.ltdId,
+      accountType: this.formData.accountType
     });
   }
 

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

@@ -297,7 +297,8 @@ export class WithdrawalsRecordComponent {
                 rmYll: item.userId,
                 snglFlgCd: item.coreSerNo,
                 bussType: '06',
-                ltdId: item.ltdId
+                ltdId: item.ltdId,
+                accountType: item.accountType
               })
           }
         ]

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

@@ -2,7 +2,6 @@ import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { FreightAccountService } from 'src/app/routes/financial-management/services/freight-account.service';
 
-
 @Component({
   selector: 'app-partner-account-management-withdrawals-detail',
   templateUrl: './withdrawals-detail.component.html',
@@ -18,7 +17,7 @@ export class PartnerAccountManagementWithdralDetailComponent implements OnInit {
     this.loadRefundDetail(id);
   }
 
-  ngOnInit(): void { }
+  ngOnInit(): void {}
 
   loadRefundDetail(id: string) {
     this.service.request(this.service.$api_get_refund_detail, { id }).subscribe(res => {
@@ -77,7 +76,8 @@ export class PartnerAccountManagementWithdralDetailComponent implements OnInit {
       rmYll: this.formData.userId,
       snglFlgCd: this.formData.coreSerNo,
       bussType: '06',
-      ltdId: this.formData.ltdId
+      ltdId: this.formData.ltdId,
+      accountType: this.formData.accountType
     });
   }
 

src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts

@@ -311,7 +311,8 @@ export class PartnerAccountManagementWithdrawalsRecordComponent implements OnIni
                 rmYll: item.userId,
                 snglFlgCd: item.coreSerNo,
                 bussType: '06',
-                ltdId: item.ltdId
+                ltdId: item.ltdId,
+                accountType: item.accountType
               })
           },
           {

src/app/routes/partner/channel-sales/components/edit/edit.component.html

@@ -1,4 +1,4 @@
-<sf #sf [ui]="ui" [schema]="schema" [button]="'none'" [formData]="i">
+<sf #sf [ui]="ui" [schema]="schema" [button]="'none'" [formData]="record">
 </sf>
 
 <div *nzModalFooter>

src/app/routes/partner/channel-sales/components/edit/edit.component.ts

@@ -17,7 +17,8 @@ export class ParterChannelSalesEditComponent implements OnInit {
   ui!: SFUISchema;
   i: any;
   type: any;
-
+  record:any;
+  currentOAItem:any;
   constructor(
     public http: _HttpClient,
     private cdr: ChangeDetectorRef,
@@ -28,7 +29,14 @@ export class ParterChannelSalesEditComponent implements OnInit {
   ) {}
 
   ngOnInit(): void {
+    
+    this.service.request(this.service.$api_getChannelSalesInfo, {id:this.i?.id}).subscribe(res => {
+      if(res){
+        this.record = res;
+      }
       this.initSF();
+    });
+    
   }
   initSF() {
     this.schema = {
@@ -62,10 +70,14 @@ export class ParterChannelSalesEditComponent implements OnInit {
             placeholder:'请选择',
             asyncData: (input:string) => this.service.request(this.service.$api_fuzzyQuery,{name:input}).pipe(
               map((res: any) => {
-                console.log('111',res)
+                return res.map((item:any)=>{
-                return [];
+                  return {label: item.empName+"/"+item.empNo, value: item.empNo, obj: item}
                 })
-            )
+              })
+            ),
+            change:(item:any, org:any)=>{
+              this.currentOAItem = org.obj;
+            }
           } as SFAutoCompleteWidgetSchema,
         },
         isAuthorization: {
@@ -89,7 +101,6 @@ export class ParterChannelSalesEditComponent implements OnInit {
             mode: 'multiple',
             maxMultipleCount: 5,
             asyncData: () => {
-        
               return this.service.request(this.service.$api_getAppRoleList).pipe(
                 map((res: any) => {
                   return res
@@ -134,7 +145,7 @@ export class ParterChannelSalesEditComponent implements OnInit {
   save() {
     this.sf.validator({ emitError: true });
     if(!this.sf.valid) return;
-    this.service.request(this.service.$api_save, { ...this.sf.value }).subscribe(res => {
+    this.service.request(this.service.$api_save, { ...this.sf.value, employeeVO: this.currentOAItem}).subscribe(res => {
       if (res) {
         this.modalRef.destroy(true);
       } else {

src/app/routes/partner/channel-sales/components/list/list.component.ts

@@ -98,10 +98,6 @@ export class ParterChannelSalesListComponent implements OnInit {
             text: '编辑',
             click: (_record, _modal, _instance) => this.edit(_record),
           },
-          {
-            text: '查看',
-            click: (_record, _modal, _instance) => this.view(_record),
-          },
           {
             text: '冻结',
             click: (_record, _modal, _instance) => this.stop(_record.id),
@@ -116,7 +112,6 @@ export class ParterChannelSalesListComponent implements OnInit {
       nzWidth:600,
       nzTitle: '新增',
       nzContent: ParterChannelSalesEditComponent,
-      nzComponentParams: { type: this.spuStatus }
     });
     modalRef.afterClose.subscribe(res => {
       if (res) {
@@ -131,7 +126,7 @@ export class ParterChannelSalesListComponent implements OnInit {
       nzWidth:600,
       nzTitle: '编辑',
       nzContent: ParterChannelSalesEditComponent,
-      nzComponentParams: { i: record, type: this.spuStatus }
+      nzComponentParams: { i: record }
     });
     modalRef.afterClose.subscribe(res => {
       if (res) {
@@ -140,14 +135,7 @@ export class ParterChannelSalesListComponent implements OnInit {
     });
   }
 
-   // 编辑
+   
-   view(record: STData) {
-    const modalRef = this.modalService.create({
-      nzTitle: '查看',
-      nzContent: ParterChannelSalesEditComponent,
-      nzComponentParams: { i: record }
-    });
-  }
 
   stop(id: any) {
     this.modalService.confirm({

src/app/routes/partner/channel-sales/services/channel-sales.service.ts

@@ -15,6 +15,10 @@ export class ChannelSalesService extends BaseService {
   $api_fuzzyQuery = '/api/mdc/channelSalesManagement/fuzzyQuery';
   // 获取角色列表
   $api_getAppRoleList = '/api/mdc/cuc/roleInfo/getRoleList';
+  // 获取渠道销售管理详情
+  $api_listChannelSalesManagement = '/api/mdc/channelSalesManagement/list/listChannelSalesManagement';
+  // 根据渠道销售id获取渠道信息
+  $api_getChannelSalesInfo = '/api/mdc/channelSalesManagement/getChannelSalesInfo';
   
 
   constructor(public injector: Injector) {

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

@@ -205,6 +205,10 @@ export class CancellationInvoiceComponent implements OnInit {
     });
   }
 
+  downLoadDetail(item: any) {
+    this.service.exportStart({ id: item.id }, this.service.$api_export_invoic_detail);
+  }
+
   /**
    * 推送发票
    * @param item
@@ -387,6 +391,11 @@ export class CancellationInvoiceComponent implements OnInit {
                 queryParams: { type: 1, expressno: item.expressno, ltdId: item.shipperId }
               })
           },
+          {
+            text: '销货清单<br>',
+            iif: item => item.isdetail,
+            click: item => this.downLoadDetail(item)
+          },
           {
             text: '手工开票<br>',
             iif: item => item.sts != '3',

src/app/routes/ticket-management/components/express-info/express-detail-modal/express-detail-modal.component.ts

@@ -34,11 +34,11 @@ export class ExpressDetailModalComponent implements OnInit {
     },
     {
       title: '金额',
-      index: 'vatnotax',
+      index: 'vatmoney',
       width: 90,
       type: 'widget',
       className: 'text-right',
-      widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vatnotax }) }
+      widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vatmoney }) }
     },
     {
       title: '税率',
@@ -53,7 +53,7 @@ export class ExpressDetailModalComponent implements OnInit {
       width: 90,
       type: 'widget',
       className: 'text-right',
-      widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vatnotax }) }
+      widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vattax }) }
     },
     { title: '开票日期', index: 'invoicedate', type: 'date', width: 150, className: 'text-center' }
   ];

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

@@ -46,6 +46,8 @@ export class TicketService extends ShipperBaseService {
   $api_batch_push_invoic = '/api/fcc/ficoVatinvH/crmPushInvoBath';
   // 发票作废
   $api_cancel_invoic = '/api/fcc/ficoVatinvH/inpinvHCancel';
+  // 运营端销票处理导出销售清单
+  $api_export_invoic_detail = '/api/fcc/ficoVatinvH/reportVatinvHByOperator';
 
   // 获取汇总下单路径
   $api_get_order_summary_path = '/api/fcc/ficoExpressH/getSummaryOrderAddress';
@@ -60,7 +62,7 @@ export class TicketService extends ShipperBaseService {
   $api_get_invoice_page = '/api/fcc/ficoVatinvH/list/page';
 
   // 更新快递信息
-  $api_update_Express= '/api/fcc/ficoVatinvH/updateExpress';
+  $api_update_Express = '/api/fcc/ficoVatinvH/updateExpress';
 
   // 发票作废
   $api_cancel_invoice = '/api/fcc/ficoVatinvH/inpinvHCancel';