@@ -131,15 +131,26 @@ function otherHisConfirm(dispatch,store,params){
if(+res.data.code===0){
const list = res.data.data;
existsId.map((i)=>{
- has.push(list[i]);
+ if(+list[i].tagType===4){
+ has.push(...list[i].questionMapping);
+ }else{
+ has.push(list[i]);
+ }
});
withsId.map((i)=>{
- wes.push(list[i]);
+ wes.push(...list[i].questionMapping);
+ wes.push(list[i]);
dispatch({
type: CONFIRMSELECTED,
data: {exists:fullfillText(has,true,false).newArr,withs:fullfillText(wes,true,false).newArr,nones:nones,ikey}
+ dispatch({
+ type:ISREAD
+ });
}
@@ -30,7 +30,7 @@ export const confirm = (state,action) =>{
withDatas[0].value=withs.length>0?"伴":'';
}*/
//const text = Object.assign({},JSON.parse(config.textLabel),{value:"伴"}):undefined;
- arr.splice(ikey-1,0,...exists,...withs);
+ arr.splice(ikey,0,...exists,...withs);
res.update=Math.random(); //用于触发组件更新(data变化了因在对象中无法被组件检测到)
return res;
};