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
4d3b7751
Commit
4d3b7751
authored
Sep 25, 2020
by
lichengming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改了试验项目原始记录查看
parent
365a29c1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
21 additions
and
7 deletions
+21
-7
soil-test.js
api/soil/soil-test.js
+5
-1
OriginalRecordView.vue
pages/soil-test-manage/test-input/OriginalRecordView.vue
+0
-0
SampleManage.vue
pages/soil-test-manage/test-input/SampleManage.vue
+8
-2
SampleRightList.vue
...il-test-manage/test-input/sample-tabs/SampleRightList.vue
+3
-2
SampleTabs.vue
pages/soil-test-manage/test-input/sample-tabs/SampleTabs.vue
+5
-2
No files found.
api/soil/soil-test.js
View file @
4d3b7751
...
...
@@ -45,5 +45,9 @@ export default {
saveItem
:
data
=>
http
.
post
(
'soil/v1/original_record/save_original_record'
,
data
)
.
then
(
res
=>
res
)
.
then
(
res
=>
res
),
recordPage
:
data
=>
http
.
post
(
'soil/v1/original_record/page'
,
data
).
then
(
res
=>
res
),
pageTest
:
data
=>
http
.
post
(
'soil/v1/experiment/page_test'
,
data
).
then
(
res
=>
res
)
}
pages/soil-test-manage/test-input/OriginalRecordView.vue
0 → 100644
View file @
4d3b7751
This diff is collapsed.
Click to expand it.
pages/soil-test-manage/test-input/SampleManage.vue
View file @
4d3b7751
...
...
@@ -11,6 +11,9 @@
<el-tab-pane
label=
"按样品录入"
name=
"waitScan"
>
<WaitScan
ref=
"waitScanModal"
></WaitScan>
</el-tab-pane>
<el-tab-pane
label=
"查看原始记录"
name=
"viewRecord"
>
<OriginalRecordView
ref=
"recordModal"
></OriginalRecordView>
</el-tab-pane>
</el-tabs>
<!--
<keep-alive>
-->
<!-- <!– eslint-disable-next-line vue/require-component-is –>-->
...
...
@@ -23,11 +26,13 @@
<
script
>
import
WaitReceive
from
'./item-tabs/ItemTabs'
import
WaitScan
from
'./sample-tabs/SampleTabs'
import
OriginalRecordView
from
'./OriginalRecordView'
export
default
{
components
:
{
WaitReceive
,
WaitScan
WaitScan
,
OriginalRecordView
},
data
()
{
return
{
...
...
@@ -69,8 +74,9 @@ export default {
this
.
$refs
.
alreadyIssuedModal
.
_open
(
this
.
contractId
,
this
.
type
)
},
_changeTabs
(
tab
,
event
)
{
if
(
tab
.
name
===
'
alreadyIssue
d'
)
{
if
(
tab
.
name
===
'
viewRecor
d'
)
{
// this._issuedPage()
this
.
$refs
.
recordModal
.
_open
(
this
.
entrustId
)
}
else
if
(
tab
.
name
===
'waitReceive'
)
{
// this._waitPage()
this
.
$refs
.
waitScanModal
.
_clearTable
()
...
...
pages/soil-test-manage/test-input/sample-tabs/SampleRightList.vue
View file @
4d3b7751
...
...
@@ -306,8 +306,9 @@ export default {
this
.
$refs
.
refModal
.
_open
(
tempData
,
'planDate'
)
}
},
_open
(
data
)
{
_open
(
id
,
data
)
{
this
.
getPage
.
records
=
[]
console
.
log
(
id
)
this
.
sampleIds
=
data
if
(
data
.
length
===
0
)
{
this
.
$set
(
this
.
getPage
,
'records'
,
[])
...
...
@@ -338,7 +339,7 @@ export default {
_page
:
async
function
()
{
Object
.
assign
(
this
.
formObj
,
this
.
$refs
.
pageTable
.
_searchParams
())
this
.
formObj
.
sampleIds
=
this
.
sampleIds
const
result
=
await
soilTest
.
page
Allo
t
(
this
.
$serializeForm
(
this
.
formObj
))
const
result
=
await
soilTest
.
page
Tes
t
(
this
.
$serializeForm
(
this
.
formObj
))
if
(
result
)
{
this
.
$refs
.
pageTable
.
_hideLoading
()
this
.
$refs
.
pageTable
.
_checkAll
()
...
...
pages/soil-test-manage/test-input/sample-tabs/SampleTabs.vue
View file @
4d3b7751
...
...
@@ -23,16 +23,19 @@ export default {
ItemRightList
},
data
()
{
return
{}
return
{
id
:
''
}
},
methods
:
{
_leftResult
(
data
)
{
this
.
$refs
.
SamplerightModal
.
_open
(
data
)
this
.
$refs
.
SamplerightModal
.
_open
(
this
.
id
,
data
)
},
_rightResult
()
{
this
.
$refs
.
SampleleftModal
.
_page
()
},
_open
(
id
)
{
this
.
id
=
id
this
.
$refs
.
SampleleftModal
.
_open
(
id
)
// this.$refs.rightModal._getColumn()
},
...
...
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