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-04-28 20:26:30 +08:00
parent 6cc12ff451
commit 2aeaa09e14
112 changed files with 339 additions and 339 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts
View File

@ -35,10 +35,10 @@ export class PartnerAccountManagementWithdrawalsRecordComponent implements OnIni
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
Object.assign(requestOptions.body, {
...this.sf.value,
...this.sf?.value,
createTime: {
start: this.sf.value.createTime?.[0] || '',
end: this.sf.value.createTime?.[1] || ''
start: this.sf?.value.createTime?.[0] || '',
end: this.sf?.value.createTime?.[1] || ''
},
refundStatus: this.refundStatus || null
});

2
src/app/routes/partner/article-management/components/edit/edit.component.ts
View File

@ -178,7 +178,7 @@ export class ParterArticleManagementEditComponent implements OnInit {
save() {
this.sf.validator({ emitError: true });
if(!this.sf.valid) return;
// this.service.request('', { ...this.sf.value }).subscribe(res => {
// this.service.request('', { ...this.sf?.value }).subscribe(res => {
// if (res) {
// this.modalRef.destroy(true);
// } else {

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

@ -208,7 +208,7 @@ export class ParterChannelSalesEditComponent implements OnInit {
if (!this.sf.valid) return;
let params: any= {
...this.sf.value,
...this.sf?.value,
}
delete params.telephone
this.service.request(this.service.$api_save, { ...params, employeeVO: this.currentOAItem }).subscribe(res => {

2
src/app/routes/partner/claim-audit/components/channel-approve/channel-approve.component.ts
View File

@ -85,7 +85,7 @@ export class ParterClaimAuditListChannelApproveComponent implements OnInit {
save() {
this.sf.validator({ emitError: true });
if(!this.sf.valid) return;
// this.service.request('', { ...this.sf.value }).subscribe(res => {
// this.service.request('', { ...this.sf?.value }).subscribe(res => {
// if (res) {
// this.modalRef.destroy(true);
// } else {

2
src/app/routes/partner/claim-audit/components/channel-reject/channel-reject.component.ts
View File

@ -85,7 +85,7 @@ export class ParterClaimAuditListChannelRejectComponent implements OnInit {
save() {
this.sf.validator({ emitError: true });
if(!this.sf.valid) return;
// this.service.request('', { ...this.sf.value }).subscribe(res => {
// this.service.request('', { ...this.sf?.value }).subscribe(res => {
// if (res) {
// this.modalRef.destroy(true);
// } else {

2
src/app/routes/partner/claim-audit/components/partner-approve/partner-approve.component.ts
View File

@ -85,7 +85,7 @@ export class ParterClaimAuditListPartnerApproveComponent implements OnInit {
save() {
this.sf.validator({ emitError: true });
if(!this.sf.valid) return;
// this.service.request('', { ...this.sf.value }).subscribe(res => {
// this.service.request('', { ...this.sf?.value }).subscribe(res => {
// if (res) {
// this.modalRef.destroy(true);
// } else {

2
src/app/routes/partner/claim-audit/components/partner-reject/partner-reject.component.ts
View File

@ -85,7 +85,7 @@ export class ParterClaimAuditListPartnerRejectComponent implements OnInit {
save() {
this.sf.validator({ emitError: true });
if(!this.sf.valid) return;
// this.service.request('', { ...this.sf.value }).subscribe(res => {
// this.service.request('', { ...this.sf?.value }).subscribe(res => {
// if (res) {
// this.modalRef.destroy(true);
// } else {

4
src/app/routes/partner/knowledge/banner/components/add/add.component.ts
View File

@ -185,7 +185,7 @@ export class BannerComponentsAddComponent implements OnInit {
if (this.queryParams.id !== '0'){
params.advertisementId = this.queryParams.id;
}
if (this.sf.value.takeEffectType === 2){
if (this.sf?.value.takeEffectType === 2){
if (this.changeTimeFlag) {
params.takeEffectTime = format(this.detailData.takeEffectTime, 'yyyy-MM-dd HH:mm');
} else {
@ -207,7 +207,7 @@ export class BannerComponentsAddComponent implements OnInit {
if (this.queryParams.type === 'add') {
delete params.id;
}
if (this.sf.value.takeEffectType === 2){
if (this.sf?.value.takeEffectType === 2){
if (this.changeTimeFlag) {
params.takeEffectTime = format(this.detailData.takeEffectTime, 'yyyy-MM-dd HH:mm');
} else {

2
src/app/routes/partner/level-config/components/edit/edit.component.ts
View File

@ -73,7 +73,7 @@ export class ParterLevelConfigEditComponent implements OnInit {
save() {
this.sf.validator({ emitError: true });
if(!this.sf.valid) return;
this.service.request(this.service.$api_save, { ...this.sf.value }).subscribe(res => {
this.service.request(this.service.$api_save, { ...this.sf?.value }).subscribe(res => {
if (res) {
this.service.msgSrv.success('保存成功！')
this.modalRef.destroy(true);

20
src/app/routes/partner/partner-list/components/add-etp-partner/add-etp-partner.component.ts
View File

@ -75,38 +75,38 @@ export class AddEtpPartnerComponent {
this.service.msgSrv.warning('请修改填写错误信息');
return;
}
if (this.sf.value.cityCodesList?.length > 3) {
if (this.sf?.value.cityCodesList?.length > 3) {
this.sf.validator({ emitError: true });
this.service.msgSrv.warning('所属城市不能超过3个');
return;
}
// 校验企业营业期限
const operatingStartTime = new Date(this.sf.value.operatingStartTime);
const operatingEndTime = new Date(this.sf.value.operatingEndTime);
const operatingStartTime = new Date(this.sf?.value.operatingStartTime);
const operatingEndTime = new Date(this.sf?.value.operatingEndTime);
if (operatingStartTime.getTime() > operatingEndTime.getTime()) {
this.service.msgSrv.warning('营业截止日期不能小于开始日期');
return;
}
// 校验法人证件有效期限
if (this.sf.value.legalPersonIdentity.validEndTime) {
const validStartTime = new Date(this.sf.value.legalPersonIdentity.validStartTime);
const validEndTime = new Date(this.sf.value.legalPersonIdentity.validEndTime);
if (this.sf?.value.legalPersonIdentity.validEndTime) {
const validStartTime = new Date(this.sf?.value.legalPersonIdentity.validStartTime);
const validEndTime = new Date(this.sf?.value.legalPersonIdentity.validEndTime);
if (validStartTime.getTime() > validEndTime.getTime()) {
this.service.msgSrv.warning('法人证件有效截止日期不能小于开始日期');
return;
}
}
// 校验管理员证件有效期限
if (this.sf.value.adminUserInfo.validEndTime) {
const validStartTime = new Date(this.sf.value.adminUserInfo.validStartTime);
const validEndTime = new Date(this.sf.value.adminUserInfo.validEndTime);
if (this.sf?.value.adminUserInfo.validEndTime) {
const validStartTime = new Date(this.sf?.value.adminUserInfo.validStartTime);
const validEndTime = new Date(this.sf?.value.adminUserInfo.validEndTime);
if (validStartTime.getTime() > validEndTime.getTime()) {
this.service.msgSrv.warning('管理员证件有效截止日期小于开始日期');
return;
}
}
const params = {};
Object.assign(params, { ...this.sf.value, source: 2 });
Object.assign(params, { ...this.sf?.value, source: 2 });
// console.log(params);
this.service.request(this.service.$api_save_entp_partner, params).subscribe(res => {

10
src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.ts
View File

@ -76,21 +76,21 @@ export class AddPersonalPartnerComponent {
this.service.msgSrv.warning('请修改填写错误信息');
return;
}
if (this.sf.value.cityCodesList?.length > 3) {
if (this.sf?.value.cityCodesList?.length > 3) {
this.sf.validator({ emitError: true });
this.service.msgSrv.warning('所属城市不能超过3个');
return;
}
if (this.sf.value.validEndTime) {
const validStartTime = new Date(this.sf.value.validStartTime);
const validEndTime = new Date(this.sf.value.validEndTime);
if (this.sf?.value.validEndTime) {
const validStartTime = new Date(this.sf?.value.validStartTime);
const validEndTime = new Date(this.sf?.value.validEndTime);
if (validStartTime.getTime() > validEndTime.getTime()) {
this.service.msgSrv.warning('身份证有效截止日期不能小于开始日期');
return;
}
}
const params = {};
Object.assign(params, { ...this.sf.value, source: 2 });
Object.assign(params, { ...this.sf?.value, source: 2 });
this.service.request(this.service.$api_save_personal_partner, params).subscribe(res => {
if (res) {

2
src/app/routes/partner/partner-list/components/index/partner-list.component.ts
View File

@ -43,7 +43,7 @@ export class PartnerListComponent {
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
let params = { ...this.sf.value };
let params = { ...this.sf?.value };
if (params.createTime) {
params.createTime = { start: this.sf?.value?.createTime?.[0], end: this.sf?.value?.createTime?.[1] };
}

6
src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts
View File

@ -93,7 +93,7 @@ export class PartnerAuditModalComponent implements OnInit {
}
sure() {
if (this.info.isPass || this.sf.value.status) {
if (this.info.isPass || this.sf?.value.status) {
this.nzModalService.confirm({
nzTitle: `确定以“${this.info.channelIdLabel}”的名义重新发起CRM《付款对象合同管理》吗？`,
nzOnOk: () => {
@ -107,9 +107,9 @@ export class PartnerAuditModalComponent implements OnInit {
audit() {
const params: any = {
...this.sf.value,
...this.sf?.value,
id: this.info.id,
auditStatusEnum: this.info.isPass || this.sf.value.status ? '20' : '30'
auditStatusEnum: this.info.isPass || this.sf?.value.status ? '20' : '30'
};
this.service
.request(this.service.$api_audit_partner, {

2
src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts
View File

@ -178,7 +178,7 @@ export class ParterRebateManageMentAddComponent implements OnInit {
rebateConfigLineDTO: this.table.data,
priority: this.priority, // 优先级
partnerIds: this.partnerId,
ruleDescription: this.sf.value.ruleDescription,
ruleDescription: this.sf?.value.ruleDescription,
remark: this.remark,
partnerType: this.partnerType
};

8
src/app/routes/partner/recorded/components/record/record.component.ts
View File

@ -55,10 +55,10 @@ export class PartnerRecordedRecordComponent implements OnInit {
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
Object.assign(requestOptions.body, {
...this.sf.value,
...this.sf?.value,
createTime: {
start: this.sf.value.createTime?.[0] || '',
end: this.sf.value.createTime?.[1] || ''
start: this.sf?.value.createTime?.[0] || '',
end: this.sf?.value.createTime?.[1] || ''
},
refundStatus: this.refundStatus || null
});
@ -354,7 +354,7 @@ export class PartnerRecordedRecordComponent implements OnInit {
* 底部统计
*/
getSummary() {
this.service.request(this.service.$api_get_list_summary, { ...this.sf.value }).subscribe(res => {
this.service.request(this.service.$api_get_list_summary, { ...this.sf?.value }).subscribe(res => {
if (res) {
this.totalInfo = res;
}

4
src/app/routes/partner/scrollimg/components/add/add.component.ts
View File

@ -183,7 +183,7 @@ export class ScrollimgComponentsAddComponent implements OnInit {
if (this.queryParams.id !== '0') {
params.advertisementId = this.queryParams.id;
}
if (this.sf.value.takeEffectType === 2) {
if (this.sf?.value.takeEffectType === 2) {
if (this.changeTimeFlag) {
params.takeEffectTime = format(this.detailData.takeEffectTime, 'yyyy-MM-dd HH:mm');
} else {
@ -205,7 +205,7 @@ export class ScrollimgComponentsAddComponent implements OnInit {
if (this.queryParams.type === 'add') {
delete params.id;
}
if (this.sf.value.takeEffectType === 2) {
if (this.sf?.value.takeEffectType === 2) {
if (this.changeTimeFlag) {
params.takeEffectTime = format(this.detailData.takeEffectTime, 'yyyy-MM-dd HH:mm');
} else {