Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
patzn-cloud-web-back-soil
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wangweidong
patzn-cloud-web-back-soil
Commits
32ec1717
Commit
32ec1717
authored
Dec 14, 2020
by
lichengming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改了报告编制查看原始记录
parent
acd66af3
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
43 additions
and
6 deletions
+43
-6
OriginalRecordView.vue
pages/soil-report-manage/report-make/OriginalRecordView.vue
+42
-5
CreateReport.vue
pages/soil-test-manage/test-input/item-tabs/CreateReport.vue
+1
-1
No files found.
pages/soil-report-manage/report-make/OriginalRecordView.vue
View file @
32ec1717
...
...
@@ -289,13 +289,15 @@ export default {
this
.
$nextTick
(()
=>
{
switch
(
res
)
{
case
'编辑'
:
this
.
$refs
.
recordEditModal
.
_openWithType
(
data
.
originalRecordId
,
'ENVTESTMAKEEDIT'
)
// this.$refs.recordEditModal._openWithType(
// data.originalRecordId,
// 'ENVTESTMAKEEDIT'
// )
this
.
_recordEdit
(
data
)
break
case
'查看原始记录'
:
this
.
_recordView
(
data
.
originalRecordId
)
this
.
_recordLook
(
data
)
// this._recordView(data.originalRecordId)
break
case
'查看试验项目'
:
this
.
_itemView
(
data
.
id
)
...
...
@@ -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
)
{
this
.
$refs
.
itemViewModal
.
_open
(
id
)
...
...
pages/soil-test-manage/test-input/item-tabs/CreateReport.vue
View file @
32ec1717
...
...
@@ -2,7 +2,7 @@
<div>
<Modal
v-model=
"showBatchModal"
:mask-closable=
"false"
width=
"900"
>
<p
slot=
"header"
>
生成报告
原始记录填写
</p>
<div>
<!--内容-->
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment