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

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

Browse Source
This commit is contained in:
wangshiming
2022-02-18 14:35:40 +08:00
parent f5e4c6d4ae a25687a5de
commit 3c86e83ca7
8 changed files with 163 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -253,7 +253,8 @@ export class TransactionFlowComponent implements OnInit {
bankType: item.bankType, bankType: item.bankType,
rmYll: item.roleId, rmYll: item.roleId,
snglFlgCd: item.channelPaySn, snglFlgCd: item.channelPaySn,
bussType: '07' bussType: '07',
ltdId: item.ltdId
}) })
} }
] ]

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

@ -273,7 +273,8 @@ export class WithdrawalsRecordComponent implements OnInit {
bankType: item.bankType, bankType: item.bankType,
rmYll: item.userId, rmYll: item.userId,
snglFlgCd: item.coreSerNo, snglFlgCd: item.coreSerNo,
bussType: '06' bussType: '06',
ltdId: item.ltdId
}) })
}, },
{ {

8
src/app/routes/sys-setting/components/network-freight/network-freight.component.html
View File

@ -76,15 +76,13 @@
<div>{{ item?.pinganEnable ? '已开启' : '未开启' }}</div> <div>{{ item?.pinganEnable ? '已开启' : '未开启' }}</div>
</ng-template> </ng-template>
<ng-template st-row="pufaEnable" let-item let-index="index"> <ng-template st-row="pufaEnable" let-item let-index="index">
<div>{{ item?.pufaEnable ? '已开启' : '未开启' }}</div> <div >{{ item?.pufaEnable ? '已开启' : '未开启' }}</div>
</ng-template> </ng-template>
<ng-template st-row="pinganAccountEnable" let-item let-index="index"> <ng-template st-row="pinganAccountEnable" let-item let-index="index">
<div>{{ item?.pinganAccountEnable ? '已开启' : '未开启' }}</div> <a (click)="createAccount(item,'1','pinganAccount')">{{ item?.pinganAccount || '开通子账户' }}</a>
<div>{{ item?.pinganAccountEnable ? item?.pinganAccount : '' }}</div>
</ng-template> </ng-template>
<ng-template st-row="pufaAccountEnable" let-item let-index="index"> <ng-template st-row="pufaAccountEnable" let-item let-index="index">
<div>{{ item?.pufaAccountEnable ? '已开启' : '未开启' }}</div> <a (click)="createAccount(item,'2','pufaAccount')">{{ item?.pufaAccount || '开通子账户' }}</a>
<div>{{ item?.pufaAccountEnable ? item?.pufaAccount : '' }}</div>
</ng-template> </ng-template>
<ng-template st-row="invoiceEnable" let-item let-index="index"> <ng-template st-row="invoiceEnable" let-item let-index="index">
<div>{{ item?.invoiceEnable ? '已开启' : '未开启' }}</div> <div>{{ item?.invoiceEnable ? '已开启' : '未开启' }}</div>

54
src/app/routes/sys-setting/components/network-freight/network-freight.component.less
View File

@ -1,27 +1,31 @@
:host { :host {
::ng-deep { ::ng-deep {
.card-height { .card-height {
min-height: 600px; min-height: 600px;
}
.save-btn {
width : 100%;
text-align: right;
}
.block-radio {
display : flex;
min-height: 32px;
}
input {
width : 100px;
margin-left: 10px;
}
.ant-form-item-control-input-content {
display: flex;
}
} }
} .save-btn {
width : 100%;
text-align: right;
}
.block-radio {
display : flex;
min-height: 32px;
}
input {
width : 100px;
margin-left: 10px;
}
.ant-form-item-control-input-content {
display: flex;
}
.text-truncate {
white-space: normal;
}
}
}

199
src/app/routes/sys-setting/components/network-freight/network-freight.component.ts
View File

@ -5,6 +5,7 @@ import { SFCascaderWidgetSchema, SFComponent, SFRadioWidgetSchema, SFSchema, SFU
import { DynamicSettingModalComponent, SinglepageSettingModalComponent } from '@shared'; import { DynamicSettingModalComponent, SinglepageSettingModalComponent } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal'; import { NzModalService } from 'ng-zorro-antd/modal';
import { takeLast } from 'rxjs/operators'; import { takeLast } from 'rxjs/operators';
import { AccountDetailComponent } from 'src/app/shared/components/account-detail/account-detail.component';
import { SystemService } from '../../services/system.service'; import { SystemService } from '../../services/system.service';
@Component({ @Component({
@ -32,77 +33,76 @@ export class NetworkFreightComponent implements OnInit {
formData: any; formData: any;
ticketId: any; ticketId: any;
ticketItem: any; ticketItem: any;
formDataTicket: any formDataTicket: any;
formDataTax: any formDataTax: any;
isVisible = false; isVisible = false;
isVisibleTicket = false; isVisibleTicket = false;
edit = false; edit = false;
editId = false; editId = false;
tabs: any[] = [ tabs: any[] = [{ name: '开票设置' }, { name: '税务设置' }];
{name: '开票设置'},
{name: '税务设置'},
];
columns: STColumn[] = [ columns: STColumn[] = [
{ {
title: '公司名称', title: '公司名称',
width: '180px', width: '180px',
index: 'enterpriseName' index: 'enterpriseName'
}, },
{ {
title: '纳税人识别号', title: '纳税人识别号',
width: '180px', width: '180px',
index: 'taxCode' }, index: 'taxCode'
{ },
{
title: '成立日期', title: '成立日期',
width: '150px', width: '150px',
index: 'enterpriseRegistrationTime' index: 'enterpriseRegistrationTime'
}, },
{ {
title: '成本费率', title: '成本费率',
width: '150px', width: '150px',
render: 'costRate' render: 'costRate'
}, },
{ {
title: '附加费率', title: '附加费率',
width: '150px', width: '150px',
render: 'goodsSurchargeRatio' render: 'goodsSurchargeRatio'
}, },
{ {
title: '云开票', title: '云开票',
width: '150px', width: '150px',
render: 'ticketEnable' render: 'ticketEnable'
}, },
{ {
title: '保险', title: '保险',
width: '150px', width: '150px',
render: 'insuranceEnable' render: 'insuranceEnable'
}, },
{ {
title: '平安银行', title: '平安银行',
width: '150px', width: '150px',
render: 'pinganEnable' }, render: 'pinganEnable'
{ },
{
title: '浦发银行', title: '浦发银行',
width: '150px', width: '150px',
render: 'pufaEnable' render: 'pufaEnable'
}, },
{ {
title: '平安电子账户', title: '平安电子账户',
width: '150px', width: '170px',
render: 'pinganAccountEnable' render: 'pinganAccountEnable'
}, },
{ {
title: '浦发电子账户', title: '浦发电子账户',
width: '150px', width: '170px',
render: 'pufaAccountEnable' render: 'pufaAccountEnable'
}, },
{ {
title: '开票开关', title: '开票开关',
width: '150px', width: '150px',
render: 'invoiceEnable' render: 'invoiceEnable'
}, },
{ {
title: '操作', title: '操作',
width: '110px', width: '110px',
@ -128,12 +128,11 @@ export class NetworkFreightComponent implements OnInit {
{ {
text: '系统配置', text: '系统配置',
click: item => this.settingAction(item) click: item => this.settingAction(item)
}, }
// { // {
// text: '合同设置', // text: '合同设置',
// click: item => this.roleAction(item, 2) // click: item => this.roleAction(item, 2)
// }, // },
] ]
} }
]; ];
@ -146,7 +145,7 @@ export class NetworkFreightComponent implements OnInit {
}; };
} }
constructor(public service: SystemService, private nzModalService: NzModalService,private router: Router,private ar: ActivatedRoute,) {} constructor(public service: SystemService, private nzModalService: NzModalService, private router: Router, private ar: ActivatedRoute) {}
ngOnInit(): void { ngOnInit(): void {
this.initSF(); this.initSF();
@ -202,17 +201,17 @@ export class NetworkFreightComponent implements OnInit {
type: 'string', type: 'string',
title: '公司名称', title: '公司名称',
ui: { ui: {
widget: 'text', widget: 'text'
}, },
default: this.ticketItem?.enterpriseName, default: this.ticketItem?.enterpriseName
}, },
taxCode2: { taxCode2: {
type: 'string', type: 'string',
title: '纳税人识别号', title: '纳税人识别号',
ui: { ui: {
widget: 'text', widget: 'text'
}, },
default: this.ticketItem?.taxCode, default: this.ticketItem?.taxCode
}, },
bankName: { bankName: {
type: 'string', type: 'string',
@ -305,9 +304,27 @@ export class NetworkFreightComponent implements OnInit {
type: 'string', type: 'string',
title: '详细地址', title: '详细地址',
ui: { placeholder: '请输入' } ui: { placeholder: '请输入' }
}, }
}, },
required: ['enterpriseName', 'taxCode', 'bankName', 'bankAccount', 'registerAddress','registerPhone', 'senderName','senderRegionCode','senderPhone', 'senderAddress','taxClassificationVersion','taxClassificationCode','invoiceTaxRate','invoiceMaxAmount','payee','reviewer','drawer'] required: [
'enterpriseName',
'taxCode',
'bankName',
'bankAccount',
'registerAddress',
'registerPhone',
'senderName',
'senderRegionCode',
'senderPhone',
'senderAddress',
'taxClassificationVersion',
'taxClassificationCode',
'invoiceTaxRate',
'invoiceMaxAmount',
'payee',
'reviewer',
'drawer'
]
}; };
this.ui3 = { '*': { spanLabelFixed: 120, grid: { span: 24 } } }; this.ui3 = { '*': { spanLabelFixed: 120, grid: { span: 24 } } };
} }
@ -318,14 +335,14 @@ export class NetworkFreightComponent implements OnInit {
type: 'string', type: 'string',
title: '公司名称', title: '公司名称',
ui: { ui: {
widget: 'text', widget: 'text'
}, },
default: this.ticketItem?.enterpriseName, default: this.ticketItem?.enterpriseName
}, }
}, },
required: ['enterpriseName'] required: ['enterpriseName']
}; };
this.ui4= { '*': { spanLabelFixed: 120, grid: { span: 24 } } }; this.ui4 = { '*': { spanLabelFixed: 120, grid: { span: 24 } } };
} }
initSFFre() { initSFFre() {
this.addSchema = { this.addSchema = {
@ -375,9 +392,9 @@ export class NetworkFreightComponent implements OnInit {
ticket(value: any) { ticket(value: any) {
this.formDataTicket = []; this.formDataTicket = [];
this.formDataTax = []; this.formDataTax = [];
this.ticketItem = value; this.ticketItem = value;
this.initSFTax(); this.initSFTax();
this.initSFTicket(); this.initSFTicket();
this.service.request(this.service.$api_getTicketByNetworkTransporterId, { id: value.id }).subscribe((res: any) => { this.service.request(this.service.$api_getTicketByNetworkTransporterId, { id: value.id }).subscribe((res: any) => {
console.log(res); console.log(res);
if (res) { if (res) {
@ -385,26 +402,25 @@ export class NetworkFreightComponent implements OnInit {
...res ...res
}; };
delete List.senderRegionCode; delete List.senderRegionCode;
List.senderRegionCode = this.getProvinceData(res?.senderRegionCode), (List.senderRegionCode = this.getProvinceData(res?.senderRegionCode)), (this.formDataTicket = List);
this.formDataTicket = List; this.ticketId = res.id;
this.ticketId = res.id;
} }
}); });
this.isVisibleTicket = true; this.isVisibleTicket = true;
} }
getProvinceData(value: any) { getProvinceData(value: any) {
this.service.http.post(this.service.$api_getRegionDetailByCode, { regionCode: value}).subscribe(res => { this.service.http.post(this.service.$api_getRegionDetailByCode, { regionCode: value }).subscribe(res => {
console.log(res.data) console.log(res.data);
console.log(this.formDataTicket) console.log(this.formDataTicket);
let enterpriseAddressCode : any= []; let enterpriseAddressCode: any = [];
let regioin = res?.data?.regionFullCodes.split(','); let regioin = res?.data?.regionFullCodes.split(',');
console.log(regioin) console.log(regioin);
regioin?.forEach((element: any) => { regioin?.forEach((element: any) => {
enterpriseAddressCode.push(Number(element)) enterpriseAddressCode.push(Number(element));
}); });
console.log(enterpriseAddressCode) console.log(enterpriseAddressCode);
this.sfTicket.setValue('/senderRegionCode', enterpriseAddressCode); this.sfTicket.setValue('/senderRegionCode', enterpriseAddressCode);
return enterpriseAddressCode; return enterpriseAddressCode;
}); });
} }
deleteAction(item?: any) { deleteAction(item?: any) {
@ -415,7 +431,7 @@ export class NetworkFreightComponent implements OnInit {
nzOnOk: () => {} nzOnOk: () => {}
}); });
} }
// 基础设置 // 基础设置
settingAction(item?: any) { settingAction(item?: any) {
this.nzModalService.create({ this.nzModalService.create({
nzTitle: '系统配置', nzTitle: '系统配置',
@ -423,7 +439,7 @@ export class NetworkFreightComponent implements OnInit {
nzWidth: 900, nzWidth: 900,
nzComponentParams: { nzComponentParams: {
extendType: '1', extendType: '1',
businessId: item.id, businessId: item.id
}, },
nzFooter: null nzFooter: null
}); });
@ -457,6 +473,31 @@ export class NetworkFreightComponent implements OnInit {
}); });
} }
createAccount(item: any, bankType: string, key: string) {
if (item[key]) {
return;
}
const params = {
accountType: 3,
bankType,
clientName: item.enterpriseName,
ctfId: item.taxCode,
ltdId: item.id,
roleId: item.id,
roleName: item.enterpriseName
};
this.service
.request('/api/fcc/accountBalance/saveByLtd', {
...params
})
.subscribe(res => {
if (res) {
this.st.load(1);
this.service.msgSrv.success('开户成功');
}
});
}
/** /**
* 重置表单 * 重置表单
*/ */
@ -470,8 +511,8 @@ export class NetworkFreightComponent implements OnInit {
this.isVisibleTicket = false; this.isVisibleTicket = false;
} }
handleOKTicket() { handleOKTicket() {
console.log(this.sfTicket.valid) console.log(this.sfTicket.valid);
console.log(this.sfTicket.value) console.log(this.sfTicket.value);
if (!this.sfTicket.valid) { if (!this.sfTicket.valid) {
this.service.msgSrv.warning('请正确填写完整！'); this.service.msgSrv.warning('请正确填写完整！');
return; return;
@ -482,8 +523,8 @@ export class NetworkFreightComponent implements OnInit {
if (this.ticketId) { if (this.ticketId) {
params.id = this.ticketId; params.id = this.ticketId;
} }
params.senderRegionCode = this.sfTicket.value.senderRegionCode[2] params.senderRegionCode = this.sfTicket.value.senderRegionCode[2];
console.log(params) console.log(params);
this.service.request(this.service.$api_networkTransporterTicket_save, params).subscribe((res: any) => { this.service.request(this.service.$api_networkTransporterTicket_save, params).subscribe((res: any) => {
if (res) { if (res) {
this.service.msgSrv.success('保存成功！'); this.service.msgSrv.success('保存成功！');
@ -516,9 +557,7 @@ export class NetworkFreightComponent implements OnInit {
}); });
} }
// 云开票 // 云开票
setMakeInvoice() { setMakeInvoice() {}
}
/* /*
* 根据地区code查询地区列表 * 根据地区code查询地区列表
*/ */
@ -526,13 +565,13 @@ export class NetworkFreightComponent implements OnInit {
return this.service.request(this.service.$api_get_region_by_code, { regionCode }); return this.service.request(this.service.$api_get_region_by_code, { regionCode });
} }
changeType(value: any) { changeType(value: any) {
console.log(value); console.log(value);
if(value.name === '税务设置') { if (value.name === '税务设置') {
this.taxStatus = true this.taxStatus = true;
} else { } else {
this.taxStatus = false this.taxStatus = false;
} }
} }
// 新增 // 新增
creat(value?: any) { creat(value?: any) {
console.log(value) console.log(value)

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

@ -78,7 +78,7 @@ export class FreightComponentsListComponent implements OnInit {
nzComponentParams: { nzComponentParams: {
isCanCreate: true, isCanCreate: true,
url: '/api/fcc/accountBalance/getShipperAccountBalanceDetailByOperator', url: '/api/fcc/accountBalance/getShipperAccountBalanceDetailByOperator',
params: { accountType: 1, roleId: item.adminAppUserId, ctfId: item.unifiedSocialCreditCode, clientName: item.enterpriseName } params: { accountType: 1, roleId: item.id, ctfId: item.unifiedSocialCreditCode, clientName: item.enterpriseName }
}, },
nzFooter: null nzFooter: null
}); });

6
src/app/shared/components/account-detail/account-detail.component.ts
View File

@ -24,13 +24,17 @@ export class AccountDetailComponent implements OnInit {
ngOnInit(): void {} ngOnInit(): void {}
createAccount(item: any, type: '1' | '2') { createAccount(item: any, type: '1' | '2') {
if (item.pfAccount) {
return;
}
const params = { const params = {
ltdId: item.ltdId, ltdId: item.ltdId,
roleId: item.roleId, roleId: item.roleId,
projectId: item.projectId, projectId: item.projectId,
enterpriseId: item.enterpriseId, enterpriseId: item.enterpriseId,
ctfId: this.params.ctfId, ctfId: this.params.ctfId,
clientName: this.params.clientName clientName: this.params.clientName,
roleName: this.params.clientName
}; };
if (this.params.accountType === 1) { if (this.params.accountType === 1) {
this.service this.service