修改了试样检测查看原始记录

api/soil/soil-report.js

@@ -14,5 +14,9 @@ export default {
     http.post('soil/v1/entrust/page_report_check_his', data).then(res => res),
   // 报告签发  历史任务分页列表
   pageReportIssueHis: data =>
-    http.post('soil/v1/entrust/page_report_issue_his', data).then(res => res)
+    http.post('soil/v1/entrust/page_report_issue_his', data).then(res => res),
+  getExcelOriginalRecord: data =>
+    http
+      .post('soil/v1/original_record/get_excel_original_record?expId=' + data)
+      .then(res => res)
 }

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

@@ -152,7 +152,8 @@ export default {
             )
             break
           case '查看原始记录':
-            this._recordView(data.originalRecordId)
+            this._reportView(data)
+            // this._recordView(data.originalRecordId)
             break
           case '查看试验项目':
             this._itemView(data.id)
@@ -167,6 +168,31 @@ export default {
     _itemView(id) {
       this.$refs.itemViewModal._open(id)
     },
+    _reportView(data) {
+      if (data.objectKey) {
+        this._reportMakeLook(data)
+      } else {
+        this._recordView(data.originalRecordId)
+      }
+    },
+    _reportMakeLook(data) {
+      console.log(data)
+      this._viewReport(data)
+      // const result = await soilReport.getExcelOriginalRecord(data.id)
+      // if (result) {
+      //   this._viewReport(result)
+      // }
+    },
+    _viewReport(data) {
+      if (data) {
+        this.$openWindowModeless({
+          objectKey: data.objectKey,
+          idType: 10,
+          id: data.id,
+          isReport: 4
+        })
+      }
+    },
     // 查看原始记录
     _recordView(originalRecordId) {
       let recordUrl = ''

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

@@ -60,7 +60,7 @@
 </template>
 <script>
 import Global from '../../../../api/config'
-import { soilSample, soilTest } from '../../../../api'
+import { soilReport, soilSample, soilTest } from '../../../../api'
 import AssignPerson from '../../../../components/user-info-single/assignPerson'
 import SelectOriTempRecord from '../SelectOriTempRecord'
 import OriginalRecordEdit from '../OriginalRecordEdit'
@@ -131,6 +131,7 @@ export default {
       ],
       iconMsg: [
         { type: 'ios-book', id: '', name: '查看原始记录' },
+        // { type: 'md-eye', id: '', name: '原始记录查看/编辑' },
         { type: 'md-apps', id: '', name: '查看指标' },
         { type: 'ios-bookmarks', id: '', name: '查看采集数据' },
         { type: 'ios-browsers', id: '', name: '查看采集文件' },
@@ -185,19 +186,23 @@ export default {
       this.$nextTick(() => {
         switch (res) {
           case '查看原始记录':
-            console.log(data)
-            if (data.recordId) {
-              this.$refs.editModal._openWithType(
-                data.recordId,
-                'ENVTESTMAKEEDIT'
-              )
-            } else {
-              this.$Message.warning('未填写原始记录')
-            }
+            this._reportView(data)
+            // console.log(data)
+            // if (data.recorded === '是') {
+            //   this.$refs.editModal._openWithType(
+            //     data.recordId,
+            //     'ENVTESTMAKEEDIT'
+            //   )
+            // } else {
+            //   this.$Message.warning('未填写原始记录')
+            // }
             break
           case '查看指标':
             this._indexManage(data)
             break
+          case '原始记录查看/编辑':
+            this._reportMakeLook(data)
+            break
           case '查看采集数据':
             this._collectManage(data)
             break
@@ -210,6 +215,24 @@ export default {
         }
       })
     },
+    _reportView(data) {
+      if (data.recorded === '是') {
+        if (data.objectKey) {
+          this._reportMakeLook(data)
+        } else {
+          this.$refs.editModal._openWithType(data.recordId, 'ENVTESTMAKEEDIT')
+        }
+      } else {
+        this.$Message.warning('未填写原始记录')
+      }
+    },
+    _reportMakeLook: async function(data) {
+      console.log(data)
+      const result = await soilReport.getExcelOriginalRecord(data.id)
+      if (result) {
+        this._viewReport(result)
+      }
+    },
     _certificateSelectExcelBack(data) {
       if (data) {
         this.$refs.pageTable._showLoading()