+
+
+
-
+
diff --git a/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.less b/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.less
index e69de29b..3148fb3e 100644
--- a/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.less
+++ b/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.less
@@ -0,0 +1,10 @@
+/* stylelint-disable-next-line CssSyntaxError */
+:host {
+ ::ng-deep {
+ .bbod{
+ height: 600px;
+ overflow-y: hidden;
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.ts b/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.ts
index 3f838c47..16ff04e7 100644
--- a/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.ts
+++ b/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.ts
@@ -1,32 +1,48 @@
-import { Component, OnInit } from '@angular/core';
-import { STColumn } from '@delon/abc/st';
+/*
+ * @Description :
+ * @Version : 1.0
+ * @Author : Shiming
+ * @Date : 2022-05-09 10:49:35
+ * @LastEditors : Shiming
+ * @LastEditTime : 2022-05-11 14:47:57
+ * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\partner-list\\components\\channel-log-modal\\channel-log-modal.component.ts
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+ */
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { STColumn, STComponent } from '@delon/abc/st';
import { PartnerListService } from '../../services/partner-list.service';
@Component({
selector: 'app-channel-log-modal',
+ styleUrls: ['./channel-log-modal.component.less'],
templateUrl: './channel-log-modal.component.html'
})
export class ChannelLogModalComponent implements OnInit {
+ @ViewChild('changeST', { static: true }) changeST!: STComponent;
+ @ViewChild('noChangeST', { static: true }) noChangeST!: STComponent;
columns: { changeColumn: STColumn[]; beChangeColumn: STColumn[] } = this.initST();
id = '';
constructor(public service: PartnerListService) {}
- ngOnInit(): void {}
+ ngOnInit(): void {
+ console.log(this.changeST);
+
+ }
private initST(): { changeColumn: STColumn[]; beChangeColumn: STColumn[] } {
return {
changeColumn: [
- { title: '客户名称', index: 'payCode', width: 180 },
- { title: '合伙人', index: 'ltdName', width: 160 },
- { title: '渠道销售', index: 'payDate', className: 'text-center', width: 130 },
- { title: 'CRM审核状态', index: 'payDate', width: 150 },
- { title: '生效时间', index: 'payDate', className: 'text-center', width: 130 }
+ { title: '客户名称', index: 'enterpriseName', width: 180 },
+ { title: '合伙人', index: 'newPartnerName', width: 160 },
+ { title: '渠道销售', index: 'newChannelName', className: 'text-center', width: 130 },
+ { title: 'CRM审核状态', render: 'crmStatus', width: 150 },
+ { title: '生效时间', index: 'effectiveTime', className: 'text-center', width: 130 }
],
beChangeColumn: [
- { title: '客户名称', index: 'payCode', width: 180 },
- { title: '合伙人', index: 'ltdName', width: 160 },
- { title: '渠道销售', index: 'payDate', className: 'text-center', width: 130 },
- { title: '生效时间', index: 'payDate', className: 'text-center', width: 130 }
+ { title: '客户名称', index: 'enterpriseName', width: 180 },
+ { title: '合伙人', index: 'newPartnerName', width: 160 },
+ { title: '渠道销售', index: 'newChannelName', className: 'text-center', width: 130 },
+ { title: '生效时间', index: 'effectiveTime', className: 'text-center', width: 130 }
]
};
}
diff --git a/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts b/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts
index 6e169027..d93c1947 100644
--- a/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts
+++ b/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts
@@ -1,8 +1,7 @@
import { Component, Input, OnInit, ViewChild } from '@angular/core';
-import { SFComponent, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFValue } from '@delon/form';
+import { SFComponent, SFSchema, SFValue } from '@delon/form';
import { ModalHelper } from '@delon/theme';
import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal';
-import { of } from 'rxjs';
import { map } from 'rxjs/operators';
import { PartnerListService } from '../../services/partner-list.service';
@@ -25,6 +24,7 @@ export class PartnerAuditModalComponent implements OnInit {
console.log(this.info);
this.initSF(this.info);
// asyncData: () => this.service.getChannel(),
+
if(this.info.channelId) {
const value = [{
label: this.info.channelIdLabel,
@@ -38,26 +38,20 @@ export class PartnerAuditModalComponent implements OnInit {
}
})
- }
- // else {
- // console.log()
- // this.service.getChannel().pipe(map(data => {
- // console.log(data);
-
- // }))
- // this.service.getChannel().subscribe((res) => {
- // console.log(res);
- // const value :any= res;
- // setTimeout(() => {
- // if(this.sf) {
- // this.sf.getProperty('/channelId2')!.schema.enum = value;
- // this.sf.getProperty('/channelId2')!.widget.reset(value);
- // this.sf.setValue('/channelId2', value);
- // }
- // })
- // })
+ } else {
+ this.service.getChannel().subscribe((res) => {
+ console.log(res);
+ const value :any= res;
+ setTimeout(() => {
+ if(this.sf) {
+ this.sf.getProperty('/channelId')!.schema.enum = value;
+ this.sf.getProperty('/channelId')!.widget.reset(value);
+ this.sf.setValue('/channelId', value);
+ }
+ })
+ })
- // }
+ }
}
initSF(user: any) {
@@ -91,36 +85,21 @@ export class PartnerAuditModalComponent implements OnInit {
default: this.info.isPass !== undefined ? this.info.isPass : true
},
channelId: {
- type: 'string',
title: '渠道销售',
+ type: 'string',
ui: {
widget: 'select',
- hidden: this.info.isPass === false,
- serverSearch: true,
- searchDebounceTime: 300,
- searchLoadingText: '搜索中...',
+ placeholder: '请选择',
allowClear: true,
- onSearch: (q: any) => {
- let str = q.replace(/^\s+|\s+$/g, '');
- let params :any= {}
- if (str) {
- console.log(+str);
- if(+str) {
- console.log('数字');
- params.phoneNumber = str
- } else {
- console.log('中文');
- params.name = str
- }
- return this.service
- .request(this.service.$api_get_channel, params)
- .pipe(map((res: any) => (res as any[]).map(i => ({ label: `${i.name}/${i.telephone}`, value: i.id } as SFSchemaEnum))))
- .toPromise();
- } else {
- return of([]);
- }
+ hidden: this.info.isPass === false,
+ visibleIf: {
+ status: value => value
},
- } as SFSelectWidgetSchema
+ errors: {
+ required: ' '
+ }
+ },
+ default: user.channelId
},
approvalOpinion: {
title: '备注',
@@ -140,8 +119,10 @@ export class PartnerAuditModalComponent implements OnInit {
}
}
},
- required: [ 'approvalOpinion','channelId']
+ required: ['channelId', 'approvalOpinion']
};
+ console.log('666');
+
}
sure() {
diff --git a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html
index 32115fda..9584bb72 100644
--- a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html
+++ b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html
@@ -28,9 +28,7 @@
转移客户数：{{ changeST?.list?.length }}
+未发起
+ 待审核
+ 审核通过
+ 驳回
+ 不转移客户数：{{noChangeST?.total}}
-不转移客户数：{{ noChangeST?.list?.length }}
+- 客户转移：客户跟着上级合伙人转移一并到新渠道销售下，会同步发起CRM《客户转移》流程；不转移的，客户会与上级合伙人解绑，修改成功后，修改时间也是合伙人与客户的结算结束时间，成为原来渠道销售的直客。 -
\ No newline at end of file + 客户转移：客户跟着上级合伙人转移一并到新渠道销售下，会同步发起CRM《客户转移》流程；不转移的，客户会与上级合伙人解绑，修改成功后，修改时间也是合伙人与客户的结算结束时间，成为原来渠道销售的直客。 + + 注册时间：{{ detailData?.createTime }}
-
- 所属城市：{{enterpriseDefaultCityName}}
-
+ 所属城市：{{ enterpriseDefaultCityName }}
-
+ "
+ >
-
+ "
+ >
-
+ "
+ >
-
+ "
+ >
-
+
@@ -301,18 +426,36 @@
-
+
-
+
{{ item?.billStatusLabel }}
{{ item?.billStatusLabel }}
@@ -49,33 +56,25 @@
已选择
{{ selectedRows.length }} 条数据
-
-
+
+
+ 更多
上传
+
![]()
-
+
diff --git a/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.html b/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.html
index cb8e1f13..deda5ad4 100644
--- a/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.html
+++ b/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.html
@@ -244,23 +244,21 @@
-
+
修改渠道销售记录
-
-
-
-
+
+
diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts b/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts
index 36035584..7efc2a2a 100644
--- a/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts
+++ b/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts
@@ -94,7 +94,7 @@ export class ParterRebateManageMentSettingComponent implements OnInit {
},
{
title: '创建时间',
- index: 'enableTime',
+ index: 'createTime',
width: '200px'
},
{
diff --git a/src/app/routes/partner/recorded/components/detail/detail.component.html b/src/app/routes/partner/recorded/components/detail/detail.component.html
index 8bfafd61..a3421887 100644
--- a/src/app/routes/partner/recorded/components/detail/detail.component.html
+++ b/src/app/routes/partner/recorded/components/detail/detail.component.html
@@ -4,8 +4,8 @@
* @Author : Shiming
* @Date : 2022-01-05 20:15:41
* @LastEditors : Shiming
- * @LastEditTime : 2022-01-18 17:17:19
- * @FilePath : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\withdrawals-record\\withdrawals-detail\\withdrawals-detail.component.html
+ * @LastEditTime : 2022-05-11 15:06:17
+ * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\recorded\\components\\detail\\detail.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@@ -40,7 +40,7 @@
{{formData?.entryNumber}}
- {{formData?.bankName}}
+ {{formData?.bankType}}
{{formData?.fictitiousAccount}}
@@ -58,7 +58,10 @@
{{formData?.recordedAmount | currency}}
- {{formData?.stsLabel}}
+ 待审核
+ 待复核
+ 已入账
+ 已驳回
![]()
diff --git a/src/app/routes/partner/recorded/components/detail/detail.component.ts b/src/app/routes/partner/recorded/components/detail/detail.component.ts
index 08d5e9bc..479d2daa 100644
--- a/src/app/routes/partner/recorded/components/detail/detail.component.ts
+++ b/src/app/routes/partner/recorded/components/detail/detail.component.ts
@@ -29,44 +29,44 @@ export class PartnerRecordedDetailComponent implements OnInit {
this.formData = res;
// 处理流程节点数据
// 流程是否结束
- // let isEnd = false;
- // if (res.successTime) {
- // isEnd = true;
- // if (res.refundStatus === '3') {
- // this.timeLineData.push({ time: res.successTime, value: `到账成功`, color: 'green' });
- // } else {
- // this.timeLineData.push({ time: res.successTime, value: `提现失败`, color: 'red' });
- // }
- // }
- // if (res.agreeTime && res.refundStatus !== '4') {
- // this.timeLineData.push({ time: res.agreeTime, value: `银行处理中`, color: 'gray' });
- // }
- // if (res.agreeTime) {
- // if (res.refundStatus === '4') {
- // isEnd = true;
- // this.timeLineData.push({
- // time: res.agreeTime,
- // value: `拒绝提现
操作人员：${res.handlerUserIdLabel}`, - // color: 'red' - // }); - // } else { - // this.timeLineData.push({ - // time: res.agreeTime, - // value: `审核通过
操作人员：${res.handlerUserIdLabel}`, - // color: 'gray' - // }); - // } - // } - // if (res.createTime) { - // this.timeLineData.push({ - // time: res.createTime, - // value: `提交提现申请
提现${res.amount}元至${res.bankName}(${res.bankCardNumber})
操作人员：${res.userIdLabel}`, - // color: 'gray' - // }); - // } - // if (this.timeLineData?.length > 0 && !isEnd) { - // this.timeLineData[0].color = 'green'; - // } + let isEnd = false; + if (res.successTime) { + isEnd = true; + if (res.refundStatus === '3') { + this.timeLineData.push({ time: res.successTime, value: `到账成功`, color: 'green' }); + } else { + this.timeLineData.push({ time: res.successTime, value: `提现失败`, color: 'red' }); + } + } + if (res.agreeTime && res.refundStatus !== '4') { + this.timeLineData.push({ time: res.agreeTime, value: `银行处理中`, color: 'gray' }); + } + if (res.agreeTime) { + if (res.refundStatus === '4') { + isEnd = true; + this.timeLineData.push({ + time: res.agreeTime, + value: `拒绝提现
操作人员：${res.handlerUserIdLabel}`, + color: 'red' + }); + } else { + this.timeLineData.push({ + time: res.agreeTime, + value: `审核通过
操作人员：${res.handlerUserIdLabel}`, + color: 'gray' + }); + } + } + if (res.createTime) { + this.timeLineData.push({ + time: res.createTime, + value: `提交提现申请
提现${res.amount}元至${res.bankName}(${res.bankCardNumber})
操作人员：${res.userIdLabel}`, + color: 'gray' + }); + } + if (this.timeLineData?.length > 0 && !isEnd) { + this.timeLineData[0].color = 'green'; + } } }); } diff --git a/src/app/routes/partner/recorded/components/record/record.component.html b/src/app/routes/partner/recorded/components/record/record.component.html index 7bcde4e5..7517efae 100644 --- a/src/app/routes/partner/recorded/components/record/record.component.html +++ b/src/app/routes/partner/recorded/components/record/record.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-04-29 17:28:23 * @LastEditors : Shiming - * @LastEditTime : 2022-05-11 10:11:53 + * @LastEditTime : 2022-05-11 14:25:14 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\recorded\\components\\record\\record.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -34,7 +34,7 @@
-
{{ item.bankCardNumber }}
+
+
diff --git a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts
index a006411a..05582e51 100644
--- a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts
+++ b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts
@@ -257,10 +257,8 @@ export class TaxManagementIndividualCollectComponent extends BasicTableComponent
this.st.load(1);
}
- /**
- * 异步导出
- */
- export() {
- this.service.exportStart(this.sf?.value, this.service.$api_async_export_order_reporting_list);
- }
+ // 导出
+ exprot() {
+ this.service.exportStart({ ...this.sfValue, pageSize: -1 }, this.service.$api_taxSummary_export);
+}
}
diff --git a/src/app/routes/tax-management/components/individual-declare/individual-declare.component.html b/src/app/routes/tax-management/components/individual-declare/individual-declare.component.html
index daee8554..c0299bc2 100644
--- a/src/app/routes/tax-management/components/individual-declare/individual-declare.component.html
+++ b/src/app/routes/tax-management/components/individual-declare/individual-declare.component.html
@@ -26,8 +26,15 @@
- 操作人员：${res.handlerUserIdLabel}`, - // color: 'red' - // }); - // } else { - // this.timeLineData.push({ - // time: res.agreeTime, - // value: `审核通过
操作人员：${res.handlerUserIdLabel}`, - // color: 'gray' - // }); - // } - // } - // if (res.createTime) { - // this.timeLineData.push({ - // time: res.createTime, - // value: `提交提现申请
提现${res.amount}元至${res.bankName}(${res.bankCardNumber})
操作人员：${res.userIdLabel}`, - // color: 'gray' - // }); - // } - // if (this.timeLineData?.length > 0 && !isEnd) { - // this.timeLineData[0].color = 'green'; - // } + let isEnd = false; + if (res.successTime) { + isEnd = true; + if (res.refundStatus === '3') { + this.timeLineData.push({ time: res.successTime, value: `到账成功`, color: 'green' }); + } else { + this.timeLineData.push({ time: res.successTime, value: `提现失败`, color: 'red' }); + } + } + if (res.agreeTime && res.refundStatus !== '4') { + this.timeLineData.push({ time: res.agreeTime, value: `银行处理中`, color: 'gray' }); + } + if (res.agreeTime) { + if (res.refundStatus === '4') { + isEnd = true; + this.timeLineData.push({ + time: res.agreeTime, + value: `拒绝提现
操作人员：${res.handlerUserIdLabel}`, + color: 'red' + }); + } else { + this.timeLineData.push({ + time: res.agreeTime, + value: `审核通过
操作人员：${res.handlerUserIdLabel}`, + color: 'gray' + }); + } + } + if (res.createTime) { + this.timeLineData.push({ + time: res.createTime, + value: `提交提现申请
提现${res.amount}元至${res.bankName}(${res.bankCardNumber})
操作人员：${res.userIdLabel}`, + color: 'gray' + }); + } + if (this.timeLineData?.length > 0 && !isEnd) { + this.timeLineData[0].color = 'green'; + } } }); } diff --git a/src/app/routes/partner/recorded/components/record/record.component.html b/src/app/routes/partner/recorded/components/record/record.component.html index 7bcde4e5..7517efae 100644 --- a/src/app/routes/partner/recorded/components/record/record.component.html +++ b/src/app/routes/partner/recorded/components/record/record.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-04-29 17:28:23 * @LastEditors : Shiming - * @LastEditTime : 2022-05-11 10:11:53 + * @LastEditTime : 2022-05-11 14:25:14 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\recorded\\components\\record\\record.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -34,7 +34,7 @@
{{ item.bankCardNumber }}
待初审
+ 待复核
+ 已入账
+ 已拒绝
+
合伙人数：合伙人数：
入账笔数：入账笔数：
开票金额：开票金额：
代缴个税： {
@@ -60,7 +63,7 @@ export class PartnerRecordedRecordComponent implements OnInit {
start: this.sf?.value.createTime?.[0] || '',
end: this.sf?.value.createTime?.[1] || ''
},
- refundStatus: this.refundStatus || null
+ sts: this.refundStatus || ''
});
}
delete requestOptions?.body?.expand;
@@ -68,7 +71,7 @@ export class PartnerRecordedRecordComponent implements OnInit {
};
afterRes = (data: any[], rawData?: any) => {
- // data = data.map(node => ({ ...node, disabled: node.sts !== '0' }));
+ data = data.map(node => ({ ...node, disabled: node.sts !== '0' }));
return data;
};
@@ -81,16 +84,15 @@ export class PartnerRecordedRecordComponent implements OnInit {
const stList = this.st.list;
stList.forEach(item => {
this.selectedRows = this.selectedRows.filter((e: any) => e.id !== item.id);
- })
+ });
} else {
//添加新增的行
checkRows.forEach((item: any) => {
const newSelectedList = this.selectedRows.filter((r: any) => r.id === item.id);
if (newSelectedList.length === 0) {
this.selectedRows.push(item);
-
}
- })
+ });
// 移除取消选中的行
const stList = this.st.list;
stList.forEach(item => {
@@ -98,17 +100,17 @@ export class PartnerRecordedRecordComponent implements OnInit {
const index = this.selectedRows.findIndex(_item => item.id === _item.id);
if (index !== -1) this.selectedRows.splice(index, 1);
}
- })
+ });
}
let totalCallNo = 0;
- this.selectedRows.forEach((item => {
+ this.selectedRows.forEach(item => {
totalCallNo = new Big(this.totalCallNo).plus(item?.entryAmount).parse();
- }));
+ });
this.totalCallNo = totalCallNo;
} else if (e.type === 'loaded') {
// 页面加载时勾选
- (e?.loaded || []).forEach((r) => {
- this.selectedRows.forEach((x) => {
+ (e?.loaded || []).forEach(r => {
+ this.selectedRows.forEach(x => {
if (x.id === r.id) {
r.checked = true;
}
@@ -117,8 +119,27 @@ export class PartnerRecordedRecordComponent implements OnInit {
}
}
- changeRefundStatus(status?: string) {
- this.refundStatus = status || null;
+ changeRefundStatus(status: any) {
+ let value = '';
+ switch (status) {
+ case '0':
+ value = '';
+ break;
+ case '1':
+ value = '0';
+ break;
+ case '2':
+ value = '1';
+ break;
+ case '3':
+ value = '2';
+ break;
+ case '4':
+ value = '3';
+ break;
+ }
+
+ this.refundStatus = value || null;
this.st.load(1);
}
@@ -146,10 +167,14 @@ export class PartnerRecordedRecordComponent implements OnInit {
this.service.msgSrv.warning('请填写拒绝原因 ');
return;
}
- this.audit({ ids: params, rejectReason: this.msg, sts: '3' }, () => {
- modal.destroy();
- this.st.load(1);
- }, '审核拒绝成功');
+ this.audit(
+ { ids: params, rejectReason: this.msg, sts: '3' },
+ () => {
+ modal.destroy();
+ this.st.load(1);
+ },
+ '审核拒绝成功'
+ );
// this.service
// .request(this.service.$api_disagree_recorded, {
// id: params,
@@ -168,10 +193,14 @@ export class PartnerRecordedRecordComponent implements OnInit {
label: '通过',
type: 'primary',
onClick: () => {
- this.audit({ ids: params, rejectReason: this.msg, sts: '1' }, () => {
- modal.destroy();
- this.st.load(1);
- }, '审核通过成功');
+ this.audit(
+ { ids: params, rejectReason: this.msg, sts: '1' },
+ () => {
+ modal.destroy();
+ this.st.load(1);
+ },
+ '审核通过成功'
+ );
}
}
]
@@ -230,22 +259,22 @@ export class PartnerRecordedRecordComponent implements OnInit {
placeholder: '请输入'
}
},
- sts: {
- type: 'string',
- title: '入账状态',
- default: '',
- enum: [
- { label: '全部', value: '' },
- { label: '待初审', value: '0' },
- { label: '待复核', value: '1' },
- { label: '已入账', value: '2' },
- { label: '已拒绝', value: '3' },
- ],
- ui: {
- widget: 'select',
- placeholder: '请选择'
- }
- },
+ // sts: {
+ // type: 'string',
+ // title: '入账状态',
+ // default: '',
+ // enum: [
+ // { label: '全部', value: '' },
+ // { label: '待初审', value: '0' },
+ // { label: '待复核', value: '1' },
+ // { label: '已入账', value: '2' },
+ // { label: '已拒绝', value: '3' },
+ // ],
+ // ui: {
+ // widget: 'select',
+ // placeholder: '请选择'
+ // }
+ // },
ltdId: {
type: 'string',
title: '网络货运人',
@@ -254,7 +283,7 @@ export class PartnerRecordedRecordComponent implements OnInit {
widget: 'select',
placeholder: '请选择',
allowClear: true,
- asyncData: () => this.shipperSrv.getNetworkFreightForwarder({}, true),
+ asyncData: () => this.shipperSrv.getNetworkFreightForwarder({}, true)
}
},
submitTime: {
@@ -269,7 +298,7 @@ export class PartnerRecordedRecordComponent implements OnInit {
expand: (value: boolean) => value
}
} as SFDateWidgetSchema
- },
+ }
}
};
}
@@ -283,11 +312,11 @@ export class PartnerRecordedRecordComponent implements OnInit {
{ title: '网络货运人', index: 'ltdName', width: 220, className: 'text-center' },
{
title: '开票金额',
- index: 'amount',
+ index: 'invoiceAmount',
width: 150,
type: 'widget',
className: 'text-right',
- widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.amount }) }
+ widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.invoiceAmount }) }
},
{
title: '代缴个税',
@@ -295,7 +324,7 @@ export class PartnerRecordedRecordComponent implements OnInit {
width: 150,
type: 'widget',
className: 'text-right',
- widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.amount }) }
+ widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.taxPersonal }) }
},
{
title: '入账金额',
@@ -303,11 +332,11 @@ export class PartnerRecordedRecordComponent implements OnInit {
width: 150,
type: 'widget',
className: 'text-right',
- widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.amount }) }
+ widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.entryAmount }) }
},
{ title: '提交时间', index: 'submitTime', width: 180, className: 'text-center' },
- { title: '入账状态', index: 'stsLabel', width: 120, className: 'text-center' },
+ { title: '入账状态', render: 'sts', width: 120, className: 'text-center' },
{
title: '操作',
fixed: 'right',
@@ -336,17 +365,15 @@ export class PartnerRecordedRecordComponent implements OnInit {
}
/**
- * 审核
- */
+ * 审核
+ */
audit(params: any, callback: Function, msg = '成功') {
- this.service
- .request(this.service.$api_audit_recored, { ...params })
- .subscribe(res => {
- if (res) {
- this.service.msgSrv.success(msg);
- callback();
- }
- });
+ this.service.request(this.service.$api_audit_recored, { ...params }).subscribe(res => {
+ if (res) {
+ this.service.msgSrv.success(msg);
+ callback();
+ }
+ });
}
search() {
@@ -361,6 +388,6 @@ export class PartnerRecordedRecordComponent implements OnInit {
if (res) {
this.totalInfo = res;
}
- })
+ });
}
}
diff --git a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.html b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.html
index b21bb753..b81b2741 100644
--- a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.html
+++ b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.html
@@ -39,7 +39,7 @@
-
+
-
-
- - 申报 - -
- - 更正 - -
- - 修改起征点 - -
- - 更新数据 - +
- 申报 +
- 更正 +
- 修改起征点 +
- 更新数据
司机姓名：张三/13812345678
是否确认要将该司机的起征点同步调整为超过15万？
@@ -84,4 +83,4 @@