|
@@ -534,7 +534,7 @@ export default {
|
|
|
var self = this
|
|
var self = this
|
|
|
uni.showLoading({ title: '加载中...' })
|
|
uni.showLoading({ title: '加载中...' })
|
|
|
var fn = self.reportType === 'dan' ? getDanReportDetail : getReportDetail
|
|
var fn = self.reportType === 'dan' ? getDanReportDetail : getReportDetail
|
|
|
- fn({ reportType: self.reportType, reportId: self.reportId }).then(function(res) {
|
|
|
|
|
|
|
+ fn(self.reportId).then(function(res) {
|
|
|
uni.hideLoading()
|
|
uni.hideLoading()
|
|
|
if (res.code === 200) {
|
|
if (res.code === 200) {
|
|
|
var report = res.data.report || res.data
|
|
var report = res.data.report || res.data
|
|
@@ -543,7 +543,7 @@ export default {
|
|
|
head.childName = report.childName || ''
|
|
head.childName = report.childName || ''
|
|
|
head.reportDateText = report.reportDate ? parseDate(report.reportDate) : ''
|
|
head.reportDateText = report.reportDate ? parseDate(report.reportDate) : ''
|
|
|
self.headInfo = head
|
|
self.headInfo = head
|
|
|
- self.blocks = report.blocks || []
|
|
|
|
|
|
|
+ self.blocks = (res.data && res.data.blocks) || report.blocks || []
|
|
|
if (res.data.payload) {
|
|
if (res.data.payload) {
|
|
|
self.payload = Object.assign({}, self.defaultPayload(), res.data.payload)
|
|
self.payload = Object.assign({}, self.defaultPayload(), res.data.payload)
|
|
|
}
|
|
}
|