添加了查看附录按钮

api/soil/soil-report.js

@@ -32,5 +32,7 @@ export default {
       .post('soil/v1/entrust/page_report_end_by_summary_report', data)
       .then(res => res),
   reportDelete: data =>
-    http.delete('soil/v1/report/?ids=' + data).then(res => res)
+    http.delete('soil/v1/report/?ids=' + data).then(res => res),
+  generateAppendix: data =>
+    http.post('soil/v1/exp_report/generate_appendix', data).then(res => res)
 }

pages/soil-test-manage/test-data-audit/ItemReportView.vue

@@ -80,7 +80,12 @@ export default {
           id: 'audit-report-view',
           name: '查看项目报告'
         },
-        { type: 'md-trash', id: 'audit-report-delete', name: '删除' }
+        { type: 'md-trash', id: 'audit-report-delete', name: '删除' },
+        {
+          type: 'md-albums',
+          id: 'audit-report-view-appendix',
+          name: '查看附录'
+        }
       ],
       pageColumns: [
         { title: '项目名称', key: 'expName' },
@@ -172,6 +177,13 @@ export default {
           case '查看试验项目':
             this._itemView(data.id)
             break
+          case '查看附录':
+            if (data.appendixKey) {
+              this._viewAppendix(data)
+            } else {
+              this.$Message.warning('未生成附录')
+            }
+            break
           case '删除':
             this._deleteByIds([data.id])
             break
@@ -209,6 +221,16 @@ export default {
         })
       }
     },
+    _viewAppendix(data) {
+      if (data) {
+        this.$openWindowModeless({
+          objectKey: data.appendixKey,
+          idType: 13,
+          id: data.id,
+          isReport: 5
+        })
+      }
+    },
     // 查看原始记录
     _recordView(originalRecordId) {
       let recordUrl = ''

pages/soil-test-manage/test-data-check/ItemReportView.vue

@@ -80,7 +80,12 @@ export default {
           id: 'check-report-view',
           name: '查看项目报告'
         },
-        { type: 'md-trash', id: 'check-report-delete', name: '删除' }
+        { type: 'md-trash', id: 'check-report-delete', name: '删除' },
+        {
+          type: 'md-albums',
+          id: 'check-report-view-appendix',
+          name: '查看附录'
+        }
       ],
       pageColumns: [
         { title: '项目名称', key: 'expName' },
@@ -165,6 +170,13 @@ export default {
             // )
             this._reportMakeLook(data)
             break
+          case '查看附录':
+            if (data.appendixKey) {
+              this._viewAppendix(data)
+            } else {
+              this.$Message.warning('未生成附录')
+            }
+            break
           case '查看项目报告':
             this._reportView(data)
             // this._recordView(data.originalRecordId)
@@ -178,6 +190,16 @@ export default {
         }
       })
     },
+    _viewAppendix(data) {
+      if (data) {
+        this.$openWindowModeless({
+          objectKey: data.appendixKey,
+          idType: 13,
+          id: data.id,
+          isReport: 5
+        })
+      }
+    },
     // 查看试验项目
     _itemView(id) {
       this.$refs.itemViewModal._open(id)

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

@@ -80,7 +80,16 @@ export default {
           id: 'do-test-sample-viewitem-view-report',
           name: '查看项目报告'
         },
-        { type: 'md-trash', id: 'do-test-sample-viewitem-delete', name: '删除' }
+        {
+          type: 'md-trash',
+          id: 'do-test-sample-viewitem-delete',
+          name: '删除'
+        },
+        {
+          type: 'md-albums',
+          id: 'do-test-sample-viewitem-view-appendix',
+          name: '生成/查看附录'
+        }
       ],
       pageColumns: [
         { title: '项目名称', key: 'expName' },
@@ -168,12 +177,25 @@ export default {
           case '查看试验项目':
             this._itemView(data.id)
             break
+          case '生成/查看附录':
+            if (data.appendixKey) {
+              this._viewAppendix(data)
+            } else {
+              this._generateAppendix(data.id)
+            }
+            break
           case '删除':
             this._deleteByIds([data.id])
             break
         }
       })
     },
+    _generateAppendix: async function(id) {
+      const result = await soilReport.generateAppendix({ id: id })
+      if (result) {
+        this._viewAppendix(result)
+      }
+    },
     // 查看试验项目
     _itemView(id) {
       this.$refs.itemViewModal._open(id)
@@ -193,6 +215,16 @@ export default {
         this._viewReport(result)
       }
     },
+    _viewAppendix(data) {
+      if (data) {
+        this.$openWindowModeless({
+          objectKey: data.appendixKey,
+          idType: 13,
+          id: data.id,
+          isReport: 5
+        })
+      }
+    },
     _viewReport(data) {
       if (data) {
         this.$openWindowModeless({