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
d6562aee
Commit
d6562aee
authored
May 14, 2021
by
lichengming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改了报告签发报告审核查看汇总报告按钮和预览报告功能
parent
63bfb045
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
8 deletions
+12
-8
SummaryInfo.vue
pages/soil-report-manage/report-audit/SummaryInfo.vue
+6
-4
reportAudit.vue
pages/soil-report-manage/report-audit/tabs/reportAudit.vue
+1
-1
SummaryInfo.vue
pages/soil-report-manage/report-issue/SummaryInfo.vue
+4
-2
reportIssue.vue
pages/soil-report-manage/report-issue/tabs/reportIssue.vue
+1
-1
No files found.
pages/soil-report-manage/report-audit/SummaryInfo.vue
View file @
d6562aee
...
@@ -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
,
...
...
pages/soil-report-manage/report-audit/tabs/reportAudit.vue
View file @
d6562aee
...
@@ -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
'操作日志'
:
...
...
pages/soil-report-manage/report-issue/SummaryInfo.vue
View file @
d6562aee
...
@@ -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
)
{
...
...
pages/soil-report-manage/report-issue/tabs/reportIssue.vue
View file @
d6562aee
...
@@ -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
'操作日志'
:
...
...
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