|
@@ -291,7 +291,7 @@ const defaultSendEmail = ['6','1','7','8','16','3','17','27','28']
|
|
|
}
|
|
|
this.otherPerson = []
|
|
|
if(this.$permission.FunPermissions('xiaoshi/sendEmail')){
|
|
|
- if(defaultSendEmail.indexOf(type+'')!=-1){
|
|
|
+ if(defaultSendEmail.indexOf(type.flowType+'')!=-1){
|
|
|
this.$set(this.form,'ifSendEmail',true)
|
|
|
}else{
|
|
|
this.$set(this.form,'ifSendEmail',false)
|
|
@@ -332,20 +332,22 @@ const defaultSendEmail = ['6','1','7','8','16','3','17','27','28']
|
|
|
if(defaultPerson.data && defaultPerson.data.length>0){
|
|
|
data = defaultPerson.data
|
|
|
}
|
|
|
- if(handlePerson && handlePerson.id){
|
|
|
- var index = data.findIndex(item=>{
|
|
|
- return item.id == handlePerson.iprPersonId
|
|
|
- })
|
|
|
- if(index == -1){
|
|
|
- data.push(
|
|
|
- {
|
|
|
- id:handlePerson.iprPersonId,
|
|
|
- name:handlePerson.name,
|
|
|
- email:handlePerson.email
|
|
|
- }
|
|
|
- )
|
|
|
+ if(handlePerson.data && handlePerson.data.length){
|
|
|
+ for(let i = 0;i<handlePerson.data.length;i++){
|
|
|
+ let handlePerson1 = handlePerson.data[i]
|
|
|
+ let index = data.findIndex(item=>{
|
|
|
+ return item.id == handlePerson1.iprPersonId
|
|
|
+ })
|
|
|
+ if(index == -1){
|
|
|
+ data.push(
|
|
|
+ {
|
|
|
+ id:handlePerson1.iprPersonId,
|
|
|
+ name:handlePerson1.name,
|
|
|
+ email:handlePerson1.email
|
|
|
+ }
|
|
|
+ )
|
|
|
+ }
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
this.sendEmailPerson = data
|
|
|
},
|