修改了试样检测选择样品生成项目报告

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

@@ -50,6 +50,9 @@ import CreateItemReport from './CreateItemReport'
 import CreateBatchItemReport from './CreateBatchItemReport'
 export default {
   components: { CreateItemReport, CreateBatchItemReport },
+  props: {
+    rightSelectData: null
+  },
   data() {
     return {
       currentComponent: '',
@@ -153,7 +156,9 @@ export default {
         case 'iconClick':
           const selcetName = []
           selcetName.push(data.rowData.name)
-          this.$emit('on-result-change', selcetName)
+          if (this.rightSelectData.length === 0) {
+            this.$emit('on-result-change', selcetName)
+          }
           this._iconClick(data.name, data.rowData, data.componentName)
           break
         case 'changeSize':
@@ -187,8 +192,15 @@ export default {
     },
     _itemReportMakeBatch() {
       if (this.selectDataName.length > 0) {
+        if (this.rightSelectData.length > 0) {
+          // this.itemName = data.name
+          this.batchSampleIds = this.rightSelectData
+        } else {
+          // console.log('12345767')
+          // this.itemName = data.name
+          this._searchBatchSampleId(this.id, this.selectDataName)
+        }
         // this.itemName = data.name
-        this._searchBatchSampleId(this.id, this.selectDataName)
         // this.selectId = data.id
         this.$refs.createBatchModal._open()
       } else {
@@ -196,8 +208,15 @@ export default {
       }
     },
     _itemReportMake(data) {
-      this.itemName = data.name
-      this._searchSampleId(this.id, data.name)
+      if (this.rightSelectData.length > 0) {
+        this.itemName = data.name
+        this.sampleIds = this.rightSelectData
+        console.log('点击生成报告', this.rightSelectData)
+      } else {
+        // console.log('12345767')
+        this.itemName = data.name
+        this._searchSampleId(this.id, data.name)
+      }
       // this.selectId = data.id
       this.$refs.createModal._open()
     },

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

@@ -593,6 +593,7 @@ export default {
           }
           this.selectIds = selectIds
           this.selectData = data
+          this.$emit('child-data', data)
           break
         case 'table-col':
           // 用户选中的表格列

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

@@ -2,10 +2,10 @@
   <div>
     <TwoColumnPage>
       <template slot="left">
-        <ItemLeftList ref="leftModal" @on-result-change="_leftResult"></ItemLeftList>
+        <ItemLeftList ref="leftModal" :rightSelectData =rightSelectData  @on-result-change="_leftResult"></ItemLeftList>
       </template>
       <template slot="right">
-        <ItemRightList ref="rightModal" @on-result-change="_rightResult"></ItemRightList>
+        <ItemRightList ref="rightModal" @child-data="_rightSelectData" @on-result-change="_rightResult"></ItemRightList>
       </template>
     </TwoColumnPage>
   </div>
@@ -24,7 +24,8 @@ export default {
   },
   data() {
     return {
-      id: ''
+      id: '',
+      rightSelectData: []
     }
   },
   methods: {
@@ -35,6 +36,16 @@ export default {
     _rightResult() {
       this.$refs.leftModal._page()
     },
+    _rightSelectData(data) {
+      this.rightSelectData = []
+      if (data.length > 0) {
+        const rightSelectId = []
+        for (let i = 0; i < data.length; i++) {
+          rightSelectId.push(data[i].id)
+        }
+        this.rightSelectData = rightSelectId
+      }
+    },
     _open(id) {
       this.id = id
       this.$refs.leftModal._open(this.id)