添加了开土制备历史记录界面

pages/soil-sample-manage/sample-preparation/SampleManageHis.vue

+<template>
+  <div>
+    <Modal v-model="showSampleModal" v-drag @on-visible-change="_visibleChange" width="1200"
+           class="zIndex-900 modal-footer-none">
+      <p slot="header">管理样品</p>
+      <div>
+        <el-tabs v-model="activeName" @tab-click="_changeTabs">
+          <el-tab-pane label="样品管理" name="prepareManage">
+            <SoilSampleManage ref="prepareManage"></SoilSampleManage>
+          </el-tab-pane>
+          <el-tab-pane label="原始记录填写" name="recordModal">
+            <RecordWrite ref="recordModal"></RecordWrite>
+          </el-tab-pane>
+        </el-tabs>
+<!--        <keep-alive>-->
+<!--          &lt;!&ndash; eslint-disable-next-line vue/require-component-is &ndash;&gt;-->
+<!--          <component ref="refModal" :is="currentComponent"></component>-->
+<!--        </keep-alive>-->
+      </div>
+    </Modal>
+  </div>
+</template>
+<script>
+import SoilSampleManage from './SoilSampleManageHis'
+import RecordWrite from './sample-preparation-record-his/RecordIndex'
+export default {
+  components: {
+    SoilSampleManage,
+    RecordWrite
+  },
+  data() {
+    return {
+      type: '',
+      contractId: '', // 合同id
+      entrustId: '',
+      showSampleModal: false,
+      modalTitle: '',
+      selectIds: [],
+      activeName: 'prepareManage',
+      name: '',
+      currentComponent: ''
+    }
+  },
+  mounted() {},
+  methods: {
+    _open(entrustId, type, name) {
+      this.type = type // 类型（采样或送样）
+      this.name = name
+      this.showSampleModal = true
+      this.entrustId = entrustId // 委托id
+      this.activeName = 'prepareManage'
+      this.selectIds = []
+      this._preparePage()
+    },
+    // 制备管理
+    _preparePage() {
+      this.$refs.prepareManage._open(this.entrustId)
+    },
+    // 原始记录填写
+    _recordPage() {
+      this.$refs.recordModal._open(this.entrustId)
+    },
+    _changeTabs(tab, event) {
+      if (tab.name === 'prepareManage') {
+        // this._issuedPage()
+        this.$refs.prepareManage._open(this.entrustId)
+        this.$refs.recordModal._clearTable()
+      } else {
+        this.$refs.recordModal._open(this.entrustId)
+      }
+    },
+    // 关闭弹框的时候刷新上个界面
+    _visibleChange(data) {
+      this.$emit('on-result-change')
+    }
+  }
+}
+</script>

pages/soil-sample-manage/sample-preparation/SamplePreparationHis.vue

@@ -6,24 +6,24 @@
         <Row>
           <!--查询-->
           <Col span="24" style="margin-top: 10px">
-            <Form v-show="searchOpen" id="formId" :label-width="90" inline onsubmit="return false">
+            <Form id="formId" v-show="searchOpen" :label-width="90" inline onsubmit="return false">
               <label class="label-sign"></label>
               <Form-item class="search-item" label="委托商:">
-                <Input v-model="formObj.client" name="client" placeholder="请输入委托单位" clearable @on-enter="_formSearch"/>
+                <Input v-model="formObj.client" @on-enter="_formSearch" name="client" placeholder="请输入委托单位" clearable/>
               </Form-item>
               <Form-item class="search-item" label="委托编号:">
-                <Input v-model="formObj.entrustCode" name="entrustCode" placeholder="请输入委托单号" clearable @on-enter="_formSearch"/>
+                <Input v-model="formObj.entrustCode" @on-enter="_formSearch" name="entrustCode" placeholder="请输入委托单号" clearable/>
               </Form-item>
               <Form-item class="search-btn">
