Commit 32ec1717 by lichengming

修改了报告编制查看原始记录

parent acd66af3
...@@ -289,13 +289,15 @@ export default { ...@@ -289,13 +289,15 @@ export default {
this.$nextTick(() => { this.$nextTick(() => {
switch (res) { switch (res) {
case '编辑': case '编辑':
this.$refs.recordEditModal._openWithType( // this.$refs.recordEditModal._openWithType(
data.originalRecordId, // data.originalRecordId,
'ENVTESTMAKEEDIT' // 'ENVTESTMAKEEDIT'
) // )
this._recordEdit(data)
break break
case '查看原始记录': case '查看原始记录':
this._recordView(data.originalRecordId) this._recordLook(data)
// this._recordView(data.originalRecordId)
break break
case '查看试验项目': case '查看试验项目':
this._itemView(data.id) this._itemView(data.id)
...@@ -318,6 +320,41 @@ export default { ...@@ -318,6 +320,41 @@ export default {
} }
}) })
}, },
_recordLook(data) {
if (data.objectKey) {
this._reportMakeLook(data)
} else {
this._recordView(data.originalRecordId)
}
},
_recordEdit(data) {
if (data.objectKey) {
this._reportMakeLook(data)
} else {
this.$refs.recordEditModal._openWithType(
data.originalRecordId,
'ENVTESTMAKEEDIT'
)
}
},
_reportMakeLook(data) {
console.log(data)
this._viewReport(data)
// const result = await soilReport.getExcelOriginalRecord(data.id)
// if (result) {
// this._viewReport(result)
// }
},
_viewReport(data) {
if (data) {
this.$openWindowModeless({
objectKey: data.objectKey,
idType: 10,
id: data.id,
isReport: 4
})
}
},
// 查看试验项目 // 查看试验项目
_itemView(id) { _itemView(id) {
this.$refs.itemViewModal._open(id) this.$refs.itemViewModal._open(id)
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div> <div>
<Modal v-model="showBatchModal" :mask-closable="false" width="900"> <Modal v-model="showBatchModal" :mask-closable="false" width="900">
<p slot="header"> <p slot="header">
生成报告 原始记录填写
</p> </p>
<div> <div>
<!--内容--> <!--内容-->
......
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