diff --git a/jero-web/src/views/documentManage/tags/dialog/TagForm.vue b/jero-web/src/views/documentManage/tags/dialog/TagForm.vue
index b82a2248b..10c63f01a 100644
--- a/jero-web/src/views/documentManage/tags/dialog/TagForm.vue
+++ b/jero-web/src/views/documentManage/tags/dialog/TagForm.vue
@@ -17,7 +17,15 @@
 <!--          所属模块-->
           <a-col :span="24">
             <a-form-model-item :label="$t('Module')" prop="isModel">
-              <j-dict-select-tag type="list" v-model="form.isModel" dictCode="module" :placeholder="$t('PleaseSelectModule')" />
+<!--              <j-dict-select-tag type="list" v-model="form.isModel" dictCode="module" :placeholder="$t('PleaseSelectModule')" />-->
+              <a-select :placeholder="$t('PleaseSelectModule')" v-model="form.isModel" @change="handleChange" :disabled="disableEdit">
+                <a-select-option :key="'1'" :value="'1'">
+                  {{$t('DocumentLibrary')}}
+                </a-select-option>
+                <a-select-option :key="'0'" :value="'0'">
+                  {{$t('DocumentSplitting')}}
+                </a-select-option>
+              </a-select>
             </a-form-model-item>
           </a-col>
 <!--          属性名称-->
@@ -73,7 +81,7 @@
                                  :placeholder="$t('SelectWhetherDisplayList')" />
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <a-col :span="24" v-if="submitKey=='1'">
             <a-form-model-item :label="$t('DisplayArea')" prop="showArea">
               <a-select :placeholder="$t('SelectDisplayArea')" v-model="form.showArea" @change="handleChange">
                 <a-select-option v-for="(item,index) in areaOptions" :key="item.id" :value="item.id">
@@ -89,14 +97,14 @@
             </a-form-model-item>
           </a-col>
 
-          <p class="tag-info">{{$t('DisplayOtherModules')}}</p>
-          <a-divider dashed />
-          <a-col :span="24">
+          <p class="tag-info" v-if="submitKey=='1'">{{$t('DisplayOtherModules')}}</p>
+          <a-divider dashed v-if="submitKey=='1'" />
+          <a-col :span="24" v-if="submitKey=='1'">
             <a-form-model-item :label="$t('RegulationsListDisplay')" prop="isShowLawsList">
               <j-dict-select-tag type="list"  v-model="form.isShowLawsList" dictCode="yn" :placeholder="$t('selectDisplayListRegulations')" />
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <a-col :span="24" v-if="submitKey=='1'">
             <a-form-model-item :label="$t('SearchCenterDisplay')" prop="isShowSearch">
               <j-dict-select-tag type="list"  v-model="form.isShowSearch" dictCode="yn" :placeholder="$t('selectSearchCenterDisplayed')" />
             </a-form-model-item>
@@ -147,13 +155,24 @@
       },
       editData:{
         type: Object,
+        default:{}
       },
       editId:{
-        type:String
+        type:String,
+        default:''
       },
       submitEdit:{
-        type:String
+        type:String,
+        default:''
       },
