From 5b033e0e0798583f17f3cad323611f0e59f233f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= Date: Tue, 19 Apr 2022 14:32:46 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E8=BD=A6=E9=95=BF?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/audit/audit.component.html | 63 ++++++++----------- 1 file changed, 25 insertions(+), 38 deletions(-) diff --git a/src/app/routes/vehicle/components/audit/audit.component.html b/src/app/routes/vehicle/components/audit/audit.component.html index 051902e9..2b2bfb44 100644 --- a/src/app/routes/vehicle/components/audit/audit.component.html +++ b/src/app/routes/vehicle/components/audit/audit.component.html @@ -7,23 +7,16 @@ * @FilePath : \\tms-obc-web\\src\\app\\routes\\vehicle\\components\\audit\\audit.component.html --> - +
- - + +
@@ -33,9 +26,10 @@
- + - + -
+ + From a55b2dc7ca986000b127fb86c1b6791c13537ea3 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Tue, 19 Apr 2022 14:33:26 +0800 Subject: [PATCH 2/3] fix bug --- .../individual-declare.component.ts | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts b/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts index 95bd1a94..703a2fa2 100644 --- a/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts +++ b/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts @@ -140,19 +140,7 @@ export class TaxManagementIndividualDeclareComponent implements OnInit { } } }, - declareResult: { - title: '申报结果', - type: 'string', - ui: { - placeholder: '请选择', - widget: 'dict-select', - params: { dictKey: 'service:type' }, - containsAllLabel: true, - visibleIf: { - _$expand: (value: boolean) => value - } - } - }, + isOvertime: { title: '是否逾期', type: 'string', From 1b0a7d4c9513a204fa161e14dddf8c2be77e57c9 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Tue, 19 Apr 2022 14:51:51 +0800 Subject: [PATCH 3/3] fix bug --- .../partnertable/partnertable.component.ts | 48 ++++++++++--------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/src/app/routes/datatable/components/customtable/partnertable/partnertable.component.ts b/src/app/routes/datatable/components/customtable/partnertable/partnertable.component.ts index 0a289a0b..1d50eaea 100644 --- a/src/app/routes/datatable/components/customtable/partnertable/partnertable.component.ts +++ b/src/app/routes/datatable/components/customtable/partnertable/partnertable.component.ts @@ -8,7 +8,7 @@ import { DataService } from '../../../services/data.service'; @Component({ selector: 'app-datatable-partnertable', - templateUrl: './partnertable.component.html', + templateUrl: './partnertable.component.html' }) export class DatatablePartnertableComponent implements OnInit { @ViewChild('st', { static: false }) st!: STComponent; @@ -24,7 +24,7 @@ export class DatatablePartnertableComponent implements OnInit { public service: DataService, private modalSrv: NzModalService, private modal: ModalHelper, - private envSrv: EAEnvironmentService, + private envSrv: EAEnvironmentService ) {} /** @@ -47,7 +47,7 @@ export class DatatablePartnertableComponent implements OnInit { * 选中行 */ get selectedRows() { - return this.st?.list.filter((item) => item.checked) || []; + return this.st?.list.filter(item => item.checked) || []; } /** @@ -60,17 +60,17 @@ export class DatatablePartnertableComponent implements OnInit { /** * 重置表单 */ - resetSF() { + resetSF() { this.sf.reset(); this._$expand = false; - this.isLoading = true + this.isLoading = true; } /** * 程序初始化入口 */ ngOnInit() { this.initSF(); - this.initST() + this.initST(); } /** @@ -84,33 +84,37 @@ export class DatatablePartnertableComponent implements OnInit { title: '合伙人名称', type: 'string', ui: { placeholder: '请输入' }, - readOnly: false, + readOnly: false }, phone: { title: '合伙人类型', type: 'string', - ui: { + ui: { widget: 'select', - placeholder: '请输入' }, - readOnly: false, + placeholder: '请输入' + }, + readOnly: false }, phone01: { title: '合伙人状态', type: 'string', - ui: { + ui: { widget: 'select', - placeholder: '请输入' }, - readOnly: false, + placeholder: '请输入' + }, + readOnly: false }, createTime: { type: 'string', title: '注册时间', - ui: { widget: 'sl-from-to', type: 'date', format: 'yyyy-MM-dd' } as SFDateWidgetSchema, - }, + ui: { widget: 'sl-from-to', type: 'date', format: 'yyyy-MM-dd', visibleIf: { + _$expand: (value: boolean) => value, + }, } as SFDateWidgetSchema + } }, - type: 'object', + type: 'object' }; - this.ui = { '*': { spanLabelFixed: 80, grid: { span: 8, gutter: 4 }, enter: () => this.st?.load(1) } }; + this.ui = { '*': { spanLabelFixed: 120, grid: { span: 8, gutter: 4 }, enter: () => this.st?.load(1) } }; } /** @@ -118,7 +122,7 @@ export class DatatablePartnertableComponent implements OnInit { */ initST() { this.columns = [ - { title: '合伙人名称', index: 'name', className: 'text-center' }, + { title: '合伙人名称', index: 'networkTransporterName', className: 'text-center' }, { title: '注册时间', index: 'telephone', className: 'text-center' }, { title: '注册时间', index: 'roleName', className: 'text-center' }, { title: '业务员', index: 'lastLoginDate', className: 'text-center' }, @@ -127,23 +131,21 @@ export class DatatablePartnertableComponent implements OnInit { index: 'stateLocked', className: 'text-center', type: 'enum', - enum: { 0: '正常', 1: '冻结' }, + enum: { 0: '正常', 1: '冻结' } }, { title: '客户数', index: 'lastLoginDate', className: 'text-center' }, { title: '收益额', index: 'lastLoginDate', className: 'text-center' }, { title: '已提现金额', index: 'lastLoginDate', className: 'text-center' }, { title: '订单数', index: 'lastLoginDate', className: 'text-center' }, { title: '订单金额', index: 'lastLoginDate', className: 'text-center' }, - { title: '应收订单数', index: 'lastLoginDate', className: 'text-center' }, + { title: '应收订单数', index: 'lastLoginDate', className: 'text-center' } ]; } - + /** * 数据列表状态变化事件 */ change(change: STChange) { // console.log(change); } - - }