修改了检测管理

pages/meter-entrust/SoilSampleManage.vue

 <template>
   <div>
-    <Modal v-model="showModal" width="1010" class="modal-footer-none">
+    <Modal v-model="showModal" width="1030" class="modal-footer-none">
       <p slot="header">
         {{ modalTitle }}
       </p>
@@ -114,7 +114,7 @@ export default {
       selectData: {},
       getPage: {},
       pageColumns: [
-        { title: '试样编号', key: 'sampleCode', width: 100, fixed: 'left' },
+        { title: '试样编号', key: 'sampleCode', width: 120, fixed: 'left' },
         { title: '试样深度', key: 'sampleDepth', width: 100 },
         { title: '现场编号', key: 'siteNo', width: 100 },
         { title: '试验项目', key: 'experimentNames' },

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

@@ -61,10 +61,14 @@
     </div>
     <!--组件加载-->
     <!--选择领样人-->
-    <UserInfo ref="userModal" @on-result-change="_userResult"></UserInfo>
-    <Operation ref="operation"></Operation>
-    <SampleManage ref="sampleManageModal" @on-result-change="_page"></SampleManage>
-    <FileManage ref="FileManage"></FileManage>
+    <keep-alive>
+      <!-- eslint-disable-next-line vue/require-component-is -->
+      <component ref="refModal" :is="currentComponent" @on-result-change="_componentResult"></component>
+    </keep-alive>
+<!--    <UserInfo ref="userModal" @on-result-change="_userResult"></UserInfo>-->
+<!--    <Operation ref="operation"></Operation>-->
+<!--    <SampleManage ref="sampleManageModal" @on-result-change="_page"></SampleManage>-->
+<!--    <FileManage ref="FileManage"></FileManage>-->
   </div>
 </template>
 <script>
@@ -73,12 +77,8 @@ import { soilTest } from '../../../api'
 import Operation from '../../../components/operation/Operation'
 import SampleManage from './SampleManage'
 export default {
-  components: {
-    UserInfo,
-    Operation,
-    // eslint-disable-next-line vue/no-unused-components
-    SampleManage
-  },
+  // eslint-disable-next-line vue/no-unused-components
+  components: { UserInfo, Operation, SampleManage },
   data() {
     return {
       formObj: {
@@ -139,7 +139,7 @@ export default {
     }
   },
   mounted() {
-    this._page()
+    // this._page()
     // 样品接收是否选择人员
     // this.acceptSelectUserValue = localStorage.getItem('acceptSelectUserValue')
   },
@@ -365,7 +365,11 @@ export default {
       })
     },
     _editModal(id, type, name) {
-      this.$refs.sampleManageModal._open(id, type, '数据录入')
+      this.currentComponent = 'SampleManage'
+      this.$nextTick(() => {
+        this.$refs.refModal._open(id, type, '数据录入')
+      })
+      // this.$refs.sampleManageModal._open(id, type, '数据录入')
     },
     _editModals(res, data) {
       if (res === '登记协议') {
@@ -429,8 +433,12 @@ export default {
       this._page()
     },
     _operationRecord(id) {
+      this.currentComponent = 'Operation'
+      this.$nextTick(() => {
+        this.$refs.refModal._open(id)
+      })
       // 操作日志
-      this.$refs.operation._open(id)
+      // this.$refs.operation._open(id)
     },
     _resultChange(msg) {
       if (this.$store.state.FoodContract.success) {
@@ -441,7 +449,11 @@ export default {
     },
     _upload(id) {
       // 上传文件
-      this.$refs.FileManage._open(id, 'entrustId')
+      this.currentComponent = 'FileManage'
+      this.$nextTick(() => {
+        this.$refs.refModal._open(id, 'entrustId')
+      })
+      // this.$refs.FileManage._open(id, 'entrustId')
     }
   }
 }

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

@@ -61,10 +61,14 @@
     </div>
     <!--组件加载-->
     <!--选择领样人-->
-    <UserInfo ref="userModal" @on-result-change="_userResult"></UserInfo>
-    <Operation ref="operation"></Operation>
-    <FileManage ref="FileManage"></FileManage>
-    <SoilSampleManageHis ref="sampleManageModal"></SoilSampleManageHis>
+    <keep-alive>
+      <!-- eslint-disable-next-line vue/require-component-is -->
+      <component ref="refModal" :is="currentComponent" @on-result-change="_componentResult"></component>
+    </keep-alive>
+<!--    <UserInfo ref="userModal" @on-result-change="_userResult"></UserInfo>-->
+<!--    <Operation ref="operation"></Operation>-->
+<!--    <FileManage ref="FileManage"></FileManage>-->
+<!--    <SoilSampleManageHis ref="sampleManageModal"></SoilSampleManageHis>-->
   </div>
 </template>
 <script>
@@ -73,11 +77,8 @@ import { soilTest } from '../../../api'
 import Operation from '../../../components/operation/Operation'
 import SoilSampleManageHis from './SoilSampleManageHis'
 export default {
-  components: {
-    UserInfo,
-    Operation,
-    SoilSampleManageHis
-  },
+  // eslint-disable-next-line vue/no-unused-components
+  components: { UserInfo, Operation, SoilSampleManageHis },
   data() {
     return {
       formObj: {
@@ -138,7 +139,7 @@ export default {
     }
   },
   mounted() {
-    this._page()
+    // this._page()
     // 样品接收是否选择人员
     // this.acceptSelectUserValue = localStorage.getItem('acceptSelectUserValue')
   },
@@ -364,7 +365,11 @@ export default {
       })
     },
     _editModal(id, type, name) {
-      this.$refs.sampleManageModal._open(id, type, name)
+      this.currentComponent = 'SoilSampleManageHis'
+      this.$nextTick(() => {
+        this.$refs.refModal._open(id, type, name)
+      })
+      // this.$refs.sampleManageModal._open(id, type, name)
     },
     _editModals(res, data) {
       if (res === '登记协议') {
@@ -429,7 +434,11 @@ export default {
     },
     _operationRecord(id) {
       // 操作日志
-      this.$refs.operation._open(id)
+      this.currentComponent = 'Operation'
+      this.$nextTick(() => {
+        this.$refs.refModal._open(id)
+      })
+      // this.$refs.operation._open(id)
     },
     _resultChange(msg) {
       if (this.$store.state.FoodContract.success) {
@@ -440,7 +449,11 @@ export default {
     },
     _upload(id) {
       // 上传文件
-      this.$refs.FileManage._open(id, 'entrustId')
+      this.currentComponent = 'FileManage'
+      this.$nextTick(() => {
+        this.$refs.refModal._open(id, 'entrustId')
+      })
+      // this.$refs.FileManage._open(id, 'entrustId')
     }
   }
 }

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

@@ -2,14 +2,22 @@
   <div>
     <div class="layout-content-padding">
       <div class="layout-content-main">
+<!--        <el-tabs v-model="activeName" @tab-click="_changeTabs">-->
+<!--          <el-tab-pane label="数据录入" name="wait">-->
+<!--            <SampleBackupsManage ref="waitTabs"></SampleBackupsManage>-->
+<!--          </el-tab-pane>-->
+<!--          <el-tab-pane label="录入历史" name="query">-->
+<!--            <SampleBackupsQuery ref="queryTabs"></SampleBackupsQuery>-->
+<!--          </el-tab-pane>-->
+<!--        </el-tabs>-->
         <el-tabs v-model="activeName" @tab-click="_changeTabs">
-          <el-tab-pane label="数据录入" name="wait">
-            <SampleBackupsManage ref="waitTabs"></SampleBackupsManage>
-          </el-tab-pane>
-          <el-tab-pane label="录入历史" name="query">
-            <SampleBackupsQuery ref="queryTabs"></SampleBackupsQuery>
-          </el-tab-pane>
+          <el-tab-pane label="数据录入" name="waitTabs"></el-tab-pane>
+          <el-tab-pane label="录入历史" name="queryTabs"></el-tab-pane>
         </el-tabs>
+        <keep-alive>
+          <!-- eslint-disable-next-line vue/require-component-is -->
+          <component ref="refModal" :is="currentComponent"></component>
+        </keep-alive>
       </div>
     </div>
   </div>
@@ -20,28 +28,37 @@ import SampleBackupsManage from './TestInput'
 import SampleBackupsQuery from './TestInputHis'
 
 export default {
-  components: {
-    SampleBackupsManage,
-    SampleBackupsQuery
-  },
+  // eslint-disable-next-line vue/no-unused-components
+  components: { SampleBackupsManage, SampleBackupsQuery },
   data() {
     return {
-      activeName: 'wait'
+      activeName: 'waitTabs',
+      currentComponent: ''
     }
   },
   mounted() {
-    this.activeName = 'wait'
-    this.$refs.waitTabs._page()
+    this.activeName = 'waitTabs'
+    this._page()
   },
   methods: {
     _changeTabs(tab, event) {
-      if (tab.name === 'wait') {
-        this.$refs.waitTabs._page()
+      if (tab.name === 'waitTabs') {
+        this._page()
       } else if (tab.name === 'applyRecord') {
         // this.$refs.applyRecordTabs._page()
       } else {
-        this.$refs.queryTabs._page()
+        this.currentComponent = 'SampleBackupsQuery'
+        this.$nextTick(() => {
+          this.$refs.refModal._page()
+        })
       }
+    },
+    _page() {
+      this.currentComponent = 'SampleBackupsManage'
+      this.$nextTick(() => {
+        this.$refs.refModal._page()
+      })
+      // this.$refs.entrustTabs._page()
     }
   }
 }

pages/soil-test-manage/test-task-manage-his/AllotByEntrust.vue

@@ -59,11 +59,15 @@
     </div>
     <!--组件加载-->
     <!--选择领样人-->
-    <UserInfo ref="userModal" @on-result-change="_userResult"></UserInfo>
-    <SampleManage ref="sampleManageModal" @on-result-change="_page"></SampleManage>
-    <ItemManage ref="itemManageModal" @on-result-change="_page"></ItemManage>
-    <Operation ref="operation"></Operation>
-    <FileManage ref="FileManage"></FileManage>
+<!--    <UserInfo ref="userModal" @on-result-change="_userResult"></UserInfo>-->
+<!--    <SampleManage ref="sampleManageModal" @on-result-change="_page"></SampleManage>-->
+<!--    <ItemManage ref="itemManageModal" @on-result-change="_page"></ItemManage>-->
+<!--    <Operation ref="operation"></Operation>-->
+<!--    <FileManage ref="FileManage"></FileManage>-->
+    <keep-alive>
+      <!-- eslint-disable-next-line vue/require-component-is -->
+      <component ref="refModal" :is="currentComponent" @on-result-change="_componentResult"></component>
+    </keep-alive>
   </div>
 </template>
 <script>
@@ -73,12 +77,8 @@ import Operation from '../../../components/operation/Operation'
 import SampleManage from './entrust-sample-manage/SampleManage'
 import ItemManage from './ItemManage'
 export default {
-  components: {
-    UserInfo,
-    SampleManage,
-    ItemManage,
-    Operation
-  },
+  // eslint-disable-next-line vue/no-unused-components
+  components: { UserInfo, SampleManage, ItemManage, Operation },
   data() {
     return {
       formObj: {
@@ -200,7 +200,11 @@ export default {
       })
     },
     _editModal(id, type) {
-      this.$refs.sampleManageModal._open(id, type, '分配历史')
+      this.currentComponent = 'SampleManage'
+      this.$nextTick(() => {
+        this.$refs.refModal._open(id, type, '分配历史')
+      })
+      // this.$refs.sampleManageModal._open(id, type, '分配历史')
     },
     _tableResultChange(msg, data) {
       switch (msg) {
@@ -233,12 +237,20 @@ export default {
     },
     _operationRecord(id) {
       // 操作日志
-      this.$refs.operation._open(id)
+      this.currentComponent = 'Operation'
+      this.$nextTick(() => {
+        this.$refs.refModal._open(id)
+      })
+      // this.$refs.operation._open(id)
     },
     _resultChange(msg) {},
     _upload(id) {
+      this.currentComponent = 'FileManage'
+      this.$nextTick(() => {
+        this.$refs.refModal._open(id, 'entrustId')
+      })
       // 上传文件
-      this.$refs.FileManage._open(id, 'entrustId')
+      // this.$refs.FileManage._open(id, 'entrustId')
     }
   }
 }

pages/soil-test-manage/test-task-manage/AllotByEntrust.vue

@@ -61,11 +61,15 @@
     </div>
     <!--组件加载-->
     <!--选择领样人-->
-    <UserInfo ref="userModal" @on-result-change="_userResult"></UserInfo>
-    <SampleManage ref="sampleManageModal" @on-result-change="_page"></SampleManage>
-    <ItemManage ref="itemManageModal" @on-result-change="_page"></ItemManage>
-    <Operation ref="operation"></Operation>
-    <FileManage ref="FileManage"></FileManage>
+    <keep-alive>
+      <!-- eslint-disable-next-line vue/require-component-is -->
+      <component ref="refModal" :is="currentComponent" @on-result-change="_componentResult"></component>
+    </keep-alive>
+<!--    <UserInfo ref="userModal" @on-result-change="_userResult"></UserInfo>-->
+<!--    <SampleManage ref="sampleManageModal" @on-result-change="_page"></SampleManage>-->
+<!--    <ItemManage ref="itemManageModal" @on-result-change="_page"></ItemManage>-->
+<!--    <Operation ref="operation"></Operation>-->
+<!--    <FileManage ref="FileManage"></FileManage>-->
   </div>
 </template>
 <script>
@@ -76,9 +80,13 @@ import SampleManage from './entrust-sample-manage/SampleManage'
 import ItemManage from './ItemManage'
 export default {
   components: {
+    // eslint-disable-next-line vue/no-unused-components
     UserInfo,
+    // eslint-disable-next-line vue/no-unused-components
     SampleManage,
+    // eslint-disable-next-line vue/no-unused-components
     ItemManage,
+    // eslint-disable-next-line vue/no-unused-components
     Operation
   },
   data() {
@@ -362,7 +370,11 @@ export default {
       })
     },
     _editModal(id, type) {
-      this.$refs.sampleManageModal._open(id, type, '按委托分配')
+      this.currentComponent = 'SampleManage'
+      this.$nextTick(() => {
+        this.$refs.refModal._open(id, type, '按委托分配')
+      })
+      // this.$refs.sampleManageModal._open(id, type, '按委托分配')
     },
     _editModals(res, data) {
       if (res === '登记协议') {
@@ -426,7 +438,11 @@ export default {
     },
     _operationRecord(id) {
       // 操作日志
-      this.$refs.operation._open(id)
+      this.currentComponent = 'Operation'
+      this.$nextTick(() => {
+        this.$refs.refModal._open(id)
+      })
+      // this.$refs.operation._open(id)
     },
     _resultChange(msg) {
       if (this.$store.state.FoodContract.success) {
@@ -437,7 +453,11 @@ export default {
     },
     _upload(id) {
       // 上传文件
-      this.$refs.FileManage._open(id, 'entrustId')
+      this.currentComponent = 'FileManage'
+      this.$nextTick(() => {
+        this.$refs.refModal._open(id, 'entrustId')
+      })
+      // this.$refs.FileManage._open(id, 'entrustId')
     }
   }
 }

pages/soil-test-manage/test-task-manage/TestTaskIndex.vue

@@ -3,13 +3,13 @@
     <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-tab-pane label="试验任务分配" name="entrust"></el-tab-pane>
+          <el-tab-pane label="分配历史" name="sample"></el-tab-pane>
         </el-tabs>
+        <keep-alive>
+          <!-- eslint-disable-next-line vue/require-component-is -->
+          <component ref="refModal" :is="currentComponent"></component>
+        </keep-alive>
       </div>
     </div>
   </div>
@@ -21,13 +21,12 @@ import ReceiveByEntrust from './AllotByEntrust'
 
 export default {
   name: 'MeterSummaryEntrustIndex',
-  components: {
-    ReceiveByEntrust,
-    ReceiveBySample
-  },
+  // eslint-disable-next-line vue/no-unused-components
+  components: { ReceiveByEntrust, ReceiveBySample },
   data() {
     return {
-      activeName: 'entrust'
+      activeName: 'entrust',
+      currentComponent: ''
     }
   },
   mounted() {
@@ -39,11 +38,19 @@ export default {
       if (tab.name === 'entrust') {
         this._page()
       } else {
-        this.$refs.sampleTabs._page()
+        this.currentComponent = 'ReceiveBySample'
+        this.$nextTick(() => {
+          this.$refs.refModal._page()
+        })
+        // this.$refs.sampleTabs._page()
       }
     },
     _page() {
-      this.$refs.entrustTabs._page()
+      this.currentComponent = 'ReceiveByEntrust'
+      this.$nextTick(() => {
+        this.$refs.refModal._page()
+      })
+      // this.$refs.entrustTabs._page()
     }
   }
 }