土工试验Lims

pages/soil-test-manage/test-input/SoilAppendix.vue

@@ -3,35 +3,35 @@
     <Row>
       <!--查询-->
       <Col span="24">
-        <Form :label-width="80" v-show="searchOpen" inline onsubmit="return false">
+        <Form v-show="searchOpen" :label-width="80" inline onsubmit="return false">
           <label class="label-sign"></label>
           <Form-item class="search-item" label="模板名称:">
-            <Input v-model="formObj.title" @on-enter="_formSearch" placeholder="请输入模板名称" clearable></Input>
+            <Input v-model="formObj.title" placeholder="请输入模板名称" clearable @on-enter="_formSearch"></Input>
           </Form-item>
           <Form-item class="search-item" label="委托编号:">
-            <Input v-model="formObj.entrustCode" @on-enter="_formSearch" placeholder="请输入委托编号" clearable></Input>
+            <Input v-model="formObj.entrustCode" placeholder="请输入委托编号" clearable @on-enter="_formSearch"></Input>
           </Form-item>
           <Form-item class="search-btn">
-            <Button @click="_formSearch" type="primary">搜索</Button>
+            <Button type="primary" @click="_formSearch">搜索</Button>
           </Form-item>
         </Form>
       </Col>
       <!--操作-->
       <Col span="24">
-        <btn-list  :open="searchOpen" :showSearchBtn="true" @on-result-change="_btnClick"
-                 class="contHide"></btn-list>
+        <btn-list  :open="searchOpen" :show-search-btn="true" class="contHide"
+                 @on-result-change="_btnClick"></btn-list>
       </Col>
       <!-- 表格 -->
       <Col span="24">
-        <PTVXETable ref="pageTable" :tableHeight="tableHeight"
-                    @on-result-change="_tableResultChange" :icon-msg="iconMsg" :getPage="getPage">
+        <PTVXETable ref="pageTable" :table-height="tableHeight"
+                    :icon-msg="iconMsg" :get-page="getPage" @on-result-change="_tableResultChange">
           <vxe-table-column
+            v-for="item in pageColumns"
+            :key="item.key"
             :field="item.key"
             :title="item.title"
             :min-width="item.width?item.width:200"
-            :fixed="item.fixed?item.fixed:undefined"
-            v-for="item in pageColumns"
-            :key="item.key" sortable>
+            :fixed="item.fixed?item.fixed:undefined" sortable>
             <template slot-scope="scope">
               <div v-if="item.dateTime">
                 {{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd HH:MM'):''}}
@@ -75,9 +75,12 @@ export default {
         { type: 'md-trash', id: '', name: '删除' }
       ],
       pageColumns: [
-        { title: '附录名称', key: 'title' },
-        { title: '填写人', key: 'uname' },
-        { title: '创建时间', key: 'ctime', dateTime: true }
+        { title: '附录标题', key: 'title', width: 85 },
+        { title: '附录名称', key: 'name', width: 120 },
+        { title: '附件类型', key: 'remark', width: 85 },
+        { title: '样品编号', key: 'sampleCode', width: 90 },
+        { title: '填写人', key: 'uname', width: 85 },
+        { title: '创建时间', key: 'ctime', dateTime: true, width: 120 }
       ],
       formObj: {
         entrustId: ''