|
@@ -238,14 +238,29 @@ Page({
|
|
|
})
|
|
|
|
|
|
let tempSchoolId = ''
|
|
|
+ let areaIndex = 0
|
|
|
if (tempList.length > 0) {
|
|
|
- const first = tempList[0]
|
|
|
- tempSchoolId = first.value || ''
|
|
|
+ const childIndex = tempList.findIndex((item: any) => this.data.schoolAreaId === item.value)
|
|
|
+ console.log(childIndex, 'childIndex')
|
|
|
+
|
|
|
+ if (childIndex !== -1) {
|
|
|
+ const first = tempList[childIndex]
|
|
|
+ tempSchoolId = first.value || ''
|
|
|
+ areaIndex = childIndex
|
|
|
+ } else {
|
|
|
+ const first = tempList[0]
|
|
|
+ tempSchoolId = first.value || ''
|
|
|
+ areaIndex = 0
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
this.setData({
|
|
|
+ schoolAreaIndex: areaIndex,
|
|
|
schoolAreaList: tempList,
|
|
|
tempChangeSchoolAreaId: tempSchoolId
|
|
|
+ }, () => {
|
|
|
+ const schoolArea = this.selectComponent('#schoolArea')
|
|
|
+ schoolArea?.setIndexes([areaIndex])
|
|
|
})
|
|
|
} catch {
|
|
|
//
|
|
@@ -326,7 +341,7 @@ Page({
|
|
|
// 排序班级
|
|
|
list.classList.sort((a: any, b: any) => a.value - b.value);
|
|
|
lastGradeList.push(list);
|
|
|
-
|
|
|
+
|
|
|
});
|
|
|
lastGradeList.sort((a: any, b: any) => a.value - b.value);
|
|
|
gradeClassList = [{
|
|
@@ -475,7 +490,7 @@ Page({
|
|
|
showSchool: true
|
|
|
})
|
|
|
},
|
|
|
-
|
|
|
+
|
|
|
/** 确定选择学校 */
|
|
|
onSubmitSchool() {
|
|
|
if (this.data.tempChangeSchoolAreaId === this.data.schoolAreaId) {
|
|
@@ -512,11 +527,12 @@ Page({
|
|
|
})
|
|
|
},
|
|
|
onSearch() {
|
|
|
- this.setData({
|
|
|
- schoolAreaIndex: 0
|
|
|
- }, () => {
|
|
|
- this.getSchools(this.data.searchName);
|
|
|
- })
|
|
|
+ // this.setData({
|
|
|
+ // schoolAreaIndex: 0
|
|
|
+ // }, () => {
|
|
|
+ // this.getSchools(this.data.searchName);
|
|
|
+ // })
|
|
|
+ this.getSchools(this.data.searchName);
|
|
|
},
|
|
|
onSearchChange(e: any) {
|
|
|
this.setData({
|
|
@@ -652,7 +668,7 @@ Page({
|
|
|
schoolAreaId: params.schoolAreaId,
|
|
|
defaultStatus: false
|
|
|
})
|
|
|
- prevPage?.setData({ backParams: { userBeneficiaryId: data.data.id, name: params.name, phone: params.phone, schoolInfo: (params.provinceName || '') + (params.cityName || '') + (params.regionName || '') + params.schoolAreaName + params.currentGradeClassTxt } });
|
|
|
+ prevPage?.setData({ backParams: { userBeneficiaryId: data.data.id, name: params.name, phone: params.phone, schoolInfo: (params.provinceName || '') + (params.cityName || '') + (params.regionName || '') + params.schoolAreaName + params.currentGradeClassTxt } });
|
|
|
|
|
|
} else {
|
|
|
const { data } = await api_userBeneficiarySave({
|
|
@@ -664,7 +680,7 @@ Page({
|
|
|
"schoolAreaId": params.schoolAreaId,
|
|
|
defaultStatus: false
|
|
|
})
|
|
|
- prevPage?.setData({ backParams: { userBeneficiaryId: data.data.id, name: params.name, phone: params.phone, schoolInfo: (params.provinceName || '') + (params.cityName || '') + (params.regionName || '') + params.schoolAreaName + params.currentGradeClassTxt } });
|
|
|
+ prevPage?.setData({ backParams: { userBeneficiaryId: data.data.id, name: params.name, phone: params.phone, schoolInfo: (params.provinceName || '') + (params.cityName || '') + (params.regionName || '') + params.schoolAreaName + params.currentGradeClassTxt } });
|
|
|
}
|
|
|
|
|
|
this.onSetCatch(params)
|