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 10:46:09 +08:00
parent 35d19d4d7e 2f01da8ccc
commit cd4d216ec7
4 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,9 +58,9 @@
<sv label="凭证流水号"> <sv label="凭证流水号">
{{info?.id}} {{info?.id}}
</sv> </sv>
<sv label="创建人"> <!-- <sv label="创建人">
{{info?.createUserId}} {{info?.createUserId}}
</sv> </sv> -->
</sv-container> </sv-container>
</nz-card> </nz-card>

2
src/app/routes/financial-management/components/voucher-management/voucher-detail/voucher-detail.component.ts
View File

@ -11,7 +11,7 @@ import { FreightAccountService } from '../../../services/freight-account.service
export class VoucherDetailComponent implements OnInit { export class VoucherDetailComponent implements OnInit {
columns: STColumn[] = [ columns: STColumn[] = [
{ title: '摘要', index: 'remarks' }, { title: '摘要', index: 'remarks' },
{ title: '会计科目', index: 'subcode' }, { title: '会计科目', index: 'subname' },
{ title: '辅助核算', render: 'auxVOList' }, { title: '辅助核算', render: 'auxVOList' },
{ title: '币种', index: 'currency', className: 'text-center' }, { title: '币种', index: 'currency', className: 'text-center' },
{ {

2
src/app/routes/sys-setting/components/agreement-config/agreement-config.component.ts
View File

@ -46,7 +46,7 @@ export class AgreementConfigComponentsBaseComponent implements OnInit {
} }
loadAgreement(type?: number) { loadAgreement(type?: number) {
this.service.request(`${this.service.$api_get_agreement_page}`).subscribe(res => { this.service.request(`${this.service.$api_get_agreement_page}`, { pageIndex: 1, pageSize: 99 }).subscribe(res => {
if (res) { if (res) {
res.records = res.records.map((item: any) => ({ ...item, agreementContent: decodeURIComponent(item.agreementContent) })); res.records = res.records.map((item: any) => ({ ...item, agreementContent: decodeURIComponent(item.agreementContent) }));
this.tabs = res.records; this.tabs = res.records;

1
src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts
View File

@ -92,7 +92,6 @@ export class FreightConfigComponent implements OnInit {
initST(): STColumn[] { initST(): STColumn[] {
return [ return [
// { title: '', type: 'checkbox', className: 'text-center' },
{ title: '企业名称', className: 'text-center', index: 'enterpriseName', width: 160 }, { title: '企业名称', className: 'text-center', index: 'enterpriseName', width: 160 },
{ title: '网络货运人', className: 'text-center', index: 'netTranName', width: 160 }, { title: '网络货运人', className: 'text-center', index: 'netTranName', width: 160 },
{ {