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

pages/soil-report-manage/report-manage/FoodReportManageIndex.vue

+<template>
+  <div>
+    <div class="layout-content-padding">
+      <div class="layout-content-main">
+        <el-tabs v-model="activeName" @tab-click="_changeTabs">
+          <el-tab-pane label="报告档案" name="contract"/>
+          <el-tab-pane label="报告台账" name="report"/>
+        </el-tabs>
+        <!--组件加载，缓存-->
+        <keep-alive>
+          <!-- eslint-disable-next-line vue/require-component-is -->
+          <component :is="currentComponent"></component>
+        </keep-alive>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import ReportByContract from './tab/ReportByContract'
+import ReportByReport from './tab/ReportByReport'
+/**
+ * 报告档案
+ */
+export default {
+  components: {
+    // eslint-disable-next-line vue/no-unused-components
+    ReportByContract,
+    // eslint-disable-next-line vue/no-unused-components
+    ReportByReport
+  },
+  data() {
+    return {
+      activeName: '',
+      // 结束
+      reportStatus: 'FLOW_END',
+      currentComponent: ''
+    }
+  },
+  mounted() {
+    this.activeName = 'contract'
+    this.currentComponent = 'ReportByContract'
+  },
+  methods: {
+    _changeTabs(tab, event) {
+      if (tab.name === 'contract') {
+        this.currentComponent = 'ReportByContract'
+      } else if (tab.name === 'report') {
+        this.currentComponent = 'ReportByReport'
+      }
+    }
+  }
+}
+</script>

pages/soil-sample-manage/SoilSampleManage.vue

 <template>
   <div>
-    <Modal v-model="showModal" width="1200" class="modal-footer-none">
+    <Modal v-model="showModal" @on-visible-change="_visibleChange" width="1200" class="modal-footer-none">
       <p slot="header">
         {{ modalTitle }}
       </p>
@@ -177,6 +177,11 @@ export default {
           break
       }
     },
+    _visibleChange(data) {
+      if (data === false) {
+        this.$emit('on-result-change')
+      }
+    },
     _cancel() {
       this.showModal = false
     },

router/soil-routes.js

@@ -28,6 +28,7 @@ import ReportIssueIndex from '../pages/soil-report-manage/report-issue/ReportIss
 import SampleDisposeIndex from '../pages/soil-sample-manage/sample-dispose/SampleDisposeIndex'
 import SurplusDisposeIndex from '../pages/soil-sample-manage/sample-surplus-dispose/SurplusDisposeIndex'
 import ClientLocationSearch from '../pages/soil-statistics/client_location/ClientLocationIndex'
+import FoodReportManageIndex from '../pages/soil-report-manage/report-manage/FoodReportManageIndex'
 import Blank from '~/pages/blank'
 export default [
   {
@@ -141,6 +142,11 @@ export default [
         path: 'report_issue',
         component: ReportIssueIndex,
         meta: { title: '报告签发' }
+      },
+      {
+        path: 'report_manage',
+        component: FoodReportManageIndex,
+        meta: { title: '报告档案' }
       }
     ]
   },