+
已选择
{{ selectedRows.length }} 条数据
-
-
+
+
+
+
+
+
-
+
\ No newline at end of file
diff --git a/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.less b/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.less
deleted file mode 100644
index 94ec07e0..00000000
--- a/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.less
+++ /dev/null
@@ -1,22 +0,0 @@
-:host {
- .text-black {
- color: #000;
- }
- .icon {
- display: inline-block;
- width: 1em;
- height: 1em;
- stroke-width: 0;
- stroke: currentColor;
- /* stylelint-disable-next-line order/properties-order */
- fill: currentColor;
- }
- ::ng-deep {
- .imgBox {
- display: flex;
- img {
- width: 60px !important;
- }
- }
- }
-}
diff --git a/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.ts b/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.ts
index 4bf92d71..8b2cf608 100644
--- a/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.ts
+++ b/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.ts
@@ -1,23 +1,19 @@
import { Component, OnInit, ViewChild } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { STColumn, STComponent, STData } from '@delon/abc/st';
-import { SFComponent, SFDateWidgetSchema, SFSchema, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
-import { ShipperBaseService } from '@shared';
+import { STColumn, STComponent } from '@delon/abc/st';
+import { SFDateWidgetSchema, SFSelectWidgetSchema } from '@delon/form';
+import { SearchDrawerService } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal';
+import { BasicTableComponent } from 'src/app/routes/commom';
import { TaxManagementService } from '../../services/tax-management.service';
@Component({
selector: 'app-tax-management-invoice-reporting',
templateUrl: './invoice-reporting.component.html',
- styleUrls: ['./invoice-reporting.component.less']
+ styleUrls: ['../../../commom/less/commom-table.less']
})
-export class TaxManagementInvoiceReportingComponent implements OnInit {
- _$expand = false;
- ui!: SFUISchema;
- schema!: SFSchema;
+export class TaxManagementInvoiceReportingComponent extends BasicTableComponent implements OnInit {
columns!: STColumn[];
@ViewChild('st', { static: false }) st!: STComponent;
- @ViewChild('sf', { static: false }) sf!: SFComponent;
tabType!: string;
isLoading: boolean = false;
tabs: any[] = [
@@ -29,21 +25,8 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
];
selectedIndex = '1'; //选择的项目
serviceTel = '';
- constructor(
- public service: TaxManagementService,
- private router: Router,
- private ar: ActivatedRoute,
- public shipperservice: ShipperBaseService,
- private modal: NzModalService,
- public shipperSrv: ShipperBaseService
- ) {
- }
-
- /**
- * 查询字段个数
- */
- get queryFieldCount(): number {
- return Object.keys(this.schema?.properties || {}).length;
+ constructor(public service: TaxManagementService, private modal: NzModalService, public searchDrawerService: SearchDrawerService) {
+ super(searchDrawerService);
}
/**
@@ -62,22 +45,6 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
return this.st?.list.filter((item: any) => item.checked) || [];
}
- /**
- * 伸缩查询条件
- */
- expandToggle() {
- this._$expand = !this._$expand;
- this.sf?.setValue('/_$expand', this._$expand);
- }
-
- /**
- * 重置表单
- */
- resetSF() {
- this.sf.reset();
- this._$expand = false;
- this.isLoading = true
- }
/**
* 程序初始化入口
*/
@@ -92,7 +59,6 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
initSF() {
this.schema = {
properties: {
- _$expand: { type: 'boolean', ui: { hidden: true } },
// uploadSts: {
// title: '上传状态',
// type: 'string',
@@ -118,7 +84,7 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
widget: 'select',
placeholder: '请选择',
allowClear: true,
- asyncData: () => this.shipperservice.getNetworkFreightForwarder()
+ asyncData: () => this.service.getNetworkFreightForwarder()
}
},
arto: {
@@ -132,7 +98,8 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
}
},
billHCode: {
- title: '订单号', type: 'string',
+ title: '订单号',
+ type: 'string',
ui: {
placeholder: '请输入'
}
@@ -143,11 +110,8 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
ui: {
widget: 'sl-from-to',
type: 'date',
- format: 'yyyy-MM-dd',
- visibleIf: {
- _$expand: (value: boolean) => value,
- },
- } as SFDateWidgetSchema,
+ format: 'yyyy-MM-dd'
+ } as SFDateWidgetSchema
},
uoloadDate: {
title: '上传日期',
@@ -155,31 +119,22 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
ui: {
widget: 'sl-from-to',
type: 'date',
- format: 'yyyy-MM-dd',
- visibleIf: {
- _$expand: (value: boolean) => value,
- },
- } as SFDateWidgetSchema,
+ format: 'yyyy-MM-dd'
+ } as SFDateWidgetSchema
},
invoiceno: {
type: 'string',
title: '发票号码',
ui: {
- placeholder: '请输入',
- visibleIf: {
- _$expand: (value: boolean) => value
- }
- },
+ placeholder: '请输入'
+ }
},
invoiceno2: {
type: 'string',
title: '发票代码',
ui: {
- placeholder: '请输入',
- visibleIf: {
- _$expand: (value: boolean) => value
- }
- },
+ placeholder: '请输入'
+ }
},
sts: {
title: '发票状态',
@@ -188,17 +143,10 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
widget: 'dict-select',
containsAllLabel: true,
params: { dictKey: 'vatinv:status' },
- containAllLable: true,
- visibleIf: {
- _$expand: (value: boolean) => value
- }
+ containAllLable: true
} as SFSelectWidgetSchema
- },
- },
- };
- this.ui = {
- '*': { spanLabelFixed: 120, grid: { span: 8, gutter: 4 }, enter: () => this.search() },
- $time: { grid: { span: 24 } },
+ }
+ }
};
}
@@ -207,9 +155,9 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
*/
initST() {
this.columns = [
- { title: '', type: 'checkbox', className: 'text-center', width: '60px', },
- { title: '上传状态', render: 'uploadSts', className: 'text-center', width: '120px', },
- { title: '发票类型', render: 'invoiceType', className: 'text-center', width: '180px', },
+ { title: '', type: 'checkbox', className: 'text-center', width: '60px' },
+ { title: '上传状态', render: 'uploadSts', className: 'text-center', width: '120px' },
+ { title: '发票类型', render: 'invoiceType', className: 'text-center', width: '180px' },
{
title: '发票号码',
index: 'invoiceno',
@@ -217,27 +165,35 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
width: '120px',
type: 'link',
click: item => {
- window.open(`/#/ticket/invoice-list/detail/${item.vatinvHId}?type=${item.invoiceType}`, '_blank', 'noopener')
+ window.open(`/#/ticket/invoice-list/detail/${item.vatinvHId}?type=${item.invoiceType}`, '_blank', 'noopener');
}
},
- { title: '发票代码', index: 'invoiceno2', className: 'text-center', width: '150px', },
+ { title: '发票代码', index: 'invoiceno2', className: 'text-center', width: '150px' },
{
title: '网络货运人',
index: 'ltdName',
className: 'text-center',
- width: '180px',
+ width: '180px'
},
{
- title: '购买方企业名称', index: 'artoname', className: 'text-center', width: '200px', type: 'link',
+ title: '购买方企业名称',
+ index: 'artoname',
+ className: 'text-center',
+ width: '200px',
+ type: 'link',
click: item => {
- window.open(`/#/usercenter/freight/list/detail/${item.arto}`, '_blank', 'noopener')
+ window.open(`/#/usercenter/freight/list/detail/${item.arto}`, '_blank', 'noopener');
}
},
{ title: '购买方统一社会信用代码', index: 'artotaxno', className: 'text-center', width: '200px' },
{
- title: '订单号', index: 'billHCode', className: 'text-center', width: '180px', type: 'link',
+ title: '订单号',
+ index: 'billHCode',
+ className: 'text-center',
+ width: '180px',
+ type: 'link',
click: item => {
- window.open(`/#/order-management/vehicle/vehicle-detail/${item.ltdId}`, '_blank', 'noopener')
+ window.open(`/#/order-management/vehicle/vehicle-detail/${item.ltdId}`, '_blank', 'noopener');
}
},
{ title: '货物名称', index: 'goodsinfo', className: 'text-center', width: '120px' },
@@ -245,12 +201,10 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
{ title: '开票日期', index: 'invoicedate', className: 'text-center', width: '180px' },
{ title: '发票所属月份', index: 'invoicemonth', className: 'text-center', width: '140px' },
{ title: '发票状态', index: 'sts', render: 'sts', className: 'text-center', width: '120px' },
- { title: '上传日期', index: 'uoloadDate', className: 'text-center', width: '180px' },
+ { title: '上传日期', index: 'uoloadDate', className: 'text-center', width: '180px' }
];
}
-
-
/**
*撤回
* @param record 记录实例
@@ -276,10 +230,9 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
this.service.msgSrv.success('撤销成功');
this.search();
}
- })
+ });
}
});
-
}
/**
@@ -307,10 +260,9 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
this.service.msgSrv.success('撤销成功');
this.search();
}
- })
+ });
}
});
-
}
selectChange(item: any) {
@@ -318,10 +270,9 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
setTimeout(() => {
this.st.load();
- })
+ });
}
-
/**
* 上传
*/
@@ -340,10 +291,9 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
this.service.msgSrv.success('上传成功');
this.st.load();
}
- })
+ });
}
-
/**
* 查看监管审核结果
*/
@@ -351,17 +301,16 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
if (record?.billStatus !== '2') {
return;
}
- this.openWainingModal('监管审核结果', record?.result)
+ this.openWainingModal('监管审核结果', record?.result);
}
-
search() {
this.st.load(1);
}
/**
- * 异步导出
- */
+ * 异步导出
+ */
export() {
this.service.exportStart(this.reqParams, this.service.$api_invoiceUpload_export);
}
@@ -370,8 +319,7 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
this.modal.warning({
nzMask: false,
nzTitle: title,
- nzContent: content,
- })
+ nzContent: content
+ });
}
-
}
diff --git a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts
index 1343b38f..577406c9 100644
--- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts
+++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { STColumn, STComponent, STData } from '@delon/abc/st';
import { SFDateWidgetSchema, SFSchemaEnum, SFSelectWidgetSchema } from '@delon/form';
-import { SearchDrawerService, ShipperBaseService } from '@shared';
+import { SearchDrawerService } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal';
import { of } from 'rxjs';
import { map } from 'rxjs/operators';
@@ -34,7 +34,6 @@ export class TaxManagementOrderReportingComponent extends BasicTableComponent im
public service: TaxManagementService,
private router: Router,
private ar: ActivatedRoute,
- public shipperservice: ShipperBaseService,
private modal: NzModalService,
public searchDrawerService: SearchDrawerService
) {
@@ -163,7 +162,7 @@ export class TaxManagementOrderReportingComponent extends BasicTableComponent im
widget: 'select',
placeholder: '请选择',
allowClear: true,
- asyncData: () => this.shipperservice.getNetworkFreightForwarder()
+ asyncData: () => this.service.getNetworkFreightForwarder()
}
},
recentlyPutTime: {
diff --git a/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts b/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts
index b1e3ed5f..9574f30a 100644
--- a/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts
+++ b/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts
@@ -257,7 +257,7 @@ export class FreightConfigComponent extends BasicTableComponent implements OnIni
format: item => `${item.contractSurchargeRatio}%`
},
{
- title: '合同单业务量（元）',
+ title: '合同单业务量（万元）',
index: 'contractQuota',
width: 170,
type: 'widget',
@@ -265,7 +265,7 @@ export class FreightConfigComponent extends BasicTableComponent implements OnIni
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.contractQuota }) }
},
{
- title: '货源单业务量（元）',
+ title: '货源单业务量（万元）',
index: 'goodsQuota',
width: 170,
type: 'widget',
diff --git a/src/app/routes/vehicle/components/list/detail/detail.component.ts b/src/app/routes/vehicle/components/list/detail/detail.component.ts
index 418b62b2..66707ca1 100644
--- a/src/app/routes/vehicle/components/list/detail/detail.component.ts
+++ b/src/app/routes/vehicle/components/list/detail/detail.component.ts
@@ -203,14 +203,18 @@ export class VehicleComponentsListDetailComponent implements OnInit {
*查看评价
*/
viewEvaluate(item: any) {
- console.log(item);
- this.st.reload();
- this.getDetailList();
- const params = {
- imgList: [item.carProtocal],
- index: 0
- };
- this.nzImageService.preview([{ src: item.carProtocal}]);
+ // console.log(item);
+ // this.st.reload();
+ // this.getDetailList();
+ // const params = {
+ // imgList: [item.carProtocal],
+ // index: 0
+ // };
+ // this.nzImageService.preview([{ src: item.carProtocal}]);
+ this.modal.createStatic(VehicleImgViewComponent, { i: item }).subscribe(() => {
+ this.st.reload();
+ this.getDetailList();
+ });
}
/**
*查看评价
diff --git a/src/app/shared/services/business/shipper-base.service.ts b/src/app/shared/services/business/shipper-base.service.ts
index 804c531a..ff9837af 100644
--- a/src/app/shared/services/business/shipper-base.service.ts
+++ b/src/app/shared/services/business/shipper-base.service.ts
@@ -383,8 +383,13 @@ export class ShipperBaseService extends BaseService {
* 获取全部返佣配置
* @returns
*/
- getRebateConfig() {
- const params = {};
+ getRebateConfig(value?: any) {
+ const params:any = {};
+ if(value) {
+ params.stateLocked = 1
+ }
+ console.log(params);
+
return this.request(this.$api_get_rebate_config, params, 'POST').pipe(
map(res => {
if (res) {