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
9d31a1b6
Commit
9d31a1b6
authored
Mar 25, 2021
by
lichengming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改了样品拆分子样品编辑
parent
748949a6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
361 additions
and
3 deletions
+361
-3
soil-sample.js
api/soil/soil-sample.js
+3
-1
SoilSampleManageTab.vue
pages/soil-sample-manage/SoilSampleManageTab.vue
+10
-2
SoilSampleSplitChild.vue
pages/soil-sample-manage/SoilSampleSplitChild.vue
+348
-0
No files found.
api/soil/soil-sample.js
View file @
9d31a1b6
...
@@ -314,5 +314,7 @@ export default {
...
@@ -314,5 +314,7 @@ export default {
.
post
(
'soil/v1/alone_in_out_stock/get_stay_date'
,
data
)
.
post
(
'soil/v1/alone_in_out_stock/get_stay_date'
,
data
)
.
then
(
res
=>
res
),
.
then
(
res
=>
res
),
outStorageBack
:
data
=>
outStorageBack
:
data
=>
http
.
post
(
'soil/v1/alone_sample/out_storage_back'
,
data
).
then
(
res
=>
res
)
http
.
post
(
'soil/v1/alone_sample/out_storage_back'
,
data
).
then
(
res
=>
res
),
editSample
:
data
=>
http
.
put
(
'soil/v1/sample/'
+
data
.
id
,
data
.
obj
).
then
(
res
=>
res
)
}
}
pages/soil-sample-manage/SoilSampleManageTab.vue
View file @
9d31a1b6
...
@@ -67,6 +67,7 @@
...
@@ -67,6 +67,7 @@
<DescribeDetailModal
ref=
"writeDetailModal"
@
on-result-change=
"_page"
></DescribeDetailModal>
<DescribeDetailModal
ref=
"writeDetailModal"
@
on-result-change=
"_page"
></DescribeDetailModal>
<PreparationModal
ref=
"preModal"
@
on-result-change=
"_page"
></PreparationModal>
<PreparationModal
ref=
"preModal"
@
on-result-change=
"_page"
></PreparationModal>
<SoilSampleSplit
ref=
"splitModal"
@
on-result-change=
"_page"
></SoilSampleSplit>
<SoilSampleSplit
ref=
"splitModal"
@
on-result-change=
"_page"
></SoilSampleSplit>
<SoilSampleSplitChild
ref=
"splitModalChild"
@
on-result-change=
"_page"
></SoilSampleSplitChild>
<SelectFlowRelBtn
ref=
"flow"
/>
<SelectFlowRelBtn
ref=
"flow"
/>
</div>
</div>
</template>
</template>
...
@@ -77,13 +78,15 @@ import SoilSampleItemManage from './SoilSampleItemManage'
...
@@ -77,13 +78,15 @@ import SoilSampleItemManage from './SoilSampleItemManage'
import
DescribeDetailModal
from
'./sample-preparation/DescribeDetailModal'
import
DescribeDetailModal
from
'./sample-preparation/DescribeDetailModal'
import
PreparationModal
from
'./sample-preparation/Preparation'
import
PreparationModal
from
'./sample-preparation/Preparation'
import
SoilSampleSplit
from
'./SoilSampleSplit'
import
SoilSampleSplit
from
'./SoilSampleSplit'
import
SoilSampleSplitChild
from
'./SoilSampleSplitChild'
export
default
{
export
default
{
components
:
{
components
:
{
SoilSampleItemManage
,
SoilSampleItemManage
,
DescribeDetailModal
,
DescribeDetailModal
,
PreparationModal
,
PreparationModal
,
SoilSampleSplit
,
SoilSampleSplit
,
SelectFlowRelBtn
SelectFlowRelBtn
,
SoilSampleSplitChild
},
},
data
()
{
data
()
{
return
{
return
{
...
@@ -277,7 +280,11 @@ export default {
...
@@ -277,7 +280,11 @@ export default {
},
},
_sampleSplit
()
{
_sampleSplit
()
{
if
(
this
.
selectData
.
length
===
1
)
{
if
(
this
.
selectData
.
length
===
1
)
{
this
.
$refs
.
splitModal
.
_open
(
this
.
selectData
[
0
])
if
(
this
.
selectData
[
0
].
sampleCode
.
indexOf
(
'-'
)
===
-
1
)
{
this
.
$refs
.
splitModal
.
_open
(
this
.
selectData
[
0
])
}
else
{
this
.
$refs
.
splitModalChild
.
_open
(
this
.
selectData
[
0
])
}
}
else
{
}
else
{
this
.
$Message
.
warning
(
'请选择一条数据'
)
this
.
$Message
.
warning
(
'请选择一条数据'
)
}
}
...
@@ -366,6 +373,7 @@ export default {
...
@@ -366,6 +373,7 @@ export default {
this
.
$refs
.
pageTable
.
_pageChange
(
1
)
this
.
$refs
.
pageTable
.
_pageChange
(
1
)
},
},
_page
:
async
function
()
{
_page
:
async
function
()
{
this
.
$forceUpdate
()
this
.
selectData
=
[]
this
.
selectData
=
[]
Object
.
assign
(
this
.
formObj
,
this
.
$refs
.
pageTable
.
_searchParams
())
Object
.
assign
(
this
.
formObj
,
this
.
$refs
.
pageTable
.
_searchParams
())
this
.
formObj
.
entrustId
=
this
.
contractId
this
.
formObj
.
entrustId
=
this
.
contractId
...
...
pages/soil-sample-manage/SoilSampleSplitChild.vue
0 → 100644
View file @
9d31a1b6
This diff is collapsed.
Click to expand it.
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