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
cc9c10ec
Commit
cc9c10ec
authored
Dec 19, 2020
by
lichengming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改了余样管理
parent
02354c35
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
17 deletions
+8
-17
soil-sample.js
api/soil/soil-sample.js
+3
-13
SurplusDisposeManage.vue
...anage/sample-surplus-dispose/tab/SurplusDisposeManage.vue
+3
-3
SampleSurplusBatchEdit.vue
...l-sample-manage/surplus-manage/SampleSurplusBatchEdit.vue
+2
-1
No files found.
api/soil/soil-sample.js
View file @
cc9c10ec
...
@@ -67,17 +67,10 @@ export default {
...
@@ -67,17 +67,10 @@ export default {
http
.
post
(
'soil/v1/prepare/handle_ok'
,
data
).
then
(
res
=>
res
),
http
.
post
(
'soil/v1/prepare/handle_ok'
,
data
).
then
(
res
=>
res
),
// 余品处理审批通过
// 余品处理审批通过
surplusDisposalOk
:
data
=>
surplusDisposalOk
:
data
=>
http
.
post
(
'soil/v1/prepare/disposal_ok
?ids='
+
data
).
then
(
res
=>
res
),
http
.
post
(
'soil/v1/prepare/disposal_ok
'
,
data
).
then
(
res
=>
res
),
// 余样处理审批驳回
// 余样处理审批驳回
surplueDisposalFail
:
data
=>
surplueDisposalFail
:
data
=>
http
http
.
post
(
'soil/v1/prepare/disposal_fail'
,
data
).
then
(
res
=>
res
),
.
post
(
'soil/v1/prepare/disposal_fail?ids='
+
data
.
ids
+
'&reason='
+
data
.
remark
)
.
then
(
res
=>
res
),
// 余样样品历史分页列表
// 余样样品历史分页列表
pageSurplusHis
:
data
=>
pageSurplusHis
:
data
=>
http
.
post
(
'soil/v1/prepare/page_surplus_his'
,
data
).
then
(
res
=>
res
),
http
.
post
(
'soil/v1/prepare/page_surplus_his'
,
data
).
then
(
res
=>
res
),
...
@@ -150,10 +143,7 @@ export default {
...
@@ -150,10 +143,7 @@ export default {
// 批量填写余样信息
// 批量填写余样信息
bathUpdateSurplusInfo
:
data
=>
bathUpdateSurplusInfo
:
data
=>
http
http
.
post
(
.
post
(
'soil/v1/prepare/bath_update_surplus_info/'
,
data
)
'soil/v1/prepare/bath_update_surplus_info/?ids='
+
data
.
id
,
data
.
obj
)
.
then
(
res
=>
res
),
.
then
(
res
=>
res
),
getUserList
:
data
=>
http
.
post
(
'/base/v1/user/page'
).
then
(
res
=>
res
),
getUserList
:
data
=>
http
.
post
(
'/base/v1/user/page'
).
then
(
res
=>
res
),
scanTakeSample
:
data
=>
scanTakeSample
:
data
=>
...
...
pages/soil-sample-manage/sample-surplus-dispose/tab/SurplusDisposeManage.vue
View file @
cc9c10ec
...
@@ -340,8 +340,8 @@ export default {
...
@@ -340,8 +340,8 @@ export default {
},
},
_reportCheckBack
:
async
function
(
data
)
{
_reportCheckBack
:
async
function
(
data
)
{
const
result
=
await
soilSample
.
surplueDisposalFail
({
const
result
=
await
soilSample
.
surplueDisposalFail
({
ids
:
this
.
selectIds
,
ids
:
this
.
selectIds
.
join
(
','
)
,
re
mark
:
data
re
ason
:
data
})
})
if
(
result
)
{
if
(
result
)
{
...
@@ -351,7 +351,7 @@ export default {
...
@@ -351,7 +351,7 @@ export default {
}
}
},
},
_disposeOk
:
async
function
(
ids
)
{
_disposeOk
:
async
function
(
ids
)
{
const
result
=
await
soilSample
.
surplusDisposalOk
(
ids
)
const
result
=
await
soilSample
.
surplusDisposalOk
(
{
ids
:
ids
}
)
if
(
result
)
{
if
(
result
)
{
this
.
_resultChange
(
'提交成功'
)
this
.
_resultChange
(
'提交成功'
)
}
}
...
...
pages/soil-sample-manage/surplus-manage/SampleSurplusBatchEdit.vue
View file @
cc9c10ec
...
@@ -159,7 +159,8 @@ export default {
...
@@ -159,7 +159,8 @@ export default {
this
.
$refs
.
formObj
.
validate
(
valid
=>
{
this
.
$refs
.
formObj
.
validate
(
valid
=>
{
if
(
valid
)
{
if
(
valid
)
{
const
data
=
this
.
formObj
const
data
=
this
.
formObj
this
.
_saveInfo
({
id
:
this
.
ids
.
join
(
','
),
obj
:
data
})
data
.
ids
=
this
.
ids
.
join
(
','
)
this
.
_saveInfo
(
data
)
}
else
{
}
else
{
this
.
$Message
.
error
(
'表单验证失败!'
)
this
.
$Message
.
error
(
'表单验证失败!'
)
this
.
$refs
.
footerModal
.
_hideLoading
()
this
.
$refs
.
footerModal
.
_hideLoading
()
...
...
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