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

12
src/app/routes/usercenter/components/driver/add-driver/add-driver.component.ts
View File

@ -665,18 +665,18 @@ export class CarSettleAddDriverComponent implements OnInit {
this.showJopFlag = !this.showJopFlag;
}
submitForm() {
const items: any = this.sf.value;
items.certificatePhotoFrontWatermark = this.sf.value?.certificatePhotoFrontWatermark?.data?.fullFilePath || this.sf.value?.certificatePhotoFrontWatermark;
items.certificatePhotoBackWatermark = this.sf.value?.certificatePhotoBackWatermark?.data?.fullFilePath || this.sf.value?.certificatePhotoBackWatermark;
const items: any = this.sf?.value;
items.certificatePhotoFrontWatermark = this.sf?.value?.certificatePhotoFrontWatermark?.data?.fullFilePath || this.sf?.value?.certificatePhotoFrontWatermark;
items.certificatePhotoBackWatermark = this.sf?.value?.certificatePhotoBackWatermark?.data?.fullFilePath || this.sf?.value?.certificatePhotoBackWatermark;
const items2: any = this.sf1.value;
items2.certificatePhotoWatermark = this.sf1.value?.certificatePhotoWatermark?.data?.fullFilePath || this.sf1.value?.certificatePhotoWatermark;
const items3: any = this.sf2.value;
items3.certificatePhotoWatermark = this.sf2.value?.certificatePhotoWatermark?.data?.fullFilePath || this.sf2.value?.certificatePhotoWatermark;
const params: any = {
source: 2,
mobile: this.sf.value.mobile,
bankCardNo: this.sf.value.bankCardNo,
bankName: this.sf.value.bankName,
mobile: this.sf?.value.mobile,
bankCardNo: this.sf?.value.bankCardNo,
bankName: this.sf?.value.bankName,
identityInfoDTO: {
...items,
certificatePhotoFront: this.detailData.certificatePhotoFront,

36
src/app/routes/usercenter/components/driver/captain/add/add.component.ts
View File

@ -90,17 +90,17 @@ export class CtcCaptatinAddComponent implements OnInit {
widget: this.i.id ? 'text' : '',
placeholder: '请输入手机号',
blur: () => {
if(!this.sf.value.mobile) {
if(!this.sf?.value.mobile) {
return
}
this.service.request(this.service.$api_getByMobile, { mobile: this.sf.value.mobile }).subscribe(res => {
this.service.request(this.service.$api_getByMobile, { mobile: this.sf?.value.mobile }).subscribe(res => {
if (res.certificateNumber) {
this.readFlag = true
this.detailData = {
mobile: this.sf.value.mobile,
bankName: this.sf.value.bankName,
bankCardNo: this.sf.value.bankCardNo,
remark: this.sf.value.remark,
mobile: this.sf?.value.mobile,
bankName: this.sf?.value.bankName,
bankCardNo: this.sf?.value.bankCardNo,
remark: this.sf?.value.remark,
identityInfoDTO: {
certificatePhotoFrontWatermark: [
{
@ -128,10 +128,10 @@ export class CtcCaptatinAddComponent implements OnInit {
} else {
this.readFlag = false
this.detailData = {
mobile: this.sf.value.mobile,
bankName: this.sf.value.bankName,
bankCardNo: this.sf.value.bankCardNo,
remark: this.sf.value.remark,
mobile: this.sf?.value.mobile,
bankName: this.sf?.value.bankName,
bankCardNo: this.sf?.value.bankCardNo,
remark: this.sf?.value.remark,
identityInfoDTO: {
certificatePhotoFrontWatermark: '',
certificatePhotoBackWatermark: '',
@ -377,17 +377,17 @@ export class CtcCaptatinAddComponent implements OnInit {
this.changeSub.pipe(debounceTime(500)).subscribe((res: string) => {
if (res) {
const params: any = {
bankCardNo: this.sf.value.bankCardNo,
bankName: this.sf.value.bankName,
mobile: this.sf.value.mobile,
remark: this.sf.value.remark,
bankCardNo: this.sf?.value.bankCardNo,
bankName: this.sf?.value.bankName,
mobile: this.sf?.value.mobile,
remark: this.sf?.value.remark,
identityInfoDTO: {
certificatePhotoBackWatermark: this.sf.value?.certificatePhotoBackWatermark?.data?.fullFilePath || this.sf.value?.certificatePhotoBackWatermark,
certificatePhotoFrontWatermark: this.sf.value?.certificatePhotoFrontWatermark?.data?.fullFilePath ||this.sf.value?.certificatePhotoFrontWatermark,
certificatePhotoBackWatermark: this.sf?.value?.certificatePhotoBackWatermark?.data?.fullFilePath || this.sf?.value?.certificatePhotoBackWatermark,
certificatePhotoFrontWatermark: this.sf?.value?.certificatePhotoFrontWatermark?.data?.fullFilePath ||this.sf?.value?.certificatePhotoFrontWatermark,
certificatePhotoFront: this.detailData.certificatePhotoFront,
certificatePhotoBack: this.detailData.certificatePhotoBack,
certificateNumber: this.sf.value.certificateNumber,
name: this.sf.value.name,
certificateNumber: this.sf?.value.certificateNumber,
name: this.sf?.value.name,
}
}
if (this.i.id) {

2
src/app/routes/usercenter/components/driver/captain/captain.component.ts
View File

@ -32,7 +32,7 @@ export class UserCenterComponentsDriverCaptainComponent implements OnInit {
*/
get reqParams() {
const params: any = {
...(this.sf && this.sf.value)
...(this.sf && this.sf?.value)
};
if (this.sf?.value.effectiveDate) {
params.effectiveDateStart = this.sf?.value.effectiveDate[0];

2
src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts
View File

@ -24,7 +24,7 @@ export class UserCenterComponentsDriverConfigComponent implements OnInit {
get reqParams() {
const params: any = {
auditStatus: 20,
...(this.sf && this.sf.value)
...(this.sf && this.sf?.value)
};
delete params.effectiveDate;
delete params.expand;

2
src/app/routes/usercenter/components/driver/driver.component.ts
View File

@ -39,7 +39,7 @@ export class UserCenterComponentsDriverComponent implements OnInit {
*/
get reqParams() {
const params: any = {
...(this.sf && this.sf.value),
...(this.sf && this.sf?.value),
auditStatus: this.resourceStatus
};
if (this.sf?.value.effectiveDate) {

10
src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts
View File

@ -50,13 +50,13 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
Object.assign(requestOptions.body, {
...this.sf.value
...this.sf?.value
});
if (this.sf.value.createTime) {
if (this.sf?.value.createTime) {
Object.assign(requestOptions.body, {
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] || ''
}
});
}
@ -240,7 +240,7 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
}
exportList() {
const params = { ...this.sf.value, flag: this.tabType, listSource: 2, pageSize: -1 };
const params = { ...this.sf?.value, flag: this.tabType, listSource: 2, pageSize: -1 };
this.service.downloadFile(this.service.$api_export_enterprise, params);
}

4
src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts
View File

@ -40,7 +40,7 @@ export class FreightConfigComponent implements OnInit {
Object.assign(requestOptions.body, { listSource: 1 });
if (this.sf?.value) {
Object.assign(requestOptions.body, {
...this.sf.value
...this.sf?.value
});
if (this.sf?.value.createTime) {
Object.assign(requestOptions.body, {
@ -171,7 +171,7 @@ export class FreightConfigComponent implements OnInit {
const params = { listSource: 1, pageSize: -1 };
if (this.sf) {
Object.assign(params, {
...this.sf.value
...this.sf?.value
});
}
this.service.downloadFile(this.service.$api_export_freight_config, params);

2
src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.ts
View File

@ -149,7 +149,7 @@ export class EditPartnerComponentsAddComponent implements OnInit {
enterId = [this.i.id]
}
const params = {
...this.sf.value,
...this.sf?.value,
enterpriceIds: enterId,
settStartTime: this.sf?.value?.settStartTime + ' 00:00:00'
}

2
src/app/routes/usercenter/components/freight/list/editSale/editSale.component.ts
View File

@ -122,7 +122,7 @@ export class EditSaleComponentsAddComponent implements OnInit {
nzContent: '确定提交吗？',
nzOnOk: () => {
const params = {
...this.sf.value,
...this.sf?.value,
enterpriceIds: enterId,
}

16
src/app/routes/usercenter/components/freight/list/list.component.ts
View File

@ -47,21 +47,21 @@ export class FreightComponentsListComponent implements OnInit {
Object.assign(requestOptions.body, { listSource: 1 });
if (this.sf) {
Object.assign(requestOptions.body, {
...this.sf.value
...this.sf?.value
});
if (this.sf.value.createTime) {
if (this.sf?.value.createTime) {
Object.assign(requestOptions.body, {
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]
}
});
}
if (this.sf.value.approvalTime) {
if (this.sf?.value.approvalTime) {
Object.assign(requestOptions.body, {
approvalTime: {
start: this.sf.value.approvalTime[0],
end: this.sf.value.approvalTime[1]
start: this.sf?.value.approvalTime[0],
end: this.sf?.value.approvalTime[1]
}
});
}
@ -555,7 +555,7 @@ export class FreightComponentsListComponent implements OnInit {
const params = { listSource: 1, pageSize: -1 };
if (this.sf) {
Object.assign(params, {
...this.sf.value
...this.sf?.value
});
}
this.service.downloadFile(this.service.$api_export_enterprise, params);

4
src/app/routes/usercenter/components/freight/list/new/new.component.ts
View File

@ -107,12 +107,12 @@ export class FreightComponentsListNewComponent implements OnInit {
return;
}
}
const sfVlaue = this.sf.value;
const sfVlaue = this.sf?.value;
const params = {};
Object.assign(
params,
{ ...this.sf1.value },
{ ...this.sf.value },
{ ...this.sf?.value },
{
enterpriseAddressCode: this.sf1.value.enterpriseAddressCode[2],
oftenUsedServices: sfVlaue.oftenUsedServices,

2
src/app/routes/usercenter/components/freight/list/showService/showservice.component.ts
View File

@ -80,7 +80,7 @@ export class ShowServiceComponent implements OnInit {
}
submitForm() {
const params: any = {
...this.sf.value,
...this.sf?.value,
enterpriseIdList: [this.i.id]
};
this.service.request(this.service.$api_distributionCusService, params).subscribe(res => {

2
src/app/routes/usercenter/components/freight/user/user.component.ts
View File

@ -35,7 +35,7 @@ export class FreightComponentsUserComponent implements OnInit {
Object.assign(requestOptions.body, { certificationStatus: this.resourceStatus });
if (this.sf) {
Object.assign(requestOptions.body, {
...this.sf.value
...this.sf?.value
});
if (this.sf?.value.effectiveDate) {
Object.assign(requestOptions.body, {