diff --git a/src/app/routes/insurance-management/components/list/list.component.html b/src/app/routes/insurance-management/components/list/list.component.html index d74b9efa..6392b20b 100644 --- a/src/app/routes/insurance-management/components/list/list.component.html +++ b/src/app/routes/insurance-management/components/list/list.component.html @@ -33,7 +33,7 @@
- + - - + +
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 aabc62f5..4dd8bb7d 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 @@ -109,35 +109,35 @@ export class TaxManagementIndividualDeclareComponent implements OnInit { this.schema = { properties: { _$expand: { type: 'boolean', ui: { hidden: true } }, - billCode: { title: '司机姓名', type: 'string', ui: { placeholder: '请输入' } }, - resourceCode: { + driverName: { title: '司机姓名', type: 'string', ui: { placeholder: '请输入' } }, + telephone: { type: 'string', title: '联系电话', ui: { placeholder: '请输入' } }, - driverName: { + cardNumber: { title: '证件号码', type: 'string', ui: { placeholder: '请输入证件号码' } }, - serviceType2: { + declareStatus: { title: '申报状态', type: 'string', ui: { placeholder: '请选择', widget: 'dict-select', - params: { dictKey: 'service:type' }, + params: { dictKey: 'taxincome:declare:status' }, containsAllLabel: true, visibleIf: { _$expand: (value: boolean) => value } } }, - serviceType3: { + declareResult: { title: '申报结果', type: 'string', ui: { @@ -150,20 +150,22 @@ export class TaxManagementIndividualDeclareComponent implements OnInit { } } }, - serviceType1: { + isOvertime: { title: '是否逾期', type: 'string', + enum: [ + { value: '', label: '全部' }, + { value: false, label: '否' }, + { value: true, label: '是' } + ], ui: { placeholder: '请选择', - widget: 'dict-select', - params: { dictKey: 'service:type' }, - containsAllLabel: true, - visibleIf: { - _$expand: (value: boolean) => value - } - } + widget: 'select', + containsAllLabel: true + }, + default: '' }, - createTime: { + taxDate: { title: '税款所属期', type: 'string', ui: { @@ -175,7 +177,7 @@ export class TaxManagementIndividualDeclareComponent implements OnInit { } } as SFDateWidgetSchema }, - createTime3: { + declareDate: { title: '申报日期', type: 'string', ui: { @@ -187,7 +189,7 @@ export class TaxManagementIndividualDeclareComponent implements OnInit { } } as SFDateWidgetSchema }, - enterpriseInfoId: { + ltdId: { type: 'string', title: '网络货运人', ui: { @@ -214,38 +216,57 @@ export class TaxManagementIndividualDeclareComponent implements OnInit { initST() { this.columns = [ { title: '', type: 'checkbox', className: 'text-center', width: '60px' }, - { title: '申报状态', render: 'orderStatus', className: 'text-center', width: '120px' }, - { title: '是否逾期', render: 'localValid', className: 'text-center', width: '120px' }, + { + title: '申报状态', + index: 'declareStatus', + className: 'text-center', + width: '120px', + type: 'badge', + badge: { + '0': { text: '待申报', color: 'default' }, + '1': { text: '待审核', color: 'processing' }, + '2': { text: '已通过', color: 'success' }, + '3': { text: '不通过', color: 'error' } + } + }, + { + title: '是否逾期', + index: 'overdueStatus', + className: 'text-center', + width: '120px', + type: 'enum', + enum: { false: '否', true: '是' } + }, { title: '税款所属期起', - render: 'billComplianceVOS', + index: 'skssqq', className: 'text-center', width: '150px' }, - { title: '税款所属期止', render: 'freightDetails', className: 'text-center', width: '150px' }, + { title: '税款所属期止', index: 'skssqz', className: 'text-center', width: '150px' }, { title: '纳税人名称', - render: 'serviceType', + index: 'nsrmc', className: 'text-center', width: '180px' }, - { title: '纳税人识别号', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' }, - { title: '姓名', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' }, - { title: '证件类型', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' }, - { title: '证件号码', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' }, - { title: '联系电话', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' }, - { title: '国家（地区）', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' }, - { title: '所属行业', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' }, - { title: '征收项目', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' }, - { title: '征收品目', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' }, - { title: '计税依据', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' }, - { title: '税率', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' }, - { title: '应纳税额', render: 'transportInfo', className: 'text-center', width: '180px' }, - { title: '减免税额', render: 'transportInfo', className: 'text-center', width: '180px' }, - { title: '已缴纳税额', render: 'transportInfo', className: 'text-center', width: '180px' }, - { title: '应代征税额', render: 'transportInfo', className: 'text-center', width: '180px' }, - { title: '已代征税额', render: 'payeeName', className: 'text-center', width: '150px' }, - { title: '申报日期', render: 'payeeName', className: 'text-center', width: '150px' }, + { title: '纳税人识别号', index: 'nsrsbh', 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: '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: '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' }, ]; } @@ -277,7 +298,7 @@ export class TaxManagementIndividualDeclareComponent implements OnInit { *撤销 * @param record 记录实例 */ - resetData() { + uploadSetting() { if (this.selectedRows.length === 0) { this.openWainingModal('请选择需要更新的数据！'); return; @@ -364,17 +385,21 @@ export class TaxManagementIndividualDeclareComponent implements OnInit { * * @param params 更新数据 */ - uploadSetting() { + resetData() { if (this.selectedRows.length === 0) { this.openWainingModal('请选择需要上传的数据'); return; } - // this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => { - // if (res) { - // this.service.msgSrv.success('更新成功'); - // this.search(); - // } - // }) + let params: any[] = []; + this.selectedRows.forEach(item => { + params.push(item.id); + }); + this.service.request(this.service.$api_get_taxDeclaration_updateAll, params).subscribe((res: any) => { + if (res) { + this.service.msgSrv.success('更新成功'); + this.st.load(1); + } + }) } /** diff --git a/src/app/routes/tax-management/services/tax-management.service.ts b/src/app/routes/tax-management/services/tax-management.service.ts index edd6d18e..dcf02420 100644 --- a/src/app/routes/tax-management/services/tax-management.service.ts +++ b/src/app/routes/tax-management/services/tax-management.service.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-27 10:30:56 * @LastEditors : Shiming - * @LastEditTime : 2022-04-08 15:28:39 + * @LastEditTime : 2022-04-09 14:22:35 * @FilePath : \\tms-obc-web\\src\\app\\routes\\tax-management\\services\\tax-management.service.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -45,6 +45,11 @@ export class TaxManagementService extends ShipperBaseService { $api_get_uploadingTaxOrder = `/api/sdc/tax/uploadingTaxOrder`; // 上传税务订单 $api_get_getTaxFieldCheckList = `/api/sdc/taxFieldCheck/getTaxFieldCheckList`; + + // 查询税务申报 + $api_get_taxDeclaration = `/api/sdc/taxDeclaration/list/page`; + // 更新所有税务申报 + $api_get_taxDeclaration_updateAll = `/api/sdc/taxDeclaration/updateAll`; $api_recall_reporting = ``; // 撤回 $api_async_export_order_reporting_list = ``; // 导出订单上报 $api_get_upload_setting = ``; // 修改上传设置 diff --git a/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.ts b/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.ts index ddb2d380..3325a4c2 100644 --- a/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.ts +++ b/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.ts @@ -229,6 +229,6 @@ export class ETCInvoicedRequestedComponent implements OnInit { } // 导出 exprot() { - this.service.exportStart(this.sf?.value, this.service.$api_get_asyncExportEtcApplyList); + this.service.exportStart({...this.sf?.value, pageSize: -1}, this.service.$api_get_asyncExportEtcApplyList); } } diff --git a/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts b/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts index 3ae0c418..66161971 100644 --- a/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts +++ b/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts @@ -62,7 +62,7 @@ export class UserCenterComponentsDriverConfigComponent implements OnInit { exportList() { const params = this.reqParams; - this.service.downloadFile(this.service.$api_export_driver_cap, { ...params, pageSize: -1 }); + this.service.downloadFile(this.service.$api_driver_exportConfig, { ...params, pageSize: -1 }); } private initSF(): SFSchema { diff --git a/src/app/routes/usercenter/services/usercenter.service.ts b/src/app/routes/usercenter/services/usercenter.service.ts index 6bd733d5..db00ea06 100644 --- a/src/app/routes/usercenter/services/usercenter.service.ts +++ b/src/app/routes/usercenter/services/usercenter.service.ts @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-11-29 15:22:34 - * @LastEditTime : 2022-02-18 11:15:16 + * @LastEditTime : 2022-04-09 14:54:17 * @LastEditors : Shiming * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @FilePath : \\tms-obc-web\\src\\app\\routes\\usercenter\\services\\usercenter.service.ts @@ -111,6 +111,8 @@ export class UsermanageService extends ShipperBaseService { $api_export_driver = '/api/mdc/cuc/driver/export'; // 车队长导出-运营后台 $api_export_driver_cap = '/api/mdc/userDriverExpand/export'; + // 司机配置列表导出-运营后台 + $api_driver_exportConfig = '/api/mdc/cuc/driver/exportConfig'; // 营业执照识别 $api_ocr_recognize_business_license = '/api/mdc/pbc/hwc/ocr/recognizeBusinessLicense';