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-09 11:24:57 +08:00
parent e4319fa591
commit 63b4b034f8
2 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -106,16 +106,9 @@ export class EditPartnerComponentsAddComponent implements OnInit {
} as SFRadioWidgetSchema, } as SFRadioWidgetSchema,
enum: [ enum: [
{ label: '修改成功后立即生效', value: 1 }, { label: '修改成功后立即生效', value: 1 },
<<<<<<< HEAD
// { label: 'CRM流程审核通过后生效', value: 2 }, // { label: 'CRM流程审核通过后生效', value: 2 },
], ],
}, },
=======
{ label: 'CRM流程审核后生效', value: 2 },
{ label: 'CRM流程审核通过后生效', value: 3 }
]
}
>>>>>>> ce53cdf83506568de0b8d5d43c83106c97e85545
}, },
required: ['channelId', 'remark', 'effectiveNode'] required: ['channelId', 'remark', 'effectiveNode']
}; };

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

@ -80,16 +80,9 @@ export class EditSaleComponentsAddComponent implements OnInit {
} as SFRadioWidgetSchema, } as SFRadioWidgetSchema,
enum: [ enum: [
{ label: '修改成功后立即生效', value: 1 }, { label: '修改成功后立即生效', value: 1 },
<<<<<<< HEAD
// { label: 'CRM流程审核通过后生效', value: 2 }, // { label: 'CRM流程审核通过后生效', value: 2 },
], ],
}, },
=======
{ label: 'CRM流程审核后生效', value: 2 },
{ label: 'CRM流程审核通过后生效', value: 3 }
]
}
>>>>>>> ce53cdf83506568de0b8d5d43c83106c97e85545
}, },
required: ['channelId', 'remark', 'effectiveNode'] required: ['channelId', 'remark', 'effectiveNode']
}; };