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

This commit is contained in:
wangshiming
2022-02-18 10:46:09 +08:00
4 changed files with 4 additions and 5 deletions

View File

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

View File

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

View File

@ -46,7 +46,7 @@ export class AgreementConfigComponentsBaseComponent implements OnInit {
}
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) {
res.records = res.records.map((item: any) => ({ ...item, agreementContent: decodeURIComponent(item.agreementContent) }));
this.tabs = res.records;

View File

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