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

api/soil/soil-sample.js

@@ -208,5 +208,16 @@ export default {
           '&entrustId=' +
           data.entrustId
       )
+      .then(res => res),
+  generateReport: data =>
+    http
+      .post(
+        'soil/v1/exp_report/generate_report?entrustId=' +
+          data.entrustId +
+          '&templateId=' +
+          data.templateId +
+          '&expReportIds=' +
+          data.expReportIds
+      )
       .then(res => res)
 }

pages/soil-report-manage/report-make/ItemReportView.vue

@@ -173,10 +173,39 @@ export default {
       if (data) {
         console.log(this.selectIds)
         console.log(data)
+        this._makeCodeExcel(data)
       } else {
         this.$refs.pageTable._hideLoading()
       }
     },
+    _makeCodeExcel: async function(data) {
+      this.$refs.pageTable._hideLoading()
+      const result = await soilSample.generateReport({
+        entrustId: this.formObj.entrustId,
+        expReportIds: this.selectIds,
+        templateId: data.id
+      })
+      if (result) {
+        // await this._page()
+        if (result === null || result === undefined) {
+          this.$Message.warning('证书编制失败，请联系管理员！')
+          this.$refs.pageTable._hideLoading()
+          return false
+        } else {
+          this._viewReport(result)
+        }
+      }
+    },
+    _viewReport(data) {
+      if (data) {
+        this.$openWindowModeless({
+          objectKey: data.objectKey,
+          idType: 10,
+          id: data.id,
+          isReport: 4
+        })
+      }
+    },
     _reportMakeOk: async function() {
       const result = await soilSample.reportMake({
         entrustId: this.formObj.entrustId,
@@ -257,16 +286,16 @@ export default {
         this._viewReport(result)
       }
     },
-    _viewReport(data) {
-      if (data) {
-        this.$openWindowModeless({
-          objectKey: data.objectKey,
-          idType: 11,
-          id: data.id,
-          isReport: 4
-        })
-      }
-    },
+    // _viewReport(data) {
+    //   if (data) {
+    //     this.$openWindowModeless({
+    //       objectKey: data.objectKey,
+    //       idType: 11,
+    //       id: data.id,
+    //       isReport: 4
+    //     })
+    //   }
+    // },
     // 查看原始记录
     _recordView(originalRecordId) {
       let recordUrl = ''