+      disableEdit:{
+        type:Boolean,
+        default:false
+      },
+      submitKey:{
+        type:String,
+        default:'1'
+      }
     },
     data () {
       return {
@@ -260,6 +279,9 @@
       },
       submitEdit(){
 
+      },
+      disableEdit(){
+
       }
     },
     computed: {
@@ -289,6 +311,7 @@
       this.showFlowData();
     },
     mounted() {
+      console.log('disableEdit',this.disableEdit)
       this.loadContent()
       this.loadShowArea()
       // console.log('edit',this.submitEdit)
diff --git a/jero-web/src/views/documentManage/tags/index.vue b/jero-web/src/views/documentManage/tags/index.vue
index ebecc9b1d..9c2118a61 100644
--- a/jero-web/src/views/documentManage/tags/index.vue
+++ b/jero-web/src/views/documentManage/tags/index.vue
@@ -3,10 +3,10 @@
     <a-card :bordered="false">
       <div class="tag-tab">
         <a-tabs type="card" @change="callback">
-          <a-tab-pane key="1" :tab="$t('TagItemManagement')">
+          <a-tab-pane key="11" :tab="$t('TagItemManagement')">
             <tag-item></tag-item>
           </a-tab-pane>
-          <a-tab-pane key="2" :tab="$t('LabelContentManagement')">
+          <a-tab-pane key="22" :tab="$t('LabelContentManagement')">
             <tag-content></tag-content>
           </a-tab-pane>
         </a-tabs>
diff --git a/jero-web/src/views/documentManage/tags/tabs/TagItem.vue b/jero-web/src/views/documentManage/tags/tabs/TagItem.vue
index d5b99735f..257160e40 100644
--- a/jero-web/src/views/documentManage/tags/tabs/TagItem.vue
+++ b/jero-web/src/views/documentManage/tags/tabs/TagItem.vue
@@ -29,7 +29,7 @@
           <a-icon type="plus" />
           {{$t('add')}}
       </div>
-      <div class="operator-text" @click="handleShow">
+      <div class="operator-text" @click="handleShow" v-if="key=='1'">
         <a-icon type="rocket" :rotate="45" />
         {{$t('ExhibitionAreaManagement')}}
       </div>
@@ -42,7 +42,7 @@
 
     <div class="new-tag-drawer">
       <a-spin :spinning="spinningDrawer" style="width: 100%;height:100%">
-        <tag-form v-if="drawerVisible&&editFlag" ref="realForm" @ok="closeTag" :isTagContent="isTagContent" :editData="editData" :editId=editId :submitEdit="submitEdit" :disabled="disableSubmit" normal> </tag-form>
+        <tag-form v-if="drawerVisible&&editFlag" ref="realForm" @ok="closeTag" :isTagContent="isTagContent" :editData="editData" :editId=editId :submitEdit="submitEdit" :disableEdit="disableEdit" :disabled="disableSubmit" :submitKey="submitKey"  normal> </tag-form>
 
         <div class="drawer-footer" v-if="drawerVisible&&editFlag">
           <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">{{$t('preservation')}}</a-button>
@@ -58,11 +58,12 @@
        <a-spin :spinning="spinning">
        <a-tabs default-active-key="1" @change="callbackTab">
          <a-tab-pane key="1" :tab="$t('DocumentLibrary')">
-           <tabTable v-if="spinning==false" :tableData="tableData" :columns="taglabColumns" :parm="queryParam" :selectedRowKey="selectedRowKey" @visibleEd="visibleEd" @visibleDelete="visibleDelete" @queryParams="queryParams" @selecteds="selecteds" :total="total"></tabTable>
+           <tab-table v-if="spinning==false" :tableData="tableData" :columns="taglabColumns"  :parm="queryParam" :selectedRowKey="selectedRowKey" @visibleEd="visibleEd" @visibleDelete="visibleDelete" @queryParams="queryParams" @selecteds="selecteds" :total="total"></tab-table>
+         </a-tab-pane>
+         <a-tab-pane key="2" :tab="$t('DocumentSplitting')">
+           <tab-table v-if="spinning==false" :tableData="tableData" :columns="taglabColumns1" :parm="queryParam" :selectedRowKey="selectedRowKey" @visibleEd="visibleEd" @visibleDelete="visibleDelete" @queryParams="queryParams" @selecteds="selecteds" :total="total"></tab-table>
+<!--           <tab-table  :tableData="tableData" :columns="taglabColumns" @visibleEd="visibleEd" @visibleDelete="visibleDelete" :total="total" :parm="queryParam"></tab-table>-->
          </a-tab-pane>
-<!--         <a-tab-pane key="2" :tab="$t('DocumentSplitting')" force-render>-->
-<!--           <tabTable :tableData="tableData" :columns="taglabColumns" @visibleEd="visibleEd" @visibleDelete="visibleDelete" @queryParams="queryParams" :total="total"></tabTable>-->
-<!--         </a-tab-pane>-->
        </a-tabs>
        </a-spin>
      </div>
@@ -142,7 +143,45 @@
             width: 170
           }
         ],
-
+        taglabColumns1: [
+          {
+            title: this.$t('ChineseName'),
+            align: "center",
+            width: 100,
+            dataIndex: 'dbFieldTxt',
+          },
+          {
+            title: this.$t('enName'),
+            align: "center",
+            width: 100,
+            dataIndex: 'dbFieldEnName',
+          },
+          {
+            title: this.$t('AttributeType'),
+            align: "center",
+            width: 100,
+            dataIndex: 'fieldShowTypeName',
+          },
+          {
+            title: this.$t('FieldLength'),
+            align: "center",
+            width: 80,
+            dataIndex: 'dbLength'
+          },
+          {
+            title: this.$t('DisplayOrder'),
+            align: "center",
+            width: 80,
+            dataIndex: 'orderNum'
+          },
+          {
+            title: this.$t('operation'),
+            dataIndex: 'action',
+            scopedSlots: {customRender: 'action'},
+            align: "center",
+            width: 170
+          }
+        ],
         areaVisible:false,
         areaTable:[],
         areaTotal:0,
@@ -156,8 +195,9 @@
         ids:[],
         disableSubmit:false,
         selectedRowKey:[],
-        spinningDrawer:false
-
+        spinningDrawer:false,
+        disableEdit:true,
+        submitKey:'1'
       }
     },
     mounted() {
@@ -234,11 +274,12 @@
       callbackTab(value){
         this.key=value
         if(value==1){
-
+          this.submitKey='1'
           this.loadData(1)
           // this.tableData=this.taglab
           // this.tableData=this.taglabSplit
         }else if(value==2){
+          this.submitKey='2'
           this.loadData(0)
         }
       },
@@ -264,6 +305,7 @@
       //编辑
       visibleEd(val,id,title){
         this.editFlag=false
+        this.disableEdit=true
         this.drawerVisible=val
         this.titleTag=title
         this.editId=id
@@ -375,6 +417,7 @@
       },
       handleAddPop(val){
         this.editData={}
+        this.disableEdit=false
         this.drawerVisible=true
         this.titleTag=this.$t('NewLabelItem')
         this.submitEdit='add'