Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
wangshiming
2022-05-13 14:09:08 +08:00
parent 85ebb019bc
commit 1e59550345
3 changed files with 10 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/routes/partner/channel-sales/components/edit/edit.component.ts
View File

@ -53,7 +53,7 @@ export class ParterChannelSalesEditComponent implements OnInit {
delete value1.employeeVO;
let value = res.employeeVO;
List.push({ label: value.empName + '/' + value.empNo, value: value.empNo });
res.roleInfoVOList.forEach((element: any) => {
res?.roleInfoVOList?.forEach((element: any) => {
List3.push(element.id);
});
setTimeout(() => {

27
src/app/routes/partner/recorded/components/detail/detail.component.ts
View File

@ -36,26 +36,18 @@ export class PartnerRecordedDetailComponent implements OnInit {
console.log(res);
// submitTime creattime
let isEnd = false;
if (res.modifyTime) {
if (res.sts == '2') {
isEnd = true;
if (res.sts === '3') {
this.timeLineData.push({ time: res.modifyTime, value: `入账成功`, color: 'green' });
} else {
} else if (res.sts == '3'){
isEnd = true;
this.timeLineData.push({ time: res.modifyTime, value: `入账失败`, color: 'red' });
}
}
// if (res.agreeTime && res.refundStatus !== '4') {
// this.timeLineData.push({ time: res.agreeTime, value: `银行处理中`, color: 'gray' });
// }
if (res.reAuditTime) {
if (res.refundStatus === '4') {
isEnd = true;
this.timeLineData.push({
time: res.reAuditTime,
value: `拒绝申请<br/>操作人员：${res.reAuditName}`,
color: 'red'
});
} else {
if (res.sts === '2') {
this.timeLineData.push({
time: res.reAuditTime,
value: `审核通过<br/>操作人员：${res.reAuditName}`,
@ -64,14 +56,7 @@ export class PartnerRecordedDetailComponent implements OnInit {
}
}
if (res.firstAuditTime) {
if (res.refundStatus === '4') {
isEnd = true;
this.timeLineData.push({
time: res.firstAuditTime,
value: `拒绝申请<br/>操作人员：${res.fristAuditName}`,
color: 'red'
});
} else {
if (res.sts === '1') {
this.timeLineData.push({
time: res.firstAuditTime,
value: `审核通过<br/>操作人员：${res.fristAuditName}`,
@ -79,7 +64,7 @@ export class PartnerRecordedDetailComponent implements OnInit {
});
}
}
if (res.submitTime) {
if (res.sts) {
this.timeLineData.push({
time: res.submitTime,
value: `提交入账申请<br/>入账${res.entryAmount}元至${res.fictitiousAccount}<br/>操作人员：${res.submitUserName}`,

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-05-13 11:42:37
* @LastEditTime : 2022-05-13 14:06:34
* @FilePath : \\tms-obc-web\\src\\app\\routes\\tax-management\\services\\tax-management.service.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@ -59,7 +59,7 @@ export class TaxManagementService extends ShipperBaseService {
// 获取发票上传列表
$api_getInvoiceReport_page = '/api/sdc/invoiceUploadInfo/list/page';
// 发票上传列表导出
$api_invoiceUpload_export = '/api/sdc/exportInvoiceUpload/exportInvoiceUpload';
$api_invoiceUpload_export = '/api/sdc/invoiceUploadInfo/exportInvoiceUpload';
// 个税明细导出接口
$api_taxIncome_export = '/api/sdc/taxIncome/asyncExport';
// 个税汇总导出接口