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
15787f4e
Commit
15787f4e
authored
Mar 22, 2021
by
lichengming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加了报告编制的按钮权限
parent
c819445e
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
32 additions
and
22 deletions
+32
-22
ItemReportView.vue
pages/soil-report-manage/report-make/ItemReportView.vue
+4
-4
OriginalRecordView.vue
pages/soil-report-manage/report-make/OriginalRecordView.vue
+3
-3
ReportInfoMake.vue
pages/soil-report-manage/report-make/tabs/ReportInfoMake.vue
+3
-1
ReportMakeByEntrust.vue
...il-report-manage/report-make/tabs/ReportMakeByEntrust.vue
+13
-9
ReportMakeBySample.vue
...oil-report-manage/report-make/tabs/ReportMakeBySample.vue
+2
-2
SummaryInfo.vue
pages/soil-report-manage/report-make/tabs/SummaryInfo.vue
+7
-3
No files found.
pages/soil-report-manage/report-make/ItemReportView.vue
View file @
15787f4e
...
@@ -83,7 +83,7 @@ export default {
...
@@ -83,7 +83,7 @@ export default {
btn
:
[
btn
:
[
{
{
type
:
'primary'
,
type
:
'primary'
,
id
:
''
,
id
:
'
make-report-item-make
'
,
name
:
'生成报告'
name
:
'生成报告'
}
}
],
],
...
@@ -96,15 +96,15 @@ export default {
...
@@ -96,15 +96,15 @@ export default {
iconMsg
:
[
iconMsg
:
[
{
{
type
:
'md-create'
,
type
:
'md-create'
,
id
:
''
,
id
:
'
make-report-item-edit
'
,
name
:
'编辑'
name
:
'编辑'
},
},
{
{
type
:
'ios-book'
,
type
:
'ios-book'
,
id
:
''
,
id
:
'
make-report-item-view-report
'
,
name
:
'查看项目报告'
name
:
'查看项目报告'
},
},
{
type
:
'md-trash'
,
id
:
''
,
name
:
'删除'
}
{
type
:
'md-trash'
,
id
:
'
make-report-item-delete
'
,
name
:
'删除'
}
],
],
pageColumns
:
[
pageColumns
:
[
{
title
:
'项目名称'
,
key
:
'expName'
,
width
:
100
},
{
title
:
'项目名称'
,
key
:
'expName'
,
width
:
100
},
...
...
pages/soil-report-manage/report-make/OriginalRecordView.vue
View file @
15787f4e
...
@@ -74,17 +74,17 @@ export default {
...
@@ -74,17 +74,17 @@ export default {
iconMsg
:
[
iconMsg
:
[
{
{
type
:
'md-create'
,
type
:
'md-create'
,
id
:
''
,
id
:
'
make-report-record-edit
'
,
name
:
'编辑'
name
:
'编辑'
},
},
{
{
type
:
'ios-book'
,
type
:
'ios-book'
,
id
:
''
,
id
:
'
make-report-record-view
'
,
name
:
'查看原始记录'
name
:
'查看原始记录'
},
},
{
{
type
:
'ios-list'
,
type
:
'ios-list'
,
id
:
''
,
id
:
'
make-report-record-item
'
,
name
:
'查看试验项目'
name
:
'查看试验项目'
}
}
],
],
...
...
pages/soil-report-manage/report-make/tabs/ReportInfoMake.vue
View file @
15787f4e
...
@@ -87,7 +87,9 @@ export default {
...
@@ -87,7 +87,9 @@ export default {
entrustId
:
''
entrustId
:
''
},
},
dateList
:
[],
dateList
:
[],
iconMsg
:
[{
type
:
'ios-book'
,
id
:
''
,
name
:
'预览/编辑报告'
}],
iconMsg
:
[
{
type
:
'ios-book'
,
id
:
'make-report-item-view'
,
name
:
'预览/编辑报告'
}
],
// 签发日期
// 签发日期
issueDateTemp
:
''
,
issueDateTemp
:
''
,
issueDate
:
''
,
issueDate
:
''
,
...
...
pages/soil-report-manage/report-make/tabs/ReportMakeByEntrust.vue
View file @
15787f4e
...
@@ -119,34 +119,34 @@ export default {
...
@@ -119,34 +119,34 @@ export default {
iconMsg
:
[
iconMsg
:
[
{
{
type
:
'ios-flask-outline'
,
type
:
'ios-flask-outline'
,
id
:
''
,
id
:
'
report-make-sample-report-manage
'
,
name
:
'管理样品和报告'
,
name
:
'管理样品和报告'
,
currentComponent
:
SampleByMakeModal
currentComponent
:
SampleByMakeModal
},
},
{
{
type
:
'ios-beaker'
,
type
:
'ios-beaker'
,
id
:
''
,
id
:
'
make-report-view-record
'
,
name
:
'查看原始记录'
,
name
:
'查看原始记录'
,
currentComponent
:
OriginalRecordView
currentComponent
:
OriginalRecordView
},
},
{
{
type
:
'ios-list-box'
,
type
:
'ios-list-box'
,
id
:
''
,
id
:
'
make-report-view-item
'
,
name
:
'查看试验项目报告'
name
:
'查看试验项目报告'
},
},
{
{
type
:
'ios-cloud-upload'
,
type
:
'ios-cloud-upload'
,
id
:
''
,
id
:
'
make-report-upload-report
'
,
name
:
'上传报告'
name
:
'上传报告'
},
},
{
{
type
:
'md-image'
,
type
:
'md-image'
,
id
:
''
,
id
:
'
make-report-view-report
'
,
name
:
'预览报告'
name
:
'预览报告'
},
},
{
{
type
:
'ios-book'
,
type
:
'ios-book'
,
id
:
''
,
id
:
'
make-report-edit-report
'
,
name
:
'编辑报告'
name
:
'编辑报告'
},
},
// {
// {
...
@@ -154,10 +154,14 @@ export default {
...
@@ -154,10 +154,14 @@ export default {
// id: '',
// id: '',
// name: '检测项目'
// name: '检测项目'
// },
// },
{
type
:
'ios-cloud-outline'
,
id
:
''
,
name
:
'附件'
},
{
type
:
'ios-cloud-outline'
,
id
:
'make-report-upload-make'
,
name
:
'附件'
},
{
{
type
:
'ios-clock-outline'
,
type
:
'ios-clock-outline'
,
id
:
''
,
id
:
'
make-report-record
'
,
name
:
'操作记录'
,
name
:
'操作记录'
,
componentName
:
'FoodContractRecord'
componentName
:
'FoodContractRecord'
}
}
...
@@ -167,7 +171,7 @@ export default {
...
@@ -167,7 +171,7 @@ export default {
btn
:
[
btn
:
[
{
{
type
:
'primary'
,
type
:
'primary'
,
id
:
''
,
id
:
'
make-report-pass
'
,
name
:
'提交'
name
:
'提交'
}
}
],
],
...
...
pages/soil-report-manage/report-make/tabs/ReportMakeBySample.vue
View file @
15787f4e
...
@@ -112,10 +112,10 @@ export default {
...
@@ -112,10 +112,10 @@ export default {
iconMsg
:
[
iconMsg
:
[
{
{
type
:
'ios-beaker'
,
type
:
'ios-beaker'
,
id
:
''
,
id
:
'
make-report-sample-item-manage
'
,
name
:
'管理检测项目'
name
:
'管理检测项目'
},
},
{
type
:
'md-trash'
,
id
:
''
,
name
:
'删除'
}
{
type
:
'md-trash'
,
id
:
'
make-report-sample-delete
'
,
name
:
'删除'
}
],
],
iconMsg1
:
[
iconMsg1
:
[
{
{
...
...
pages/soil-report-manage/report-make/tabs/SummaryInfo.vue
View file @
15787f4e
...
@@ -90,7 +90,7 @@ export default {
...
@@ -90,7 +90,7 @@ export default {
btn
:
[
btn
:
[
{
{
type
:
'primary'
,
type
:
'primary'
,
id
:
''
,
id
:
'
make-report-report-submit
'
,
name
:
'提交'
name
:
'提交'
}
}
],
],
...
@@ -101,8 +101,12 @@ export default {
...
@@ -101,8 +101,12 @@ export default {
},
},
dateList
:
[],
dateList
:
[],
iconMsg
:
[
iconMsg
:
[
{
type
:
'ios-book'
,
id
:
''
,
name
:
'预览报告'
},
{
type
:
'ios-book'
,
id
:
'make-report-report-view'
,
name
:
'预览报告'
},
{
type
:
'md-remove-circle'
,
id
:
''
,
name
:
'删除'
}
{
type
:
'md-remove-circle'
,
id
:
'make-report-report-delete'
,
name
:
'删除'
}
],
],
// 签发日期
// 签发日期
issueDateTemp
:
''
,
issueDateTemp
:
''
,
...
...
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