diff --git a/subpages/addResi/component/expandForm/index.js b/subpages/addResi/component/expandForm/index.js index e142b56..4348b3e 100644 --- a/subpages/addResi/component/expandForm/index.js +++ b/subpages/addResi/component/expandForm/index.js @@ -67,7 +67,6 @@ Component({ return item; }}) }) - console.log(this.data.formList); }, bindinput(e){ let formName = e.currentTarget.dataset.formname; diff --git a/subpages/addResi/component/expandForm/index.wxml b/subpages/addResi/component/expandForm/index.wxml index 21daa8a..438faa7 100644 --- a/subpages/addResi/component/expandForm/index.wxml +++ b/subpages/addResi/component/expandForm/index.wxml @@ -19,7 +19,7 @@ @@ -39,9 +39,9 @@ diff --git a/subpages/addResi/pages/addResi/addResi.js b/subpages/addResi/pages/addResi/addResi.js index 0fd69ba..62b38e1 100644 --- a/subpages/addResi/pages/addResi/addResi.js +++ b/subpages/addResi/pages/addResi/addResi.js @@ -1348,8 +1348,16 @@ Page({ if(obj){ item.selectLabel = obj.label || '' } + }else if(item.itemType === "radio"){ + item.selectLabel = this.data.form[item.formNameP][item.formName]!=null?this.data.form[item.formNameP][item.formName]:0 + }else if(item.itemType === "checkbox" && item.opction){ + let arr = this.data.form[item.formNameP][item.formName] + item.opction.forEach(item=>{ + item.selectLabel = arr.includes(item.value) + }) }else{ if(this.data.form[item.formNameP]){ + console.log(this.data.form.oldPeopleDto.oldPeopleCategories); item.selectLabel = this.data.form[item.formNameP][item.formName] || null }else{ this.setData({