roose 4 tahun lalu
induk
melakukan
a6e03aa437
2 mengubah file dengan 468 tambahan dan 237 penghapusan
  1. 462 231
      pages/collectInfo/collectInfo.js
  2. 6 6
      pages/collectInfo/collectInfo.wxml

+ 462 - 231
pages/collectInfo/collectInfo.js

@@ -366,7 +366,7 @@ Page({
     //   name: '其它'
     // }],
     // syrIndex:
-    regularsInfos: {
+    regularsInfos: [{
       visitMode: [{
         name: '电话问候',
         checked: false
@@ -395,7 +395,7 @@ Page({
         checked: false
       }],
       visitCountExt: '', // 频次的其他
-    },
+    }],
     regularsInfo: [{
       visitMode: '',
       visitModeExt: '', //巡访其他
@@ -498,6 +498,8 @@ Page({
           })
           this.getSelfLocation();
           console.log(this.data.nameArr)
+          console.log(this.data.oldInfo, "添加的他");
+
         }
       }
     })
@@ -801,13 +803,51 @@ Page({
               ]
             }
           })
+          this.data.regularsInfos.push({
+            visitMode: [{
+              name: '电话问候',
+              checked: false
+            }, {
+              name: '上门巡访',
+              checked: false
+            }, {
+              name: '其它',
+              checked: false
+            }],
+            visitModeExt: '', //巡访其他
+            visitCount: [{
+              name: '每天',
+              checked: false
+            }, {
+              name: '每周',
+              checked: false
+            }, {
+              name: '每月',
+              checked: false
+            }, {
+              name: '每季',
+              checked: false
+            }, {
+              name: '其它',
+              checked: false
+            }],
+            visitCountExt: '', // 频次的其他
+          })
+          this.data.regularsInfo.push({
+            visitMode: '',
+            visitModeExt: '', //巡访其他
+            visitCount: '',
+            visitCountExt: '', // 频次的其他
+          })
           console.log(this.data.childInfo)
           this.setData({
             activeIndex: this.data.nameArr.concat(res.data.data).length - 1,
             nameArr: this.data.nameArr.concat(res.data.data),
             oldInfo: this.data.oldInfo,
             childInfo: this.data.childInfo,
-            otherInfo: this.data.otherInfo
+            otherInfo: this.data.otherInfo,
+            regularsInfos: this.data.regularsInfos,
+            regularsInfo: this.data.regularsInfo
           })
           this.getSelfLocation();
         }
@@ -2120,8 +2160,6 @@ Page({
         }]
       })
     }
