土工试验Lims

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

@@ -4,36 +4,36 @@
       <!--查询条件-->
       <Col span="24">
         <div>
-          <Form :label-width="100" v-show="searchOpen" inline onsubmit="return false">
+          <Form v-show="searchOpen" :label-width="100" inline onsubmit="return false">
             <label class="label-sign"></label>
             <Form-item label="委托编号:" class="search-item">
-              <Input @on-enter="_formSearch" v-model="formObj.entrustCode" placeholder="请输入委托编号" clearable/>
+              <Input v-model="formObj.entrustCode" placeholder="请输入委托编号" clearable @on-enter="_formSearch"/>
             </Form-item>
             <Form-item label="样品编号:" class="search-item">
-              <Input @on-enter="_formSearch" v-model="formObj.sampleCode" placeholder="请输入样品编号" clearable/>
+              <Input v-model="formObj.sampleCode" placeholder="请输入样品编号" clearable @on-enter="_formSearch"/>
             </Form-item>
             <Form-item class="search-btn">
-              <Button @click="_formSearch" type="primary">搜索</Button>
+              <Button type="primary" @click="_formSearch">搜索</Button>
             </Form-item>
           </Form>
         </div>
       </Col>
       <Col span="24">
-        <BtnList :msg="btn" :open="searchOpen" :showSearchBtn="true" @on-result-change="_btnClick"
-                 class="contHide">
+        <BtnList :msg="btn" :open="searchOpen" :show-search-btn="true" class="contHide"
+                 @on-result-change="_btnClick">
         </BtnList>
       </Col>
       <Col span="24">
-        <PTVXETable ref="pageTable" :pageColumns="pageColumns" :table-name="tableName"
-                    :tableHeight="tableHeight"
-                    @on-result-change="_tableResultChange" :getPage="getPage" select-data>
+        <PTVXETable ref="pageTable" :page-columns="pageColumns" :table-name="tableName"
+                    :table-height="tableHeight"
+                    :get-page="getPage" select-data @on-result-change="_tableResultChange">
           <vxe-table-column
             v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
+            :key="item.key"
             :field="item.key"
             :title="item.title"
             :min-width="item.width?item.width:200"
             :fixed="item.fixed?item.fixed:undefined"
-            :key="item.key"
             sortable>
             <template slot-scope="scope">
               <div v-if="item.date">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}</div>
@@ -106,9 +106,9 @@ export default {
   computed: {
     tableHeight: function() {
       if (this.searchOpen) {
-        return this.$tableHeight('', 300)
+        return this.$tableHeight('', 400)
       } else {
-        return this.$tableHeight('noSearch')
+        return this.$tableHeight('noSearch') + 50
       }
     }
   },