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:
Taric Xin
2022-04-19 14:27:14 +08:00
parent a5b97bc4ed f4dfb848bf
commit 8cee9c6fa0
4 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
proxy.conf.js
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-01-18 09:51:21
* @LastEditors : Shiming
* @LastEditTime : 2022-04-19 13:17:35
* @LastEditTime : 2022-04-19 14:20:28
* @FilePath : \\tms-obc-web\\proxy.conf.js
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/

16
src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts
View File

@ -285,16 +285,12 @@ export class TaxManagementIndividualCollectComponent implements OnInit {
* @param params 更新数据
*/
uploadSetting() {
if (this.selectedRows.length === 0) {
this.service.msgSrv.warning('请选择需要更新的数据');
return;
}
// this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => {
// if (res) {
// this.service.msgSrv.success('更新成功');
// this.search();
// }
// })
this.service.request(this.service.$api_get_updateData).subscribe((res: any) => {
if (res) {
this.service.msgSrv.success('更新成功');
this.search();
}
})
}
search() {

11
src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts
View File

@ -413,10 +413,21 @@ export class TaxManagementOrderReportingComponent implements OnInit {
* 上传
*/
upload() {
let status = false
if (this.selectedRows.length === 0) {
this.openWainingModal('请选择需要上传的数据');
return;
}
this.selectedRows.forEach(item => {
if (item?.putStatus != '0') {
status = true
}
});
if(status) {
this.service.msgSrv.warning('选择了已上传，请重新勾选！');
return;
}
let params: any[] = [];
this.selectedRows.forEach(item => {
params.push(item.id);

4
src/app/routes/tax-management/services/tax-management.service.ts
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-27 10:30:56
* @LastEditors : Shiming
* @LastEditTime : 2022-04-09 14:22:35
* @LastEditTime : 2022-04-19 14:19:44
* @FilePath : \\tms-obc-web\\src\\app\\routes\\tax-management\\services\\tax-management.service.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@ -50,6 +50,8 @@ export class TaxManagementService extends ShipperBaseService {
$api_get_taxDeclaration = `/api/sdc/taxDeclaration/list/page`;
// 更新所有税务申报
$api_get_taxDeclaration_updateAll = `/api/sdc/taxDeclaration/updateAll`;
// 更新所有个税汇总
$api_get_updateData = `/api/sdc/taxSummary/updateData`;
$api_recall_reporting = ``; // 撤回
$api_async_export_order_reporting_list = ``; // 导出订单上报
$api_get_upload_setting = ``; // 修改上传设置