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

api/soil/soil-sample.js

@@ -207,18 +207,22 @@ export default {
     http
       .post('soil/v1/experiment/save_excel_original_record', data)
       .then(res => res),
+  // saveExcelExpReport: data =>
+  //   http
+  //     .post(
+  //       'soil/v1/experiment/save_excel_exp_report?ids=' +
+  //         data.ids +
+  //         '&templateId=' +
+  //         data.templateId +
+  //         '&expName=' +
+  //         data.expName +
+  //         '&entrustId=' +
+  //         data.entrustId
+  //     )
+  //     .then(res => res),
   saveExcelExpReport: data =>
     http
-      .post(
-        'soil/v1/experiment/save_excel_exp_report?ids=' +
-          data.ids +
-          '&templateId=' +
-          data.templateId +
-          '&expName=' +
-          data.expName +
-          '&entrustId=' +
-          data.entrustId
-      )
+      .post('soil/v1/experiment/save_excel_exp_report', data)
       .then(res => res),
   generateReport: data =>
     http

pages/soil-test-manage/test-input/item-tabs/ItemLeftList.vue

@@ -193,15 +193,10 @@ export default {
       }
     },
     _makeCodeExcel: async function(data) {
-      console.log('左侧项目名称', this.itemName)
-      console.log('右侧样品Id', this.sampleIds)
-      console.log('报告信息', data)
-      console.log('this.entrustId', this.id)
-      this.$refs.pageTable._hideLoading()
       const result = await soilSample.saveExcelExpReport({
         entrustId: this.id,
         expName: encodeURI(this.itemName),
-        ids: this.sampleIds,
+        ids: this.sampleIds.join(','),
         templateId: data.id
       })
       if (result) {
@@ -211,6 +206,7 @@ export default {
           this.$refs.pageTable._hideLoading()
           return false
         } else {
+          this.$refs.pageTable._hideLoading()
           this._viewReport(result)
         }
       }