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
ade4d48f
Commit
ade4d48f
authored
Oct 23, 2020
by
lichengming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改了试验委托登记试验项目列表
parent
4c5ba0a1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
27 additions
and
2 deletions
+27
-2
soil-entrust.js
api/soil/soil-entrust.js
+2
-0
SoilSampleItemManage.vue
pages/meter-entrust/SoilSampleItemManage.vue
+24
-1
EntrustRegister.vue
pages/meter-entrust/entrust-register/EntrustRegister.vue
+1
-1
No files found.
api/soil/soil-entrust.js
View file @
ade4d48f
...
@@ -11,6 +11,8 @@ export default {
...
@@ -11,6 +11,8 @@ export default {
pageRegHis
:
data
=>
pageRegHis
:
data
=>
http
.
post
(
'soil/v1/entrust/page_reg_his'
,
data
).
then
(
res
=>
res
),
http
.
post
(
'soil/v1/entrust/page_reg_his'
,
data
).
then
(
res
=>
res
),
pageItem
:
data
=>
http
.
post
(
'soil/v1/experiment/page'
,
data
).
then
(
res
=>
res
),
pageItem
:
data
=>
http
.
post
(
'soil/v1/experiment/page'
,
data
).
then
(
res
=>
res
),
pageItemByEntrustId
:
data
=>
http
.
post
(
'soil/v1/experiment/page_by_entrust'
,
data
).
then
(
res
=>
res
),
pageReview
:
data
=>
pageReview
:
data
=>
http
.
post
(
'soil/v1/entrust/page_review'
,
data
).
then
(
res
=>
res
),
http
.
post
(
'soil/v1/entrust/page_review'
,
data
).
then
(
res
=>
res
),
pageSampleReceive
:
data
=>
pageSampleReceive
:
data
=>
...
...
pages/meter-entrust/SoilSampleItemManage.vue
View file @
ade4d48f
...
@@ -124,6 +124,7 @@ export default {
...
@@ -124,6 +124,7 @@ export default {
btn
:
[],
btn
:
[],
iconMsg
:
[{
type
:
'pt-a-end'
,
id
:
''
,
name
:
'删除'
}],
iconMsg
:
[{
type
:
'pt-a-end'
,
id
:
''
,
name
:
'删除'
}],
sampleId
:
''
,
// 样品id
sampleId
:
''
,
// 样品id
entrustId
:
''
,
showModal
:
false
,
showModal
:
false
,
modalTitle
:
'管理检测项目'
,
modalTitle
:
'管理检测项目'
,
selectIds
:
[],
selectIds
:
[],
...
@@ -163,7 +164,8 @@ export default {
...
@@ -163,7 +164,8 @@ export default {
formObj
:
{
formObj
:
{
name
:
undefined
,
name
:
undefined
,
sampleId
:
undefined
,
sampleId
:
undefined
,
groupName
:
undefined
groupName
:
undefined
,
entrustId
:
undefined
}
}
}
}
},
},
...
@@ -449,6 +451,14 @@ export default {
...
@@ -449,6 +451,14 @@ export default {
this
.
$refs
.
pageTable
.
_hideLoading
()
this
.
$refs
.
pageTable
.
_hideLoading
()
this
.
_page
()
this
.
_page
()
},
},
_openByEntrustId
(
id
)
{
this
.
formObj
=
this
.
$resetFields
(
this
.
formObj
)
this
.
dateList
=
[]
this
.
showModal
=
true
this
.
entrustId
=
id
// 委托id
this
.
$refs
.
pageTable
.
_hideLoading
()
this
.
_pageByEntrustId
()
},
_openRecord
(
id
)
{
_openRecord
(
id
)
{
this
.
formObj
=
this
.
$resetFields
(
this
.
formObj
)
this
.
formObj
=
this
.
$resetFields
(
this
.
formObj
)
this
.
dateList
=
[]
this
.
dateList
=
[]
...
@@ -461,6 +471,19 @@ export default {
...
@@ -461,6 +471,19 @@ export default {
_formSearch
()
{
_formSearch
()
{
this
.
$refs
.
pageTable
.
_pageChange
(
1
)
this
.
$refs
.
pageTable
.
_pageChange
(
1
)
},
},
_pageByEntrustId
:
async
function
()
{
Object
.
assign
(
this
.
formObj
,
this
.
$refs
.
pageTable
.
_searchParams
())
this
.
formObj
=
this
.
$serializeForm
(
this
.
formObj
)
this
.
formObj
.
entrustId
=
this
.
entrustId
const
result
=
await
soilEntrust
.
pageItemByEntrustId
(
this
.
$serializeForm
(
this
.
formObj
)
)
if
(
result
)
{
this
.
$refs
.
pageTable
.
_hideLoading
()
this
.
getPage
=
result
console
.
log
(
result
)
}
},
_page
:
async
function
()
{
_page
:
async
function
()
{
Object
.
assign
(
this
.
formObj
,
this
.
$refs
.
pageTable
.
_searchParams
())
Object
.
assign
(
this
.
formObj
,
this
.
$refs
.
pageTable
.
_searchParams
())
this
.
formObj
=
this
.
$serializeForm
(
this
.
formObj
)
this
.
formObj
=
this
.
$serializeForm
(
this
.
formObj
)
...
...
pages/meter-entrust/entrust-register/EntrustRegister.vue
View file @
ade4d48f
...
@@ -242,7 +242,7 @@ export default {
...
@@ -242,7 +242,7 @@ export default {
},
},
_itemManage
(
data
)
{
_itemManage
(
data
)
{
// 管理样品
// 管理样品
this
.
$refs
.
itemManageModal
.
_open
(
data
)
this
.
$refs
.
itemManageModal
.
_open
ByEntrustId
(
data
)
},
},
_submitToReview
()
{
_submitToReview
()
{
this
.
_submitByContractIds
(
'委托评审'
)
this
.
_submitByContractIds
(
'委托评审'
)
...
...
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