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

pages/meter-send/sample-input/OriginalRecordClassTree.vue

@@ -88,13 +88,20 @@ export default {
     },
     // 原始记录模板管理查env所有的类别
     _page: async function(data) {
-      data.service = 'env'
       const result = await meterPrint.pageSampleInputRecordTemp(data)
       if (result) {
         console.log(result)
+        const treeObj = $.fn.zTree.init(
+          $('#' + this.treeId),
+          this.setting,
+          result
+        )
+        treeObj.expandAll(true)
       } else {
         console.log('请求失败')
       }
+      this.isloading = false
+      this.isTree = true
     },
     _request() {
       console.log('// 查询所有类别')
@@ -120,7 +127,7 @@ export default {
     _requestByBusinessTypeList() {
       console.log('采样/实验室查env下，不同类型（采样/实验室）的树数据')
       const data = {}
-      data.businessTypeList = this.businessTypeList
+      // data.businessTypeList = this.businessTypeList
       if (this.key) {
         data.name = this.key
       }

pages/meter-send/sample-input/SelectOriTempRecord.vue

@@ -3,7 +3,7 @@
     <Modal v-model="showModal" v-drag width="1100">
       <p slot="header">选择原始记录模板</p>
       <div>
-        <TwoCard @on-result-change="_refresh" left-name="原始记录模板类别" right-name="实验室原始记录模板名称" :gutter=16 left-span="8">
+        <TwoCard @on-result-change="_refresh" :gutter=16 left-name="原始记录模板类别" right-name="实验室原始记录模板名称" left-span="8">
           <template slot="left">
             <OriginalRecordClassTree ref="classTree" @on-result-change="_classData"></OriginalRecordClassTree>
           </template>
@@ -60,6 +60,7 @@
  */
 import Global from '../../../api/config'
 import TwoCard from '../../../components/base/TwoCard'
+import { meterPrint } from '../../../api'
 import RecordIframe from './RecordIframe'
 import OriginalRecordClassTree from './OriginalRecordClassTree'
 let count = 0
@@ -76,9 +77,9 @@ export default {
       getPage: {},
       pageColumns: [{ title: '名称', key: 'title' }],
       formObj: {
-        id: '',
-        title: '',
-        businessTypeList: 0
+        // id: '',
+        title: ''
+        // businessTypeList: 0
       },
       selectData: [],
       itemIds: [],
@@ -140,25 +141,31 @@ export default {
     },
     _open(ids) {
       this.formObj = this.$resetFields(this.formObj)
+      console.log('852369', this.formObj)
       this._classTree()
       this.showModal = true
       this.itemIds = ids
-      this.formObj.businessTypeList = 0
-      // this._page()
+      // this.formObj.businessTypeList = 0
+      this._page()
       this.selectData = []
       this._hideLoading()
       count = 0
     },
-    _page() {
+    _page: async function(data) {
       // 只查实验室的
-      this.$refs.pageTable._page(
-        '',
-        'ElnTemplate/page',
-        this.$serializeFormSearch(this.formObj)
-      )
+      // this.$refs.pageTable._page(
+      //   '',
+      //   'ElnTemplate/page',
+      //   this.$serializeFormSearch(this.formObj)
+      // )
+      const result = await meterPrint.pageSampleTemplate(data)
+      if (result) {
+        this.getPage = result
+      }
     },
     _search() {
-      this.$refs.pageTable._pageChange(1)
+      // this.$refs.pageTable._pageChange(1)
+      this._page(this.formObj)
     },
     _tableResultChange(msg, data) {
       switch (msg) {