修改了编辑报告模板,原始记录模板

pages/soil-record-template-manage/SoilRecordTemplate.vue

@@ -165,7 +165,7 @@ export default {
         this.$openWindowModeless({
           objectKey: data.objectKey,
           id: data.id,
-          idType: 11,
+          idType: 12,
           isReport: 4
         })
       }

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

@@ -158,7 +158,7 @@ export default {
       const result = await soilReport.pageReportCheckHis(data)
       if (result) {
         this.getPage = result
-        this.$refs.pageTable._initTable()
+        this.$refs.pageTable._hideLoading()
       }
     },
     _clearPage() {

pages/soil-test-manage/test-input/OriginalRecordView.vue

@@ -51,7 +51,7 @@
  * 原始记录查看
  */
 import Global from '../../../api/config'
-import { soilTest } from '../../../api'
+import { soilReport, soilTest } from '../../../api'
 import ItemOriginalRecordEdit from './OriginalRecordEdit'
 import ItemView from './ItemView'
 
@@ -146,10 +146,7 @@ export default {
       this.$nextTick(() => {
         switch (res) {
           case '编辑':
-            this.$refs.recordEditModal._openWithType(
-              data.originalRecordId,
-              'ENVTESTMAKEEDIT'
-            )
+            this._reportEdit(data)
             break
           case '查看原始记录':
             this._reportView(data)
@@ -175,13 +172,22 @@ export default {
         this._recordView(data.originalRecordId)
       }
     },
-    _reportMakeLook(data) {
+    _reportEdit(data) {
+      if (data.objectKey) {
+        this._reportMakeLook(data)
+      } else {
+        this.$refs.recordEditModal._openWithType(
+          data.originalRecordId,
+          'ENVTESTMAKEEDIT'
+        )
+      }
+    },
+    _reportMakeLook: async function(data) {
       console.log(data)
-      this._viewReport(data)
-      // const result = await soilReport.getExcelOriginalRecord(data.id)
-      // if (result) {
-      //   this._viewReport(result)
-      // }
+      const result = await soilReport.originalRecordGetById(data.id)
+      if (result) {
+        this._viewReport(result)
+      }
     },
     _viewReport(data) {
       if (data) {