修改了统计查询

pages/soil-statistics/experiment-progress/ExperimrntProgressDetail.vue

@@ -5,16 +5,16 @@
         <Row style="margin-top: 10px;">
           <Form id="search-form-sample-progress" :label-width="80" inline onsubmit="return false">
             <Form-item label="试验名称:" class="search-item">
-              <Input v-model="formObj.name" name="name" placeholder="请输入试验名称" style="width:100%" clearable @on-enter="_search"></Input>
+              <Input v-model="formObj.name" @on-enter="_search" name="name" placeholder="请输入试验名称" style="width:100%" clearable></Input>
             </Form-item>
             <Form-item label="钻孔名称:" class="search-item">
-              <Input v-model="formObj.boreholeName" name="boreholeName" placeholder="请输入钻孔名称" style="width:100%" clearable @on-enter="_search"></Input>
+              <Input v-model="formObj.boreholeName" @on-enter="_search" name="boreholeName" placeholder="请输入钻孔名称" style="width:100%" clearable></Input>
             </Form-item>
             <Form-item class="search-item">
-              <Button type="primary" class="width-80" @click="_search">搜索</Button>
+              <Button @click="_search" type="primary" class="width-80">搜索</Button>
             </Form-item>
           </Form>
-          <Col style="height: 100%;" span="24">
+          <Col style="height: 400px;" span="24">
             <VScrollFull ref="myscrollfull" :page-size="rows" @load="_loadData">
               <div slot="empty" style="text-align:center" class="gray-color">暂无数据</div>
               <SampleSteps ref="stepsModal" :info="sampleInfo"></SampleSteps>
@@ -36,11 +36,6 @@ export default {
     SampleSteps,
     VScrollFull
   },
-  computed: {
-    tableHeight: function() {
-      return this.$tableHeight('noSearch')
-    }
-  },
   data() {
     return {
       dateList: [],
@@ -60,6 +55,11 @@ export default {
       typeList: [{ name: '企业', value: 0 }, { name: '政府', value: 1 }]
     }
   },
+  computed: {
+    tableHeight: function() {
+      return this.$tableHeight('noBtn') - 200
+    }
+  },
   mounted() {
     // this._initData()
   },

pages/soil-statistics/sample-progress/SampleProgressDetail.vue

@@ -28,9 +28,9 @@
         </div>
       </Col>
       <Col span="24">
-        <BtnList :msg="btn" :open="searchOpen" :showSearchBtn="true" @on-result-change="_btnClick"
+        <btn-list :msg="btn" :open="searchOpen" :showSearchBtn="true" @on-result-change="_btnClick"
                  class="contHide">
-        </BtnList>
+        </btn-list>
       </Col>
       <Col span="24">
         <PTVXETable ref="pageTable" :pageColumns="pageColumns" :table-name="tableName"
@@ -84,10 +84,7 @@ export default {
         projectName: undefined,
         siteNo: undefined
       },
-      btn: [
-        { type: 'primary', id: '', name: '导出' },
-        { type: 'primary', id: '', name: '催单' }
-      ],
+      btn: [],
       getPage: {},
       pageColumns: [
         { title: '委托编号', key: 'entrustCode', width: 130 },