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

api/soil/soil-test.js

@@ -161,5 +161,7 @@ export default {
   deleteRecord: data =>
     http.delete('soil/v1/original_record/?ids=' + data).then(res => res),
   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 {
       })
     },
     _deleteOk: async function(ids) {
-      const result = await soilTest.deleteRecord(ids)
+      const result = await soilTest.deleteReport(ids)
       if (result) {
         this.$Message.success('删除成功')
         this._page()

plugins/common.js

@@ -841,7 +841,8 @@ Vue.prototype.$openWindowModeless = function(data) {
     data.isReport +
     '&userId=' +
     global.getUserInfo().id +
-    '&companyId=1304005330061996033' +
+    '&companyId=' +
+    global.getUserInfo().companyId +
     '&userName=' +
     realname +
     '&idType=' +