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-04-09 15:02:30 +08:00
parent d276b7fc20 bf4b65d7d8
commit 0b0a225034
2 changed files with 35 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -143,24 +143,23 @@ export class DatatableFundReportingComponent implements OnInit {
},
}
},
uploadStatus: {
title: '上传状态',
type: 'string',
default: 0,
enum: [
{ label: '待上传', value: 0 },
{ label: '已上传', value: 1 },
{ label: '异常', value: 2 }
],
ui: {
placeholder: '请选择',
widget: 'select',
allowClear: true,
visibleIf: {
_$expand: (value: boolean) => value,
},
}
},
// uploadStatus: {
// title: '上传状态',
// type: 'string',
// enum: [
// { label: '待上传', value: 0 },
// { label: '已上传', value: 1 },
// { label: '异常', value: 2 }
// ],
// ui: {
// placeholder: '请选择',
// widget: 'select',
// allowClear: true,
// visibleIf: {
// _$expand: (value: boolean) => value,
// },
// }
// },
verifyStatus: {
title: '本地校验',
type: 'string',

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

@ -146,25 +146,25 @@ export class DatatableOrderReportingComponent implements OnInit {
},
}
},
putStatus: {
title: '上传状态',
type: 'string',
default: 0,
enum: [
{ label: '待上传', value: 0 },
{ label: '已上传', value: 1 },
{ label: '异常', value: 2 }
],
// putStatus: {
// title: '上传状态',
// type: 'string',
// default: 0,
// enum: [
// { label: '待上传', value: 0 },
// { label: '已上传', value: 1 },
// { label: '异常', value: 2 }
// ],
ui: {
placeholder: '请选择',
widget: 'select',
allowClear: true,
visibleIf: {
_$expand: (value: boolean) => value,
},
}
},
// ui: {
// placeholder: '请选择',
// widget: 'select',
// allowClear: true,
// visibleIf: {
// _$expand: (value: boolean) => value,
// },
// }
// },
checkStatus: {
title: '本地校验',
type: 'string',