Commit 02354c35 by lichengming

修改了备样管理

parent b1461a2b
......@@ -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),
......
......@@ -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()
......
......@@ -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('提交成功')
}
......
......@@ -371,8 +371,8 @@ export default {
},
_reportCheckBack: async function(data) {
const result = await soilSample.disposalFail({
ids: this.selectIds,
remark: data
ids: this.selectIds.join(','),
reason: 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('提交成功')
}
......
......@@ -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('提交成功')
}
......
......@@ -108,7 +108,7 @@ export default [
{
path: 'dispose',
component: SampleDisposeIndex,
meta: { title: '样品处理' }
meta: { title: '备样样品处理' }
},
{
path: 'surplus_dispose',
......
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