Commit d6562aee by lichengming

修改了报告签发报告审核查看汇总报告按钮和预览报告功能

parent 63bfb045
...@@ -209,20 +209,22 @@ export default { ...@@ -209,20 +209,22 @@ export default {
}, },
_reportView(data) { _reportView(data) {
if (data.objectKey) { if (data.objectKey) {
this._reportMakeLook(data) // this._reportMakeLook(data)
this._viewReport(data)
} else { } else {
this._recordView(data.originalRecordId) this._reportMakeLook(data)
// this._recordView(data.originalRecordId)
} }
}, },
_reportMakeLook: async function(data) { _reportMakeLook: async function(data) {
console.log(data)
const result = await soilReport.reportGetById(data.id) const result = await soilReport.reportGetById(data.id)
if (result) { if (result) {
console.log('result') console.log('objectKey', result)
this._viewReport(result) this._viewReport(result)
} }
}, },
_viewReport(data) { _viewReport(data) {
console.log('objectKey', data)
if (data) { if (data) {
this.$openWindowModeless({ this.$openWindowModeless({
objectKey: data.objectKey, objectKey: data.objectKey,
......
...@@ -278,7 +278,7 @@ export default { ...@@ -278,7 +278,7 @@ export default {
case '预览报告': case '预览报告':
this._viewReport(data) this._viewReport(data)
break break
case '查看汇总报告': case '管理汇总报告':
this._viewSummary(data) this._viewSummary(data)
break break
case '操作日志': case '操作日志':
......
...@@ -198,9 +198,11 @@ export default { ...@@ -198,9 +198,11 @@ export default {
}, },
_reportView(data) { _reportView(data) {
if (data.objectKey) { if (data.objectKey) {
this._reportMakeLook(data) this._viewReport(data)
// this._reportMakeLook(data)
} else { } else {
this._recordView(data.originalRecordId) // this._recordView(data.originalRecordId)
this._reportMakeLook(data)
} }
}, },
_reportMakeLook: async function(data) { _reportMakeLook: async function(data) {
......
...@@ -336,7 +336,7 @@ export default { ...@@ -336,7 +336,7 @@ export default {
case '预览报告': case '预览报告':
this._viewReport(data) this._viewReport(data)
break break
case '查看汇总报告': case '管理汇总报告':
this._viewSummary(data) this._viewSummary(data)
break break
case '操作日志': case '操作日志':
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment