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
dcd8d1a4
Commit
dcd8d1a4
authored
Apr 23, 2021
by
lichengming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改了报告档案按样品查看原始记录接口
parent
c1a0b9fc
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
12 deletions
+21
-12
soil-test.js
api/soil/soil-test.js
+12
-0
ItemLeftList.vue
pages/soil-report-manage/report-manage/ItemLeftList.vue
+1
-1
ItemRightList.vue
pages/soil-report-manage/report-manage/ItemRightList.vue
+7
-11
ItemTabs.vue
pages/soil-report-manage/report-manage/ItemTabs.vue
+1
-0
No files found.
api/soil/soil-test.js
View file @
dcd8d1a4
...
...
@@ -65,6 +65,8 @@ export default {
http
.
post
(
'soil/v1/experiment/page_exp_allot_his'
,
data
).
then
(
res
=>
res
),
pageTestByExp
:
data
=>
http
.
post
(
'soil/v1/experiment/page_test_by_exp'
,
data
).
then
(
res
=>
res
),
pageDocumentByExp
:
data
=>
http
.
post
(
'soil/v1/experiment/page_document_by_exp'
,
data
).
then
(
res
=>
res
),
pagePrepareByExp
:
data
=>
http
.
post
(
'soil/v1/experiment/page_prepare_by_exp'
,
data
).
then
(
res
=>
res
),
pageExperimentTest
:
data
=>
...
...
@@ -81,6 +83,16 @@ export default {
JSON
.
stringify
(
data
.
obj
)
)
.
then
(
res
=>
res
),
pageDocumentTestBath
:
data
=>
https
.
post
(
'soil/v1/experiment/page_document_test_bath?page='
+
data
.
page
+
'&rows='
+
data
.
rows
,
JSON
.
stringify
(
data
.
obj
)
)
.
then
(
res
=>
res
),
pageExperimentCheckBath
:
data
=>
https
.
post
(
...
...
pages/soil-report-manage/report-manage/ItemLeftList.vue
View file @
dcd8d1a4
...
...
@@ -119,7 +119,7 @@ export default {
_page
:
async
function
()
{
Object
.
assign
(
this
.
formObj
,
this
.
$refs
.
pageTable
.
_searchParams
())
this
.
formObj
.
entrustId
=
this
.
id
const
result
=
await
soilTest
.
page
Tes
tByExp
(
const
result
=
await
soilTest
.
page
Documen
tByExp
(
this
.
$serializeForm
(
this
.
formObj
)
)
if
(
result
)
{
...
...
pages/soil-report-manage/report-manage/ItemRightList.vue
View file @
dcd8d1a4
...
...
@@ -6,7 +6,7 @@
<Form
id=
"task-assign-item-right"
:label-width=
"70"
inline
onsubmit=
"return false"
>
<label
class=
"label-sign"
></label>
<Form-item
class=
"search-item"
label=
"试样编号:"
>
<Input
v-model=
"formObj.s
ampleCode"
@
on-enter=
"_formSearch"
name=
"sampleCode
"
placeholder=
"请输入试样编号"
clearable
></Input>
<Input
v-model=
"formObj.s
pecimenNum"
@
on-enter=
"_formSearch"
name=
"specimenNum
"
placeholder=
"请输入试样编号"
clearable
></Input>
</Form-item>
<Form-item
class=
"search-btn"
>
<Button
@
click=
"_formSearch"
type=
"primary"
>
搜索
</Button>
...
...
@@ -60,9 +60,11 @@ export default {
name
:
''
,
testMethod
:
''
,
testBasis
:
''
,
specimenNum
:
undefined
,
obj
:
{
entrustId
:
''
,
nameList
:
[]
nameList
:
[],
sampleCode
:
undefined
}
},
entrustId
:
''
,
...
...
@@ -198,22 +200,15 @@ export default {
_formSearch
()
{
this
.
$refs
.
pageTable
.
_pageChange
(
1
)
},
_searchParams
()
{
const
obj
=
{}
const
obj1
=
this
.
$refs
.
selInput1
.
_getFormObj
()
const
obj2
=
this
.
$refs
.
selInput2
.
_getFormObj
()
const
obj3
=
{
foodItemList
:
this
.
leftSelectData
}
Object
.
assign
(
obj
,
obj1
,
obj2
,
obj3
)
return
obj
},
_page
:
async
function
()
{
this
.
formObj
.
obj
.
nameList
=
[]
Object
.
assign
(
this
.
formObj
,
this
.
$refs
.
pageTable
.
_searchParams
())
this
.
formObj
.
obj
.
entrustId
=
this
.
entrustId
this
.
formObj
.
obj
.
nameList
=
this
.
leftSelectData
this
.
formObj
.
obj
.
sampleCode
=
this
.
formObj
.
specimenNum
// this.formObj.entrustId = this.entrustId
// this.formObj.nameList = this.leftSelectData.join(',')
const
result
=
await
soilTest
.
page
Experi
mentTestBath
(
const
result
=
await
soilTest
.
page
Docu
mentTestBath
(
this
.
$serializeForm
(
this
.
formObj
)
)
if
(
result
)
{
...
...
@@ -252,6 +247,7 @@ export default {
_clearAll
()
{
this
.
getPage
.
records
=
[]
this
.
selectIds
=
[]
this
.
formObj
.
specimenNum
=
undefined
}
}
}
...
...
pages/soil-report-manage/report-manage/ItemTabs.vue
View file @
dcd8d1a4
...
...
@@ -50,6 +50,7 @@ export default {
this
.
id
=
id
this
.
$refs
.
leftModal
.
_open
(
this
.
id
)
this
.
$refs
.
rightModal
.
_getEntrustId
(
this
.
id
)
this
.
$refs
.
rightModal
.
_clearAll
()
// this.$refs.rightModal._getColumn()
},
_clearTable
()
{
...
...
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