Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Taric Xin
2022-04-21 13:48:08 +08:00
parent 06ccfaf642 528a1ae90b
commit ad115d20dc
20 changed files with 153 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
proxy.conf.js
View File

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

2
src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.html
View File

@ -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>

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

@ -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: '请输入'
}

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

@ -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 09:45:41
* @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>

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

@ -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',
placeholder: '请选择',
widget: 'dict-select',
params: { dictKey: 'trade:type' },
visibleIf: {
expand: (value: boolean) => value
}
},
default: ''
},
} as SFSelectWidgetSchema
},
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: {
title: '所属项目',
projectName: {
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 },

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

@ -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(),
visibleIf: {
expand: (value: boolean) => value
}
asyncData: () => this.service.getCloseAccount()
},
default: ''
},

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

@ -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"
[class.expend-options]="_$expand">
<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)">查询</button>
<button nz-button [disabled]="false" (click)="resetSF()">重置</button>
<!-- <button nz-button [disabled]="false"> 导出</button>

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

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

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

@ -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="网络货运人">

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

@ -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: '请选择',

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

@ -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 13:29:36
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\audit\\voucher-view\\voucher-view.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->

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

@ -29,7 +29,6 @@ import format from 'date-fns/format';
providers: [DatePipe]
})
export class orderManagementVoucherViewComponent implements OnInit {
record: any = {};
i: any;
loadPDF: string = '';
formData: any;
@ -45,7 +44,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
constructor(private modal: NzModalRef, private msgSrv: NzMessageService, public http: _HttpClient, public service: OrderManagementService, private datePipe: DatePipe, private envSrv: EAEnvironmentService,) { }
ngOnInit(): void {
// console.log(this.i)
console.log(this.i)
this.initData()
this.i.time = this.i.loadingTime;
this.initSF();
@ -72,8 +71,8 @@ export class orderManagementVoucherViewComponent implements OnInit {
data: {
appId: this.envSrv.env.appId,
content: [
`上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
`上传位置:${this.record?.loadingAddressArr[0]}`,
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.loadingAddressArr[0]}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
@ -117,8 +116,8 @@ export class orderManagementVoucherViewComponent implements OnInit {
data: {
appId: this.envSrv.env.appId,
content: [
`上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
`上传位置:${this.record?.loadingAddressArr[0]}`,
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.loadingAddressArr[0]}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
@ -170,8 +169,8 @@ export class orderManagementVoucherViewComponent implements OnInit {
data: {
appId: this.envSrv.env.appId,
content: [
`上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
`上传位置:${this.record?.unloadingAddressArr[0]}`,
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.unloadingAddressArr[0]}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
@ -215,8 +214,8 @@ export class orderManagementVoucherViewComponent implements OnInit {
data: {
appId: this.envSrv.env.appId,
content: [
`上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
`上传位置:${this.record?.unloadingAddressArr[0]}`,
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.unloadingAddressArr[0]}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
@ -274,8 +273,8 @@ export class orderManagementVoucherViewComponent implements OnInit {
data: {
appId: this.envSrv.env.appId,
content: [
`上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
`上传位置:${this.record?.loadingAddressArr[0]}`,
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.loadingAddressArr[0]}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
@ -320,8 +319,8 @@ export class orderManagementVoucherViewComponent implements OnInit {
data: {
appId: this.envSrv.env.appId,
content: [
`上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
`上传位置:${this.record?.loadingAddressArr[0]}`,
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.loadingAddressArr[0]}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
@ -382,8 +381,8 @@ export class orderManagementVoucherViewComponent implements OnInit {
data: {
appId: this.envSrv.env.appId,
content: [
`上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
`上传位置:${this.record?.unloadingAddressArr[0]}`,
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.unloadingAddressArr[0]}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
@ -428,8 +427,8 @@ export class orderManagementVoucherViewComponent implements OnInit {
data: {
appId: this.envSrv.env.appId,
content: [
`上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
`上传位置:${this.record?.unloadingAddressArr[0]}`,
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.unloadingAddressArr[0]}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
@ -560,7 +559,13 @@ export class orderManagementVoucherViewComponent implements OnInit {
this.modal.destroy(true);
}
openlaod(value: any) {
if (value === 1) {
if(this.datas?.esignFlowStatus == '1') {
this.service.request(this.service.$api_getBillTakeEsignFile, [this.datas?.id]).subscribe((res) => {
console.log(res);
})
}
const a = document.createElement('a');
a.href = this.datas?.loadingElectronicsLadingBillFilePath;
document.body.appendChild(a);
@ -568,6 +573,11 @@ export class orderManagementVoucherViewComponent implements OnInit {
a.click(); //点击下载
document.body.removeChild(a); //下载完成移除元素
} else {
if(this.datas?.esignFlowStatus == '1') {
this.service.request(this.service.$api_getBillTakeEsignFile, [this.datas?.id]).subscribe((res) => {
console.log(res);
})
}
const a = document.createElement('a');
a.href = this.datas?.unloadingElectronicsLadingBillFilePath;
document.body.appendChild(a);

12
src/app/routes/order-management/services/order-management.service.ts
View File

@ -204,10 +204,16 @@ 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`;
/**
* 根据企业ID，获取企业历史网络货运人
* @returns

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

@ -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;

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

@ -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);
}

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

@ -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',

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

@ -96,26 +96,26 @@ export class TaxManagementIndividualIncomeComponent implements OnInit {
placeholder: '请输入证件号码'
}
},
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,
visibleIf: {
_$expand: (value: boolean) => value
}
},
default: ''
},
// 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,
// visibleIf: {
// _$expand: (value: boolean) => value
// }
// },
// default: ''
// },
// declareStatu1s: {
// title: '申报结果',
// type: 'string',

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

@ -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>

2
src/app/routes/usercenter/components/freight/user/user.component.ts
View File

@ -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' },

2
src/app/routes/usercenter/services/usercenter.service.ts
View File

@ -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';
// 冻结或恢复应用用户