Commit cc9c10ec by lichengming

修改了余样管理

parent 02354c35
...@@ -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 =>
......
...@@ -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(','),
remark: data reason: 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('提交成功')
} }
......
...@@ -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()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment