修改了收样室收样

pages/soil-sample-manage/sample-receive/SampleReceiveIndex.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="entrust">
+            <ReceiveByEntrust ref="entrustTabs"></ReceiveByEntrust>
+          </el-tab-pane>
+          <el-tab-pane label="按样品接收" name="sample">
+            <ReceiveBySample ref="sampleTabs"></ReceiveBySample>
+          </el-tab-pane>
+        </el-tabs>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import ReceiveByEntrust from './ReceiveByEntrust'
+import ReceiveBySample from './ReceiveBySample'
+
+export default {
+  name: 'MeterSummaryEntrustIndex',
+  components: {
+    ReceiveByEntrust,
+    ReceiveBySample
+  },
+  data() {
+    return {
+      activeName: 'entrust'
+    }
+  },
+  mounted() {
+    this.activeName = 'entrust'
+    this._page()
+  },
+  methods: {
+    _changeTabs(tab, event) {
+      if (tab.name === 'entrust') {
+        this._page()
+      } else {
+        this.$refs.sampleTabs._page()
+      }
+    },
+    _page() {
+      this.$refs.entrustTabs._page()
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>

pages/soil-sample-manage/sample-receive/entrust-sample-manage/SampleManage.vue

+<template>
+  <div>
+    <Modal v-model="showSampleModal" @on-visible-change="_visibleChange" width="1200"
+           class="zIndex-900 modal-footer-none">
+      <p slot="header"> {{name}}--管理样品</p>
+      <div>
+        <el-tabs v-model="activeName" @tab-click="_changeTabs">
+          <el-tab-pane label="待接收样品" name="waitReceive">
+            <WaitReceive ref="waitReceiveModal" @on-result-change="_search"></WaitReceive>
+          </el-tab-pane>
+          <el-tab-pane label="待发放样品" name="waitScan">
+            <WaitScan ref="waitScanModal" @-result-change="_search"></WaitScan>
+          </el-tab-pane>
+          <el-tab-pane label="已接样样品" name="alreadyIssued">
+            <AlreadyIssued ref="alreadyIssuedModal"></AlreadyIssued>
+          </el-tab-pane>
+        </el-tabs>
+      </div>
+    </Modal>
+  </div>
+</template>
+<script>
+import WaitReceive from './WaitReceive'
+import AlreadyIssued from './AlreadyIssued'
+import WaitScan from './WaitScan'
+
+export default {
+  components: {
+    WaitReceive,
+    AlreadyIssued,
+    WaitScan
+  },
+  data() {
+    return {
+      type: '',
+      contractId: '', // 合同id
+      showSampleModal: false,
+      modalTitle: '',
+      selectIds: [],
+      activeName: 'waitReceive',
+      name: ''
+    }
+  },
+  methods: {
+    _initTab() {
+      if (this.$showBtn('food-wait-Issue-sample')) {
+        this.activeName = 'waitScan'
+        this._waitSend()
+      }
+    },
+    _open(contractId, type, name) {
+      this.type = type // 类型（采样或送样）
+      this.name = name
+      this.showSampleModal = true
+      this.entrustId = contractId // 合同id
+      this.activeName = 'waitReceive'
+      this.selectIds = []
+      this._waitPage()
+    },
+    // 待接收
+    _waitPage() {
+      this.$refs.waitReceiveModal._open(this.contractId, this.type)
+    },
+    // 待发放
+    _waitSend() {
+      this.$refs.waitScanModal._open(this.contractId, this.type)
+    },
+    // 已接收
+    _issuedPage() {
+      this.$refs.alreadyIssuedModal._open(this.contractId, this.type)
+    },
+    _changeTabs(tab, event) {
+      if (tab.name === 'alreadyIssued') {
+        this._issuedPage()
+      } else if (tab.name === 'waitReceive') {
+        this._waitPage()
+      } else if (tab.name === 'waitScan') {
+        this._waitSend()
+      }
+    },
+    _search() {
+      this.$emit('on-result-change')
+    },
+    // 关闭弹框的时候刷新上个界面
+    _visibleChange(data) {
+      if (data === false) {
+        this._search()
+      }
+    }
+  }
+}
+</script>

router/soil-routes.js

@@ -7,6 +7,7 @@ import StandardManage from '../pages/meter-aptitude/standard-manage/StandardMana
 import ExperimentItemManage from '../pages/meter-aptitude/item-manage/ExperimentItemManage'
 import EntrustIndex from '../pages/meter-entrust/entrust-register/EntrustIndex'
 import ReviewEntrust from '../pages/meter-entrust/entrust-review/ReviewEntrust'
+import SampleReceiveIndex from '../pages/soil-sample-manage/sample-receive/SampleReceiveIndex'
 import Blank from '~/pages/blank'
 export default [
   {
@@ -36,7 +37,7 @@ export default [
     children: [
       {
         path: 'receive',
-        component: workbench,
+        component: SampleReceiveIndex,
         meta: { title: '收样室收样' }
       },
       {