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
02354c35
Commit
02354c35
authored
Dec 19, 2020
by
lichengming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改了备样管理
parent
b1461a2b
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
24 additions
and
22 deletions
+24
-22
soil-sample.js
api/soil/soil-sample.js
+12
-15
SampleParpareBatchEdit.vue
...l-sample-manage/backups-manage/SampleParpareBatchEdit.vue
+2
-1
SampleBackupsManage.vue
...-sample-manage/backups-manage/tab/SampleBackupsManage.vue
+3
-1
SampleDisposeManage.vue
...-sample-manage/sample-dispose/tab/SampleDisposeManage.vue
+3
-3
SampleSurplusManage.vue
...-sample-manage/surplus-manage/tab/SampleSurplusManage.vue
+3
-1
soil-routes.js
router/soil-routes.js
+1
-1
No files found.
api/soil/soil-sample.js
View file @
02354c35
...
...
@@ -45,20 +45,13 @@ export default {
.
then
(
res
=>
res
),
// 样品处理审批通过
disposalOk
:
data
=>
http
.
post
(
'soil/v1/sample_backup/disposal_ok
?ids='
+
data
).
then
(
res
=>
res
),
http
.
post
(
'soil/v1/sample_backup/disposal_ok
'
,
data
).
then
(
res
=>
res
),
// 样品处理审批驳回
disposalFail
:
data
=>
http
.
post
(
'soil/v1/sample_backup/disposal_fail?ids='
+
data
.
ids
+
'&reason='
+
data
.
remark
)
.
then
(
res
=>
res
),
http
.
post
(
'soil/v1/sample_backup/disposal_fail'
,
data
).
then
(
res
=>
res
),
// 备样管理处理备样申请
handleOk
:
data
=>
http
.
post
(
'soil/v1/sample_backup/handle_ok
?ids='
+
data
).
then
(
res
=>
res
),
http
.
post
(
'soil/v1/sample_backup/handle_ok
'
,
data
).
then
(
res
=>
res
),
pageSurplus
:
data
=>
http
.
post
(
'soil/v1/prepare/page_surplus'
,
data
).
then
(
res
=>
res
),
// 余样处理审批分页列表
...
...
@@ -71,7 +64,7 @@ export default {
http
.
post
(
'soil/v1/prepare/apply_handle'
,
data
).
then
(
res
=>
res
),
// 余样管理处理备样申请
surplusHandleOk
:
data
=>
http
.
post
(
'soil/v1/prepare/handle_ok
?ids='
+
data
).
then
(
res
=>
res
),
http
.
post
(
'soil/v1/prepare/handle_ok
'
,
data
).
then
(
res
=>
res
),
// 余品处理审批通过
surplusDisposalOk
:
data
=>
http
.
post
(
'soil/v1/prepare/disposal_ok?ids='
+
data
).
then
(
res
=>
res
),
...
...
@@ -138,12 +131,16 @@ export default {
http
.
post
(
'res/v1/dict/dict_query?type='
+
data
).
then
(
res
=>
res
),
editBackup
:
data
=>
http
.
put
(
'soil/v1/sample_backup/'
+
data
.
id
,
data
.
obj
).
then
(
res
=>
res
),
// bathUpdateBackupInfo: data =>
// http
// .post(
// 'soil/v1/sample_backup/bath_update_backup_info/?ids=' + data.id,
// data.obj
// )
// .then(res => res),
bathUpdateBackupInfo
:
data
=>
http
.
post
(
'soil/v1/sample_backup/bath_update_backup_info/?ids='
+
data
.
id
,
data
.
obj
)
.
post
(
'soil/v1/sample_backup/bath_update_backup_info/'
,
data
)
.
then
(
res
=>
res
),
editItem
:
data
=>
http
.
post
(
'soil/v1/experiment/bath_update_info'
,
data
).
then
(
res
=>
res
),
...
...
pages/soil-sample-manage/backups-manage/SampleParpareBatchEdit.vue
View file @
02354c35
...
...
@@ -148,7 +148,8 @@ export default {
this
.
$refs
.
formObj
.
validate
(
valid
=>
{
if
(
valid
)
{
const
data
=
this
.
$serializeForm
(
this
.
formObj
)
this
.
_saveInfo
({
id
:
this
.
ids
.
join
(
','
),
obj
:
data
})
data
.
ids
=
this
.
ids
.
join
(
','
)
this
.
_saveInfo
(
data
)
}
else
{
this
.
$Message
.
error
(
'表单验证失败!'
)
this
.
$refs
.
footerModal
.
_hideLoading
()
...
...
pages/soil-sample-manage/backups-manage/tab/SampleBackupsManage.vue
View file @
02354c35
...
...
@@ -491,7 +491,9 @@ export default {
}
},
_handleOk
:
async
function
()
{
const
result
=
await
soilSample
.
handleOk
(
this
.
selectIds
.
join
(
','
))
const
result
=
await
soilSample
.
handleOk
({
ids
:
this
.
selectIds
.
join
(
','
)
})
if
(
result
)
{
this
.
_resultChange
(
'提交成功'
)
}
...
...
pages/soil-sample-manage/sample-dispose/tab/SampleDisposeManage.vue
View file @
02354c35
...
...
@@ -371,8 +371,8 @@ export default {
},
_reportCheckBack
:
async
function
(
data
)
{
const
result
=
await
soilSample
.
disposalFail
({
ids
:
this
.
selectIds
,
re
mark
:
data
ids
:
this
.
selectIds
.
join
(
','
)
,
re
ason
:
data
})
if
(
result
)
{
...
...
@@ -382,7 +382,7 @@ export default {
}
},
_disposeOk
:
async
function
(
ids
)
{
const
result
=
await
soilSample
.
disposalOk
(
ids
)
const
result
=
await
soilSample
.
disposalOk
(
{
ids
:
ids
}
)
if
(
result
)
{
this
.
_resultChange
(
'提交成功'
)
}
...
...
pages/soil-sample-manage/surplus-manage/tab/SampleSurplusManage.vue
View file @
02354c35
...
...
@@ -434,7 +434,9 @@ export default {
}
},
_handleOk
:
async
function
()
{
const
result
=
await
soilSample
.
surplusHandleOk
(
this
.
selectIds
.
join
(
','
))
const
result
=
await
soilSample
.
surplusHandleOk
({
ids
:
this
.
selectIds
.
join
(
','
)
})
if
(
result
)
{
this
.
_resultChange
(
'提交成功'
)
}
...
...
router/soil-routes.js
View file @
02354c35
...
...
@@ -108,7 +108,7 @@ export default [
{
path
:
'dispose'
,
component
:
SampleDisposeIndex
,
meta
:
{
title
:
'样品处理'
}
meta
:
{
title
:
'
备样
样品处理'
}
},
{
path
:
'surplus_dispose'
,
...
...
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