修改了试样检测和委托单登记

api/soil/soil-test.js

@@ -26,6 +26,8 @@ export default {
   samplePage: data => http.post('soil/v1/sample/page', data).then(res => res),
   pageExpTestSample: data =>
     http.post('soil/v1/sample/page_exp_test_sample', data).then(res => res),
+  pageExpAuditSample: data =>
+    http.post('soil/v1/sample/page_exp_audit_sample', data).then(res => res),
   pageExpCheckSample: data =>
     http.post('soil/v1/sample/page_exp_check_sample', data).then(res => res),
   pageItem: data => http.post('soil/v1/experiment/page', data).then(res => res),
@@ -117,5 +119,15 @@ export default {
   pageExpCheckHis: data =>
     http.post('soil/v1/entrust/page_exp_check_his', data).then(res => res),
   pageExpTestSampleHis: data =>
-    http.post('soil/v1/sample/page_exp_test_sample_his', data).then(res => res)
+    http.post('soil/v1/sample/page_exp_test_sample_his', data).then(res => res),
+  // 数据复核历史任务  试样分页列表
+  pageExpCheckSampleHis: data =>
+    http
+      .post('soil/v1/sample/page_exp_check_sample_his', data)
+      .then(res => res),
+  // 数据审核 按照样品审核 右侧分页列表
+  pageAudit: data =>
+    http.post('soil/v1/experiment/page_audit', data).then(res => res),
+  pageExpAuditSampleHis: data =>
+    http.post('soil/v1/sample/page_exp_audit_sample_his', data).then(res => res)
 }

pages/meter-entrust/SoilSampleItemManage.vue

@@ -142,7 +142,6 @@ export default {
       ],
       pageColumns: [
         { title: '试验名称', key: 'name', width: 160 },
-        { title: '试样编号', key: 'sampleCode', width: 160 },
         { title: '试验项目英文简写', key: 'shortName', width: 140 },
         { title: '试验科室', key: 'groupName', width: 140 },
         { title: '大类', key: 'mainType', width: 140 },

pages/meter-entrust/entrust-register/EntrustIndex.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="wait">
-            <MeterSendEntrust ref="waitTabs"></MeterSendEntrust>
-          </el-tab-pane>
-          <el-tab-pane label="历史记录" name="his">
-            <MeterSendEntrustHis ref="hisTabs"></MeterSendEntrustHis>
-          </el-tab-pane>
+          <el-tab-pane label="待完成" name="wait"></el-tab-pane>
+          <el-tab-pane label="历史记录" name="his"></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 +20,38 @@ import MeterSendEntrustHis from './EntrustRegisterHis'
 export default {
   name: 'MeterSendEntrustIndex',
   components: {
+    // eslint-disable-next-line vue/no-unused-components
     MeterSendEntrust,
+    // eslint-disable-next-line vue/no-unused-components
     MeterSendEntrustHis
   },
   data() {
     return {
-      activeName: 'wait'
+      activeName: 'wait',
+      currentComponent: ''
     }
   },
   mounted() {
     this.activeName = 'wait'
-    this._page()
+    this.currentComponent = 'MeterSendEntrust'
+    this.$nextTick(() => {
+      this.$refs.refModal._page()
+    })
   },
   methods: {
     _changeTabs(tab, event) {
       if (tab.name === 'wait') {
-        this._page()
+        this.currentComponent = 'MeterSendEntrust'
+        this.$nextTick(() => {
+          this.$refs.refModal._page()
+        })
       } else {
-        this.$refs.hisTabs._page()
+        this.currentComponent = 'MeterSendEntrustHis'
+        this.$nextTick(() => {
+          this.$refs.refModal._page()
+        })
+        // this.$refs.hisTabs._page()
       }
-    },
-    _page() {
-      this.$refs.waitTabs._page()
     }
   }
 }

pages/meter-entrust/entrust-register/EntrustRegister.vue

@@ -47,12 +47,10 @@
         </Row>
       </div>
     </div>
-    <FileManage ref="FileManage"></FileManage>
-    <importModal ref="importModal" @on-result-change="_page"></importModal>
-    <Operation ref="operationModal"></Operation>
-    <EntrustRegisterEdit ref="editModal" @on-result-change="_formSearch"></EntrustRegisterEdit>
-    <SoilSampleManage ref="sampleManageModal" @on-result-change="_page"></SoilSampleManage>
-    <SoilSampleItemManage ref="itemManageModal" @on-result-change="_page"></SoilSampleItemManage>
+    <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>
@@ -65,10 +63,15 @@ import SoilSampleItemManage from '../SoilSampleItemManageEdit'
 import EntrustRegisterEdit from './EntrustRegisterEdit'
 export default {
   components: {
+    // eslint-disable-next-line vue/no-unused-components
     Operation,
+    // eslint-disable-next-line vue/no-unused-components
     EntrustRegisterEdit,
+    // eslint-disable-next-line vue/no-unused-components
     SoilSampleManage,
+    // eslint-disable-next-line vue/no-unused-components
     importModal,
+    // eslint-disable-next-line vue/no-unused-components
     SoilSampleItemManage
   },
   data() {
@@ -173,9 +176,7 @@ export default {
       }
     }
   },
-  mounted() {
-    this._page()
-  },
+  mounted() {},
   methods: {
     _btnClick(msg, componentName) {
       this.currentComponent = componentName
@@ -200,12 +201,31 @@ export default {
       })
     },
     _import() {
+      this.currentComponent = 'importModal'
       const data = {
         importUrl: '/soil/v1/entrust/import_entrust/',
         downloadUrl: '/soil/v1/excel/template/SoilEntrustImport',
         title: '试验委托单导入'
       }
-      this.$refs.importModal._open(data, '试验委托单导入')
+      this.$nextTick(() => {
+        this.$refs.refModal._open(data, '试验委托单导入')
+      })
+      // this.$refs.importModal._open(data, '试验委托单导入')
+    },
+    _componentResult(msg, data) {
+      switch (this.currentComponent) {
+        case 'MeterSubcontractorEdit':
+          this._formSearch()
+          break
+        case 'DrugSampleManage':
+          this._formSearch()
+          break
+        case 'FileManage':
+          this._fileResult(msg, data)
+          break
+        default:
+          this._page()
+      }
     },
     _iconClick(res, data, componentName) {
       this.currentComponent = componentName
@@ -238,11 +258,19 @@ export default {
 
     _sampleManage(data) {
       // 管理样品
-      this.$refs.sampleManageModal._open(data)
+      this.currentComponent = 'SoilSampleManage'
+      this.$nextTick(() => {
+        this.$refs.refModal._open(data)
+      })
+      // this.$refs.sampleManageModal._open(data)
     },
     _itemManage(data) {
       // 管理样品
-      this.$refs.itemManageModal._openByEntrustId(data)
+      this.currentComponent = 'SoilSampleItemManage'
+      this.$nextTick(() => {
+        this.$refs.refModal._openByEntrustId(data)
+      })
+      // this.$refs.itemManageModal._openByEntrustId(data)
     },
     _submitToReview() {
       this._submitByContractIds('委托评审')
@@ -294,7 +322,11 @@ export default {
       this._page()
     },
     _record(id) {
-      this.$refs.operationModal._open(id)
+      this.currentComponent = 'Operation'
+      this.$nextTick(() => {
+        this.$refs.refModal._open(id)
+      })
+      // this.$refs.operationModal._open(id)
     },
     _tableResultChange(msg, data) {
       switch (msg) {
@@ -336,12 +368,16 @@ export default {
     },
     // 编辑&添加
     _editModal(edit, id) {
+      this.currentComponent = 'EntrustRegisterEdit'
       if (edit) {
         // 编辑
         this._getById(id)
       } else {
         // 添加
-        this.$refs.editModal._open()
+        this.$nextTick(() => {
+          this.$refs.refModal._open()
+        })
+        // this.$refs.editModal._open()
       }
     },
     // 追加项目
@@ -351,7 +387,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')
     },
     _exportEntrust(id) {
       this.$Modal.confirm({
@@ -366,7 +406,7 @@ export default {
     _getById: async function(id) {
       const result = await soilEntrust.getVOById(id)
       if (result) {
-        this.$refs.editModal._openEdit(result)
+        this.$refs.refModal._openEdit(result)
       }
     },
     _delete: async function(ids) {

pages/meter-entrust/entrust-register/EntrustRegisterHis.vue

@@ -47,8 +47,12 @@
         </Row>
       </div>
     </div>
-    <MeterEntrustRecord ref="entrustRecordModal"  @on-result-change="_page"></MeterEntrustRecord>
-    <SoilSampleManage ref="sampleManageModal" @on-result-change="_page"></SoilSampleManage>
+    <keep-alive>
+      <!-- eslint-disable-next-line vue/require-component-is -->
+      <component ref="refModal" :is="currentComponent" @on-result-change="_componentResult"></component>
+    </keep-alive>
+<!--    <MeterEntrustRecord ref="entrustRecordModal"  @on-result-change="_page"></MeterEntrustRecord>-->
+<!--    <SoilSampleManage ref="sampleManageModal" @on-result-change="_page"></SoilSampleManage>-->
   </div>
 </template>
 <script>
@@ -56,6 +60,7 @@ import { soilAptitude, soilEntrust } from '../../../api'
 import MeterEntrustRecord from '../../../components/operation/Operation'
 import SoilSampleManage from '../SoilSampleManageHis'
 export default {
+  // eslint-disable-next-line vue/no-unused-components
   components: { MeterEntrustRecord, SoilSampleManage },
   data() {
     return {
@@ -161,10 +166,18 @@ export default {
     },
     _sampleManage(data) {
       // 管理样品
-      this.$refs.sampleManageModal._open(data)
+      this.currentComponent = 'SoilSampleManage'
+      this.$nextTick(() => {
+        this.$refs.refModal._open(data)
+      })
+      // this.$refs.sampleManageModal._open(data)
     },
     _record(id) {
-      this.$refs.entrustRecordModal._open(id)
+      this.currentComponent = 'MeterEntrustRecord'
+      this.$nextTick(() => {
+        this.$refs.refModal._open(id)
+      })
+      // this.$refs.entrustRecordModal._open(id)
     },
     _tableResultChange(msg, data) {
       switch (msg) {

pages/soil-sample-manage/sample-receive/ReceiveByEntrust.vue

@@ -61,26 +61,19 @@
     </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"></component>
+    </keep-alive>
   </div>
 </template>
 <script>
-import UserInfo from '../../../components/user-info-single/AssignPerson'
 import { soilEntrust } from '../../../api'
 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: { SampleManage, Operation },
   data() {
     return {
       formObj: {
@@ -140,46 +133,8 @@ export default {
       }
     }
   },
-  mounted() {
-    // 样品接收是否选择人员
-    // this.acceptSelectUserValue = localStorage.getItem('acceptSelectUserValue')
-  },
+  mounted() {},
   methods: {
-    _userResult(data, msg) {
-      const sendData = {
-        ids: this.selectIds.join(',')
-      }
-      if (data) {
-        sendData.person = data.realname
-        sendData.personId = data.userId
-      }
-      switch (msg) {
-        case 'contractSendMan':
-          // 一键发放
-          this.$store.dispatch('FoodContract/oneKeySend', sendData).then(() => {
-            this._resultChange('发放成功')
-          })
-          break
-        case 'contractReceiveSendMan':
-          // 一键接收并发放
-          this.$store
-            .dispatch('FoodContract/oneKeyReceiveSend', sendData)
-            .then(() => {
-              this._resultChange('一键接收并发放成功')
-            })
-          break
-        case 'sampleSendScanMan':
-          // 扫码发放
-          this.$refs.refModal._open('扫码发放', data)
-          break
-        case 'sampleReceiveSendScanMan':
-          // 扫码接收并发放
-          this.$refs.refModal._open('扫码接收发放', data)
-          break
-      }
-    },
-    // 一键接收并发放
-
     // 组件返回值
     _componentResult(data, msg) {
       switch (this.currentComponent) {
@@ -194,154 +149,9 @@ export default {
           case 'search':
             this.searchOpen = !this.searchOpen
             break
-          default:
-            this._btnOption(msg)
         }
       })
     },
-    // btn操作
-    _btnOption(msg) {
-      console.log(msg)
-      switch (msg) {
-        case '一键接收':
-          this._oneKeyReceive()
-          break
-        case '一键发放':
-          this._oneKeySend()
-          break
-        case '一键接收并发放':
-          this._oneKeyReceiveSend()
-          break
-        case '扫码接收':
-          this.currentComponent = 'ReceiveScan'
-          this.$nextTick(function() {
-            this.$refs.refModal._open()
-          })
-          break
-        case '扫码发放':
-          this._scanSend('sampleSendScanMan')
-          break
-        case '扫码接收并发放':
-          this._scanSend('sampleReceiveSendScanMan')
-          break
-        case '信息维护':
-          this._maintainInfo()
-          break
-        case '登记协议':
-          this._editModals(msg)
-          break
-      }
-    },
-    // 扫码接收并发放
-    _scanSend(msg) {
-      if (msg === 'sampleReceiveSendScanMan' || msg === 'sampleSendScanMan') {
-        // 扫码接收并发放判断是够选人
-        if (this.acceptSelectUserValue === '是') {
-          this.$refs.userModal._open(msg, '请选择领样人')
-        } else {
-          this.$refs.refModal._open('扫码发放')
-        }
-      } else {
-        // 其他
-        this.$refs.userModal._open(msg, '请选择领样人')
-      }
-    },
-    // 一键接收并发放
-    _oneKeyReceiveSend() {
-      if (this.selectIds.length === 0) {
-        this.$msgTip('warning', '请至少选择一条数据！')
-      } else {
-        // 根据字典是否选择人员
-        // eslint-disable-next-line no-lonely-if
-        if (this.acceptSelectUserValue === '是') {
-          // 选择人员接收并发放
-          this.$store
-            .dispatch('FoodContract/oneKeyReceiveSendCheck', {
-              ids: this.selectIds.join(',')
-            })
-            .then(() => {
-              const result = this.$store.state.FoodContract.success
-              if (result) {
-                // 验证成功
-                this.$refs.userModal._open(
-                  'contractReceiveSendMan',
-                  '请选择领样人'
-                )
-              }
-            })
-        } else {
-          // 不选择人员
-          this.$store
-            .dispatch('FoodContract/oneKeyReceiveSend', {
-              ids: this.selectIds.join(',')
-            })
-            .then(() => {
-              this._resultChange('一键接收并发放成功')
-            })
-        }
-      }
-    },
-    // 一键发放
-    _oneKeySend() {
-      if (this.selectIds.length === 0) {
-        this.$msgTip('warning', '请至少选择一条数据！')
-      } else {
-        // 一键发放判断是否选人
-        // eslint-disable-next-line no-lonely-if
-        if (this.acceptSelectUserValue === '是') {
-          this.$store
-            .dispatch('FoodContract/oneKeySendCheck', {
-              ids: this.selectIds.join(',')
-            })
-            .then(() => {
-              if (this.$store.state.FoodContract.success) {
-                this.$refs.userModal._open('contractSendMan', '请选择领样人')
-              }
-            })
-        } else {
-          // 一键发放
-          this.$store
-            .dispatch('FoodContract/oneKeySend', {
-              ids: this.selectIds.join(',')
-            })
-            .then(() => {
-              this._resultChange('发放成功')
-            })
-        }
-      }
-    },
-    // 一键接收
-    _oneKeyReceive() {
-      if (this.selectIds.length === 0) {
-        this.$msgTip('warning', '请至少选择一条数据！')
-      } else {
-        this.$Modal.confirm({
-          title: '提示',
-          content:
-            '确定要一键接收这 ' + this.selectIds.length + ' 条委托下的样品？',
-          onOk: () => {
-            this.$store
-              .dispatch('FoodContract/oneKeyReceive', {
-                ids: this.selectIds.join(',')
-              })
-              .then(() => {
-                this._resultChange('接收成功')
-              })
-          }
-        })
-      }
-    },
-    // 信息维护
-    _maintainInfo() {
-      if (this.selectIds.length === 0) {
-        this.$Message.warning('请至少选择一条数据！')
-      } else {
-        this.currentComponent = 'MaintainInfoModal'
-        this.$nextTick(() => {
-          this.$refs.refModal._open(this.selectIds, 1)
-        })
-      }
-    },
     _iconClick(res, data, currentComponent) {
       this.currentComponent = currentComponent
       console.log(res)
@@ -350,54 +160,21 @@ export default {
           case '管理样品':
             this._editModal(data.id, data.type, data.entrustCode)
             break
-          case '项目管理':
-            this.$refs.itemManageModal._open(data.id)
-            break
-          case '编辑协议':
-            this._editModals(res, data)
-            break
           case '附件':
             this._upload(data.id)
             break
-          case '删除':
-            this._delete(data.id)
-            break
           case '操作日志':
             this._operationRecord(data.id)
             break
         }
       })
     },
-    _delete(id) {
-      this.$Modal.confirm({
-        title: '提示',
-        content: '确定删除这条数据？',
-        onOk: () => {
-          this._deleteOk(id)
-        }
-      })
-    },
-    _deleteOk: async function(id) {
-      const result = await soilEntrust.deleteById(id)
-      if (result) {
-        this._resultChange('删除成功')
-      }
-    },
     _editModal(id, type, name) {
-      this.$refs.sampleManageModal._open(id, type, name)
-    },
-    _editModals(res, data) {
-      if (res === '登记协议') {
-        this.$refs.editModal._open(res, data)
-      } else if (res === '编辑协议') {
-        this.$store
-          .dispatch('FoodContract/verificationEdit', { id: data.id })
-          .then(() => {
-            if (this.$store.state.FoodContract.model === true) {
-              this.$refs.editModal._open(res, data)
-            }
-          })
-      }
+      this.currentComponent = 'SampleManage'
+      this.$nextTick(() => {
+        this.$refs.refModal._open(id, type, name)
+      })
+      // this.$refs.sampleManageModal._open(id, type, name)
     },
     _tableResultChange(msg, data) {
       switch (msg) {
@@ -429,27 +206,16 @@ export default {
         this.getPage = result
       }
     },
-    _detailModal(id, type) {
-      // 查看
-      this.$store.dispatch('FoodContract/getById', id).then(() => {
-        if (type === 0) {
-          // 企业委托 ’0‘
-          this.currentComponent = 'FoodContractCompanyDetail'
-        } else {
-          // 政府委托 ’1‘
-          this.currentComponent = 'FoodContractGovernDetail'
-        }
-        this.$nextTick(() => {
-          this.$refs.refModal._open(this.$store.state.FoodContract.model)
-        })
-      })
-    },
     _search() {
       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) {
       this._page()
@@ -458,7 +224,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-sample-manage/sample-receive/SampleReceiveIndex.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="entrust">-->
+<!--            <ReceiveByEntrust ref="entrustTabs"></ReceiveByEntrust>-->
+<!--          </el-tab-pane>-->
+<!--          <el-tab-pane label="接收历史" name="sample">-->
+<!--            <ReceiveBySample ref="sampleTabs"></ReceiveBySample>-->
+<!--          </el-tab-pane>-->
+<!--        </el-tabs>-->
         <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>
@@ -22,12 +30,15 @@ import ReceiveBySample from './ReceiveBySample'
 export default {
   name: 'MeterSummaryEntrustIndex',
   components: {
+    // eslint-disable-next-line vue/no-unused-components
     ReceiveByEntrust,
+    // eslint-disable-next-line vue/no-unused-components
     ReceiveBySample
   },
   data() {
     return {
-      activeName: 'entrust'
+      activeName: 'entrust',
+      currentComponent: ''
     }
   },
   mounted() {
@@ -39,11 +50,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()
     }
   }
 }

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

@@ -71,7 +71,7 @@
 import UserInfo from '../../../components/user-info-single/AssignPerson'
 import { soilTest } from '../../../api'
 import Operation from '../../../components/operation/Operation'
-import SoilSampleManageHis from '../SoilSampleManageHis'
+import SoilSampleManageHis from './SoilSampleManageHis'
 export default {
   components: {
     UserInfo,

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

+<template>
+  <div>
+    <Modal v-model="showModal" width="800" class="modal-footer-none full-screen">
+      <div slot="header">{{modalTitle}}</div>
+      <div>
+        <Form id="index-right-form" :label-width="80" inline onsubmit="return false">
+          <label class="label-sign"></label>
+          <Form-item class="search-item" label="仪器名称:">
+            <Input v-model="formObj.equipName" @on-enter="_formSearch" placeholder="请输入仪器名称" clearable/>
+          </Form-item>
+          <Form-item class="search-btn">
+            <Button @click="_formSearch" type="primary">搜索</Button>
+          </Form-item>
+        </Form>
+          <btn-list :msg="btn" @on-result-change="_btnClick" class="contHide" style="margin-bottom: 10px;"/>
+        <PTVXETable ref="pageTable" :tableHeight="tableHeight"
+                    @on-result-change="_tableResultChange" :icon-msg="iconMsg" :getPage="getPage">
+          <vxe-table-column
+            :field="item.key"
+            :title="item.title"
+            :min-width="item.width?item.width:200"
+            :fixed="item.fixed?item.fixed:undefined"
+            v-for="item in pageColumns" :key="item.key">
+            <template slot-scope="scope">
+              <span v-if="item.key==='defaulted'">{{scope.row[item.key]?'是':'否'}}</span>
+              <span v-else>{{scope.row[item.key]}}</span>
+            </template>
+          </vxe-table-column>
+        </PTVXETable>
+      </div>
+    </Modal>
+    <IndexManageEdit ref="indexEdit" @on-result-change="_page"></IndexManageEdit>
+  </div>
+</template>
+
+<script>
+import { soilTest } from '../../../api'
+import IndexManageEdit from './IndexManageEdit'
+
+export default {
+  components: { IndexManageEdit },
+  data() {
+    return {
+      id: '',
+      modalTitle: '',
+      showModal: false,
+      btn: [],
+      tableHeight: document.documentElement.clientHeight - 180,
+      pageColumns: [
+        { title: '仪器名称', key: 'equipName', width: 120 },
+        { title: '仪器编号', key: 'equipNum', width: 120 },
+        { title: '仪器品牌', key: 'brand', width: 120 },
+        { title: '采集类型', key: 'collectionType', width: 120 },
+        { title: '采集地址', key: 'collectionAddress', width: 120 },
+        { title: '采集命令', key: 'acquisitionCommand', width: 120 }
+      ],
+      getPage: {},
+      iconMsg: [{ type: 'md-trash', id: '', name: '删除' }],
+      selectIds: [],
+      formObj: {
+        name: ''
+      },
+      // 资质信息
+      aptitudeItemInfo: {}
+    }
+  },
+  methods: {
+    _open(data) {
+      console.log(data)
+      this.aptitudeItemInfo = data
+      this.formObj = this.$resetFields(this.formObj)
+      this.id = data.id
+      this.modalTitle = data.name + ' 设备管理'
+      this.showModal = true
+      this._page()
+    },
+    _page: async function() {
+      Object.assign(this.formObj, this.$refs.pageTable._searchParams())
+      this.formObj.experimentId = this.id
+      const result = await soilTest.equipPage(this.$serializeForm(this.formObj))
+      if (result) {
+        console.log(result)
+        this.getPage = result
+        this.$refs.pageTable._hideLoading()
+      }
+    },
+    _formSearch() {
+      this.$refs.pageTable._pageChange(1)
+    },
+    _tableResultChange(msg, data) {
+      switch (msg) {
+        case 'page':
+          break
+        case 'selectIds':
+          this.selectIds = data
+          break
+        case 'iconClick':
+          this._iconClick(data.name, data.rowData)
+          break
+        case 'changeSize':
+          this._page()
+          break
+      }
+    },
+    _iconClick(res, data) {
+      switch (res) {
+        case '编辑':
+          this._editModal(true, data)
+          break
+        case '删除':
+          this._deleteByIds(data.id)
+          break
+      }
+    },
+    _editModal(edit, data) {
+      if (edit) {
+        this._getById(data)
+      } else {
+        this.$refs.indexEdit._open(this.id, '')
+      }
+    },
+    _getById: async function(data) {
+      const result = await soilTest.itemGetById(data.id)
+      console.log(result)
+      if (result) {
+        this.$refs.indexEdit._open('', result)
+      }
+    },
+    _btnClick(msg) {
+      switch (msg) {
+        case '添加指标':
+          this._editModal(false)
+          break
+        case '删除':
+          this._deleteByIds()
+          break
+      }
+    },
+    _deleteByIds(id) {
+      this.$Modal.confirm({
+        title: '提示',
+        content: '确定删除这条记录？',
+        onOk: () => {
+          this._delOk(id)
+        }
+      })
+    },
+    _delOk: async function(id) {
+      const result = await soilTest.deleteEquip(id)
+      if (result) {
+        this.$Message.success('删除成功')
+        this._page()
+      }
+    }
+  }
+}
+</script>

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

+<template>
+  <div>
+    <Modal v-model="showModal" width="1200">
+      <p slot="header">
+        {{ modalTitle }}
+      </p>
+      <div>
+        <!--内容-->
+        <Row>
+          <!--查询-->
+          <Col span="24">
+          <Form id="search-sample-company" v-show="searchOpen" :label-width="90" inline onsubmit="return false">
+            <label class="label-sign"></label>
+            <Form-item label="检测项目:" class="search-item">
+              <Input v-model="formObj.name" @on-enter="_formSearch" placeholder="请输入检测项目" clearable />
+            </Form-item>
+            <Form-item label="检测依据:" class="search-item">
+              <Input v-model="formObj.code" @on-enter="_formSearch" placeholder="请输入检测依据" clearable />
+            </Form-item>
+            <Form-item class="search-btn">
+              <Button @click="_formSearch" type="primary">
+                搜索
+              </Button>
+            </Form-item>
+          </Form>
+          </Col>
+          <!--操作-->
+          <Col span="24">
+          <btn-list :msg="btn" :open="searchOpen" @on-result-change="_btnClick" class="contHide" show-search-btn="true"></btn-list>
+          </Col>
+          <!-- 表格 -->
+          <Col span="24">
+            <PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :loading="true"
+                        :get-page="getPage" @on-result-change="_tableResultChange">
+              <vxe-table-column
+                v-for="item in pageColumns"
+                :key="item.key"
+                :field="item.key"
+                :title="item.title"
+                :min-width="item.width?item.width:200"
+                :fixed="item.fixed?item.fixed:undefined" sortable>
+              <template slot-scope="scope">
+                <div v-if="item.detail">
+                  <a @click.stop="_detailModal(scope.row)">{{ scope.row[item.key] }}</a>
+                </div>
+                <div v-else-if="item.key==='epibolyItem'" @click.stop="_handleRow(scope)">
+                  <el-select v-if="showOption" v-model="scope.row.epibolyItem" @change="_optionChange(scope.row)" placeholder="请选择">
+                    <el-option
+                      v-for="(item,index) in subOptions"
+                      :key="index"
+                      :label="item.label"
+                      :value="index"
+                    />
+                  </el-select>
+                  <span v-if="!showOption">{{ scope.row[item.key]===0? '否':'是' }}</span>
+                </div>
+                <span v-else-if="item.status">{{scope.row[item.key]}}</span>
+                <div v-else-if="item.judged">
+                  {{ scope.row[item.key]===0? '否':'是' }}
+                </div>
+                <div v-else-if="item.date">
+                  {{ scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):'' }}
+                </div>
+                <div v-else-if="item.key==='code'" @click.stop="_handleRow(scope)">
+                  <el-input
+                    v-model="scope.row.code"
+                    @blur="_codeEdit({id:scope.row.id, obj :{code:scope.row.code}})"
+                    style="width: 130px;"
+                    blur
+                    placeholder="请选择检测依据"
+                  />
+                  <i @click.stop="_selectjudgeBasis(scope.row.id,scope.$index)" style="cursor: pointer;font-size: 14px;" class="icons iconfont pt-search icon-search"></i>
+                </div>
+                <div v-else-if="item.key==='compareSymbol'" @click.stop="_handleRow(scope)">
+                  <el-input
+                    v-model="scope.row.compareSymbol"
+                    @blur="_compareSymbolEdit({id:scope.row.id, obj :{compareSymbol:scope.row.compareSymbol}})"
+                    blur
+                    placeholder="请输入比较符"
+                  />
+                </div>
+                <div v-else-if="item.key==='limitValue'" @click.stop="_handleRow(scope)">
+                  <el-input
+                    v-model="scope.row.limitValue"
+                    @blur="_limitValueEdit({id:scope.row.id, obj :{limitValue:scope.row.limitValue}})"
+                    blur
+                    placeholder="请输入限值"
+                  />
+                </div>
+                <div v-else-if="item.key==='unit'" @click.stop="_handleRow(scope)">
+                  <el-input
+                    v-model="scope.row.unit"
+                    @blur="_unitEdit({id:scope.row.id, obj :{unit:scope.row.unit}})"
+                    blur
+                    placeholder="请输入单位"
+                  />
+                </div>
+                <div v-else>
+                  {{ scope.row[item.key] }}
+                </div>
+              </template>
+            </vxe-table-column>
+            </PTVXETable>
+          </Col>
+        </Row>
+      </div>
+      <div slot="footer">
+        <modal-footer ref="footerModal" :footer="footerList" @on-result-change="_footerResult" />
+      </div>
+    </Modal>
+  </div>
+</template>
+<script>
+import http from '../../../api/http'
+import { soilEntrust } from '../../../api'
+export default {
+  components: {},
+  data() {
+    return {
+      formId: 'SoilSampleItemManage',
+      currentComponent: '',
+      btn: [
+        // { type: 'success', id: '', name: '提交分包' },
+        { type: 'success', id: 'ZBC', name: '取消分包' }
+      ],
+      iconMsg: [{ type: 'pt-a-end', id: '', name: '删除' }],
+      sampleId: '', // 样品id
+      showModal: false,
+      modalTitle: '管理检测项目',
+      selectIds: [],
+      itemId: '',
+      index: '',
+      showOption: true,
+      searchOpen: true,
+      selectData: {},
+      getPage: {},
+      currentRow: '',
+      currentIndex: '',
+      footerList: [
+        { id: '', name: '取消', type: '' },
+        { id: '', name: '关闭', type: 'primary' }
+      ],
+      pageColumns: [
+        { title: '试验名称', key: 'name', width: 160 },
+        { title: '试验项目英文简写', key: 'shortName', width: 140 },
+        { title: '检测科室', key: 'groupName', width: 140 },
+        { title: '大类', key: 'mainType', width: 140 },
+        { title: '小类', key: 'smallType' },
+        { title: '检测依据', key: 'testBasis', width: 180 },
+        { title: '试验方法', key: 'testMethod', width: 180 },
+        { title: '状态', key: 'status', width: 180 }
+      ],
+      subOptions: [
+        {
+          value: '0',
+          label: '否'
+        },
+        {
+          value: '1',
+          label: '是'
+        }
+      ],
+      dateList: [],
+      formObj: {
+        name: undefined,
+        sampleId: undefined,
+        code: undefined
+      }
+    }
+  },
+  computed: {
+    tableHeight: function() {
+      return this.$tableHeight('tableModal')
+    }
+  },
+  methods: {
+    _selectjudgeBasis(id, index) {
+      console.log(id)
+      this.itemId = id
+      this.index = index
+      this.$refs.EditModal._open()
+    },
+    _optionChange(data) {
+      console.log(data)
+      if (data.epibolyItem === 1) {
+        this._submit(data.id)
+      } else {
+        this._cancelSub(data.id)
+      }
+    },
+    _footerResult(name) {
+      switch (name) {
+        case '取消':
+          this._cancel()
+          break
+        case '关闭':
+          this._cancel()
+          break
+      }
+    },
+    _cancel() {
+      this.$emit('on-result-change')
+      this.$refs.pageTable._hideLoading()
+      this.$refs.footerModal._hideLoading()
+      this.showModal = false
+    },
+    _ok() {
+      console.log(this.getPage.records)
+    },
+    _modalResult(data1, data2) {
+      switch (this.currentComponent) {
+        case 'CopyModal':
+          if (data1 === 0) {
+            this._copySample(data2)
+          } else {
+            this._copyAll(data2)
+          }
+          break
+        default:
+          this._search()
+      }
+    },
+    _handleRow(data) {
+      this.currentRow = data.row
+      this.currentIndex = data.rowIndex
+    },
+    _dateChange(data) {
+      this.formObj.ctimeBegin = data[0]
+      this.formObj.ctimeEnd = data[1]
+    },
+    _btnClick(msg, componentName) {
+      this.currentComponent = componentName
+      this.$nextTick(function() {
+        switch (msg) {
+          case '提交分包':
+            this._submitOutPack()
+            break
+          case '取消分包':
+            this._cancelOutPack()
+            break
+          case '添加':
+            this._editModal(false)
+            break
+          case '复制历史样品':
+            this._copyHisSample()
+            break
+          case '导入样品':
+            this._importSample()
+            break
+          case '导入检测项目':
+            this._importItem()
+            break
+          case '导入检测项目包':
+            this._importItemPackage()
+            break
+          case '复制历史样品检测项目':
+            this._copyHisItem()
+            break
+          case '删除':
+            this._deleteSelected()
+            break
+          case '导出':
+            this._exportSample()
+            break
+          case '添加模拟样品':
+            this._editImitateModal(false)
+            break
+          case 'search':
+            this.searchOpen = !this.searchOpen
+            break
+        }
+      })
+    },
+    _backData(data) {
+      this.getPage.records[this.index].code = data.code
+      this._codeEdit({ id: this.itemId, obj: { code: data.code } })
+    },
+    _codeEdit: async function(data) {
+      const result = await soilEntrust.pageItemEdit(data)
+      if (result) {
+        this.$message.success('保存成功')
+        this._page()
+      } else {
+        this.$message.warning('保存失败')
+      }
+    },
+    _compareSymbolEdit: async function(data) {
+      const result = await soilEntrust.pageItemEdit(data)
+      if (result) {
+        this.$message.success('保存成功')
+        this._page()
+      } else {
+        this.$message.warning('保存失败')
+      }
+    },
+    _limitValueEdit: async function(data) {
+      const result = await soilEntrust.pageItemEdit(data)
+      if (result) {
+        this.$message.success('保存成功')
+        this._page()
+      } else {
+        this.$message.warning('保存失败')
+      }
+    },
+    _unitEdit: async function(data) {
+      const result = await soilEntrust.pageItemEdit(data)
+      if (result) {
+        this.$message.success('保存成功')
+        this._page()
+      } else {
+        this.$message.warning('保存失败')
+      }
+    },
+    _submitOutPack() {
+      if (this.selectIds.length === 0) {
+        this.$Message.warning('请至少选择一条')
+      } else {
+        this.$Modal.confirm({
+          title: '提示',
+          content: '确定分包这' + this.selectIds.length + '条',
+          onOk: () => {
+            this._submit()
+          }
+        })
+      }
+    },
+    _cancelOutPack() {
+      if (this.selectIds.length === 0) {
+        this.$Message.warning('请至少选择一条')
+      } else {
+        this.$Modal.confirm({
+          title: '提示',
+          content: '确定取消这' + this.selectIds.length + '条分包',
+          onOk: () => {
+            this._cancelSub()
+          }
+        })
+      }
+    },
+    _submit: async function(data) {
+      if (data !== undefined) {
+        this.selectIds = data
+      }
+      const result = await soilEntrust.submitOutPack(this.selectIds)
+      if (result) {
+        this._resultChange('分包成功')
+      }
+    },
+    _cancelSub: async function(data) {
+      if (data !== undefined) {
+        this.selectIds = data
+      }
+      const result = await soilEntrust.cancelOutPack(this.selectIds)
+      if (result) {
+        this._resultChange('取消分包成功')
+      }
+    },
+    _exportSample() {
+      if (this.selectIds.length === 0) {
+        this.$Message.warning('请至少选择一条样品')
+      } else {
+        this.$Modal.confirm({
+          title: '提示',
+          content: '确定导出这' + this.selectIds.length + '条样品',
+          onOk: () => {
+            http.open(
+              '/food/v1/sample/company/export',
+              { ids: this.selectIds.join(',') },
+              '_blank'
+            )
+          }
+        })
+      }
+    },
+    _copyHisSample() {
+      this.$refs.refModal._open(this.sampleId)
+    },
+
+    _iconClick(res, data, componentName, index) {
+      this.currentComponent = componentName
+      this.$nextTick(function() {
+        switch (res) {
+          case '编辑':
+            this._editModal(true, data)
+            break
+          case '复制':
+            this._copy(data)
+            break
+          case '删除':
+            console.log(index)
+            this._deleteById(data.id)
+            break
+          case '导出样品委托协议':
+            this._exportAgreement(data.id)
+            break
+          case '附件':
+            this.$refs.refModal._open(data.id, 'sampleId')
+            break
+        }
+      })
+    },
+    _exportAgreement(id) {
+      this.$store
+        .dispatch(
+          'ReportExport/getById',
+          'food-contract-company-export-sample-agreement'
+        )
+        .then(() => {
+          if (this.$store.state.ReportExport.model) {
+            if (this.$store.state.ReportExport.model.indexOf('?') !== -1) {
+              window.open(
+                this.$store.state.ReportExport.model + '&sampleId=' + id,
+                '_blank'
+              )
+            } else {
+              window.open(
+                this.$store.state.ReportExport.model + '?sampleId=' + id,
+                '_blank'
+              )
+            }
+          }
+        })
+    },
+    _tableResultChange(msg, data) {
+      const selectIds = []
+      switch (msg) {
+        case 'selectData':
+          for (let i = 0; i < data.length; i++) {
+            selectIds.push(data[i].id)
+          }
+          this.selectIds = selectIds
+          this.selectData = data
+          break
+        // case 'iconClick':
+        //   this._iconClick(data.name, data.rowData, data.componentName)
+        //   break
+        case 'page':
+          this._page()
+          break
+        case 'changeSize':
+          this._page()
+          break
+      }
+    },
+    _open(id) {
+      this.formObj = this.$resetFields(this.formObj)
+      this.dateList = []
+      this.showModal = true
+      this.sampleId = id // 委托id
+      this.$refs.pageTable._hideLoading()
+      this._page()
+    },
+    _openRecord(id) {
+      this.formObj = this.$resetFields(this.formObj)
+      this.dateList = []
+      this.showModal = true
+      this.sampleId = id // 委托id
+      this.$refs.pageTable._hideLoading()
+      this.showOption = false
+      this._page()
+    },
+    _formSearch() {
+      this.$refs.pageTable._pageChange(1)
+    },
+    _page: async function() {
+      Object.assign(this.formObj, this.$refs.pageTable._searchParams())
+      this.formObj = this.$serializeForm(this.formObj)
+      this.formObj.sampleId = this.sampleId
+      const result = await soilEntrust.experimentPage(
+        this.$serializeForm(this.formObj)
+      )
+      if (result) {
+        this.$refs.pageTable._hideLoading()
+        this.getPage = result
+        console.log(result)
+      }
+    },
+    _deleteByIds(ids, content) {
+      this.$Modal.confirm({
+        title: '提示',
+        content: content || '确定删除该记录？',
+        onOk: () => {
+          this._deleteOk(ids)
+        }
+      })
+    },
+
+    _deleteOk: async function(ids) {
+      const result = await soilEntrust.deleteById(ids)
+      if (result) {
+        this._resultChange('删除成功！ ')
+      }
+    },
+    _deleteById(id) {
+      // 删除一条记录
+      this._deleteByIds([id])
+    },
+    _deleteSelected() {
+      // 批量删除
+      const ids = this.selectIds
+      if (ids.length === 0) {
+        this.$Message.warning('请选择一条或多条数据！')
+      } else {
+        this._deleteByIds(ids, '确定删除 ' + ids.length + ' 条记录？')
+      }
+    },
+    _detailModal(data) {},
+    _editModal(edit, data) {
+      if (edit) {
+        console.log(data)
+        this.$refs.sampleManageEdit._open(data)
+        // localStorage.setItem('type', data.type)
+        // // 编辑
+        // this.$store.dispatch('FoodSample/getByCompanyId', data.id).then(() => {
+        //   const result = this.$store.state.FoodSample.companyModel
+        //   if (data.type === 0) {
+        //     // 普通企业样品
+        //     this.$refs.refModal._open(result, this.sampleId)
+        //   } else if (data.type === 3) {
+        //     // 模拟样品
+        //     this._editImitateModal(true, result)
+        //   }
+        // })
+      } else {
+        // 添加
+        this.$refs.refModal._open('', this.sampleId)
+      }
+    },
+    // 添加编辑模拟样品
+    _editImitateModal(edit, data) {
+      if (edit) {
+        // 模拟样品的编辑
+        const tempData = JSON.parse(JSON.stringify(data)) // 深拷贝
+        this.$refs.imitateModal._open(tempData, this.sampleId)
+      } else {
+        // 模拟样品的添加
+        this.$refs.imitateModal._open('', this.sampleId)
+      }
+    },
+    _search() {
+      this._page()
+    },
+    _resultChange(msg) {
+      this._page()
+      this.$Message.success(msg)
+      this.$emit('on-result-change')
+    },
+    _copy(data) {
+      this.$refs.copyModal._open(data.id, data.type)
+    },
+    // 复制样品
+    _copySample(data) {
+      this.$store
+        .dispatch('FoodSample/getByCompanyId', data.sampleId)
+        .then(() => {
+          const result = this.$store.state.FoodSample.companyModel
+          if (data.type === 0) {
+            // 普通样品
+            this.currentComponent = 'FoodSampleCompanyEdit'
+            this.$nextTick(function() {
+              this.$refs.refModal._openCopySample(result)
+            })
+          } else if (data.type === 3) {
+            // 模拟样品
+            this.$refs.imitateModal._openCopySample(result)
+          }
+        })
+    },
+    _copyAll(data) {
+      this.$store
+        .dispatch('FoodSample/getByCompanyId', data.sampleId)
+        .then(() => {
+          const result = this.$store.state.FoodSample.companyModel
+          if (data.type === 0) {
+            // 普通样品
+            this.currentComponent = 'FoodSampleCompanyEdit'
+            this.$nextTick(function() {
+              this.$refs.refModal._openCopyAll(result)
+            })
+          } else if (data.type === 3) {
+            // 模拟样品
+            this.$refs.imitateModal._openCopyAll(result)
+          }
+        })
+    },
+    // 导入样品
+    _importSample() {
+      const data = {
+        importUrl: '/food/v1/sample/company/import_' + this.sampleId,
+        downloadUrl: '/food/v1/excel/template/FoodSampleCompany',
+        title: '导入'
+      }
+      this.$refs.refModal._open(data)
+    },
+    // 导入检测项目
+    _importItem() {
+      if (this.selectIds.length === 0) {
+        this.$Message.warning('请至少选中一条样品数据！')
+      } else {
+        this.$refs.refModal._open(
+          this.selectIds,
+          this.selectData[0],
+          this.selectData
+        )
+      }
+    },
+    // 导入检测项目包
+    _importItemPackage() {
+      if (this.selectIds.length === 0) {
+        this.$Message.warning('请至少选中一条样品数据！')
+      } else {
+        this.$refs.refModal._open(this.selectIds, 'sample-rel-package-item')
+      }
+    },
+    _copyHisItem() {
+      if (this.selectIds.length === 0) {
+        this.$Message.warning('请至少选中一条样品数据！')
+      } else {
+        this.$refs.refModal._open(this.selectIds)
+      }
+    },
+    _operationRecord(id) {
+      // 操作日志
+      this.$refs.recordModal._open(id)
+    }
+  }
+}
+</script>

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

+<template>
+  <div>
+    <Modal v-model="showModal" width="960" class="modal-footer-none">
+      <p slot="header">
+        {{ modalTitle }}
+      </p>
+      <div>
+        <!--内容-->
+        <Row>
+          <!--查询-->
+          <Col span="24">
+          <Form id="search-sample-company" v-show="searchOpen" :label-width="80" inline onsubmit="return false">
+            <label class="label-sign"></label>
+            <Form-item label="试样编号:" class="search-item">
+              <Input v-model="formObj.sampleCode" @on-enter="_formSearch" placeholder="请输入样品编号" clearable />
+            </Form-item>
+            <Form-item class="search-btn">
+              <Button @click="_page" type="primary">
+                搜索
+              </Button>
+            </Form-item>
+          </Form>
+          </Col>
+          <!--操作-->
+          <Col span="24">
+          <btn-list :msg="btn" :open="searchOpen" @on-result-change="_btnClick" class="contHide" show-search-btn="true"></btn-list>
+          </Col>
+          <!-- 表格 -->
+          <Col span="24">
+            <PTVXETableHeight ref="pageTable" :table-height="tableHeight" :form-id="formId" :loading="true"
+                        :get-page="getPage" :icon-msg="iconMsg" @on-result-change="_tableResultChange"  select-data>
+              <vxe-table-column
+                v-for="item in pageColumns"
+                :key="item.key"
+                :field="item.key"
+                :title="item.title"
+                :width="item.width?item.width:200"
+                :fixed="item.fixed?item.fixed:undefined" sortable>
+              <template slot-scope="scope">
+                <div v-if="item.detail">
+                  <a @click.stop="_detailModal(scope.row)">{{ scope.row[item.key] }}</a>
+                </div>
+                <div v-else-if="item.status">
+                  {{ scope.row[item.key].display }}
+                </div>
+                <div v-else-if="item.date">
+                  {{ scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):'' }}
+                </div>
+                <div v-else>
+                  {{ scope.row[item.key] }}
+                </div>
+              </template>
+            </vxe-table-column>
+          </PTVXETableHeight>
+          </Col>
+        </Row>
+      </div>
+      <div slot="footer">
+        <modal-footer ref="footerModal" :footer="footerList" @on-result-change="_footerResult" />
+      </div>
+    </Modal>
+    <SoilSampleItemManage ref="sampleItemManage" @on-result-change="_page"></SoilSampleItemManage>
+  </div>
+</template>
+<script>
+import http from '../../../api/http'
+import { getLodop } from '../../../plugins/clodop/LodopFuncs'
+import { soilEntrust, soilTest } from '../../../api'
+import SoilSampleItemManage from './SoilSampleItemManageHis'
+let LODOP
+export default {
+  components: {
+    SoilSampleItemManage
+  },
+  data() {
+    return {
+      formId: 'soilSampleManage',
+      currentComponent: '',
+      btn: [
+        {
+          type: 'success',
+          id: 'ZBC',
+          name: '打印标签'
+        }
+      ],
+      itemList: [],
+      indexList: [],
+      footerList: [
+        { id: '', name: '取消', type: '' },
+        { id: '', name: '确定', type: 'primary' }
+      ],
+      iconMsg: [
+        {
+          type: 'ios-beaker',
+          id: '',
+          name: '管理检测项目'
+        }
+        // { type: 'md-trash', id: '', name: '删除' }
+      ],
+      entrustId: '', // 委托id
+      showModal: false,
+      recordHis: false,
+      searchOpen: true,
+      modalTitle: '管理样品',
+      selectIds: [],
+      selectData: {},
+      getPage: {},
+      pageColumns: [
+        { title: '试样编号', key: 'sampleCode', width: 100, fixed: 'left' },
+        { title: '试样深度', key: 'sampleDepth', width: 100 },
+        { title: '现场编号', key: 'siteNo', width: 100 },
+        { title: '土质描述', key: 'sampleDescribe', width: 160 },
+        { title: '土质描述详情', key: 'describeDetail', width: 160 },
+        { title: '样品包装类型', key: 'samplePack', width: 120 }
+      ],
+      sampleId: '',
+      dateList: [],
+      formObj: {
+        entrustId: undefined,
+        sampleCode: undefined
+      }
+    }
+  },
+  computed: {
+    tableHeight: function() {
+      if (this.searchOpen) {
+        return this.$tableHeight('search')
+      } else {
+        return this.$tableHeight('noSearch')
+      }
+    }
+  },
+  methods: {
+    _inputChange: async function(info) {
+      const result = await soilEntrust.sampleEdit({
+        id: info.id,
+        describeDetail: info.describeDetail
+      })
+      if (result) {
+        this._resultChange('修改成功')
+      }
+    },
+    _handleRow(data) {
+      this.currentRow = data.row
+      this.currentIndex = data.rowIndex
+    },
+    _footerResult(name) {
+      switch (name) {
+        case '取消':
+          this._cancel()
+          break
+        case '确定':
+          this._ok()
+          break
+      }
+    },
+    _cancel() {
+      this.showModal = false
+    },
+    _ok() {
+      this.showModal = false
+      this.$refs.footerModal._hideLoading()
+      console.log(this.getPage)
+    },
+    _itemImportBack(data) {
+      if (this.selectIds === undefined || this.selectIds.length === 0) {
+        return false
+      }
+      if (data === undefined || data.length === 0) {
+        return false
+      }
+      this._importItemOk({ sampleIds: this.selectIds, drugItemList: data })
+    },
+
+    // _importItemOk: async function(data) {
+    //   const result = await drugSample.importSampleItemDTO(data)
+    //   if (result) {
+    //     this.$Message.success('导入成功！')
+    //     await this._page()
+    //   }
+    // },
+
+    _modalResult(data1, data2) {
+      switch (this.currentComponent) {
+        case 'CopyModal':
+          if (data1 === 0) {
+            this._copySample(data2)
+          } else {
+            this._copyAll(data2)
+          }
+          break
+        default:
+          this._search()
+      }
+    },
+    _dateChange(data) {
+      this.formObj.ctimeBegin = data[0]
+      this.formObj.ctimeEnd = data[1]
+    },
+    _btnClick(msg, componentName) {
+      this.currentComponent = componentName
+      this.$nextTick(function() {
+        switch (msg) {
+          case '添加':
+            this._editModal(false)
+            break
+          case '复制历史样品':
+            this._copyHisSample()
+            break
+          case '导入样品':
+            this._importSample()
+            break
+          case '导入检测项目':
+            this._importItem()
+            break
+          case '导入检测项目包':
+            this._importItemPackage()
+            break
+          case '打印标签':
+            this._printLabel()
+            break
+          case '试样制备':
+            this._samplePre()
+            break
+          case '批量填写土质描述详情':
+            this._writeDetail(this.selectIds)
+            break
+          case '复制历史样品检测项目':
+            this._copyHisItem()
+            break
+          case '删除':
+            this._deleteSelected()
+            break
+          case '导出':
+            this._exportSample()
+            break
+          case '添加模拟样品':
+            this._editImitateModal(false)
+            break
+          case 'search':
+            this.searchOpen = !this.searchOpen
+            break
+        }
+      })
+    },
+    _samplePre() {
+      if (this.selectIds.length === 0) {
+        this.$message.warning('至少选择一条数据')
+      } else {
+        this.$refs.preModal._open(this.selectIds.join(','))
+      }
+    },
+    _writeDetail(id) {
+      if (this.selectIds.length === 0) {
+        this.$Message.warning('请至少选中一条样品数据！')
+      } else {
+        const ids = id.join(',')
+        this.$refs.writeDetailModal._open(ids)
+      }
+    },
+    _exportSample() {
+      if (this.selectIds.length === 0) {
+        this.$Message.warning('请至少选择一条样品')
+      } else {
+        this.$Modal.confirm({
+          title: '提示',
+          content: '确定导出这' + this.selectIds.length + '条样品',
+          onOk: () => {
+            http.open(
+              '/food/v1/sample/company/export',
+              { ids: this.selectIds.join(',') },
+              '_blank'
+            )
+          }
+        })
+      }
+    },
+    _copyHisSample() {
+      this.$refs.refModal._open(this.entrustId)
+    },
+
+    _iconClick(res, data, componentName, index) {
+      this.currentComponent = componentName
+      this.$nextTick(function() {
+        switch (res) {
+          case '管理检测项目':
+            this._itemManage(data.id)
+            break
+          case '制备详情':
+            this._preEdit(data.id)
+            break
+          case '编辑':
+            this._editModal(true, data)
+            break
+          case '复制':
+            this._copy(data)
+            break
+          case '删除':
+            console.log(index)
+            this._deleteById(data.id)
+            break
+          case '附件':
+            this.$refs.refModal._open(data.id, 'sampleId')
+            break
+        }
+      })
+    },
+    _preEdit(id) {
+      this.$refs.preHisModal._open(id)
+    },
+    _itemManage(data) {
+      // 管理检测项目
+      if (this.recordHis) {
+        this.$refs.sampleItemManage._openRecord(data)
+      } else {
+        this.$refs.sampleItemManage._open(data)
+      }
+    },
+    _tableResultChange(msg, data) {
+      const selectIds = []
+      switch (msg) {
+        case 'selectData':
+          for (let i = 0; i < data.length; i++) {
+            selectIds.push(data[i].id)
+          }
+          this.selectIds = selectIds
+          this.selectData = data
+          break
+        case 'allSelect':
+          console.log('123465798', data)
+          this.allSelect(data)
+          break
+        case 'iconClick':
+          this._iconClick(data.name, data.rowData)
+          break
+        case 'changeSize':
+          this._page()
+          break
+      }
+    },
+    allSelect(data) {
+      this.indexList = []
+      for (let i = 0; i < data.length; i++) {
+        this.indexList.push(data[i].index)
+      }
+      console.log('索引', this.indexList)
+    },
+    _open(id) {
+      this.formObj = this.$resetFields(this.formObj)
+      this.dateList = []
+      this.showModal = true
+      this.formObj.entrustId = id // 委托id
+      console.log(this.entrustId)
+      this.$refs.pageTable._hideLoading()
+      this._page()
+    },
+    _openHis(id) {
+      this.formObj = this.$resetFields(this.formObj)
+      this.dateList = []
+      this.showModal = true
+      this.formObj.entrustId = id // 委托id
+      console.log(this.entrustId)
+      this.$refs.pageTable._hideLoading()
+      this.recordHis = true
+      this._page()
+    },
+    _formSearch() {
+      this.$refs.pageTable._pageChange(1)
+    },
+    _page: async function() {
+      const result = await soilTest.pageExpAuditSampleHis(this.formObj)
+      if (result) {
+        this.$refs.pageTable._hideLoading()
+        this.getPage = result
+      }
+    },
+    _deleteByIds(ids, content) {
+      this.$Modal.confirm({
+        title: '提示',
+        content: content || '确定删除该记录？',
+        onOk: () => {
+          // this.$store.dispatch('FoodSample/deleteByIds', ids).then(() => {
+          //   this._resultChange('删除成功!')
+          // })
+          this._deleteOk(ids)
+        }
+      })
+    },
+
+    // _deleteOk: async function(ids) {
+    //   const result = await drugSample.deleteById(ids)
+    //   if (result) {
+    //     this._resultChange('删除成功')
+    //   }
+    // },
+
+    _deleteById(id) {
+      // 删除一条记录
+      this._deleteByIds([id])
+    },
+    _deleteSelected() {
+      // 批量删除
+      const ids = this.selectIds
+      if (ids.length === 0) {
+        this.$Message.warning('请选择一条或多条数据！')
+      } else {
+        this._deleteByIds(ids, '确定删除 ' + ids.length + ' 条记录？')
+      }
+    },
+    _detailModal(data) {},
+    _editModal(edit, data) {
+      if (edit) {
+        console.log(data)
+        this.$refs.sampleManageEdit._open(data)
+      } else {
+        // 添加
+        this.$refs.refModal._open('', this.entrustId)
+      }
+    },
+    // 添加编辑模拟样品
+    _editImitateModal(edit, data) {
+      if (edit) {
+        // 模拟样品的编辑
+        const tempData = JSON.parse(JSON.stringify(data)) // 深拷贝
+        this.$refs.imitateModal._open(tempData, this.entrustId)
+      } else {
+        // 模拟样品的添加
+        this.$refs.imitateModal._open('', this.entrustId)
+      }
+    },
+    _search() {
+      this._page()
+    },
+    _resultChange(msg) {
+      this.$Message.success(msg)
+      this._page()
+    },
+    _copy(data) {
+      this.$refs.copyModal._open(data.id, data.type)
+    },
+    // 复制样品
+    _copySample(data) {
+      this.$store
+        .dispatch('FoodSample/getByCompanyId', data.sampleId)
+        .then(() => {
+          const result = this.$store.state.FoodSample.companyModel
+          if (data.type === 0) {
+            // 普通样品
+            this.currentComponent = 'FoodSampleCompanyEdit'
+            this.$nextTick(function() {
+              this.$refs.refModal._openCopySample(result)
+            })
+          } else if (data.type === 3) {
+            // 模拟样品
+            this.$refs.imitateModal._openCopySample(result)
+          }
+        })
+    },
+    _copyAll(data) {
+      this.$store
+        .dispatch('FoodSample/getByCompanyId', data.sampleId)
+        .then(() => {
+          const result = this.$store.state.FoodSample.companyModel
+          if (data.type === 0) {
+            // 普通样品
+            this.currentComponent = 'FoodSampleCompanyEdit'
+            this.$nextTick(function() {
+              this.$refs.refModal._openCopyAll(result)
+            })
+          } else if (data.type === 3) {
+            // 模拟样品
+            this.$refs.imitateModal._openCopyAll(result)
+          }
+        })
+    },
+    // 导入检测项目
+    _importItem() {
+      if (this.selectIds.length === 0) {
+        this.$Message.warning('请至少选中一条样品数据！')
+      } else {
+        this.$refs.sampleItemModal._open()
+        this.$refs.pageTable.checkedData()
+      }
+    },
+    // 导入检测项目包
+    _importItemPackage() {
+      if (this.selectIds.length === 0) {
+        this.$Message.warning('请至少选中一条样品数据！')
+      } else {
+        // this.$refs.refModal._open(this.selectIds, 'sample-rel-package-item')
+        this.$refs.itemPackageModal._open(
+          this.selectIds,
+          'sample-rel-package-item'
+        )
+      }
+    },
+
+    _printLabel() {
+      if (this.selectData.length === 0) {
+        this.$Message.warning('请至少选中一条样品数据！')
+      } else {
+        for (let m = 0; m < this.selectData.length; m++) {
+          const row = this.selectData[m]
+          this._printLabelOk(row)
+        }
+      }
+    },
+
+    _printLabelOk(row) {
+      LODOP = getLodop()
+      if (LODOP === 'undefined' || LODOP === undefined) {
+        this._pluginDownload()
+        return false
+      }
+      if (LODOP.GET_PRINTER_COUNT() === 0) {
+        this.$Messager.warning('系统未关联打印机,请确认....')
+        return false
+      }
+
+      LODOP.PRINT_INITA('0mm', '0mm', '70.01mm', '50.01mm', '样品标签打印')
+      LODOP.ADD_PRINT_LINE(36, 15, 35, 251, 0, 1)
+      LODOP.ADD_PRINT_LINE(74, 15, 73, 251, 0, 1)
+      LODOP.ADD_PRINT_LINE(107, 15, 106, 251, 0, 1)
+      LODOP.ADD_PRINT_LINE(140, 15, 139, 251, 0, 1)
+      LODOP.ADD_PRINT_LINE(175, 15, 174, 251, 0, 1)
+      LODOP.ADD_PRINT_LINE(35, 15, 174, 16, 0, 1)
+      LODOP.ADD_PRINT_LINE(35, 74, 174, 75, 0, 1)
+      LODOP.ADD_PRINT_LINE(35, 251, 174, 252, 0, 1)
+      LODOP.ADD_PRINT_TEXT(49, 17, 59, 20, '样品名称')
+      LODOP.ADD_PRINT_TEXT(82, 18, 59, 20, '样品编号')
+      LODOP.ADD_PRINT_TEXT(116, 17, 59, 20, '样品状态')
+      LODOP.ADD_PRINT_TEXT(151, 27, 39, 20, '备注')
+      LODOP.ADD_PRINT_TEXT(16, 95, 100, 20, '检测样品标签')
+      LODOP.SET_PRINT_STYLEA(0, 'Bold', 1)
+      LODOP.ADD_PRINT_TEXT(49, 78, 135, 20, row.name)
+      LODOP.ADD_PRINT_TEXT(82, 77, 136, 20, row.sampleCode)
+      LODOP.ADD_PRINT_TEXT(117, 76, 176, 20, '□未检 □在检 □已检 □留样')
+      if (row.surplus === '取回') {
+        LODOP.ADD_PRINT_TEXT(152, 77, 138, 20, '☑"取回 □服务方处理')
+      } else if (row.surplus === '服务方处理') {
+        LODOP.ADD_PRINT_TEXT(152, 77, 138, 20, '□取回 ☑服务方处理')
+      } else {
+        LODOP.ADD_PRINT_TEXT(152, 77, 138, 20, '□取回 □服务方处理')
+      }
+
+      LODOP.PRINT_DESIGN()
+    },
+
+    _copyHisItem() {
+      if (this.selectIds.length === 0) {
+        this.$Message.warning('请至少选中一条样品数据！')
+      } else {
+        this.$refs.refModal._open(this.selectIds)
+      }
+    },
+    _operationRecord(id) {
+      // 操作日志
+      this.$refs.recordModal._open(id)
+    }
+  }
+}
+</script>

pages/soil-test-manage/test-data-audit/item-tabs/ItemRightList.vue

@@ -49,6 +49,7 @@
     <AssignPerson ref="personModal" @on-result-change="_assignBackData"></AssignPerson>
 <!--    <SelectOriTempRecord ref="recordModal" @on-result-change="_page"></SelectOriTempRecord>-->
 <!--    <OriginalRecordEdit ref="editModal"></OriginalRecordEdit>-->
+    <EquipManage ref="equipModal" @on-result-change="_page"></EquipManage>
     <IndexManage ref="indexModal" @on-result-change="_page"></IndexManage>
     <Reason ref="reasonModal" @on-result-change="_reasonResult"></Reason>
   </div>
@@ -57,6 +58,7 @@
 import Global from '../../../../api/config'
 import { soilTest } from '../../../../api'
 import AssignPerson from '../../../../components/user-info-single/AssignPerson'
+import EquipManage from '../EquipManage'
 // import SelectOriTempRecord from '../SelectOriTempRecord'
 // import OriginalRecordEdit from '../OriginalRecordEdit'
 import IndexManage from '../IndexManage'
@@ -65,6 +67,7 @@ export default {
   components: {
     AssignPerson,
     Reason,
+    EquipManage,
     // SelectOriTempRecord,
     // OriginalRecordEdit,
     IndexManage
@@ -117,7 +120,8 @@ export default {
       ],
       iconMsg: [
         { type: 'ios-book', id: '', name: '查看原始记录' },
-        { type: 'md-apps', id: '', name: '查看指标' }
+        { type: 'md-apps', id: '', name: '查看指标' },
+        { type: 'ios-flask', id: '', name: '设备列表' }
       ],
       getPage: {},
       pageColumns: [
@@ -185,9 +189,15 @@ export default {
           case '查看指标':
             this._indexManage(data)
             break
+          case '设备列表':
+            this._equipManage(data)
+            break
         }
       })
     },
+    _equipManage(data) {
+      this.$refs.equipModal._open(data)
+    },
     _auditBack() {
       if (this.selectIds.length === 0) {
         this.$Message.warning('请至少选择一条数据')

pages/soil-test-manage/test-data-audit/sample-tabs/SampleLeftList.vue

@@ -106,7 +106,7 @@ export default {
     _page: async function() {
       Object.assign(this.formObj, this.$refs.pageTable._searchParams())
       this.formObj.entrustId = this.entrustId
-      const result = await soilTest.pageExpTestSample(
+      const result = await soilTest.pageExpAuditSample(
         this.$serializeForm(this.formObj)
       )
       if (result) {

pages/soil-test-manage/test-data-audit/sample-tabs/SampleRightList.vue

@@ -20,7 +20,7 @@
       <!-- 表格 -->
       <Col span="24">
         <PTVXETable ref="pageTable" :pageColumns="pageColumns" :tableHeight="tableHeight"
-                    @on-result-change="_tableResultChange" :getPage="getPage" :table-name="tableName" :rows="100" is-task select-data>
+                    @on-result-change="_tableResultChange" :icon-msg="iconMsg" :getPage="getPage" :table-name="tableName" :rows="100" is-task select-data>
           <vxe-table-column
             v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
             :key="item.key"
@@ -48,14 +48,20 @@
       </Col>
     </Row>
     <AssignPerson ref="personModal" @on-result-change="_assignBackData"></AssignPerson>
+    <Reason ref="reasonModal" @on-result-change="_reasonResult"></Reason>
+    <IndexManage ref="indexModal" @on-result-change="_page"></IndexManage>
+    <EquipManage ref="equipModal" @on-result-change="_page"></EquipManage>
   </div>
 </template>
 <script>
 import Global from '../../../../api/config'
 import { soilTest } from '../../../../api'
 import AssignPerson from '../../../../components/user-info-single/AssignPerson'
+import IndexManage from '../IndexManage'
+import Reason from '../../../../components/base/Reason'
+import EquipManage from '../EquipManage'
 export default {
-  components: { AssignPerson },
+  components: { AssignPerson, IndexManage, Reason, EquipManage },
   data() {
     return {
       // 定义表格名称----英文
@@ -86,7 +92,8 @@ export default {
         { key: 'detectType', name: '样品类别', placeholder: '请输入样品类别' }
       ],
       btn: [
-        { type: 'success', id: '', name: '试验项目分配' },
+        { type: 'success', id: '', name: '提交' },
+        { type: 'warning', id: '', name: '退回' },
         { type: '', id: 'food-task-assign-adjust-group', name: '调整分组' },
         {
           type: '',
@@ -95,6 +102,11 @@ export default {
         },
         { type: '', id: 'food-task-assign-maintain-info', name: '信息维护' }
       ],
+      iconMsg: [
+        { type: 'ios-book', id: '', name: '查看原始记录' },
+        { type: 'md-apps', id: '', name: '查看指标' },
+        { type: 'ios-flask', id: '', name: '设备列表' }
+      ],
       getPage: {},
       pageColumns: [
         { title: '试验名称', key: 'name', width: 160 },
@@ -134,6 +146,21 @@ export default {
     // this._dicSearch()
   },
   methods: {
+    _reasonResult(data) {
+      if (undefined !== data && data !== '') {
+        this._reportCheckBack(data)
+      }
+    },
+    _reportCheckBack: async function(data) {
+      const result = await soilTest.auditBack({
+        ids: this.selectIds,
+        remark: data
+      })
+
+      if (result) {
+        this._resultChange('退回成功')
+      }
+    },
     // 获取column
     _getColumn() {
       this.$refs.pageTable._getColByTableName()
@@ -264,6 +291,12 @@ export default {
           await this._reportDueDate()
           await this._groupAssign()
           break
+        case '提交':
+          this._submitToMake()
+          break
+        case '退回':
+          this._auditBack()
+          break
         case '调整分组':
           if (this.selectIds.length === 0) {
             this.$Message.warning('请至少选择=一条数据')
@@ -285,6 +318,32 @@ export default {
           break
       }
     },
+    _auditBack() {
+      if (this.selectIds.length === 0) {
+        this.$Message.warning('请至少选择一条数据')
+      } else {
+        this.$refs.reasonModal._open('退回原因')
+      }
+    },
+    _submitToMake() {
+      if (this.selectIds.length === 0) {
+        this.$Message.warning('请至少选择一条数据')
+      } else {
+        this.$Modal.confirm({
+          title: '提示',
+          content: '确定提交该数据？',
+          onOk: () => {
+            this._submitToMakeOk()
+          }
+        })
+      }
+    },
+    _submitToMakeOk: async function() {
+      const result = await soilTest.endExpAudit(this.selectIds.join(','))
+      if (result) {
+        this._resultChange('提交成功')
+      }
+    },
     // 信息维护
     _maintainInfo() {
       if (this.selectSampleIds.length === 0) {
@@ -339,7 +398,7 @@ export default {
     _page: async function() {
       Object.assign(this.formObj, this.$refs.pageTable._searchParams())
       this.formObj.sampleIds = this.sampleIds
-      const result = await soilTest.pageTest(this.$serializeForm(this.formObj))
+      const result = await soilTest.pageAudit(this.$serializeForm(this.formObj))
       if (result) {
         this.$refs.pageTable._hideLoading()
         this.$refs.pageTable._checkAll()
@@ -351,13 +410,9 @@ export default {
       switch (msg) {
         case 'page':
           this._page()
-          // this.result = this.getPage.records;
-          // this.$nextTick(() => {
-          // this.$refs.pageTable._checkAll()
-          // })
-          // if (this.getPage.records.length === 0) {
-          //   this.$emit('on-result-change')
-          // }
+          break
+        case 'iconClick':
+          this._iconClick(data.name, data.rowData, data.componentName)
           break
         case 'selectData':
           for (let i = 0; i < data.length; i++) {
@@ -376,6 +431,50 @@ export default {
           break
       }
     },
+    _iconClick(res, data, currentComponent) {
+      this.$nextTick(() => {
+        switch (res) {
+          case '查看原始记录':
+            console.log(data)
+            this._viewRecord(data.id)
+            break
+          case '查看指标':
+            this._indexManage(data)
+            break
+          case '设备列表':
+            this._equipManage(data)
+            break
+        }
+      })
+    },
+    _equipManage(data) {
+      this.$refs.equipModal._open(data)
+    },
+    _indexManage(data) {
+      this.$refs.indexModal._open(data)
+    },
+    _viewRecord(originalRecordId) {
+      // layx.iframe('labRecordWriteOriView', '原始记录预览', Global.recordURL + '/print/v1/form/' + originalRecordId, {
+      // eslint-disable-next-line no-undef
+      layx.iframe(
+        'labRecordWriteOriView',
+        '原始记录预览',
+        Global.recordURL +
+          '/print/v1/form/' +
+          originalRecordId +
+          '?type=ENVTESTMAKE',
+        {
+          event: {
+            onload: {
+              after: function(layxWindow, winform) {
+                // eslint-disable-next-line no-undef
+                layx.max(winform.id)
+              }
+            }
+          }
+        }
+      )
+    },
     // 按人分配  选人选时间
     _userAssign() {
       const user = Global.getUserInfo('userInfo')

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

@@ -71,7 +71,7 @@
 import UserInfo from '../../../components/user-info-single/AssignPerson'
 import { soilTest } from '../../../api'
 import Operation from '../../../components/operation/Operation'
-import SoilSampleManageHis from '../SoilSampleManageHis'
+import SoilSampleManageHis from './SoilSampleManageHis'
 export default {
   components: {
     UserInfo,

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

+<template>
+  <div>
+    <Modal v-model="showModal" width="1200">
+      <p slot="header">
+        {{ modalTitle }}
+      </p>
+      <div>
+        <!--内容-->
+        <Row>
+          <!--查询-->
+          <Col span="24">
+          <Form id="search-sample-company" v-show="searchOpen" :label-width="90" inline onsubmit="return false">
+            <label class="label-sign"></label>
+            <Form-item label="检测项目:" class="search-item">
+              <Input v-model="formObj.name" @on-enter="_formSearch" placeholder="请输入检测项目" clearable />
+            </Form-item>
+            <Form-item label="检测依据:" class="search-item">
+              <Input v-model="formObj.code" @on-enter="_formSearch" placeholder="请输入检测依据" clearable />
+            </Form-item>
+            <Form-item class="search-btn">
+              <Button @click="_formSearch" type="primary">
+                搜索
+              </Button>
+            </Form-item>
+          </Form>
+          </Col>
+          <!--操作-->
+          <Col span="24">
+          <btn-list :msg="btn" :open="searchOpen" @on-result-change="_btnClick" class="contHide" show-search-btn="true"></btn-list>
+          </Col>
+          <!-- 表格 -->
+          <Col span="24">
+            <PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :loading="true"
+                        :get-page="getPage" @on-result-change="_tableResultChange">
+              <vxe-table-column
+                v-for="item in pageColumns"
+                :key="item.key"
+                :field="item.key"
+                :title="item.title"
+                :min-width="item.width?item.width:200"
+                :fixed="item.fixed?item.fixed:undefined" sortable>
+              <template slot-scope="scope">
+                <div v-if="item.detail">
+                  <a @click.stop="_detailModal(scope.row)">{{ scope.row[item.key] }}</a>
+                </div>
+                <div v-else-if="item.key==='epibolyItem'" @click.stop="_handleRow(scope)">
+                  <el-select v-if="showOption" v-model="scope.row.epibolyItem" @change="_optionChange(scope.row)" placeholder="请选择">
+                    <el-option
+                      v-for="(item,index) in subOptions"
+                      :key="index"
+                      :label="item.label"
+                      :value="index"
+                    />
+                  </el-select>
+                  <span v-if="!showOption">{{ scope.row[item.key]===0? '否':'是' }}</span>
+                </div>
+                <span v-else-if="item.status">{{scope.row[item.key]}}</span>
+                <div v-else-if="item.judged">
+                  {{ scope.row[item.key]===0? '否':'是' }}
+                </div>
+                <div v-else-if="item.date">
+                  {{ scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):'' }}
+                </div>
+                <div v-else-if="item.key==='code'" @click.stop="_handleRow(scope)">
+                  <el-input
+                    v-model="scope.row.code"
+                    @blur="_codeEdit({id:scope.row.id, obj :{code:scope.row.code}})"
+                    style="width: 130px;"
+                    blur
+                    placeholder="请选择检测依据"
+                  />
+                  <i @click.stop="_selectjudgeBasis(scope.row.id,scope.$index)" style="cursor: pointer;font-size: 14px;" class="icons iconfont pt-search icon-search"></i>
+                </div>
+                <div v-else-if="item.key==='compareSymbol'" @click.stop="_handleRow(scope)">
+                  <el-input
+                    v-model="scope.row.compareSymbol"
+                    @blur="_compareSymbolEdit({id:scope.row.id, obj :{compareSymbol:scope.row.compareSymbol}})"
+                    blur
+                    placeholder="请输入比较符"
+                  />
+                </div>
+                <div v-else-if="item.key==='limitValue'" @click.stop="_handleRow(scope)">
+                  <el-input
+                    v-model="scope.row.limitValue"
+                    @blur="_limitValueEdit({id:scope.row.id, obj :{limitValue:scope.row.limitValue}})"
+                    blur
+                    placeholder="请输入限值"
+                  />
+                </div>
+                <div v-else-if="item.key==='unit'" @click.stop="_handleRow(scope)">
+                  <el-input
+                    v-model="scope.row.unit"
+                    @blur="_unitEdit({id:scope.row.id, obj :{unit:scope.row.unit}})"
+                    blur
+                    placeholder="请输入单位"
+                  />
+                </div>
+                <div v-else>
+                  {{ scope.row[item.key] }}
+                </div>
+              </template>
+            </vxe-table-column>
+            </PTVXETable>
+          </Col>
+        </Row>
+      </div>
+      <div slot="footer">
+        <modal-footer ref="footerModal" :footer="footerList" @on-result-change="_footerResult" />
+      </div>
+    </Modal>
+  </div>
+</template>
+<script>
+import http from '../../../api/http'
+import { soilEntrust } from '../../../api'
+export default {
+  components: {},
+  data() {
+    return {
+      formId: 'SoilSampleItemManage',
+      currentComponent: '',
+      btn: [
+        // { type: 'success', id: '', name: '提交分包' },
+        { type: 'success', id: 'ZBC', name: '取消分包' }
+      ],
+      iconMsg: [{ type: 'pt-a-end', id: '', name: '删除' }],
+      sampleId: '', // 样品id
+      showModal: false,
+      modalTitle: '管理检测项目',
+      selectIds: [],
+      itemId: '',
+      index: '',
+      showOption: true,
+      searchOpen: true,
+      selectData: {},
+      getPage: {},
+      currentRow: '',
+      currentIndex: '',
+      footerList: [
+        { id: '', name: '取消', type: '' },
+        { id: '', name: '关闭', type: 'primary' }
+      ],
+      pageColumns: [
+        { title: '试验名称', key: 'name', width: 160 },
+        { title: '试验项目英文简写', key: 'shortName', width: 140 },
+        { title: '检测科室', key: 'groupName', width: 140 },
+        { title: '大类', key: 'mainType', width: 140 },
+        { title: '小类', key: 'smallType' },
+        { title: '检测依据', key: 'testBasis', width: 180 },
+        { title: '试验方法', key: 'testMethod', width: 180 },
+        { title: '状态', key: 'status', width: 180 }
+      ],
+      subOptions: [
+        {
+          value: '0',
+          label: '否'
+        },
+        {
+          value: '1',
+          label: '是'
+        }
+      ],
+      dateList: [],
+      formObj: {
+        name: undefined,
+        sampleId: undefined,
+        code: undefined
+      }
+    }
+  },
+  computed: {
+    tableHeight: function() {
+      return this.$tableHeight('tableModal')
+    }
+  },
+  methods: {
+    _selectjudgeBasis(id, index) {
+      console.log(id)
+      this.itemId = id
+      this.index = index
+      this.$refs.EditModal._open()
+    },
+    _optionChange(data) {
+      console.log(data)
+      if (data.epibolyItem === 1) {
+        this._submit(data.id)
+      } else {
+        this._cancelSub(data.id)
+      }
+    },
+    _footerResult(name) {
+      switch (name) {
+        case '取消':
+          this._cancel()
+          break
+        case '关闭':
+          this._cancel()
+          break
+      }
+    },
+    _cancel() {
+      this.$emit('on-result-change')
+      this.$refs.pageTable._hideLoading()
+      this.$refs.footerModal._hideLoading()
+      this.showModal = false
+    },
+    _ok() {
+      console.log(this.getPage.records)
+    },
+    _modalResult(data1, data2) {
+      switch (this.currentComponent) {
+        case 'CopyModal':
+          if (data1 === 0) {
+            this._copySample(data2)
+          } else {
+            this._copyAll(data2)
+          }
+          break
+        default:
+          this._search()
+      }
+    },
+    _handleRow(data) {
+      this.currentRow = data.row
+      this.currentIndex = data.rowIndex
+    },
+    _dateChange(data) {
+      this.formObj.ctimeBegin = data[0]
+      this.formObj.ctimeEnd = data[1]
+    },
+    _btnClick(msg, componentName) {
+      this.currentComponent = componentName
+      this.$nextTick(function() {
+        switch (msg) {
+          case '提交分包':
+            this._submitOutPack()
+            break
+          case '取消分包':
+            this._cancelOutPack()
+            break
+          case '添加':
+            this._editModal(false)
+            break
+          case '复制历史样品':
+            this._copyHisSample()
+            break
+          case '导入样品':
+            this._importSample()
+            break
+          case '导入检测项目':
+            this._importItem()
+            break
+          case '导入检测项目包':
+            this._importItemPackage()
+            break
+          case '复制历史样品检测项目':
+            this._copyHisItem()
+            break
+          case '删除':
+            this._deleteSelected()
+            break
+          case '导出':
+            this._exportSample()
+            break
+          case '添加模拟样品':
+            this._editImitateModal(false)
+            break
+          case 'search':
+            this.searchOpen = !this.searchOpen
+            break
+        }
+      })
+    },
+    _backData(data) {
+      this.getPage.records[this.index].code = data.code
+      this._codeEdit({ id: this.itemId, obj: { code: data.code } })
+    },
+    _codeEdit: async function(data) {
+      const result = await soilEntrust.pageItemEdit(data)
+      if (result) {
+        this.$message.success('保存成功')
+        this._page()
+      } else {
+        this.$message.warning('保存失败')
+      }
+    },
+    _compareSymbolEdit: async function(data) {
+      const result = await soilEntrust.pageItemEdit(data)
+      if (result) {
+        this.$message.success('保存成功')
+        this._page()
+      } else {
+        this.$message.warning('保存失败')
+      }
+    },
+    _limitValueEdit: async function(data) {
+      const result = await soilEntrust.pageItemEdit(data)
+      if (result) {
+        this.$message.success('保存成功')
+        this._page()
+      } else {
+        this.$message.warning('保存失败')
+      }
+    },
+    _unitEdit: async function(data) {
+      const result = await soilEntrust.pageItemEdit(data)
+      if (result) {
+        this.$message.success('保存成功')
+        this._page()
+      } else {
+        this.$message.warning('保存失败')
+      }
+    },
+    _submitOutPack() {
+      if (this.selectIds.length === 0) {
+        this.$Message.warning('请至少选择一条')
+      } else {
+        this.$Modal.confirm({
+          title: '提示',
+          content: '确定分包这' + this.selectIds.length + '条',
+          onOk: () => {
+            this._submit()
+          }
+        })
+      }
+    },
+    _cancelOutPack() {
+      if (this.selectIds.length === 0) {
+        this.$Message.warning('请至少选择一条')
+      } else {
+        this.$Modal.confirm({
+          title: '提示',
+          content: '确定取消这' + this.selectIds.length + '条分包',
+          onOk: () => {
+            this._cancelSub()
+          }
+        })
+      }
+    },
+    _submit: async function(data) {
+      if (data !== undefined) {
+        this.selectIds = data
+      }
+      const result = await soilEntrust.submitOutPack(this.selectIds)
+      if (result) {
+        this._resultChange('分包成功')
+      }
+    },
+    _cancelSub: async function(data) {
+      if (data !== undefined) {
+        this.selectIds = data
+      }
+      const result = await soilEntrust.cancelOutPack(this.selectIds)
+      if (result) {
+        this._resultChange('取消分包成功')
+      }
+    },
+    _exportSample() {
+      if (this.selectIds.length === 0) {
+        this.$Message.warning('请至少选择一条样品')
+      } else {
+        this.$Modal.confirm({
+          title: '提示',
+          content: '确定导出这' + this.selectIds.length + '条样品',
+          onOk: () => {
+            http.open(
+              '/food/v1/sample/company/export',
+              { ids: this.selectIds.join(',') },
+              '_blank'
+            )
+          }
+        })
+      }
+    },
+    _copyHisSample() {
+      this.$refs.refModal._open(this.sampleId)
+    },
+
+    _iconClick(res, data, componentName, index) {
+      this.currentComponent = componentName
+      this.$nextTick(function() {
+        switch (res) {
+          case '编辑':
+            this._editModal(true, data)
+            break
+          case '复制':
+            this._copy(data)
+            break
+          case '删除':
+            console.log(index)
+            this._deleteById(data.id)
+            break
+          case '导出样品委托协议':
+            this._exportAgreement(data.id)
+            break
+          case '附件':
+            this.$refs.refModal._open(data.id, 'sampleId')
+            break
+        }
+      })
+    },
+    _exportAgreement(id) {
+      this.$store
+        .dispatch(
+          'ReportExport/getById',
+          'food-contract-company-export-sample-agreement'
+        )
+        .then(() => {
+          if (this.$store.state.ReportExport.model) {
+            if (this.$store.state.ReportExport.model.indexOf('?') !== -1) {
+              window.open(
+                this.$store.state.ReportExport.model + '&sampleId=' + id,
+                '_blank'
+              )
+            } else {
+              window.open(
+                this.$store.state.ReportExport.model + '?sampleId=' + id,
+                '_blank'
+              )
+            }
+          }
+        })
+    },
+    _tableResultChange(msg, data) {
+      const selectIds = []
+      switch (msg) {
+        case 'selectData':
+          for (let i = 0; i < data.length; i++) {
+            selectIds.push(data[i].id)
+          }
+          this.selectIds = selectIds
+          this.selectData = data
+          break
+        // case 'iconClick':
+        //   this._iconClick(data.name, data.rowData, data.componentName)
+        //   break
+        case 'page':
+          this._page()
+          break
+        case 'changeSize':
+          this._page()
+          break
+      }
+    },
+    _open(id) {
+      this.formObj = this.$resetFields(this.formObj)
+      this.dateList = []
+      this.showModal = true
+      this.sampleId = id // 委托id
+      this.$refs.pageTable._hideLoading()
+      this._page()
+    },
+    _openRecord(id) {
+      this.formObj = this.$resetFields(this.formObj)
+      this.dateList = []
+      this.showModal = true
+      this.sampleId = id // 委托id
+      this.$refs.pageTable._hideLoading()
+      this.showOption = false
+      this._page()
+    },
+    _formSearch() {
+      this.$refs.pageTable._pageChange(1)
+    },
+    _page: async function() {
+      Object.assign(this.formObj, this.$refs.pageTable._searchParams())
+      this.formObj = this.$serializeForm(this.formObj)
+      this.formObj.sampleId = this.sampleId
+      const result = await soilEntrust.experimentPage(
+        this.$serializeForm(this.formObj)
+      )
+      if (result) {
+        this.$refs.pageTable._hideLoading()
+        this.getPage = result
+        console.log(result)
+      }
+    },
+    _deleteByIds(ids, content) {
+      this.$Modal.confirm({
+        title: '提示',
+        content: content || '确定删除该记录？',
+        onOk: () => {
+          this._deleteOk(ids)
+        }
+      })
+    },
+
+    _deleteOk: async function(ids) {
+      const result = await soilEntrust.deleteById(ids)
+      if (result) {
+        this._resultChange('删除成功！ ')
+      }
+    },
+    _deleteById(id) {
+      // 删除一条记录
+      this._deleteByIds([id])
+    },
+    _deleteSelected() {
+      // 批量删除
+      const ids = this.selectIds
+      if (ids.length === 0) {
+        this.$Message.warning('请选择一条或多条数据！')
+      } else {
+        this._deleteByIds(ids, '确定删除 ' + ids.length + ' 条记录？')
+      }
+    },
+    _detailModal(data) {},
+    _editModal(edit, data) {
+      if (edit) {
+        console.log(data)
+        this.$refs.sampleManageEdit._open(data)
+        // localStorage.setItem('type', data.type)
+        // // 编辑
+        // this.$store.dispatch('FoodSample/getByCompanyId', data.id).then(() => {
+        //   const result = this.$store.state.FoodSample.companyModel
+        //   if (data.type === 0) {
+        //     // 普通企业样品
+        //     this.$refs.refModal._open(result, this.sampleId)
+        //   } else if (data.type === 3) {
+        //     // 模拟样品
+        //     this._editImitateModal(true, result)
+        //   }
+        // })
+      } else {
+        // 添加
+        this.$refs.refModal._open('', this.sampleId)
+      }
+    },
+    // 添加编辑模拟样品
+    _editImitateModal(edit, data) {
+      if (edit) {
+        // 模拟样品的编辑
+        const tempData = JSON.parse(JSON.stringify(data)) // 深拷贝
+        this.$refs.imitateModal._open(tempData, this.sampleId)
+      } else {
+        // 模拟样品的添加
+        this.$refs.imitateModal._open('', this.sampleId)
+      }
+    },
+    _search() {
+      this._page()
+    },
+    _resultChange(msg) {
+      this._page()
+      this.$Message.success(msg)
+      this.$emit('on-result-change')
+    },
+    _copy(data) {
+      this.$refs.copyModal._open(data.id, data.type)
+    },
+    // 复制样品
+    _copySample(data) {
+      this.$store
+        .dispatch('FoodSample/getByCompanyId', data.sampleId)
+        .then(() => {
+          const result = this.$store.state.FoodSample.companyModel
+          if (data.type === 0) {
+            // 普通样品
+            this.currentComponent = 'FoodSampleCompanyEdit'
+            this.$nextTick(function() {
+              this.$refs.refModal._openCopySample(result)
+            })
+          } else if (data.type === 3) {
+            // 模拟样品
+            this.$refs.imitateModal._openCopySample(result)
+          }
+        })
+    },
+    _copyAll(data) {
+      this.$store
+        .dispatch('FoodSample/getByCompanyId', data.sampleId)
+        .then(() => {
+          const result = this.$store.state.FoodSample.companyModel
+          if (data.type === 0) {
+            // 普通样品
+            this.currentComponent = 'FoodSampleCompanyEdit'
+            this.$nextTick(function() {
+              this.$refs.refModal._openCopyAll(result)
+            })
+          } else if (data.type === 3) {
+            // 模拟样品
+            this.$refs.imitateModal._openCopyAll(result)
+          }
+        })
+    },
+    // 导入样品
+    _importSample() {
+      const data = {
+        importUrl: '/food/v1/sample/company/import_' + this.sampleId,
+        downloadUrl: '/food/v1/excel/template/FoodSampleCompany',
+        title: '导入'
+      }
+      this.$refs.refModal._open(data)
+    },
+    // 导入检测项目
+    _importItem() {
+      if (this.selectIds.length === 0) {
+        this.$Message.warning('请至少选中一条样品数据！')
+      } else {
+        this.$refs.refModal._open(
+          this.selectIds,
+          this.selectData[0],
+          this.selectData
+        )
+      }
+    },
+    // 导入检测项目包
+    _importItemPackage() {
+      if (this.selectIds.length === 0) {
+        this.$Message.warning('请至少选中一条样品数据！')
+      } else {
+        this.$refs.refModal._open(this.selectIds, 'sample-rel-package-item')
+      }
+    },
+    _copyHisItem() {
+      if (this.selectIds.length === 0) {
+        this.$Message.warning('请至少选中一条样品数据！')
+      } else {
+        this.$refs.refModal._open(this.selectIds)
+      }
+    },
+    _operationRecord(id) {
+      // 操作日志
+      this.$refs.recordModal._open(id)
+    }
+  }
+}
+</script>

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

+<template>
+  <div>
+    <Modal v-model="showModal" width="960" class="modal-footer-none">
+      <p slot="header">
+        {{ modalTitle }}
+      </p>
+      <div>
+        <!--内容-->
+        <Row>
+          <!--查询-->
+          <Col span="24">
+          <Form id="search-sample-company" v-show="searchOpen" :label-width="80" inline onsubmit="return false">
+            <label class="label-sign"></label>
+            <Form-item label="试样编号:" class="search-item">
+              <Input v-model="formObj.sampleCode" @on-enter="_formSearch" placeholder="请输入样品编号" clearable />
+            </Form-item>
+            <Form-item class="search-btn">
+              <Button @click="_page" type="primary">
+                搜索
+              </Button>
+            </Form-item>
+          </Form>
+          </Col>
+          <!--操作-->
+          <Col span="24">
+          <btn-list :msg="btn" :open="searchOpen" @on-result-change="_btnClick" class="contHide" show-search-btn="true"></btn-list>
+          </Col>
+          <!-- 表格 -->
+          <Col span="24">
+            <PTVXETableHeight ref="pageTable" :table-height="tableHeight" :form-id="formId" :loading="true"
+                        :get-page="getPage" :icon-msg="iconMsg" @on-result-change="_tableResultChange"  select-data>
+              <vxe-table-column
+                v-for="item in pageColumns"
+                :key="item.key"
+                :field="item.key"
+                :title="item.title"
+                :width="item.width?item.width:200"
+                :fixed="item.fixed?item.fixed:undefined" sortable>
+              <template slot-scope="scope">
+                <div v-if="item.detail">
+                  <a @click.stop="_detailModal(scope.row)">{{ scope.row[item.key] }}</a>
+                </div>
+                <div v-else-if="item.status">
+                  {{ scope.row[item.key].display }}
+                </div>
+                <div v-else-if="item.date">
+                  {{ scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):'' }}
+                </div>
+                <div v-else>
+                  {{ scope.row[item.key] }}
+                </div>
+              </template>
+            </vxe-table-column>
+          </PTVXETableHeight>
+          </Col>
+        </Row>
+      </div>
+      <div slot="footer">
+        <modal-footer ref="footerModal" :footer="footerList" @on-result-change="_footerResult" />
+      </div>
+    </Modal>
+    <SoilSampleItemManage ref="sampleItemManage" @on-result-change="_page"></SoilSampleItemManage>
+  </div>
+</template>
+<script>
+import http from '../../../api/http'
+import { getLodop } from '../../../plugins/clodop/LodopFuncs'
+import { soilEntrust, soilTest } from '../../../api'
+import SoilSampleItemManage from './SoilSampleItemManageHis'
+let LODOP
+export default {
+  components: {
+    SoilSampleItemManage
+  },
+  data() {
+    return {
+      formId: 'soilSampleManage',
+      currentComponent: '',
+      btn: [
+        {
+          type: 'success',
+          id: 'ZBC',
+          name: '打印标签'
+        }
+      ],
+      itemList: [],
+      indexList: [],
+      footerList: [
+        { id: '', name: '取消', type: '' },
+        { id: '', name: '确定', type: 'primary' }
+      ],
+      iconMsg: [
+        {
+          type: 'ios-beaker',
+          id: '',
+          name: '管理检测项目'
+        }
+        // { type: 'md-trash', id: '', name: '删除' }
+      ],
+      entrustId: '', // 委托id
+      showModal: false,
+      recordHis: false,
+      searchOpen: true,
+      modalTitle: '管理样品',
+      selectIds: [],
+      selectData: {},
+      getPage: {},
+      pageColumns: [
+        { title: '试样编号', key: 'sampleCode', width: 100, fixed: 'left' },
+        { title: '试样深度', key: 'sampleDepth', width: 100 },
+        { title: '现场编号', key: 'siteNo', width: 100 },
+        { title: '土质描述', key: 'sampleDescribe', width: 160 },
+        { title: '土质描述详情', key: 'describeDetail', width: 160 },
+        { title: '样品包装类型', key: 'samplePack', width: 120 }
+      ],
+      sampleId: '',
+      dateList: [],
+      formObj: {
+        entrustId: undefined,
+        sampleCode: undefined
+      }
+    }
+  },
+  computed: {
+    tableHeight: function() {
+      if (this.searchOpen) {
+        return this.$tableHeight('search')
+      } else {
+        return this.$tableHeight('noSearch')
+      }
+    }
+  },
+  methods: {
+    _inputChange: async function(info) {
+      const result = await soilEntrust.sampleEdit({
+        id: info.id,
+        describeDetail: info.describeDetail
+      })
+      if (result) {
+        this._resultChange('修改成功')
+      }
+    },
+    _handleRow(data) {
+      this.currentRow = data.row
+      this.currentIndex = data.rowIndex
+    },
+    _footerResult(name) {
+      switch (name) {
+        case '取消':
+          this._cancel()
+          break
+        case '确定':
+          this._ok()
+          break
+      }
+    },
+    _cancel() {
+      this.showModal = false
+    },
+    _ok() {
+      this.showModal = false
+      this.$refs.footerModal._hideLoading()
+      console.log(this.getPage)
+    },
+    _itemImportBack(data) {
+      if (this.selectIds === undefined || this.selectIds.length === 0) {
+        return false
+      }
+      if (data === undefined || data.length === 0) {
+        return false
+      }
+      this._importItemOk({ sampleIds: this.selectIds, drugItemList: data })
+    },
+
+    // _importItemOk: async function(data) {
+    //   const result = await drugSample.importSampleItemDTO(data)
+    //   if (result) {
+    //     this.$Message.success('导入成功！')
+    //     await this._page()
+    //   }
+    // },
+
+    _modalResult(data1, data2) {
+      switch (this.currentComponent) {
+        case 'CopyModal':
+          if (data1 === 0) {
+            this._copySample(data2)
+          } else {
+            this._copyAll(data2)
+          }
+          break
+        default:
+          this._search()
+      }
+    },
+    _dateChange(data) {
+      this.formObj.ctimeBegin = data[0]
+      this.formObj.ctimeEnd = data[1]
+    },
+    _btnClick(msg, componentName) {
+      this.currentComponent = componentName
+      this.$nextTick(function() {
+        switch (msg) {
+          case '添加':
+            this._editModal(false)
+            break
+          case '复制历史样品':
+            this._copyHisSample()
+            break
+          case '导入样品':
+            this._importSample()
+            break
+          case '导入检测项目':
+            this._importItem()
+            break
+          case '导入检测项目包':
+            this._importItemPackage()
+            break
+          case '打印标签':
+            this._printLabel()
+            break
+          case '试样制备':
+            this._samplePre()
+            break
+          case '批量填写土质描述详情':
+            this._writeDetail(this.selectIds)
+            break
+          case '复制历史样品检测项目':
+            this._copyHisItem()
+            break
+          case '删除':
+            this._deleteSelected()
+            break
+          case '导出':
+            this._exportSample()
+            break
+          case '添加模拟样品':
+            this._editImitateModal(false)
+            break
+          case 'search':
+            this.searchOpen = !this.searchOpen
+            break
+        }
+      })
+    },
+    _samplePre() {
+      if (this.selectIds.length === 0) {
+        this.$message.warning('至少选择一条数据')
+      } else {
+        this.$refs.preModal._open(this.selectIds.join(','))
+      }
+    },
+    _writeDetail(id) {
+      if (this.selectIds.length === 0) {
+        this.$Message.warning('请至少选中一条样品数据！')
+      } else {
+        const ids = id.join(',')
+        this.$refs.writeDetailModal._open(ids)
+      }
+    },
+    _exportSample() {
+      if (this.selectIds.length === 0) {
+        this.$Message.warning('请至少选择一条样品')
+      } else {
+        this.$Modal.confirm({
+          title: '提示',
+          content: '确定导出这' + this.selectIds.length + '条样品',
+          onOk: () => {
+            http.open(
+              '/food/v1/sample/company/export',
+              { ids: this.selectIds.join(',') },
+              '_blank'
+            )
+          }
+        })
+      }
+    },
+    _copyHisSample() {
+      this.$refs.refModal._open(this.entrustId)
+    },
+
+    _iconClick(res, data, componentName, index) {
+      this.currentComponent = componentName
+      this.$nextTick(function() {
+        switch (res) {
+          case '管理检测项目':
+            this._itemManage(data.id)
+            break
+          case '制备详情':
+            this._preEdit(data.id)
+            break
+          case '编辑':
+            this._editModal(true, data)
+            break
+          case '复制':
+            this._copy(data)
+            break
+          case '删除':
+            console.log(index)
+            this._deleteById(data.id)
+            break
+          case '附件':
+            this.$refs.refModal._open(data.id, 'sampleId')
+            break
+        }
+      })
+    },
+    _preEdit(id) {
+      this.$refs.preHisModal._open(id)
+    },
+    _itemManage(data) {
+      // 管理检测项目
+      if (this.recordHis) {
+        this.$refs.sampleItemManage._openRecord(data)
+      } else {
+        this.$refs.sampleItemManage._open(data)
+      }
+    },
+    _tableResultChange(msg, data) {
+      const selectIds = []
+      switch (msg) {
+        case 'selectData':
+          for (let i = 0; i < data.length; i++) {
+            selectIds.push(data[i].id)
+          }
+          this.selectIds = selectIds
+          this.selectData = data
+          break
+        case 'allSelect':
+          console.log('123465798', data)
+          this.allSelect(data)
+          break
+        case 'iconClick':
+          this._iconClick(data.name, data.rowData)
+          break
+        case 'changeSize':
+          this._page()
+          break
+      }
+    },
+    allSelect(data) {
+      this.indexList = []
+      for (let i = 0; i < data.length; i++) {
+        this.indexList.push(data[i].index)
+      }
+      console.log('索引', this.indexList)
+    },
+    _open(id) {
+      this.formObj = this.$resetFields(this.formObj)
+      this.dateList = []
+      this.showModal = true
+      this.formObj.entrustId = id // 委托id
+      console.log(this.entrustId)
+      this.$refs.pageTable._hideLoading()
+      this._page()
+    },
+    _openHis(id) {
+      this.formObj = this.$resetFields(this.formObj)
+      this.dateList = []
+      this.showModal = true
+      this.formObj.entrustId = id // 委托id
+      console.log(this.entrustId)
+      this.$refs.pageTable._hideLoading()
+      this.recordHis = true
+      this._page()
+    },
+    _formSearch() {
+      this.$refs.pageTable._pageChange(1)
+    },
+    _page: async function() {
+      const result = await soilTest.pageExpCheckSampleHis(this.formObj)
+      if (result) {
+        this.$refs.pageTable._hideLoading()
+        this.getPage = result
+      }
+    },
+    _deleteByIds(ids, content) {
+      this.$Modal.confirm({
+        title: '提示',
+        content: content || '确定删除该记录？',
+        onOk: () => {
+          // this.$store.dispatch('FoodSample/deleteByIds', ids).then(() => {
+          //   this._resultChange('删除成功!')
+          // })
+          this._deleteOk(ids)
+        }
+      })
+    },
+
+    // _deleteOk: async function(ids) {
+    //   const result = await drugSample.deleteById(ids)
+    //   if (result) {
+    //     this._resultChange('删除成功')
+    //   }
+    // },
+
+    _deleteById(id) {
+      // 删除一条记录
+      this._deleteByIds([id])
+    },
+    _deleteSelected() {
+      // 批量删除
+      const ids = this.selectIds
+      if (ids.length === 0) {
+        this.$Message.warning('请选择一条或多条数据！')
+      } else {
+        this._deleteByIds(ids, '确定删除 ' + ids.length + ' 条记录？')
+      }
+    },
+    _detailModal(data) {},
+    _editModal(edit, data) {
+      if (edit) {
+        console.log(data)
+        this.$refs.sampleManageEdit._open(data)
+      } else {
+        // 添加
+        this.$refs.refModal._open('', this.entrustId)
+      }
+    },
+    // 添加编辑模拟样品
+    _editImitateModal(edit, data) {
+      if (edit) {
+        // 模拟样品的编辑
+        const tempData = JSON.parse(JSON.stringify(data)) // 深拷贝
+        this.$refs.imitateModal._open(tempData, this.entrustId)
+      } else {
+        // 模拟样品的添加
+        this.$refs.imitateModal._open('', this.entrustId)
+      }
+    },
+    _search() {
+      this._page()
+    },
+    _resultChange(msg) {
+      this.$Message.success(msg)
+      this._page()
+    },
+    _copy(data) {
+      this.$refs.copyModal._open(data.id, data.type)
+    },
+    // 复制样品
+    _copySample(data) {
+      this.$store
+        .dispatch('FoodSample/getByCompanyId', data.sampleId)
+        .then(() => {
+          const result = this.$store.state.FoodSample.companyModel
+          if (data.type === 0) {
+            // 普通样品
+            this.currentComponent = 'FoodSampleCompanyEdit'
+            this.$nextTick(function() {
+              this.$refs.refModal._openCopySample(result)
+            })
+          } else if (data.type === 3) {
+            // 模拟样品
+            this.$refs.imitateModal._openCopySample(result)
+          }
+        })
+    },
+    _copyAll(data) {
+      this.$store
+        .dispatch('FoodSample/getByCompanyId', data.sampleId)
+        .then(() => {
+          const result = this.$store.state.FoodSample.companyModel
+          if (data.type === 0) {
+            // 普通样品
+            this.currentComponent = 'FoodSampleCompanyEdit'
+            this.$nextTick(function() {
+              this.$refs.refModal._openCopyAll(result)
+            })
+          } else if (data.type === 3) {
+            // 模拟样品
+            this.$refs.imitateModal._openCopyAll(result)
+          }
+        })
+    },
+    // 导入检测项目
+    _importItem() {
+      if (this.selectIds.length === 0) {
+        this.$Message.warning('请至少选中一条样品数据！')
+      } else {
+        this.$refs.sampleItemModal._open()
+        this.$refs.pageTable.checkedData()
+      }
+    },
+    // 导入检测项目包
+    _importItemPackage() {
+      if (this.selectIds.length === 0) {
+        this.$Message.warning('请至少选中一条样品数据！')
+      } else {
+        // this.$refs.refModal._open(this.selectIds, 'sample-rel-package-item')
+        this.$refs.itemPackageModal._open(
+          this.selectIds,
+          'sample-rel-package-item'
+        )
+      }
+    },
+
+    _printLabel() {
+      if (this.selectData.length === 0) {
+        this.$Message.warning('请至少选中一条样品数据！')
+      } else {
+        for (let m = 0; m < this.selectData.length; m++) {
+          const row = this.selectData[m]
+          this._printLabelOk(row)
+        }
+      }
+    },
+
+    _printLabelOk(row) {
+      LODOP = getLodop()
+      if (LODOP === 'undefined' || LODOP === undefined) {
+        this._pluginDownload()
+        return false
+      }
+      if (LODOP.GET_PRINTER_COUNT() === 0) {
+        this.$Messager.warning('系统未关联打印机,请确认....')
+        return false
+      }
+
+      LODOP.PRINT_INITA('0mm', '0mm', '70.01mm', '50.01mm', '样品标签打印')
+      LODOP.ADD_PRINT_LINE(36, 15, 35, 251, 0, 1)
+      LODOP.ADD_PRINT_LINE(74, 15, 73, 251, 0, 1)
+      LODOP.ADD_PRINT_LINE(107, 15, 106, 251, 0, 1)
+      LODOP.ADD_PRINT_LINE(140, 15, 139, 251, 0, 1)
+      LODOP.ADD_PRINT_LINE(175, 15, 174, 251, 0, 1)
+      LODOP.ADD_PRINT_LINE(35, 15, 174, 16, 0, 1)
+      LODOP.ADD_PRINT_LINE(35, 74, 174, 75, 0, 1)
+      LODOP.ADD_PRINT_LINE(35, 251, 174, 252, 0, 1)
+      LODOP.ADD_PRINT_TEXT(49, 17, 59, 20, '样品名称')
+      LODOP.ADD_PRINT_TEXT(82, 18, 59, 20, '样品编号')
+      LODOP.ADD_PRINT_TEXT(116, 17, 59, 20, '样品状态')
+      LODOP.ADD_PRINT_TEXT(151, 27, 39, 20, '备注')
+      LODOP.ADD_PRINT_TEXT(16, 95, 100, 20, '检测样品标签')
+      LODOP.SET_PRINT_STYLEA(0, 'Bold', 1)
+      LODOP.ADD_PRINT_TEXT(49, 78, 135, 20, row.name)
+      LODOP.ADD_PRINT_TEXT(82, 77, 136, 20, row.sampleCode)
+      LODOP.ADD_PRINT_TEXT(117, 76, 176, 20, '□未检 □在检 □已检 □留样')
+      if (row.surplus === '取回') {
+        LODOP.ADD_PRINT_TEXT(152, 77, 138, 20, '☑"取回 □服务方处理')
+      } else if (row.surplus === '服务方处理') {
+        LODOP.ADD_PRINT_TEXT(152, 77, 138, 20, '□取回 ☑服务方处理')
+      } else {
+        LODOP.ADD_PRINT_TEXT(152, 77, 138, 20, '□取回 □服务方处理')
+      }
+
+      LODOP.PRINT_DESIGN()
+    },
+
+    _copyHisItem() {
+      if (this.selectIds.length === 0) {
+        this.$Message.warning('请至少选中一条样品数据！')
+      } else {
+        this.$refs.refModal._open(this.selectIds)
+      }
+    },
+    _operationRecord(id) {
+      // 操作日志
+      this.$refs.recordModal._open(id)
+    }
+  }
+}
+</script>

pages/soil-test-manage/test-data-check/item-tabs/ItemRightList.vue

@@ -184,11 +184,7 @@ export default {
         switch (res) {
           case '查看原始记录':
             console.log(data)
-            if (data.originalRecordId) {
-              this._viewRecord(data.originalRecordId)
-            } else {
-              this.$Message.warning('尚未编制报告')
-            }
+            this._viewRecord(data.id)
             break
           case '查看指标':
             this._indexManage(data)

pages/soil-test-manage/test-data-check/sample-tabs/SampleRightList.vue

@@ -436,7 +436,11 @@ export default {
         switch (res) {
           case '查看原始记录':
             console.log(data)
-            this._viewRecord('1309434759937146882')
+            if (data.originalRecordId) {
+              this._viewRecord(data.originalRecordId)
+            } else {
+              this.$Message.warning('尚未填写原始记录')
+            }
             break
           case '查看指标':
             this._indexManage(data)

pages/soil-test-manage/test-input/item-tabs/ItemRightList.vue

@@ -172,9 +172,9 @@ export default {
         switch (res) {
           case '查看原始记录':
             console.log(data)
-            if (data.recorded === '是') {
+            if (data.recordId) {
               // this._viewRecord('1309434759937146882')
-              this._viewRecord(data.originalRecordId)
+              this._viewRecord(data.recordId)
             } else {
               this.$Message.warning('未填写原始记录')
             }
@@ -450,13 +450,12 @@ export default {
         const errorInfo = []
         for (let i = 0; i < this.selectData.length; i++) {
           console.log(this.selectData[i].recorded)
-          if (this.selectData[i].recorded === '否') {
+          if (this.selectData[i].recorded !== '否') {
             errorInfo.push(this.selectData[i].index + 1)
           }
         }
-        console.log('未编制报告', errorInfo)
         if (errorInfo.length !== 0) {
-          this.$Message.warning('第' + errorInfo + '条数据未编制报告')
+          this.$Message.warning('第' + errorInfo + '条数据已填写原始记录')
         } else {
           console.log('打开填写原始记录界面')
           this.$refs.recordModal._open(this.selectIds, this.entrustId)

pages/soil-test-manage/test-input/sample-tabs/SampleRightList.vue

@@ -373,13 +373,12 @@ export default {
         const errorInfo = []
         for (let i = 0; i < this.selectData.length; i++) {
           console.log(this.selectData[i].recorded)
-          if (this.selectData[i].recorded === '否') {
+          if (this.selectData[i].recorded !== '否') {
             errorInfo.push(this.selectData[i].index + 1)
           }
         }
-        console.log('未编制报告', errorInfo)
         if (errorInfo.length !== 0) {
-          this.$Message.warning('第' + errorInfo + '条数据未编制报告')
+          this.$Message.warning('第' + errorInfo + '条数据已填写原始记录')
         } else {
           console.log('打开填写原始记录界面')
           this.$refs.recordModal._open(this.selectIds, this.entrustId)
@@ -485,9 +484,9 @@ export default {
         switch (res) {
           case '查看原始记录':
             console.log(data)
-            if (data.recorded === '是') {
+            if (data.recordId) {
               // this._viewRecord('1309434759937146882')
-              this._viewRecord(data.originalRecordId)
+              this._viewRecord(data.recordId)
             } else {
               this.$Message.warning('未填写原始记录')
             }