Merge branch 'dev' of http://git.patzn.com/wangweidong/pt-cloud-service-soil-web into dev

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

@@ -177,13 +177,9 @@ export default {
       this.$nextTick(() => {
         this.$refs.refModal._open(id, type, name)
       })
-      // this.$refs.sampleManageModal._open(id, type, name)
     },
     _tableResultChange(msg, data) {
       switch (msg) {
-        case 'page':
-          this.getPage = this.$store.state.FoodContract.page
-          break
         case 'selectIds':
           this.selectIds = data
           break

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

@@ -7,7 +7,6 @@
           <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>

pages/soil-sample-manage/sample-receive/entrust-sample-manage/WaitReceive.vue

@@ -601,16 +601,6 @@ export default {
       } else {
         const ids = id.join(',')
         this.$refs.locationModal._open(ids)
-        // const tempData = {
-        //   ids: this.selectIds.join(',')
-        // }
-        // this.$Modal.confirm({
-        //   title: '提示',
-        //   content: '确定要接收这 ' + this.selectIds.length + ' 条数据？',
-        //   onOk: () => {
-        //     console.log(tempData)
-        //   }
-        // })
       }
     },
     _copyHisItem() {