diff --git a/jero-web/src/views/documentManage/tags/tabs/tabTable.vue b/jero-web/src/views/documentManage/tags/tabs/tabTable.vue
index efad20c91..a99a89799 100644
--- a/jero-web/src/views/documentManage/tags/tabs/tabTable.vue
+++ b/jero-web/src/views/documentManage/tags/tabs/tabTable.vue
@@ -7,7 +7,7 @@
       rowKey="id"
       :columns="columns"
       :dataSource="tableData"
-      :pagination="ipagination"
+      :pagination="false"
       :loading="loading"
       :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
       @change="handleTableChange">
@@ -15,7 +15,7 @@
       <span slot="customTitle">属性名称</span>
       <span slot="action" slot-scope="text, record">
           <a @click="editVisible(record.id)" v-if="record.isReadOnly==0">编辑</a>
-          <a-divider type="vertical" />
+          <a-divider type="vertical" v-if="record.isReadOnly==0" />
         <a-popconfirm
           v-if="tableData.length&&record.isReadOnly==0"
           title="Sure to delete?"
@@ -26,6 +26,17 @@
 <!--          <a class="table-del" @click="deleteVisible(record.id)">删除</a>-->
         </span>
     </a-table>
+    <div class="page" v-if="tableData.length > 0">
+      <a-pagination
+        :show-total="total => `共 ${total} 条`"
+        show-quick-jumper
+        show-size-changer
+        :page-size.sync="queryParams.pageSize"
+        :total="total"
+        @change="onChangePage"
+        @showSizeChange="SizeChange"
+      />
+    </div>
   </div>
 </template>
 
@@ -34,6 +45,11 @@
     name: 'tabTable',
     data(){
       return{
+        queryParams:{
+          pageNo:1,
+          pageSize:10
+
+        },
         selectedRowKeys: [],
         loading: false,
         ipagination:true,
@@ -42,7 +58,8 @@
     },
     props:{
       tableData:Array,
-      columns:Array
+      columns:Array,
+      total:Number
     },
     mounted() {
       // console.log('colum',this.tableData,this.columns)
@@ -60,7 +77,17 @@
       },
       deleteVisible(id){
         this.$emit('visibleDelete',id)
-      }
+      },
+      //点击页数
+      onChangePage(page,pageSize){
+        this.queryParams.pageNo = page
+        this.$emit('queryParams',this.queryParams)
+      },
+      //一页显示条数
+      SizeChange(page,pageSize){
+        this.queryParams.pageSize = pageSize
+        this.$emit('queryParams',this.queryParams)
+      },
     }
   }
 </script>
@@ -70,5 +97,8 @@
     .table-del{
       color: red;
     }
+    .page{
+      margin-top: 20px;
+    }
   }
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/documentManage/tags/tabs/tagItem.vue b/jero-web/src/views/documentManage/tags/tabs/tagItem.vue
index c247144e8..257bd5550 100644
--- a/jero-web/src/views/documentManage/tags/tabs/tagItem.vue
+++ b/jero-web/src/views/documentManage/tags/tabs/tagItem.vue
@@ -1,58 +1,60 @@
 <template>
   <div class="tag-item">
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-row :gutter="24">
-          <a-col :md="6" :sm="12">
-            <a-form-item :label="'标签项名称'">
-              <j-input :placeholder="'请输入标签名称'" v-model="queryParam.tagName"></j-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <a-form-item :label="'显示区域'">
-              <a-select v-model="queryParam.area" :placeholder="$t('pleaseSelect')">
-                <a-select-option :value="item.value" v-for="item in areas">{{item.label}}</a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8">
+   <a-card>
+     <div class="table-page-search-wrapper">
+       <a-form layout="inline" @keyup.enter.native="searchQuery">
+         <a-row :gutter="24">
+           <a-col :md="6" :sm="12">
+             <a-form-item :label="'标签项名称'">
+               <j-input :placeholder="'请输入标签名称'" v-model="queryParam.dbFieldName"></j-input>
+             </a-form-item>
+           </a-col>
+           <a-col :md="6" :sm="8">
+             <a-form-item :label="'显示区域'">
+               <a-select v-model="queryParam.area" :placeholder="$t('pleaseSelect')">
+                 <a-select-option :value="item.value" v-for="item in areas">{{item.label}}</a-select-option>
+               </a-select>
+             </a-form-item>
+           </a-col>
+           <a-col :md="6" :sm="8">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">{{$t('query')}}</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">{{$t('reset')}}</a-button>
             </span>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-    <div class="table-operator" style="border-top: 5px">
-      <a-popover placement="right" v-model="typeVisible" trigger="click">
-        <template slot="content"  class="type-popover-content">
-          <div class="type-popover">
-            <p class="type type-input" @click="handleAddPop('input')">输入框类型</p>
-            <p class="type type-select" @click="handleAddPop('select')">下拉选类型</p>
-          </div>
-        </template>
-        <a-button type="primary">{{$t('add')}}</a-button>
-      </a-popover>
+           </a-col>
+         </a-row>
+       </a-form>
+     </div>
+     <div class="table-operator" style="border-top: 5px">
+       <a-popover placement="right" v-model="typeVisible" trigger="click">
+         <template slot="content"  class="type-popover-content">
+           <div class="type-popover">
+             <p class="type type-input" @click="handleAddPop('input')">输入框类型</p>
+             <p class="type type-select" @click="handleAddPop('select')">下拉选类型</p>
+           </div>
+         </template>
+         <a-button type="primary">{{$t('add')}}</a-button>
+       </a-popover>
 
