From db46e5c093b07feff8116d0e79aa7100fab340a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= Date: Thu, 14 Apr 2022 18:01:22 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order-reporting.component.html | 22 +++++++++---------- .../order-reporting.component.ts | 10 ++++++--- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html index be7285cc..b1d74f18 100644 --- a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html +++ b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html @@ -3,19 +3,19 @@
-
+
-
- - - - -
+
+
+ + + +
diff --git a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts index d8bafb1f..0f7a87d1 100644 --- a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts +++ b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts @@ -112,7 +112,6 @@ export class DatatableOrderReportingComponent implements OnInit { placeholder: '请选择', widget: 'select', asyncData: () => this.shipperSrv.getNetworkFreightForwarder({}, false), - allowClear: true } }, @@ -266,8 +265,13 @@ export class DatatableOrderReportingComponent implements OnInit { }, }; this.ui = { - '*': { spanLabelFixed: 120, grid: { span: 8, gutter: 4 }, enter: () => this.search() }, - $time: { grid: { span: 24 } }, + '*': { + spanLabelFixed: 120, + grid: { + lg: 12, + xl: 8 + }, enter: () => this.search() + }, }; } From 7f7f1f8ffc1b9dee8adfe827add4c3f4794e9749 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 14 Apr 2022 18:08:36 +0800 Subject: [PATCH 2/5] fix bug --- .../individual-declare.component.ts | 69 +++++++++++-------- 1 file changed, 42 insertions(+), 27 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 ce4705c0..0f7c54a0 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 @@ -32,7 +32,7 @@ export class TaxManagementIndividualDeclareComponent implements OnInit { ]; selectedIndex = ''; //选择的项目 serviceTel = ''; - isVisible : boolean = false + isVisible: boolean = false; constructor( public service: TaxManagementService, private router: Router, @@ -88,16 +88,16 @@ export class TaxManagementIndividualDeclareComponent implements OnInit { ngOnInit() { this.initSF(); this.initST(); - const object1 : any = {}; - const object2 : any = {}; - Object.defineProperty(object1, 'name',{ writable: false ,value: 'wang'}); - Object.defineProperty(object2, 'xxoo',{ writable: false ,value: 'wang'}); + const object1: any = {}; + const object2: any = {}; + Object.defineProperty(object1, 'name', { writable: false, value: 'wang' }); + Object.defineProperty(object2, 'xxoo', { writable: false, value: 'wang' }); console.log(object1); console.log(object1.name); console.log(object2); console.log(object2.xxoo); - object1.name = 'ming' - object2.xxoo = 'ming' + object1.name = 'ming'; + object2.xxoo = 'ming'; console.log(object1); console.log(object2); } @@ -254,22 +254,40 @@ export class TaxManagementIndividualDeclareComponent implements OnInit { width: '180px' }, { title: '纳税人识别号', index: 'nsrsbh', className: 'text-center', width: '200px' }, - { title: '姓名', index: 'xm', className: 'text-center', width: '200px' }, + { title: '姓名', index: 'xm', className: 'text-center', width: '200px' }, { title: '证件类型', index: 'sfzjlx', className: 'text-center', width: '200px' }, - { title: '证件号码', index: 'sfzjhm', className: 'text-center', width: '200px' }, + { title: '证件号码', index: 'sfzjhm', className: 'text-center', width: '200px' }, { title: '联系电话', index: 'lxdh', className: 'text-center', width: '200px' }, - { title: '国家（地区）', index: ' gjdq', className: 'text-center', width: '200px' }, - { title: '所属行业', index: 'hy', className: 'text-center', width: '200px' }, - { title: '征收项目', index: 'zsxm', className: 'text-center', width: '200px' }, + { title: '国家（地区）', index: ' gjdq', className: 'text-center', width: '200px' }, + { title: '所属行业', index: 'hy', className: 'text-center', width: '200px' }, + { title: '征收项目', index: 'zsxm', className: 'text-center', width: '200px' }, { title: '征收品目', index: 'zsmp', className: 'text-center', width: '200px' }, { title: '计税依据', index: 'jsyj', className: 'text-center', width: '200px' }, - { title: '税率', index: 'sl', render: 'sl', className: 'text-center', width: '200px' }, - { title: '应纳税额', index: 'ynse', className: 'text-center', width: '180px' }, - { title: '减免税额', index: 'jmse', className: 'text-center', width: '180px' }, - { title: '已缴纳税额', index: 'yjnse', className: 'text-center', width: '180px' }, - { title: '应代征税额', index: 'dzse', className: 'text-center', width: '180px' }, - { title: '已代征税额', index: 'ydzse', className: 'text-center', width: '150px' }, - { title: '申报日期', render: 'sbrq', className: 'text-center', width: '150px' }, + { + title: '税率', + index: 'sl', + render: 'sl', + className: 'text-center', + width: '200px', + format: item => `${item.sl ? ((item.sl as number) * 100).toFixed(2) : 0}%` + }, + { + title: '应纳税额', + index: 'ynse', + className: 'text-center', + width: '180px', + type: 'widget', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.ynse }) } + }, + { title: '减免税额', index: 'jmse', className: 'text-center', width: '180px' , type: 'widget', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.jmse }) } }, + { title: '已缴纳税额', index: 'yjnse', className: 'text-center', width: '180px', type: 'widget', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.yjnse }) } }, + { title: '应代征税额', index: 'dzse', className: 'text-center', width: '180px', type: 'widget', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.dzse }) } }, + { title: '已代征税额', index: 'ydzse', className: 'text-center', width: '150px', type: 'widget', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.ydzse }) } }, + { title: '申报日期', render: 'sbrq', className: 'text-center', width: '150px' } ]; } @@ -301,13 +319,12 @@ export class TaxManagementIndividualDeclareComponent implements OnInit { *修改 * @param record 记录实例 */ - uploadSetting() { + uploadSetting() { if (this.selectedRows.length === 0) { this.openWainingModal('请选择需要修改的数据！'); return; } // this.isVisible = true - } /** *撤销 @@ -388,7 +405,7 @@ export class TaxManagementIndividualDeclareComponent implements OnInit { * * @param params 更新数据 */ - resetData() { + resetData() { if (this.selectedRows.length === 0) { this.openWainingModal('请选择需要更新的数据'); return; @@ -402,7 +419,7 @@ export class TaxManagementIndividualDeclareComponent implements OnInit { this.service.msgSrv.success('更新成功'); this.st.load(1); } - }) + }); } /** @@ -450,10 +467,8 @@ export class TaxManagementIndividualDeclareComponent implements OnInit { nzContent: content }); } - handleOK() { - - } + handleOK() {} handleCancel() { - this.isVisible = false; + this.isVisible = false; } } From 3a30575fd52b24c7b8598b934c76dee582c7a505 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 14 Apr 2022 19:33:36 +0800 Subject: [PATCH 3/5] fix bug --- .../components/invoice-detail/invoice-detail.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html index 15cd0983..160bf708 100644 --- a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html +++ b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html @@ -106,9 +106,9 @@ - {{ item.billLType }}: {{ item.vatmoney |currency }} + {{ item.billLTypeLabel }}: {{ item.vatmoney |currency }} - + vatmoney Date: Thu, 14 Apr 2022 20:51:51 +0800 Subject: [PATCH 4/5] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order-reporting/order-reporting.component.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts index d8bafb1f..39fda63a 100644 --- a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts +++ b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts @@ -277,12 +277,12 @@ export class DatatableOrderReportingComponent implements OnInit { initST() { this.columns = [ { title: '', type: 'checkbox', className: 'text-center', width: '60px', }, - { title: '订单状态', render: 'billPutStatus', className: 'text-center', width: '120px', }, - { title: '司机状态', render: 'driverPutStatus', className: 'text-center', width: '120px', }, + { title: '订单状态', render: 'billPutStatusLabel', className: 'text-center', width: '120px', }, + { title: '司机状态', render: 'driverPutStatusLabel', className: 'text-center', width: '120px', }, - { title: '车辆状态', render: 'carPutStatus', className: 'text-center', width: '120px', }, + { title: '车辆状态', render: 'carPutStatusLabel', className: 'text-center', width: '120px', }, - { title: '本地校验', render: 'checkStatus', className: 'text-center', width: '120px', }, + { title: '本地校验', render: 'checkStatusLabel', className: 'text-center', width: '120px', }, { title: '订单号', render: 'billCode', From f7a908f5c8e1432953058070db97718471bec98d Mon Sep 17 00:00:00 2001 From: "xiaoxing.liu" Date: Thu, 14 Apr 2022 21:10:40 +0800 Subject: [PATCH 5/5] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order-reporting/order-reporting.component.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts index cae73b65..bd7bf8c1 100644 --- a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts +++ b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts @@ -281,12 +281,12 @@ export class DatatableOrderReportingComponent implements OnInit { initST() { this.columns = [ { title: '', type: 'checkbox', className: 'text-center', width: '60px', }, - { title: '订单状态', render: 'billPutStatusLabel', className: 'text-center', width: '120px', }, - { title: '司机状态', render: 'driverPutStatusLabel', className: 'text-center', width: '120px', }, + { title: '订单状态', index: 'billPutStatusLabel', className: 'text-center', width: '120px', }, + { title: '司机状态', index: 'driverPutStatusLabel', className: 'text-center', width: '120px', }, - { title: '车辆状态', render: 'carPutStatusLabel', className: 'text-center', width: '120px', }, + { title: '车辆状态', index: 'carPutStatusLabel', className: 'text-center', width: '120px', }, - { title: '本地校验', render: 'checkStatusLabel', className: 'text-center', width: '120px', }, + { title: '本地校验', index: 'checkStatusLabel', className: 'text-center', width: '120px', }, { title: '订单号', render: 'billCode',