Skip to content

P
patzn-cloud-web-back-soil
Commit 589ad68f by wangweidong
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 30d108a4 91571d22
Showing with 6 additions and 3 deletions
api/soil/soil-test.js
...@@ -161,5 +161,7 @@ export default { ...@@ -161,5 +161,7 @@ export default {
deleteRecord: data => deleteRecord: data =>
http.delete('soil/v1/original_record/?ids=' + data).then(res => res), http.delete('soil/v1/original_record/?ids=' + data).then(res => res),
expReportPage: data => expReportPage: data =>
http.post('soil/v1/exp_report/page', data).then(res => res) http.post('soil/v1/exp_report/page', data).then(res => res),
deleteReport: data =>
http.delete('soil/v1/exp_report/?ids=' + data).then(res => res)
} }
pages/soil-test-manage/test-input/ItemReportView.vue
...@@ -265,7 +265,7 @@ export default { ...@@ -265,7 +265,7 @@ export default {
}) })
}, },
_deleteOk: async function(ids) { _deleteOk: async function(ids) {
const result = await soilTest.deleteRecord(ids) const result = await soilTest.deleteReport(ids)
if (result) { if (result) {
this.$Message.success('删除成功') this.$Message.success('删除成功')
this._page() this._page()
......
plugins/common.js
...@@ -841,7 +841,8 @@ Vue.prototype.$openWindowModeless = function(data) { ...@@ -841,7 +841,8 @@ Vue.prototype.$openWindowModeless = function(data) {
data.isReport + data.isReport +
'&userId=' + '&userId=' +
global.getUserInfo().id + global.getUserInfo().id +
'&companyId=1304005330061996033' + '&companyId=' +
global.getUserInfo().companyId +
'&userName=' + '&userName=' +
realname + realname +
'&idType=' + '&idType=' +
......
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