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:
Taric Xin
2022-04-11 16:34:34 +08:00
parent f6260bf4c1 9e9633f708
commit 18696c2cca
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts
View File

@ -410,6 +410,7 @@ export class DatatableFundReportingComponent implements OnInit {
const ids = this.selectedRows.map(i => i?.id); const ids = this.selectedRows.map(i => i?.id);
this.service.request(this.service.$api_update_fund_data, ids).subscribe(res => { this.service.request(this.service.$api_update_fund_data, ids).subscribe(res => {
if (res) { if (res) {
this.service.msgSrv.success('更新成功');
this.selectedRows = []; this.selectedRows = [];
this.st.reload(); this.st.reload();

2
src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts
View File

@ -559,9 +559,9 @@ export class DatatableOrderReportingComponent implements OnInit {
const ids = this.selectedRows.map(i => i?.id); const ids = this.selectedRows.map(i => i?.id);
this.service.request(this.service.$api_update_order_data, ids).subscribe(res => { this.service.request(this.service.$api_update_order_data, ids).subscribe(res => {
if (res) { if (res) {
this.service.msgSrv.success('更新成功');
this.selectedRows = []; this.selectedRows = [];
this.st.reload(); this.st.reload();
} }
}) })
} }

2
src/app/routes/order-management/components/risk/risk.component.ts
View File

@ -194,7 +194,7 @@ export class OrderManagementRiskComponent implements OnInit {
type: 'string', type: 'string',
ui: { ui: {
widget: 'dict-select', widget: 'dict-select',
params: { dictKey: 'freight:type' }, params: { dictKey: 'bill:type' },
containsAllLabel: true, containsAllLabel: true,
visibleIf: { visibleIf: {
_$expand: (value: boolean) => value _$expand: (value: boolean) => value