-      <a-button type="primary" @click="handleShow">展示区域管理</a-button>
-    </div>
-    <a-drawer class="show-drawer" :title="titleTag" placement="right" width="1000px" @close="close" :visible="drawerVisible" :after-visible-change="afterVisibleChange" >
-      <new-drawer v-if="drawerVisible&&editFlag" :drawerVisible="drawerVisible" :isTagContent="isTagContent" :editData="editData" :editId="editId" :submitEdit="submitEdit" @closeTag="closeTag" ></new-drawer>
-    </a-drawer>
-    <a-modal class="show-area" v-model="areaVisible" title="展示区域管理" :footer="null" @cancel="hideModal">
-      <area-manage v-if="areaVisible" @diaHide="diaHide" :areaTable="areaTable" @submitOk="submitOk" @deleteOk="deleteOk" @updateOk="updateOk"></area-manage>
-    </a-modal>
-    <div class="tag-doc-tab">
-      <a-tabs default-active-key="1" @change="callbackTab">
-        <a-tab-pane key="1" tab="文档库">
-          <tabTable :tableData="tableData" :columns="taglabColumns" @visibleEd="visibleEd" @visibleDelete="visibleDelete" ></tabTable>
-        </a-tab-pane>
-        <a-tab-pane key="2" tab="文档拆分" force-render>
-          <tabTable :tableData="tableData" :columns="tagSplit" @visibleEd="visibleEd" @visibleDelete="visibleDelete"></tabTable>
-        </a-tab-pane>
-      </a-tabs>
-    </div>
+       <a-button type="primary" @click="handleShow">展示区域管理</a-button>
+     </div>
+     <a-drawer class="show-drawer" :title="titleTag" placement="right" width="1000px" @close="close" :visible="drawerVisible" :after-visible-change="afterVisibleChange" >
+       <new-drawer v-if="drawerVisible&&editFlag" :drawerVisible="drawerVisible" :isTagContent="isTagContent" :editData="editData" :editId="editId" :submitEdit="submitEdit" @closeTag="closeTag" ></new-drawer>
+     </a-drawer>
+     <a-modal class="show-area" v-model="areaVisible" title="展示区域管理" :footer="null" @cancel="hideModal">
+       <area-manage v-if="areaVisible" @diaHide="diaHide" :areaTable="areaTable" @submitOk="submitOk" @deleteOk="deleteOk" @updateOk="updateOk"></area-manage>
+     </a-modal>
+     <div class="tag-doc-tab">
+       <a-tabs default-active-key="1" @change="callbackTab">
+         <a-tab-pane key="1" tab="文档库">
+           <tabTable :tableData="tableData" :columns="taglabColumns" @visibleEd="visibleEd" @visibleDelete="visibleDelete"  @queryParams="queryParams" :total="total"></tabTable>
+         </a-tab-pane>
+         <a-tab-pane key="2" tab="文档拆分" force-render>
+           <tabTable :tableData="tableData" :columns="tagSplit" @visibleEd="visibleEd" @visibleDelete="visibleDelete" @queryParams="queryParams" :total="total"></tabTable>
+         </a-tab-pane>
+       </a-tabs>
+     </div>
+   </a-card>
   </div>
 </template>
 
@@ -73,8 +75,6 @@
     data(){
       return{
         queryParam:{
-          area:'',   //显示区域
-          tagName:'',   //标签项名称
           page:1,
           pageSize:10,
         },
@@ -86,11 +86,11 @@
         areas:[
           {
             value: 1,
-            label:'文档库'
+            label:'基本信息'
           },
           {
             value:2,
-            label:'文档条款'
+            label:'文本信息'
           }
         ],
         tableData:[],
@@ -201,6 +201,7 @@
         editId:'',
         submitEdit:'add',
         key:1,
+        total:0
       }
     },
     mounted() {
@@ -208,10 +209,18 @@
     },
     methods:{
       searchQuery(){
-
+        if(this.key==1){
+          this.loadData(1)
+        }else if(this.key==2){
+          this.loadData(0)
+        }
       },
       searchReset(){
-
+        this.queryParam={
+          pageNo:0,
+          pageSize: 10
+        }
+        this.searchQuery()
       },
       handleAdd(){
         this.drawerVisible=true
@@ -230,6 +239,7 @@
       //标签项管理文档库初始数据
       loadData(val){
         let params={
+          ...this.queryParam,
           isModel:1
         }
         if(val==1){
@@ -239,6 +249,7 @@
         }
         getAction(`tag/onlCgformTag/page`,params).then(res=>{
           if(res.success){
+            this.total=res.result.total
             this.tableData= [ ...res.result.records]
           }
         })
@@ -345,6 +356,16 @@
 
           }
         })
+      },
+      //接收查询条件
+      queryParams(val){
+        this.queryParam=val
+        if(this.key==1){
+          this.loadData(1)
+        }else if(this.key==2){
+          this.loadData(0)
+        }
+
       }
     }
   }