From d2f6c49e980d61e5ed19e5326b348dc7c54ec272 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Mon, 22 Apr 2024 13:53:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=BC=96=E8=BE=91=E5=A4=8D?=
 =?UTF-8?q?=E9=80=89=E6=A1=86=E5=8D=95=E9=80=89=E6=A1=86=E5=9B=9E=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 subpages/addResi/component/expandForm/index.js   | 1 -
 subpages/addResi/component/expandForm/index.wxml | 6 +++---
 subpages/addResi/pages/addResi/addResi.js        | 8 ++++++++
 3 files changed, 11 insertions(+), 4 deletions(-)

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 @@
             <radio-group bindchange="radioChange" data-formNameP="{{itemP.formNameP}}" data-formName="{{itemP.formName}}" data-opction="{{itemP.opction}}" class="form_item_input_radio">
                 <label class="weui-cell weui-check__label" wx:for="{{itemP.opction}}" wx:key="{{itemP.value}}" >
                     <view class="weui-cell__hd">
-                        <radio value="{{item.value}}" checked="{{itemP.selectLabel === 1?true:false}}" />
+                        <radio value="{{item.value}}" checked="{{itemP.selectLabel == item.value?true:false}}" />
                     </view>
                     <view class="weui-cell__bd">{{item.label}}</view>
                 </label>
@@ -39,9 +39,9 @@
                 <checkbox-group bindchange="bindCheckbox" data-formNameP="{{itemP.formNameP}}" data-formName="{{itemP.formName}}">
                     <label class="weui-cell weui-check__label" wx:for="{{itemP.opction}}" wx:for-item="itemC" wx:key="{{item.value}}">
                         <view class="weui-cell__hd">
-                            <checkbox value="{{itemC.value}}" color="#3974f6" checked="{{itemP.selectLabel.includes(itemC.value)}}" />
+                            <checkbox value="{{itemC.value}}" color="#3974f6" checked="{{itemC.selectLabel}}" />
                         </view>
-                        <view class="weui-cell__bd">{{itemC.label}}</view>
+                        <view class="weui-cell__bd">{{itemC.label}} {{itemC.value}}</view>
                     </label>
                 </checkbox-group>
             </view>
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({