修改了生成报告和报告审核退回

.eslintrc.js

@@ -9,7 +9,6 @@ module.exports = {
     parser: 'babel-eslint'
   },
   extends: [
-    '@nuxtjs',
     'plugin:nuxt/recommended',
     'plugin:prettier/recommended',
     'prettier',

api/soil/soil-sample.js

@@ -105,6 +105,11 @@ export default {
           data.remark
       )
       .then(res => res),
+  // 审核退回至编制
+  summaryReportBackFromCheck: data =>
+    http
+      .post('soil/v1/report/summary_report_back_from_check', data)
+      .then(res => res),
   // 报告签发提交
   reportIssueSubmit: data =>
     http

pages/soil-report-manage/report-audit/tabs/reportAudit.vue

@@ -103,7 +103,7 @@ export default {
       ],
       btn: [
         // { id: '', type: 'primary', name: '提交' },
-        // { id: '', type: 'primary', name: '退回' }
+        { id: '', type: 'primary', name: '退回' }
       ],
       getPage: {},
       searchOpen: false,
@@ -178,8 +178,8 @@ export default {
       }
     },
     _reportCheckBack: async function(data) {
-      const result = await soilSample.reportCheckBack({
-        ids: this.selectIds,
+      const result = await soilSample.summaryReportBackFromCheck({
+        ids: this.selectIds.join(','),
         remark: data
       })
 

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

@@ -206,7 +206,13 @@ export default {
           return false
         } else {
           this.$refs.pageTable._hideLoading()
-          this._viewReport(result)
+          // this._viewReport(result)
+          this.$openWindowModeless({
+            objectKey: result.objectKey,
+            idType: 12,
+            id: result.id,
+            isReport: 4
+          })
         }
       } else {
         this.$refs.pageTable._hideLoading()