-
-
     this.SubmitOldmanInfo({
       id: this.data.nameArr[this.data.activeIndex]._id,
       childrenNum: e.detail.value
@@ -2450,42 +2488,9 @@ Page({
       otherInfo: JSON.stringify(this.data.otherInfo[this.data.activeIndex].Info)
     })
   },
-  // // tab4巡访方式
-  // tab4Change1(e) {
-  //   let info = 'regularsInfo.visitMode'
-  //   let index = e.detail.value.indexOf('其它')
-  //   if (e.detail.value.length == 0) {
-  //     this.setData({
-  //       isnull1: true
-  //     })
-  //   } else {
-  //     this.setData({
-  //       isnull1: false,
-  //       [info]: e.detail.value
-  //     })
-  //     this.SubmitOldmanInfo({
-  //       id: this.data.nameArr[this.data.activeIndex]._id,
-  //       regularsInfo: JSON.stringify(this.data.regularsInfo)
-  //     })
-  //   }
-  //   if (index >= 0) {
-  //     this.setData({
-  //       isVisitways: true
-  //     })
-  //   } else {
-  //     this.setData({
-  //       isVisitways: false,
-  //       isVisitwaysnull: false
-  //     })
-  //   }
-  // },
-  // 巡访方式
+  //tab4巡访方式
   tab4Change1: function (e) {
-    console.log(e.detail.value)
-    console.log(this.data.oldInfo[this.data.activeIndex].regularsInfo);
-    const items = this.data.oldInfo[this.data.activeIndex].regularsInfos.visitMode
-    let itemss = this.data.oldInfo[this.data.activeIndex].regularsInfo.visitMode
-    itemss = JSON.stringify(e.detail.value);
+    const items = this.data.regularsInfos[this.data.activeIndex].visitMode
     const values = e.detail.value
     for (let i = 0, lenI = items.length; i < lenI; ++i) {
       items[i].checked = false
@@ -2496,100 +2501,67 @@ Page({
         }
       }
     }
-    let visitModes = 'oldInfo[' + this.data.activeIndex + '].regularsInfos.visitMode'
-    let visitMode = 'oldInfo[' + this.data.activeIndex + '].regularsInfo.visitMode'
+    let visitMode = 'regularsInfos[' + this.data.activeIndex + '].visitMode'
+    let visitMode1 = 'regularsInfo[' + this.data.activeIndex + '].visitMode'
     this.setData({
-      [visitModes]: items,
-      [visitMode]: itemss
+      [visitMode]: items,
+      [visitMode1]: e.detail.value
     })
-
-    if (e.detail.value.length == 0) {
-      this.setData({
-        visitWaysFromOther: true
-      })
-      return
-    } else {
-      this.setData({
-        visitWaysFromOther: false
-      })
-    }
     this.SubmitOldmanInfo({
       id: this.data.nameArr[this.data.activeIndex]._id,
-      regularsInfo: JSON.stringify(this.data.oldInfo[this.data.activeIndex].regularsInfo)
+      regularsInfo: JSON.stringify(this.data.regularsInfo[this.data.activeIndex])
     })
   },
   // 巡防方式其他内容
-  tab4Change1_1: function (e) {
-    console.log(e.detail.value);
-    let visitModeExts = 'oldInfo[' + this.data.activeIndex + '].regularsInfos.visitModeExt'
-    let visitModeExt = 'oldInfo[' + this.data.activeIndex + '].regularsInfo.visitModeExt'
-    if (e.detail.value == null || e.detail.value == '') {
-      this.setData({
-        moneyOtherQtnull: true
-      })
-    } else {
-      this.setData({
-        moneyOtherQtnull: false,
-        [visitModeExts]: e.detail.value,
-        [visitModeExt]: e.detail.value
-      })
-      this.SubmitOldmanInfo({
-        id: this.data.nameArr[this.data.activeIndex]._id,
-        regularsInfo: JSON.stringify(this.data.oldInfo[this.data.activeIndex].regularsInfo)
-      })
-    }
+  tab4Change2: function (e) {
+    let Info = 'regularsInfos[' + this.data.activeIndex + '].visitModeExt'
+    let Info1 = 'regularsInfo[' + this.data.activeIndex + '].visitModeExt'
+    this.setData({
+      [Info]: e.detail.value,
+      [Info1]: e.detail.value
+    })
+    this.SubmitOldmanInfo({
+      id: this.data.nameArr[this.data.activeIndex]._id,
+      regularsInfo: JSON.stringify(this.data.regularsInfo[this.data.activeIndex])
+    })
   },
   // 巡访频次
   tab4Change3: function (e) {
-    console.log(e.detail.value)
-    let items = this.data.oldInfo[this.data.activeIndex].regularsInfos.visitCount
-    let itemss = this.data.oldInfo[this.data.activeIndex].regularsInfo.visitCount
-    itemss = e.detail.value;
-    for (let i = 0, len = items.length; i < len; ++i) {
-      items[i].checked = items[i].name === e.detail.value
-    }
-    let visitCounts = 'oldInfo[' + this.data.activeIndex + '].regularsInfos.visitCount'
-    let visitCount = 'oldInfo[' + this.data.activeIndex + '].regularsInfo.visitCount'
+    let data = this.data.regularsInfos[this.data.activeIndex].visitCount.map(v => {
+      if (v.name == e.detail.value) {
+        return {
+          name: v.name,
+          checked: true
+        }
+      }
+      return {
+        name: v.name,
+        checked: false
+      }
+    })
+    let visitCount = 'regularsInfos[' + this.data.activeIndex + '].visitCount'
+    let visitCount1 = 'regularsInfo[' + this.data.activeIndex + '].visitCount'
     this.setData({
-      [visitCounts]: items,
-      [visitCount]: itemss
+      [visitCount]: data,
+      [visitCount1]: e.detail.value
     })
-
-    if (e.detail.value.length == 0) {
-      this.setData({
-        isVisittimesnull: true
-      })
-      return
-    } else {
-      this.setData({
-        isVisittimesnull: false
-      })
-    }
     this.SubmitOldmanInfo({
       id: this.data.nameArr[this.data.activeIndex]._id,
-      regularsInfo: JSON.stringify(this.data.oldInfo[this.data.activeIndex].regularsInfo)
+      regularsInfo: JSON.stringify(this.data.regularsInfo[this.data.activeIndex])
     })
   },
   // 巡防方式其他内容
   tab4change4: function (e) {
-    console.log(e.detail.value);
-    let visitCountExts = 'oldInfo[' + this.data.activeIndex + '].regularsInfos.visitCountExt'
-    let visitCountExt = 'oldInfo[' + this.data.activeIndex + '].regularsInfo.visitCountExt'
-    if (e.detail.value == null || e.detail.value == '') {
-      this.setData({
-        moneyOtherQtnull: true
-      })
-    } else {
-      this.setData({
-        moneyOtherQtnull: false,
-        [visitCountExts]: e.detail.value,
-        [visitCountExt]: e.detail.value
-      })
-      this.SubmitOldmanInfo({
-        id: this.data.nameArr[this.data.activeIndex]._id,
-        regularsInfo: JSON.stringify(this.data.oldInfo[this.data.activeIndex].regularsInfo)
-      })
-    }
+    let Info = 'regularsInfos[' + this.data.activeIndex + '].visitCountExt'
+    let Info1 = 'regularsInfo[' + this.data.activeIndex + '].visitCountExt'
+    this.setData({
+      [Info]: e.detail.value,
+      [Info1]: e.detail.value
+    })
+    this.SubmitOldmanInfo({
+      id: this.data.nameArr[this.data.activeIndex]._id,
+      regularsInfo: JSON.stringify(this.data.regularsInfo[this.data.activeIndex])
+    })
   },
 
 
@@ -2695,11 +2667,6 @@ Page({
             }, {
               name: '其它'
             }];
-            let visitModeExt = '';
-            let visitCountExt = '';
-            let visitModes = '';
-            let visitCounts = '';
-
             let otherInfo = ''
             let imgPath = ''
             if (item.photo) {
@@ -2707,37 +2674,6 @@ Page({
             } else {
               imgPath = ''
             }
-            if (item.regularsInfo) {
-              let partol = this.removeExcess(item.regularsInfo);
-              console.log(partol, "大姨娘");
-              if (partol.visitMode) {
-                let parto11 = this.removeExcess(partol.visitMode);
-                visitWays.forEach(itemss => {
-                  parto11.forEach(item => {
-                    if (itemss.name == item) {
-                      itemss.checked = true;
-                    }
-                  })
-                })
-                visitModes = partol.visitMode
-              }
-              console.log(visitWays, "返回的你锕");
-
-              if (partol.visitCount) {
-                visitTimes.forEach(itemss => {
-                  if (itemss.name == partol.visitCount) {
-                    itemss.checked = true
-                  }
-                })
-                visitCounts = partol.visitCount
-              }
-              if (partol.visitModeExt) {
-                visitModeExt = partol.visitModeExt;
-              }
-              if (partol.visitCountExt) {
-                visitCountExt = partol.visitCountExt;
-              }
-            }
             let disabilityAyyss = [{
               name: "视力残疾"
             }, {
@@ -3014,18 +2950,6 @@ Page({
               imgPath: imgPath,
               healthAyy: finalarr,
               disabilityAyy: disabilityAyyss,
-              regularsInfos: {
-                visitMode: visitWays,
-                visitModeExt: visitModeExt,
-                visitCount: visitTimes,
-                visitCountExt: visitCountExt
-              },
-              regularsInfo: {
-                visitMode: visitModes,
-                visitModeExt: visitModeExt,
-                visitCount: visitCounts,
-                visitCountExt: visitModeExt
-              },
               moneyFromAyy: moneyFromAyy,
               familyHelpArr: familyHelpArr,
               otherInfo: otherInfo, //赡养人存在么
@@ -3180,8 +3104,42 @@ Page({
             if (item.childInfo) {
               let partol = this.removeExcess(item.childInfo);
               Info = partol
-
             } else {
+              if (parseInt(childrenNum) == 5) {
+                for (let i = 0; i < parseInt(childrenNum) - 1; i++) {
+                  let chlidInfos = {
+                    name: '', // 姓名
+                    sex: '',
+                    phone: '', //  常用联系电话,
+                    isHasGoOut: '', // 子女是否外出
+                    outgoingplace: '', //  外出地点
+                    isHasPartner: '', // 是否有配偶 当是的时候 子女配偶姓名 子女配偶电话 必填 0: 是 1: 否
+                    name2: '', // 子女配偶姓名
+                    phone2: '', //  子女配偶电话
+                    outgoingTime: '', // 最后一次离家时间
+                    outgoingCause: '', // 外出原因
+                    visit: '', // 平均一年探望次数
+                  }
+                  Info.push(chlidInfos)
+                }
+              } else {
+                for (let i = 0; i < parseInt(childrenNum); i++) {
+                  let chlidInfos = {
+                    name: '', // 姓名
+                    sex: '',
+                    phone: '', //  常用联系电话,
+                    isHasGoOut: '', // 子女是否外出
+                    outgoingplace: '', //  外出地点
+                    isHasPartner: '', // 是否有配偶 当是的时候 子女配偶姓名 子女配偶电话 必填 0: 是 1: 否
+                    name2: '', // 子女配偶姓名
+                    phone2: '', //  子女配偶电话
+                    outgoingTime: '', // 最后一次离家时间
+                    outgoingCause: '', // 外出原因
+                    visit: '', // 平均一年探望次数
+                  }
+                  Info.push(chlidInfos)
+                }
+              }
 
             }
             return {
@@ -3189,16 +3147,84 @@ Page({
               childrenNum: childrenNum,
               Info: Info
             }
-
           })
+          let zzz = data.map(item => {
+            let visitModeExt = ''
+            let visitCountExt = ''
+            let visitMode = [{
+              name: '电话问候',
+              checked: false
+            }, {
+              name: '上门巡访',
+              checked: false
+            }, {
+              name: '其它',
+              checked: false
+            }]
+            let visitCounts = [{
+                name: '每天',
+                checked: false
+              }, {
+                name: '每周',
+                checked: false
+              }, {
+                name: '每月',
+                checked: false
+              },
+              {
+                name: '每季',
+                checked: false
+              },
+              {
+                name: '其它',
+                checked: false
+              }
+            ];
+            if (item.regularsInfo) {
+              let partol = this.removeExcess(item.regularsInfo);
+              console.log(partol, "777777777777777777777");
+              if (partol.visitMode) {
+                visitMode.forEach(items => {
+                  partol.visitMode.forEach(itemss => {
+                    if (items.name == itemss) {
+                      items.checked = true;
+                    }
+                  })
+                })
+              }
+              if (partol.visitCount) {
+                visitCounts.forEach(items => {
+                  if (items.name == partol.visitCount) {
+                    items.checked = true;
+                  }
+                })
+              }
+              if (partol.visitCountExt) {
+                visitCountExt = partol.visitCountExt;
+              }
+              if (partol.visitModeExt) {
+                visitModeExt = partol.visitModeExt;
+              }
+            }
+            return {
+              ...item,
+              visitCountExt: visitCountExt,
+              visitModeExt: visitModeExt,
+              visitMode: visitMode,
+              visitCount: visitCounts,
+            }
+          })
+
           that.setData({
             oldInfo: abc,
             otherInfo: def,
             childInfo: ghi,
+            regularsInfos: zzz,
           })
           console.log(that.data.oldInfo, "老人的返现数组")
           console.log(that.data.otherInfo, "其他的返现数组")
           console.log(that.data.childInfo, "孩子的返现数组")
+          console.log(that.data.regularsInfos, "q巡访的返现数组")
           // let ghi = res.data.data.map(item => {
           //   console.log(item.otherInfo, ";;;;;;;;;;;;;;;;;;;;;;;;;;");
           //   let sex = [{
@@ -3264,13 +3290,278 @@ Page({
         }
       })
     } else {
+      let oldInfo = [{
+        name: '',
+        oldSex: [{
+          name: '男'
+        }, {
+          name: '女'
+        }],
+        nation: '', //民族
+        idNumber: '', //身份证号
+        phone: '',
+        oldMarry: [{
+          name: "未婚"
+        }, {
+          name: "已婚"
+        }, {
+          name: "离异"
+        }, {
+          name: "丧偶"
+        }],
+        partnerName: '',
+        partnerIdNumber: '',
+        healthAyy: [{
+          name: "健康",
+          disabled: false
+        }, {
+          name: "残疾",
+          disabled: false
+        }, {
+          name: "患重特大疾病",
+          disabled: false
+        }, {
+          name: "老年人慢性病",
+          disabled: false
+        }],
+        disabilityAyy: [{
+          name: "视力残疾"
+        }, {
+          name: "听力残疾"
+        }, {
+          name: "言语残疾"
+        }, {
+          name: "肢体残疾"
+        }, {
+          name: "智力残疾"
+        }, {
+          name: "精神残疾"
+        }, {
+          name: "多重残疾"
+        }],
+        disabilityLevel: '', //残疾人类别
+        sickType: [{
+          name: "重大器官类疾病"
+        }, {
+          name: "心脑血管类疾病"
+        }, {
+          name: "神经与代谢类疾病"
+        }, {
+          name: "肢体与病毒类疾病"
+        }, {
+          name: "恶性肿瘤"
+        }],
+        ability: '', //老年人能力情况
+        livingCondition: '', //生活经济情况
+        moneyFromAyy: [{
+          name: "家庭经营性收入"
+        }, {
+          name: "工资性收入"
+        }, {
+          name: "转移性收入"
+        }, {
+          name: "财产性收入"
+        }, {
+          name: "其它"
+        }],
+        income: '',
+        sourceOfIncomeExt: '', //其他收入情况
+        familyHelpArr: [{
+          name: "低保"
+        }, {
+          name: "建档立卡贫困户"
+        }, {
+          name: "医疗救助"
+        }, {
+          name: "临时救助"
+        }, {
+          name: "老年人福利津贴"
+        }, {
+          name: "残疾人两项补贴(或一项补贴)"
+        }, {
+          name: "其他救助"
+        }],
+        rescueStateExt: '', //其他救助
+        loneArr: [{
+          name: "是"
+        }, {
+          name: "否"
+        }],
+        liveStatus: [{
+          name: "无人陪伴居住",
+          disabled: false
+        }, {
+          name: "配偶",
+          disabled: false
+        }, {
+          name: "近亲属",
+          disabled: false
+        }, {
+          name: "未成年孙子女",
+          disabled: false
+        }, {
+          name: "其他情形",
+          disabled: false
+        }],
+        accompanyExt: '', //陪伴居住其他
+        oftenMan: [{
+          name: "无人照料",
+          disabled: false
+        }, {
+          name: "近亲属",
+          disabled: false
+        }, {
+          name: "配偶",
+          disabled: false
+        }, {
+          name: "邻里互助",
+          disabled: false
+        }, {
+          name: "购买养老服务",
+          disabled: false
+        }, {
+          name: "其他人员",
+          disabled: false
+        }],
+        lookAfterExt: '', //其他日常生活照料人关系
+        mainLookName: '', //日常生活照料人姓名
+        mainLookSex: [{
+          name: "男"
+        }, {
+          name: "女"
+        }],
+        mainLookPhone: '', //
+        loveRequire: [{
+            name: "生活照料"
+          },
+          {
+            name: "生产帮助"
+          },
+          {
+            name: "精神慰藉"
+          },
+          {
+            name: "医疗保健"
+          },
+          {
+            name: "权益维护"
+          },
+          {
+            name: "安全监护"
+          },
+          {
+            name: "文化娱乐"
+          },
+          {
+            name: "紧急救助"
+          },
+          {
+            name: "其它"
+          },
+        ],
+        oldType: [{
+          name: "农村留守老年人",
+          disable: false,
+          checked: false
+        }, {
+          name: "分散供养特困老年人",
+          disable: false,
+          checked: false
+        }, {
+          name: "计划生育特殊家庭老人",
+          disable: false,
+          checked: false
+        }, {
+          name: "空巢老年人",
+          disable: false,
+          checked: false
+        }, {
+          name: "独居老年人",
+          disable: false,
+          checked: false
+        }, {
+          name: "重残老年人",
+          disable: false,
+          checked: false
+        }, {
+          name: "高龄老年人",
+          disable: false,
+          checked: false
+        }],
+        isHavePhoto: false,
+        imgPath: '',
+        photoAndLocation: '',
+      }];
+      let regularsInfos = [{
+        visitMode: [{
+          name: '电话问候',
+          checked: false
+        }, {
+          name: '上门巡访',
+          checked: false
+        }, {
+          name: '其它',
+          checked: false
+        }],
+        visitModeExt: '', //巡访其他
+        visitCount: [{
+          name: '每天',
+          checked: false
+        }, {
+          name: '每周',
+          checked: false
+        }, {
+          name: '每月',
+          checked: false
+        }, {
+          name: '每季',
+          checked: false
+        }, {
+          name: '其它',
+          checked: false
+        }],
+        visitCountExt: '', // 频次的其他
+      }];
+      let otherInfo = [{
+        isHasOther: '',
+        Info: {
+          name: '', // 其他赡养人姓名,
+          sex: '', //其他赡养人性别
+          phone: '', //其他赡养人电话,
+          relation: '', //与被赡养人关系 如果选了其他也是必填 单选
+          relationExt: '', //与被赡养人关系--其他
+          isHasGoOut: '', //是否外出
+          outgoingCause: '', //外出原因
+          outgoingplace: '', // 外出地点
+          outgoingTime: '', // 最后一次离家时间
+          isHasPartner: '', //是否有配偶  当是的时候  子女配偶姓名 子女配偶电话 必填   0:是  1:否
+          name2: '',
+          phone2: '',
+          visit: '', //平均一年探望次数
+          othersyrSexArr: [{
+              name: '男',
+              checked: false
+            },
+            {
+              name: '女',
+              checked: false
+            },
+          ]
+        }
+      }];
+      let childInfo = [{
+        childrenNum: ''
+      }]
       this.setData({
         showBj: true,
         nameArr: [],
-        oldInfo: [],
-        childInfo: [],
-        otherInfo: [],
+        oldInfo: oldInfo,
+        childInfo: childInfo,
+        otherInfo: otherInfo,
+        regularsInfos: regularsInfos,
       })
+      console.log(this.data.regularsInfos);
+
     }
 
   },
@@ -3396,68 +3687,6 @@ Page({
     const app = getApp()
     app.globalData.id = ''
     app.globalData.name = ''
-    if (this.data.activeIndex >= 0) {
-      let visitMode = 'oldInfo[' + this.data.activeIndex + '].regularsInfos.visitMode'
-      let visitCount = 'oldInfo[' + this.data.activeIndex + '].regularsInfos.visitCount'
-      let visitModeExt = 'oldInfo[' + this.data.activeIndex + '].regularsInfos.visitModeExt'
-      let visitCountExt = 'oldInfo[' + this.data.activeIndex + '].regularsInfos.visitCountExt'
-      let visitModea = [{
-        name: '电话问候',
-        checked: false
-      }, {
-        name: '上门巡访',
-        checked: false
-      }, {
-        name: '其它',
-        checked: false
-      }];
-      let visitCounts = [{
-          name: '每天',
-          checked: false
-        }, {
-          name: '每周',
-          checked: false
-        }, {
-          name: '每月',
-          checked: false
-        },
-        {
-          name: '每季',
-          checked: false
-        },
-        {
-          name: '其它',
-          checked: false
-        }
-      ];
-      this.setData({
-        [visitMode]: visitModea,
-        [visitCount]: visitCounts,
-        [visitModeExt]: '',
-        [visitCountExt]: '',
-      })
-    }
-
-    // visitModeExt: '', //巡访其他
-    // visitCount: [{
-    //   name: '每天',
-    //   checked: false
-    // }, {
-    //   name: '每周',
-    //   checked: false
-    // }, {
-    //   name: '每月',
-    //   checked: false
-    // }, {
-    //   name: '每季',
-    //   checked: false
-    // }, {
-    //   name: '其它',
-    //   checked: false
-    // }],
-    // visitCountExt: '', // 频次的其他
-
-
   },
   //获取位置
   getSelfLocation: function (varSendOrgId) {
@@ -3489,6 +3718,8 @@ Page({
             that.setData({
               [photoAndLocation]: gps
             })
+            console.log(that.data.nameArr[that.data.activeIndex], "定位的问题");
+
             that.SubmitOldmanInfo({
               id: that.data.nameArr[that.data.activeIndex]._id,
               photoAndLocation: gps

+ 6 - 6
pages/collectInfo/collectInfo.wxml

@@ -431,28 +431,28 @@
 				</view>
 			</view>
 			<!-- 第四个tab寻访联系人信息 -->
-			<view wx:if="{{currentIndex==3}}">
+		<view wx:if="{{currentIndex==3}}">
 				<view class="block">
-					<view class="name"><text class="red">*</text>巡访方式{{oldInfo[activeIndex].regularsInfos.visitMode}} </view>
+					<view class="name"><text class="red">*</text>巡访方式</view>
 					<checkbox-group bindchange="tab4Change1">
-						<label wx:for="{{oldInfo[activeIndex].regularsInfos.visitMode}}" wx:key="{{item.name}}">
+						<label wx:for="{{regularsInfos[activeIndex].visitMode}}" wx:key="{{item.name}}">
 							<checkbox value="{{item.name}}" checked="{{item.checked}}" color="#fff" />{{item.name}}
 						</label>
 					</checkbox-group>
 				</view>
 				<view wx:if="{{visitWaysFromOther}}" class="required">巡访方式不能为空哦!</view>
-				<input wx:if="{{oldInfo[activeIndex].regularsInfos.visitMode[2].checked}}" placeholder="请填写其它内容" value="{{oldInfo[activeIndex].regularsInfos.visitModeExt}}" bindblur="tab4Change1_1" name="name" class="otherinput" />
+				<input wx:if="{{regularsInfos[activeIndex].visitMode[2].checked}}" placeholder="请填写其它内容" value="{{regularsInfos[activeIndex].visitModeExt}}" bindblur="tab4Change2" class="otherinput" />
 				<view wx:if="{{isVisittimesnull}}" class="required">其它巡访方式不能为空哦!</view>
 				<view class="block">
 					<view class="name"><text class="red">*</text>巡访频次</view>
 					<radio-group bindchange="tab4Change3">
-						<label wx:for="{{oldInfo[activeIndex].regularsInfos.visitCount}}" wx:key="{{item.name}}">
+						<label wx:for="{{regularsInfos[activeIndex].visitCount}}" wx:key="{{item.name}}">
 							<radio value="{{item.name}}" checked="{{item.checked}}" color="#fff" />{{item.name}}
 						</label>
 					</radio-group>
 				</view>
 				<view wx:if="{{isnull2}}" class="required">巡访频次不能为空哦!</view>
-				<input wx:if="{{oldInfo[activeIndex].regularsInfos.visitCount[4].checked}}" value="{{oldInfo[activeIndex].regularsInfos.visitCountExt}}" placeholder="请填写其它内容" bindblur="tab4change4" name="name" class="otherinput" />
+				<input wx:if="{{regularsInfos[activeIndex].visitCount[4].checked}}" value="{{regularsInfos[activeIndex].visitCountExt}}" placeholder="请填写其它内容" bindblur="tab4change4" name="name" class="otherinput" />
 				<view wx:if="{{isVisittimesnull}}" class="required">其它巡访频次不能为空哦!</view>
 			</view>
 		</view>