-                <Button type="primary" @click="_formSearch">搜索</Button>
+                <Button @click="_formSearch" type="primary">搜索</Button>
               </Form-item>
             </Form>
           </Col>
           <!--操作-->
           <Col span="24">
 
-            <btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" class="contHide"
-                     @on-result-change="_btnClick"></btn-list>
+            <btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" @on-result-change="_btnClick"
+                     class="contHide"></btn-list>
           </Col>
           <!--表格-->
           <Col span="24">
@@ -51,15 +51,15 @@
     </div>
     <keep-alive>
       <!-- eslint-disable-next-line vue/require-component-is -->
-      <component :is="currentComponent" ref="refModal" @on-result-change="_componentResult"></component>
+      <component ref="refModal" :is="currentComponent" @on-result-change="_componentResult"></component>
     </keep-alive>
   </div>
 </template>
 <script>
 import { soilAptitude, soilEntrust } from '../../../api'
 import MeterEntrustRecord from '../../../components/operation/Operation'
-import SoilSampleManageHis from '../SoilSampleManageHis'
 import global from '../../../api/config'
+import SoilSampleManageHis from './SampleManageHis'
 import SoilEntrustItemNum from './SoilItemNum'
 export default {
   // eslint-disable-next-line vue/no-unused-components

pages/soil-sample-manage/sample-preparation/sample-preparation-record-his/RecordIndex.vue

+<template>
+  <div>
+    <TwoColumnPage>
+      <template slot="left">
+        <ItemLeftList ref="leftModal" @on-result-change="_leftResult"></ItemLeftList>
+      </template>
+      <template slot="right">
+        <ItemRightList ref="rightModal" @on-result-change="_rightResult"></ItemRightList>
+      </template>
+    </TwoColumnPage>
+  </div>
+</template>
+
+<script>
+import TwoColumnPage from '../../../../components/base/TwoColumnPage'
+import ItemLeftList from './RecordLeftList'
+import ItemRightList from './RecordRightList'
+
+export default {
+  components: {
+    TwoColumnPage,
+    ItemLeftList,
+    ItemRightList
+  },
+  data() {
+    return {
+      id: ''
+    }
+  },
+  methods: {
+    _leftResult(data) {
+      console.log('ItemTabs', data)
+      this.$refs.rightModal._open(this.id, data)
+    },
+    _rightResult() {
+      this.$refs.leftModal._page()
+    },
+    _open(id) {
+      this.id = id
+      console.log(id)
+      this.$refs.leftModal._open(this.id)
+    },
+    _clearTable() {
+      this.$refs.rightModal._clearAll()
+    }
+  }
+}
+</script>

pages/soil-sample-manage/sample-preparation/sample-preparation-record-his/RecordLeftList.vue

+<template>
+  <div>
+    <Row>
+      <!--查询-->
+      <Col span="24">
+        <Form id="task-assign-item-left" :label-width="70" inline onsubmit="return false">
+        <label class="label-sign"></label>
+        <Form-item class="search-item" label="检测项目:">
+          <Input v-model="formObj.name" @on-enter="_formSearch" placeholder="请输入检测项目" clearable></Input>
+        </Form-item>
+        <Form-item class="search-btn">
+          <Button @click="_formSearch" type="primary">搜索</Button>
+        </Form-item>
+      </Form>
+      </Col>
+      <Col span="24">
+      <btn-list @on-result-change="_btnClick" class="contHide" style="margin-bottom: 6px;"></btn-list>
+      </Col>
+      <!-- 表格 -->
+      <Col span="24">
+      <PTVXETable ref="pageTable" :isRadio="true" :pageColumns="pageColumns" :table-name="tableName"
+                  :tableHeight="tableHeight"
+                    @on-result-change="_tableResultChange" :getPage="getPage" :hide-checkbox="true"  select-data>
+        <vxe-table-column
+          v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
+          :key="item.key"
+          :field="item.key"
+          :title="item.title"
+          :min-width="item.width"
+          :fixed="item.fixed?item.fixed:undefined"
+          sortable>
+          <template slot-scope="scope">
+            <a v-if="item.detail" @click.stop="_detailModal(scope.row)">{{scope.row[item.key]}}</a>
+            <span v-else-if="item.date">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}</span>
+            <span v-else>{{scope.row[item.key]}}</span>
+          </template>
+        </vxe-table-column>
+        <VXESettingCol slot="setting" :pageColumns="pageColumns" :userColumns="userColumns"
+                       @on-result-change="_resetColumn" :table-name="tableName"></VXESettingCol>
+      </PTVXETable>
+      </Col>
+    </Row>
+  </div>
+</template>
+<script>
+import { soilTest } from '../../../../api'
+export default {
+  components: {},
+  data() {
+    return {
+      currentComponent: '',
+      formObj: {
+        name: undefined
+      },
+      tableName: 'food-task-assign-item-left',
+      // 用户自己选中的列
+      userColumns: [],
+      optionList: [
+        { key: 'name', name: '检测项目', placeholder: '请输入检测项目' },
+        { key: 'testBasis', name: '检测依据', placeholder: '请输入检测依据' }
+      ],
+      getPage: {},
+      id: '',
+      pageColumns: [
+        { title: '检测项目', key: 'name', width: 120 },
+        { title: '检测方法', key: 'testMethod', width: 140 },
+        { title: '检测依据名称', key: 'testBasisName', width: 200 }
+      ]
+    }
+  },
+  computed: {
+    tableHeight: function() {
+      return this.$tableHeight('tabSearch')
+    }
+  },
+  methods: {
+    // 重置column
+    _resetColumn(colList) {
+      this.userColumns = colList
+      this.$refs.pageTable._loadColumn(colList)
+    },
+    _modalResult() {
+      if (this.currentComponent === 'AutoAssignModal') {
+        this._formSearch()
+      }
+    },
+    _selInputResult1(msg, data) {
+      switch (msg) {
+        case 'search':
+          this._formSearch()
+          break
+      }
+    },
+    _open(id) {
+      this.id = id
+      this._page()
+    },
+    _searchParams() {
+      const obj = {}
+      const obj1 = this.$refs.selInput1._getFormObj()
+      Object.assign(obj, obj1)
+      return obj
+    },
+    _page: async function() {
+      Object.assign(this.formObj, this.$refs.pageTable._searchParams())
+      this.formObj.entrustId = this.id
+      const result = await soilTest.pagePrepareByExp(
+        this.$serializeForm(this.formObj)
+      )
+      if (result) {
+        this.$refs.pageTable._hideLoading()
+        this.getPage = result
+      }
+    },
+    _tableResultChange(msg, data) {
+      console.log(msg, data)
+      switch (msg) {
+        case 'page':
+          this.getPage = this.$store.state.FoodItem.page
+          break
+        case 'selectData':
+          this.$emit('on-result-change', data)
+          break
+        case 'singleSelect':
+          this.$emit('on-result-change', data)
+          break
+        case 'changeSize':
+          this._page()
+          break
+        case 'table-col':
+          // 用户选中的表格列
+          this.userColumns = data
+          break
+      }
+    },
+    _formSearch() {
+      this.$refs.pageTable._pageChange(1)
+    },
+    _btnClick(msg) {
+      switch (msg) {
+        case '自动分配':
+          this._autoAssign()
+          break
+      }
+    },
+    _autoAssign() {
+      console.log('自动分配')
+    }
+  }
+}
+</script>

pages/soil-sample-manage/sample-preparation/sample-preparation-record/RecordRightList.vue

@@ -183,7 +183,10 @@ export default {
           case '查看原始记录':
             console.log(data)
             if (data.recordId) {
-              this._viewRecord(data.recordId)
+              this.$refs.editModal._openWithType(
+                data.recordId,
+                'ENVTESTMAKEEDIT'
+              )
             } else {
               this.$Message.warning('未填写原始记录')
             }