diff --git a/proxy.conf.js b/proxy.conf.js index 822b7622..31995def 100644 --- a/proxy.conf.js +++ b/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 }, diff --git a/src/app/routes/ticket-management/services/ticket.service.ts b/src/app/routes/ticket-management/services/ticket.service.ts index 288b5286..14778143 100644 --- a/src/app/routes/ticket-management/services/ticket.service.ts +++ b/src/app/routes/ticket-management/services/ticket.service.ts @@ -33,7 +33,7 @@ export class TicketService extends ShipperBaseService { // 运营端订单明细开票处理 $api_apply_fico = '/api/fcc/ficoVatinvH/crmPushInvo'; // 运营端手工开票/确认/E税云开票成功后的回调 - $api_apply_fico_invoic = '/api/fcc/ficoVatinvH/ficoVatinvInvoicing'; + $api_apply_fico_invoic = '/api/fcc/ficoVatinvH/operateAffirmVatinv'; // 获取汇总下单路径 $api_get_order_summary_path = '/api/fcc/ficoExpressH/getSummaryOrderAddress'; diff --git a/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.html b/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.html index 6846b9e7..f6bd64aa 100644 --- a/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.html +++ b/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.html @@ -12,28 +12,14 @@
-
- +
+
-
- - +
+ + - + -
{{item?.monthFreightAmount | currency}}
+
{{item?.monthFreightAmount | currency}}
 -
{{item?.dayWithdrawalAmount | currency}}
+
{{item?.dayWithdrawalAmount | currency}}
 -
{{item?.monthWithdrawalAmount | currency}}
+
{{item?.monthWithdrawalAmount | currency}}
 -
{{item?.monthReceivableAmount | currency}}
+
{{item?.monthReceivableAmount | currency}}
 -
{{item?.isCaptain == 1 ? '车队长' : '司机'}}
+
{{item?.isCaptain == 1 ? '车队长' : '司机'}}
 - - - -
-
- - - -
-
- + \ No newline at end of file diff --git a/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts b/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts index c38311ea..67067671 100644 --- a/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts +++ b/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts @@ -1,8 +1,7 @@ import { Component, OnInit, ViewChild } from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; -import { STColumn, STColumnBadge, STComponent, STData } from '@delon/abc/st'; -import { SFComponent, SFSchema, SFUISchema } from '@delon/form'; -import { ModalHelper } from '@delon/theme'; +import { ActivatedRoute } from '@angular/router'; +import { STColumn, STComponent } from '@delon/abc/st'; +import { SFComponent, SFSchema } from '@delon/form'; import { DynamicSettingModalComponent } from '@shared'; import { NzModalService } from 'ng-zorro-antd/modal'; import { UsermanageService } from '../../../services/usercenter.service'; @@ -12,19 +11,12 @@ import { UsermanageService } from '../../../services/usercenter.service'; styleUrls: ['./driver-config.component.less'] }) export class UserCenterComponentsDriverConfigComponent implements OnInit { - _$expand = false; - - ui: SFUISchema = { '*': { spanLabelFixed: 120, grid: { lg: 8, md: 12, sm: 12, xs: 24 } } }; schema: SFSchema = this.initSF(); columns: STColumn[] = this.initST(); @ViewChild('st', { static: false }) st!: STComponent; @ViewChild('sf', { static: false }) sf!: SFComponent; - @ViewChild('promoterModal', { static: false }) - promoterModal!: any; - promotersTelephone = ''; - - constructor(public service: UsermanageService, private modal: NzModalService, private router: Router, private ar: ActivatedRoute, private modalHelper: ModalHelper,) {} + constructor(public service: UsermanageService, private modal: NzModalService) {} /** * 查询参数 @@ -33,56 +25,12 @@ export class UserCenterComponentsDriverConfigComponent implements OnInit { const params: any = { ...(this.sf && this.sf.value) }; - if (this.sf?.value.effectiveDate) { - params.effectiveDateStart = this.sf?.value.effectiveDate[0]; - params.effectiveDateEnd = this.sf?.value.effectiveDate[1]; - } delete params.effectiveDate; delete params.expand; return params; } - get selectedRows() { - return this.st?.list.filter(item => item.checked) || []; - } - - ngOnInit() { - this.ar.url.subscribe(params => { - this.st?.load(1); - }); - } - dataProcess(data: STData[]): STData[] { - return data.map((i, index) => { - i.showSortFlag = false; - return i; - }); - } - - addPromoter(item?: any) { - this.promotersTelephone = item?.promotersTelephone; - const modal = this.modal.create({ - nzTitle: '推广业务员', - nzContent: this.promoterModal, - nzOnOk: () => { - if (!!!this.promotersTelephone) { - return false; - } - if (typeof this.promotersTelephone === 'string' && !/(^1\d{10}$)/.test(this.promotersTelephone)) { - this.service.msgSrv.error('手机格式错误'); - return false; - } - this.service - .request(this.service.$api_add_user_salesman, { userId: item.userId, mobile: this.promotersTelephone }) - .subscribe(res => { - if (res) { - this.service.msgSrv.success(item?.promotersTelephone ? '添加推广员成功' : '修改推广员成功'); - } - this.st.load(); - }); - return; - } - }); - } + ngOnInit() {} settingAction(item?: any) { this.modal.create({ @@ -91,24 +39,18 @@ export class UserCenterComponentsDriverConfigComponent implements OnInit { nzWidth: 900, nzComponentParams: { extendType: '3', - businessId: item.id, + businessId: item.appUserId, configvalue: 'sys.config' }, nzFooter: null }); } - expandToggle() { - this._$expand = !this._$expand; - this.sf?.setValue('/expand', this._$expand); - } - /** * 重置表单 */ resetSF() { this.sf.reset(); - this._$expand = false; } exportList() { @@ -140,11 +82,11 @@ export class UserCenterComponentsDriverConfigComponent implements OnInit { enum: [ { label: '全部', value: '' }, { label: '车队长', value: 1 }, - { label: '司机', value: 0 }, + { label: '司机', value: 0 } ], default: '', ui: { - widget: 'select', + widget: 'select' } } } @@ -158,7 +100,7 @@ export class UserCenterComponentsDriverConfigComponent implements OnInit { { title: '手机号', className: 'text-center', index: 'mobile' }, { title: '类型', className: 'text-center', render: 'isCaptain' }, { title: '月承运金额上限（元）', className: 'text-center', render: 'monthFreightAmount' }, - { title: '日提现金额上限（元）', className: 'text-center', render: 'dayWithdrawalAmount', }, + { title: '日提现金额上限（元）', className: 'text-center', render: 'dayWithdrawalAmount' }, { title: '月提现金额上限（元）', className: 'text-center', render: 'monthWithdrawalAmount' }, { title: '月收款金额上限（元）', className: 'text-center', render: 'monthReceivableAmount' }, { diff --git a/src/app/routes/usercenter/components/driver/driver.component.ts b/src/app/routes/usercenter/components/driver/driver.component.ts index 20a3bcf2..cf5c6376 100644 --- a/src/app/routes/usercenter/components/driver/driver.component.ts +++ b/src/app/routes/usercenter/components/driver/driver.component.ts @@ -319,11 +319,11 @@ export class UserCenterComponentsDriverComponent implements OnInit { }, acl: { ability: ['USERCENTER-DRIVER-LIST-view'] }, }, - { - text: '基础设置', - click: item => this.settingAction(item), - acl: { ability: ['USERCENTER-DRIVER-LIST-basicSetting'] }, - }, + // { + // text: '基础设置', + // click: item => this.settingAction(item), + // acl: { ability: ['USERCENTER-DRIVER-LIST-basicSetting'] }, + // }, { text: '资金账户', click: item => this.showAccountDetail(item), diff --git a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html index 35f6b480..924dc24c 100644 --- a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html +++ b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html @@ -88,7 +88,7 @@ + [(nzFileList)]="item.itemValue" style="margin-left: 26px;">