Compare commits
No commits in common. "6e5505d88954f3e7c7a8d71980d6fd0ce673be34" and "e39a8acc4cb194a52a9800daaf0fc759eef2bbdf" have entirely different histories.
6e5505d889
...
e39a8acc4c
@ -390,7 +390,7 @@
|
||||
this.TaskID = option.taskID
|
||||
this.tableKey = option.tableKey
|
||||
this.ORG_ID = uni.getStorageSync('orgId')
|
||||
if (option.ID != null && option.ID != 'null') {
|
||||
if (option.ID != null) {
|
||||
this.loadData()
|
||||
} else {
|
||||
this.isLoadOK = true
|
||||
@ -632,25 +632,13 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
if (this.model.Nav_ListSafeCheckDetail && this.model.Nav_ListSafeCheckDetail.length > 0) {
|
||||
this.total = this.model.Nav_ListSafeCheckDetail.length
|
||||
if (this.total > 10) {
|
||||
this.Nav_ListSafeCheckDetailShow = this.model.Nav_ListSafeCheckDetail.slice(0, 10)
|
||||
} else {
|
||||
this.Nav_ListSafeCheckDetailShow = this.model.Nav_ListSafeCheckDetail.slice(0, this
|
||||
.total)
|
||||
}
|
||||
this.model.RiskAreaNAME = strRiskAreaNAME
|
||||
this.model.CheckProjectCategoryNAME = CheckProjectCategoryNAME
|
||||
this.model.CheckProjectNAME = CheckProjectNAME
|
||||
} else {
|
||||
this.Nav_ListSafeCheckDetailShow = this.model.Nav_ListSafeCheckDetail
|
||||
this.model.RiskAreaNAME = strRiskAreaNAME
|
||||
this.model.CheckProjectCategoryNAME = CheckProjectCategoryNAME
|
||||
this.model.CheckProjectNAME = CheckProjectNAME
|
||||
this.total = 0
|
||||
}
|
||||
this.Nav_ListSafeCheckDetailShow = this.model.Nav_ListSafeCheckDetail.slice(0, 10)
|
||||
this.model.RiskAreaNAME = strRiskAreaNAME
|
||||
this.model.CheckProjectCategoryNAME = CheckProjectCategoryNAME
|
||||
this.model.CheckProjectNAME = CheckProjectNAME
|
||||
this.isLoadOK = true
|
||||
this.total = this.model.Nav_ListSafeCheckDetail.length
|
||||
|
||||
})
|
||||
},
|
||||
|
||||
@ -1174,13 +1162,6 @@
|
||||
OrderPagedSafeCheckDetail(json).then(res => {
|
||||
this.model.Nav_ListSafeCheckDetail = []
|
||||
this.model.Nav_ListSafeCheckDetail = res
|
||||
|
||||
this.total = this.model.Nav_ListSafeCheckDetail.length
|
||||
if (this.total > 10) {
|
||||
this.Nav_ListSafeCheckDetailShow = this.model.Nav_ListSafeCheckDetail.slice(0, 10)
|
||||
} else {
|
||||
this.Nav_ListSafeCheckDetailShow = this.model.Nav_ListSafeCheckDetail.slice(0, this.total)
|
||||
}
|
||||
})
|
||||
}
|
||||
},
|
||||
|
||||
Loading…
Reference in New Issue
Block a user