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

pages/soil-report-manage/report-make/tabs/ReportInfoMake.vue

@@ -232,7 +232,7 @@ export default {
             this.$refs.refModal._open(data)
             break
           case '预览/编辑报告':
-            this._viewReport(data.id)
+            this._viewReport(data)
             break
           case '操作记录':
             this._record(data.id)
@@ -258,32 +258,15 @@ export default {
     _upload(id) {
       this.$refs.refModal._open(id)
     },
-    _viewReport(id) {
-      this.$openWindowModeless({ id: id })
-      // this.$store.dispatch('FoodSampleReport/viewReport', id).then(() => {
-      //   const data = this.$store.state.FoodSampleReport.page
-      //   if (data !== undefined) {
-      //     // 查询token,后台使用pageoffice调接口查询数据，需要token,否则提示未登录
-      //     this.$store.dispatch('Redirect/getAccessToken').then(() => {
-      //       const token = this.$store.state.Redirect.str
-      //       if (token) {
-      //         if (localStorage.getItem('reportReadOnly')) {
-      //           // 只读
-      //           this.$openWindowModeless({ objectKey: data.objectKey, id: id })
-      //         } else {
-      //           // 编辑
-      //           this.$openWindowModeless({
-      //             objectKey: data.objectKey,
-      //             id: id,
-      //             isReport: 1,
-      //             token: token,
-      //             reportStatus: this.reportStatus
-      //           })
-      //         }
-      //       }
-      //     })
-      //   }
-      // })
+    _viewReport(data) {
+      if (data) {
+        this.$openWindowModeless({
+          objectKey: data.objectKey,
+          idType: 10,
+          id: data.id,
+          isReport: 4
+        })
+      }
     },
     _tableResultChange(msg, data) {
       switch (msg) {
@@ -304,6 +287,7 @@ export default {
           this._iconClick(data.name, data.rowData, data.componentName)
           break
         case 'table-col':
+          console.log('table-col', data)
           this.userColumns = data
           break
         case 'changeSize':