diff --git a/src/api/documentToolApi.js b/src/api/documentToolApi.js
index a06908e7..cc82e685 100644
--- a/src/api/documentToolApi.js
+++ b/src/api/documentToolApi.js
@@ -17,13 +17,13 @@ const getDocSplitSearch = (params) => getAction('/clause/split/getQueryCondition
 // 文档拆分编辑-表单字段
 const getDocSplitEditForm = (params) => getAction('/clause/split/getFormModel', params)
 // 文档拆分编辑-表单值
-const getDocSplitEditFormData = (params) => getAction('/split/sarFileSplitItems/getSplitItemsById', params)
+const getDocSplitEditFormData = (params) => getAction('/laws/DocumentTool/documentSplit/queryDocumentSplitDetailById', params)
 // 文档拆分编辑-新增条款
 const addClause = (params) => postAction('/split/sarFileSplitItems/addSplitItems', params)
 // 文档拆分编辑-编辑条款
-const editClause = (params) => postAction('/split/sarFileSplitItems/updateSplitItems', params)
+const editClause = (params) => postAction('/laws/DocumentTool/documentSplit/editDocumentSplitDetail', params)
 // 文档拆分编辑-获取条款内容
-const getEditClauseContent = (params) => getAction('/split/sarFileSplitItemsVal/getItemsValList', params)
+const getEditClauseContent = (params) => getAction('/laws/DocumentTool/documentSplit/queryItemsValList', params)
 // 文档拆分编辑-删除树节点
 const deleteClauseTreeNode = (params) => getAction('/split/sarFileSplitMenu/deleteMenu', params)
 // 文档拆分编辑-树节点下移
@@ -31,7 +31,7 @@ const moveUpOrDownClauseTreeNode = (params) => postAction('/split/sarFileSplitMe
 // 文档拆分编辑-批量复制
 const batchCopyClause = (params) => getAction('/split/sarFileSplitItems/batchCopyItems', params)
 // 文档拆分编辑-合并条款
-const merageClause = (params) => getAction('/split/sarFileSplitItems/batchMergeItems', params)
+const merageClause = (params) => postAction('/laws/DocumentTool/documentSplit/mergeDocumentSplitDetail', params)
 // 文档拆分编辑-批量编辑-新增
 const addBatchEditClause = (params) => postAction('/split/sarFileSplitItems/addSplitItems', params)
 // 文档拆分编辑-批量编辑-编辑
@@ -42,6 +42,10 @@ const getFormForBatchEditClause = (params) => getAction('/split/sarFileSplitItem
 const getFormDataForBatchEditClause = (params) => getAction('/split/sarFileSplitItems/batchSet', params)
 // 文档拆分编辑-获取左侧树数据
 const getClauseTreeData = (params) => getAction('/split/sarFileSplitMenu/getSplitMenusByInfoId', params)
+// 文档拆分-编辑-树节点新增
+const addClauseTreeNode = (params) => postAction('/split/sarFileSplitMenu/addMenu', params)
+// 文档拆分-编辑-树节点编辑
+const editClauseTreeNode = (params) => postAction('/split/sarFileSplitMenu/updateMenu', params)
 
 // 文档对比-发布/撤回
 const withdrawPublication = (params) => postAction('/compare/sarFileCompareInfo/changeState', params)
@@ -92,6 +96,8 @@ export {
   getFormForBatchEditClause,
   getFormDataForBatchEditClause,
   getClauseTreeData,
+  addClauseTreeNode,
+  editClauseTreeNode,
 
   // 文档比对
   withdrawPublication,
diff --git a/src/components/splitUpload/SplitAddClauseUploadImage.vue b/src/components/splitUpload/SplitAddClauseUploadImage.vue
index de3d4bf8..3eef7544 100644
--- a/src/components/splitUpload/SplitAddClauseUploadImage.vue
+++ b/src/components/splitUpload/SplitAddClauseUploadImage.vue
@@ -1,6 +1,6 @@
 <template>
   <a-modal
-    v-model="visible"
+    v-model="uploadVisible"
     :maskClosable="false"
     :footer="[]"
     :title="title"
@@ -41,7 +41,7 @@ export default {
   ],
   data () {
     return {
-      visible: false,
+      uploadVisible: false,
       uploadAction: window._CONFIG.domianURL + '/split/sarFileSplitItems/upload',
       downLoadFileUrl: window._CONFIG.domianPreviewURL + '/sys/common/static',
       fileList: [],
@@ -58,7 +58,7 @@ export default {
   },
   methods: {
     open () {
-      this.visible = true
+      this.uploadVisible = true
     },
     perentHandleFunc (data) {
       this.myFileList = data
@@ -128,7 +128,7 @@ export default {
             })
             this.$emit('uploadSuccess', this.fileList, fileList)
             if (this.uploadFileFlag === 0) {
-              this.visible = false
+              this.uploadVisible = false
             }
             if (this.myFileList.length > 0) {
               this.$message.destroy()
@@ -162,7 +162,7 @@ export default {
               // console.log('file111111',this.fileList,fileList,file,this.uploadFileFlag)
               this.$emit('uploadSuccess', file, this.fileList, fileList)
               if (this.uploadFileFlag === 0) {
-                this.visible = false
+                this.uploadVisible = false
               }
               // console.log('uplossss',this.fileList,fileList)
               if (this.myFileList.length > 0) {
@@ -187,7 +187,7 @@ export default {
       this.previewImage = file.response.path
     },
     handlePreImgCancel () {
-      this.visible = false
+      this.uploadVisible = false
     }
   }
 }
diff --git a/src/enums/commonEnums.js b/src/enums/commonEnums.js
index bcd22b3e..0e4f872b 100644
--- a/src/enums/commonEnums.js
+++ b/src/enums/commonEnums.js
@@ -96,3 +96,10 @@ export const SplitStatus = {
   EDITING: { text: '编辑中', value: '1' },
   RELEASED: { text: '已发布', value: '2' }
 }
+
+// 文档拆分-条款内容类型
+export const TypeOfClauseItem = {
+  TEXT: { text: '文本', value: 'TEXT' },
+  TABLE: { text: '表格', value: 'TABLE' },
+  IMG: { text: '图片', value: 'IMG' }
+}
diff --git a/src/views/documentTool/documentSplit/DocumentSplit.vue b/src/views/documentTool/documentSplit/DocumentSplit.vue
index 4c5cf978..0163b339 100644
--- a/src/views/documentTool/documentSplit/DocumentSplit.vue
+++ b/src/views/documentTool/documentSplit/DocumentSplit.vue
@@ -158,7 +158,7 @@ export default {
         },
         // 文件状态
         {
-          dataIndex: 'fileType',
+          dataIndex: 'fileType_dictText',
           title: this.$t('docTool.split.fileStatus'),
           width: 150
         },
@@ -202,9 +202,9 @@ export default {
         }
       ],
       url: {
-        list: '/split/sarFileSplitInfo/page', // 表格数据
-        deleteBatch: '/split/sarFileSplitInfo/deleteBatch', // 批量删除
-        deleteUrl: '/split/sarFileSplitInfo/delete',
+        list: '/laws/DocumentTool/documentSplit/queryByPage', // 表格数据
+        deleteBatch: '/laws/DocumentTool/documentSplit/deleteBatch', // 批量删除
+        delete: '/laws/DocumentTool/documentSplit/delete',
         backDocument: '' // 回传至文档库
       }
     }
diff --git a/src/views/documentTool/documentSplit/DocumentSplitDetail.vue b/src/views/documentTool/documentSplit/DocumentSplitDetail.vue
index 3171ed02..2e5a4f96 100644
--- a/src/views/documentTool/documentSplit/DocumentSplitDetail.vue
+++ b/src/views/documentTool/documentSplit/DocumentSplitDetail.vue
@@ -3,7 +3,7 @@
     <div class="page-left-right-layout">
       <!--树部分-->
       <div class="page-left-box">
-        <a-input-search class="tree-search" v-model="searchValue" :placeholder="$t('nodeQuickLookup')" @search="onSearch" />
+        <a-input-search class="tree-search" v-model="searchValue" :placeholder="$t('nodeQuickLookup')" @search="onSearch"/>
         <div class="page-tree-box page-tree-box-has-search">
           <a-spin :spinning="loading">
             <a-tree :show-line="true" :show-icon="true" :tree-data="treeData" :selected-keys="selectedKeys">
@@ -12,7 +12,7 @@
                      @mouseenter="handleTreeMouseover(record.id)"
                      @mouseleave="handleTreeMouseout(record.id)"
                      @click="handleSelectTreeNode(record)">
-                  <a-icon class="parent-node-icon" type="folder" v-if="record.dataRef.children && record.dataRef.children.length > 0" />
+                  <a-icon class="parent-node-icon" type="folder" v-if="record.dataRef.children && record.dataRef.children.length > 0"/>
                   <a-tooltip>
                     <template #title>
                       {{ record.name }}{{ record.itemName }}
@@ -24,21 +24,20 @@
                     <a-button icon="plus"
                               class="tree-operate-node-btn"
                               @click.stop="orgAdd(record)"
-                              v-has="'split:sarFileSplitMenu:add'">
-                    </a-button>
+                              v-has="'split:sarFileSplitMenu:add'"></a-button>
                     <!--编辑-->
                     <a-button class="tree-operate-node-btn"
                               @click.stop="orgEdit(record)"
                               v-if="record.pid"
                               v-has="'split:sarFileSplitMenu:update'">
-                      <i class="iconfont icon-bianji" />
+                      <i class="iconfont icon-bianji"/>
                     </a-button>
                     <!--删除，根节点不能删除-->
                     <a-button class="tree-operate-node-btn"
                               v-if="record.pid"
                               v-has="'split:sarFileSplitMenu:delete'"
                               @click.stop="orgDelete(record)">
-                      <i class="iconfont icon-shanchu_" />
+                      <i class="iconfont icon-shanchu_"/>
                     </a-button>
                     <!--节点上移，是否可以上移在树形数据中应该有字段标识-->
                     <a-button icon="up"
@@ -55,26 +54,6 @@
                               v-has="'split:sarFileSplitMenu:moveDown'">
                     </a-button>
                   </div>
-                  <!--<template #overlay>-->
-                  <!--  <a-menu v-if="$route.query.createBy === userInfo.username || administrators"-->
-                  <!--          @click="({ key: menuKey }) => onContextMenuClick(treeKey, menuKey, record)">-->
-                  <!--    <a-menu-item key="1" @click="orgAdd" v-has="'split:sarFileSplitMenu:add'">-->
-                  <!--      {{ $t('newNode') }}-->
-                  <!--    </a-menu-item>-->
-                  <!--    <a-menu-item key="2" @click="orgEdit" v-has="'split:sarFileSplitMenu:update'">-->
-                  <!--      {{ $t('modifyNode') }}-->
-                  <!--    </a-menu-item>-->
-                  <!--    <a-menu-item key="3" @click="orgDelete" v-if="deleteNode"-->
-                  <!--                 v-has="'split:sarFileSplitMenu:delete'">{{ $t('deleteNode') }}-->
-                  <!--    </a-menu-item>-->
-                  <!--    <a-menu-item key="4" @click="orgMoveUp" v-if="deleteNode && moveUpFlag"-->
-                  <!--                 v-has="'split:sarFileSplitMenu:moveUp'">{{ $t('moveUp') }}-->
-                  <!--    </a-menu-item>-->
-                  <!--    <a-menu-item key="5" @click="orgmoveDown" v-if="deleteNode && moveDownFlag"-->
-                  <!--                 v-has="'split:sarFileSplitMenu:moveDown'">{{ $t('moveDown') }}-->
-                  <!--    </a-menu-item>-->
-                  <!--  </a-menu>-->
-                  <!--</template>-->
                 </div>
               </template>
             </a-tree>
@@ -89,12 +68,12 @@
                   :get-query-condition-func="getQueryConditionFunc"
                   search-has="split:sarFileSplitItems:search"
                   @search="searchQuery"
-                  @reset="searchReset" />
+                  @reset="searchReset"/>
         </div>
         <!--操作按钮-->
         <div class="table-operator">
           <!--新增-->
-          <a-button icon="plus" type="primary" @click="handleAdd" v-has="'split:sarFileSplitItems:add'">{{ $t('newlyAdded') }}</a-button>
+          <!--<a-button icon="plus" type="primary" @click="handleAdd" v-has="'split:sarFileSplitItems:add'">{{ $t('newlyAdded') }}</a-button>-->
           <!--导入-->
           <a-upload name="file"
                     :showUploadList="false"
@@ -114,7 +93,10 @@
             {{ $t('export') }}
           </a-button>
           <!--批量删除-->
-          <a-button type="primary" icon="delete" ghost @click="batchDel" v-has="'split:sarFileSplitItems:delete'">{{ $t('batchDelete') }}</a-button>
+          <a-button type="primary" icon="delete" ghost @click="batchDel" v-has="'split:sarFileSplitItems:delete'">{{
+              $t('batchDelete')
+            }}
+          </a-button>
           <!--模板下载-->
           <a-button type="primary"
                     icon="download"
@@ -124,7 +106,7 @@
             {{ $t('templateDownload') }}
           </a-button>
           <!--批量复制-->
-          <a-button type="primary" ghost @click="handleCopyManage" v-has="'split:sarFileSplitItems:copy'">
+          <a-button type="primary" ghost @click="handleCopy" v-has="'split:sarFileSplitItems:copy'">
             {{ $t('docTool.split.batchCopy') }}
           </a-button>
           <!--批量编辑-->
@@ -132,7 +114,7 @@
             {{ $t('docTool.split.batchEdit') }}
           </a-button>
           <!--合并条款-->
-          <a-button type="primary" ghost @click="handleMergeManage" v-has="'split:sarFileSplitItems:merge'">
+          <a-button type="primary" ghost @click="handleMerge" v-has="'split:sarFileSplitItems:merge'">
             {{ $t('docTool.split.mergerClause') }}
           </a-button>
         </div>
@@ -147,7 +129,8 @@
             :pagination="ipagination"
             :scroll="{x: '100%'}"
             :operation-list="operationList"
-            @change="tableOnChange">
+            @change="tableOnChange"
+            @operationClick="operationClick">
 
             <!--        详情-->
             <template slot="detailClick" slot-scope="{text, record}">
@@ -159,7 +142,7 @@
             </template>
 
             <!--条文内容-->
-            <template slot="Item_content" slot-scope="{text, record}">
+            <template slot="item_content" slot-scope="{text, record}">
               <div class="table-text" @click="showContent(text,record)">
                 {{ text && text !== 'null' ? text.replace(/<.*?>/ig, ' ') : '' }}
               </div>
@@ -171,15 +154,15 @@
     </div>
 
     <!--  条款详情  -->
-    <split-clause-detail ref="splitClauseDetail"></split-clause-detail>
+    <split-clause-detail ref="splitClauseDetail"/>
     <!--  添加节点  -->
-    <split-detail-node-add ref="splitDetailNodeAdd" @ok="nodeAddOk" @update="nodeUpdateOk"></split-detail-node-add>
+    <split-detail-node-add ref="splitDetailNodeAdd" @ok="nodeAddOk"/>
     <!--  批量设置弹框  -->
-    <split-detail-batch-setting ref="splitDetailBatchSetting" @ok="batchSettingOk"></split-detail-batch-setting>
+    <split-detail-batch-setting ref="splitDetailBatchSetting" @ok="batchSettingOk"/>
     <!--条款添加-->
     <split-add-form ref="modalForm" :flag="'4'"
                     :url="url" :infoId="infoId" :menuId="menuId" :itemId="itemId"
-                    @sumber="sumber"></split-add-form>
+                    @sumber="sumber"/>
   </internal-detail-page>
 </template>
 
@@ -269,15 +252,15 @@ export default {
         }
       ],
       url: {
-        list: '/split/sarFileSplitItems/getSplitItemsByPage',
+        list: '/laws/DocumentTool/documentSplit/queryDocumentSplitDetail',
         importUrl: '/split/sarFileSplitItems/importSplitItems', // 导入
         exportXlsUrl: '/split/sarFileSplitItems/exportSplitInfoZip', // 导出
-        delete: '/split/sarFileSplitItems/batchDeleteItems', // 删除
-        deleteBatch: '/split/sarFileSplitItems/batchDeleteItems', // 批量删除
+        delete: '/laws/DocumentTool/documentSplit/deleteDocumentSplitDetail', // 删除
+        deleteBatch: '/laws/DocumentTool/documentSplit/deleteBatchDocumentSplitDetail', // 批量删除
         downTemplateUrl: '/split/sarFileSplitItems/exportTemplate' // 模板下载
       },
       disabledMixinsCreate: true,
-      tableSlotField: ['Item_content']
+      tableSlotField: ['item_content']
     }
   },
   computed: {
@@ -375,15 +358,13 @@ export default {
       this.$refs.splitDetailNodeAdd.edit(record.dataRef, this.infoId)
     },
     // 添加节点完成后的回调
-    nodeAddOk () {
+    nodeAddOk (expandId) {
+      if (expandId && expandId.length > 0) {
+        this.onExpand(expandId)
+      }
       this.loadMenuData()
       this.loadData()
     },
-    // 修改节点完成后的回调
-    nodeUpdateOk (expandId) {
-      this.onExpand(expandId)
-      this.loadMenuData()
-    },
     // 树形删除
     orgDelete (record) {
       this.$confirm({
@@ -428,7 +409,7 @@ export default {
       const query = {
         moveFlag: 'down',
         infoId: this.infoId,
-        SarFileSplitMenu: {
+        sarFileSplitMenu: {
           id: record.dataRef.id,
           pId: record.dataRef.pid,
           displaySeq: record.dataRef.displaySeq
@@ -444,11 +425,14 @@ export default {
         }
       })
     },
-    onContextMenuClick (treeKey, menuKey) {
-      // console.log(`treeKey: ${treeKey}, menuKey: ${menuKey}`);
-    },
-    // 复制按钮
-    handleCopyManage (record) {
+    /**
+     * 批量复制
+     */
+    handleCopy () {
+      if (!this.selectedRowKeys || this.selectedRowKeys.length === 0) {
+        this.$message.warning(this.$t('selectLeastOne'))
+        return
+      }
       const ids = []
       const infoIds = []
       const menuIds = []
@@ -485,42 +469,40 @@ export default {
     },
     // 新增
     handleAdd () {
-      // console.log('this.menuId',this.menuId)
+      if (!this.menuId) {
+        this.$message.warning(this.$t('docTool.split.selectDirectoryTerms'))
+        return
+      }
       if (this.menuId) {
         this.formTitle = this.$t('add')
         this.itemId = ''
-        this.addVisible = true
-        this.$nextTick(() => {
-          this.$refs.modalForm.add()
-        })
-      } else {
-        this.$message.warning(this.$t('selectDirectoryTerms'))
+        this.$refs.modalForm.add()
       }
     },
     // 合并条款
-    handleMergeManage () {
+    handleMerge () {
       if (this.selectedRowKeys && this.selectedRowKeys.length < 2) {
         this.$message.warning(this.$t('leastTwo'))
-      } else {
-        const ids = this.selectedRowKeys.join(',')
-        this.$confirm({
-          title: this.$t('docTool.split.mergeTerms'),
-          content: '',
-          onOk: () => {
-            merageClause({ ids: ids }).then(res => {
-              if (res.data.success) {
-                this.$message.success(this.$t('operationSuccessful'))
-                this.onClearSelected()
-                this.loadMenuData()
-                this.loadData()
-                this.selectedRowKeys = []
-              } else {
-                this.$message.warning(this.$t('operationFailed'))
-              }
-            })
-          }
-        })
+        return
       }
+      const ids = this.selectedRowKeys.join(',')
+      this.$confirm({
+        title: this.$t('docTool.split.mergeTerms'),
+        content: '',
+        onOk: () => {
+          merageClause({ ids: ids }).then(res => {
+            if (res.data.success) {
+              this.$message.success(this.$t('operationSuccessful'))
+              this.onClearSelected()
+              this.loadMenuData()
+              this.loadData()
+              this.selectedRowKeys = []
+            } else {
+              this.$message.warning(this.$t('operationFailed'))
+            }
+          })
+        }
+      })
     },
     // 批量设置
     handleManage () {
diff --git a/src/views/documentTool/documentSplit/modules/SplitAddForm.vue b/src/views/documentTool/documentSplit/modules/SplitAddForm.vue
index 486feabc..3d3a0217 100644
--- a/src/views/documentTool/documentSplit/modules/SplitAddForm.vue
+++ b/src/views/documentTool/documentSplit/modules/SplitAddForm.vue
@@ -3,235 +3,179 @@
     :title="formTitle"
     placement="right"
     :visible="visible"
-    @close="splitCancel"
+    @close="handleCancel"
     width="900"
     class="custom-drawer-style">
+
     <div class="custom-drawer-style-scroll">
       <a-spin :spinning="loading">
-        <a-form>
-          <a-form-model
-            class="split-content"
-            :model="formInline"
-            :rules="rules"
-            ref="splitEditForm"
-          >
-            <a-row :gutter="24">
-              <a-col :span="12" v-for="(item,index) in dataList" :key="index">
-                <div class="box-title-text" v-if="item.field_show_type === '1' || item.field_show_type === '11'">
-                  <div class="title-text">
-                    <span class="required" v-if="item.field_must_input === 1">*</span>
-                    <span class="title-text-text" :title="item.db_field_txt">{{ item.db_field_txt }}</span>
-                  </div>
-                  <a-form-model-item class="item-model" :prop="item.db_field_name">
-                    <a-input class="box-input"
-                             :disabled="disabled"
-                             v-model="formInline[item.db_field_name]"
-                             :placeholder="$t('pleaseEnter')+item.db_field_txt" />
-                  </a-form-model-item>
+        <!--表单部分-->
+        <a-form-model :model="formInline" v-if="isFormInline" class="form-add" :rules="rules" ref="ruleForm">
+          <div class="form-flex-box">
+            <template v-for="(item, index) in dataList">
+              <div :key="index"
+                   class="box-title-text form-flex-item-half"
+                   :class="{'form-flex-item-line': item.fieldShowType === FieldType.STANDARD_MORE.value}"
+                   v-if="!hiddenFieldList.includes(item.dbFieldName)">
+                <div class="title-text">
+                  <span class="required" v-if="item.fieldMustInput === '1'">*</span>
+                  <span class="title-text-text" :title="item.dbFieldTxt">{{ item.dbFieldTxt }}</span>
                 </div>
-                <div class="box-title-text" v-else-if="item.field_show_type === '2'">
-                  <div class="title-text">
-                    <span class="required" v-if="item.field_must_input === 1">*</span>
-                    <span class="title-text-text" :title="item.db_field_txt">{{ item.db_field_txt }}</span>
-                  </div>
-                  <a-form-model-item class="item-model" :prop="item.db_field_name">
-                    <a-input-number class="box-input"
-                                    :placeholder="$t('pleaseEnter')+item.db_field_txt"
-                                    :disabled="disabled"
-                                    :min="0"
-                                    v-model="formInline[item.db_field_name]" :max="99999999" />
-                  </a-form-model-item>
-                </div>
-
-                <div class="box-title-text" v-else-if="item.field_show_type === '3'">
-                  <div class="title-text">
-                    <span class="required" v-if="item.field_must_input === 1">*</span>
-                    <span class="title-text-text" :title="item.db_field_txt">{{ item.db_field_txt }}</span>
-                  </div>
-                  <a-form-model-item class="item-model" :prop="item.db_field_name">
-                    <j-dict-select-tag class="box-input" v-model="formInline[item.db_field_name]"
-                                       :disabled="disabled"
-                                       @input="handleInput(item.db_field_name)"
-                                       :placeholder="$t('pleaseSelect')+item.db_field_txt"
-                                       :type="'select'"
-                                       :triggerChange="false" :dictCode="item.dict_field" />
-                  </a-form-model-item>
-                </div>
-                <div class="box-title-text" v-else-if="item.field_show_type === '4'">
-                  <div class="title-text">
-                    <span class="required" v-if="item.field_must_input === 1">*</span>
-                    <span class="title-text-text" :title="item.db_field_txt">{{ item.db_field_txt }}</span>
-                  </div>
-                  <a-form-model-item class="item-model-multi" :prop="item.db_field_name">
-                    <j-multi-select-tag class="box-input" v-model="formInline[item.db_field_name]"
-                                        :disabled="disabled"
-                                        :placeholder="$t('pleaseSelect')+item.db_field_txt"
-                                        :type="'select'"
-                                        :triggerChange="false" :dictCode="item.dict_field" />
-                  </a-form-model-item>
-                </div>
-                <div class="box-title-text" v-else-if="item.field_show_type === '5'">
-                  <div class="title-text">
-                    <span class="required" v-if="item.field_must_input === 1">*</span>
-                    <span class="title-text-text" :title="item.db_field_txt">{{ item.db_field_txt }}</span>
-                  </div>
-                  <a-form-model-item class="item-model" :prop="item.db_field_name">
-                    <a-date-picker class="box-input"
-                                   format="YYYY-MM-DD"
-                                   value-format="YYYY-MM-DD"
-                                   :getCalendarContainer="(trigger) => trigger.parentNode"
-                                   v-model="formInline[item.db_field_name]"
-                                   :disabled="disabled"
-                                   style="width: 100%" />
-                  </a-form-model-item>
-                </div>
-                <div class="box-title-text" v-else-if="item.field_show_type === '6'">
-                  <div class="title-text">
-                    <span class="required" v-if="item.field_must_input === 1">*</span>
-                    <span class="title-text-text" :title="item.db_field_txt">{{ item.db_field_txt }}</span>
-                  </div>
-                  <a-form-model-item class="item-model" :prop="item.db_field_name">
-                    <a-range-picker class="box-input" v-model="formInline[item.db_field_name]"
-                                    :disabled="disabled"
-                                    @change="onChange(item.db_field_name)"></a-range-picker>
-                  </a-form-model-item>
-                </div>
-                <div class="box-title-text" v-else-if="item.field_show_type === '7'">
-                  <div class="title-text">
-                    <span class="required" v-if="item.field_must_input === 1">*</span>
-                    <span class="title-text-text" :title="item.db_field_txt">{{ item.db_field_txt }}</span>
-                  </div>
-                  <a-form-model-item class="item-model" :prop="item.db_field_name">
-                    <a-button type="primary" class="button-text"
-                              @click="clickButtonToUpload(item)">
-                      {{ (formInline[item.db_field_name] === 'null' || formInline[item.db_field_name] === '' ||
-                      formInline[item.db_field_name] === null) ? $t('clickUpload') : $t('viewUploadedFiles')
-                      }}
-                    </a-button>
-                  </a-form-model-item>
-                </div>
-                <div class="box-title-text" v-else-if="item.field_show_type === '8'">
-                  <div class="title-text">
-                    <span class="required" v-if="item.field_must_input === 1">*</span>
-                    <span class="title-text-text" :title="item.db_field_txt">{{ item.db_field_txt }}</span>
-                  </div>
-                  <a-form-model-item class="item-model" :prop="item.db_field_name">
-                    <a-textarea
-                      :placeholder="$t('pleaseEnter')+item.db_field_txt"
-                      :disabled="disabled"
-                      v-model="formInline[item.db_field_name]" :rows="4" />
-                  </a-form-model-item>
-                </div>
-                <div class="box-title-text" v-else-if="item.field_show_type === '10'">
-                  <div class="title-text">
-                    <span class="required" v-if="item.field_must_input === 1">*</span>
-                    <span class="title-text-text" :title="item.db_field_txt">{{ item.db_field_txt }}</span>
-                  </div>
-                  <a-form-model-item class="item-model" :prop="item.db_field_name">
-                    <standard-selection :query="item"
-                                        :disabled="disabled"
-                                        :standard="formInline"
-                                        v-model="formInline[item.db_field_name]" />
-                  </a-form-model-item>
-                </div>
-                <div class="box-title-text" v-else-if="item.field_show_type === 'RADIO'">
-                  <div class="title-text">
-                    <span class="required" v-if="item.field_must_input === 1">*</span>
-                    <span class="title-text-text" :title="item.db_field_txt">{{ item.db_field_txt }}</span>
-                  </div>
-                  <a-form-model-item class="item-model" :prop="item.db_field_name">
-                    <j-dict-select-tag v-model="formInline[item.db_field_name]"
-                                       :disabled="disabled"
-                                       class="box-input"
-                                       @input="handleInput(item.db_field_name)"
-                                       :placeholder="$t('pleaseSelect')+item.db_field_txt"
-                                       :type="'radio'" :triggerChange="false" :dictCode="item.dict_field" />
-                  </a-form-model-item>
-                </div>
-                <div class="box-title-text" :title="item.db_field_txt" v-else-if="item.field_show_type === '0'">
-                  <div class="title-text">
-                    <span class="required" v-if="item.field_must_input === 1">*</span>
-                    <span class="title-text-text">{{ item.db_field_txt }}</span>
-                  </div>
-                  <a-form-model-item class="item-model" :prop="item.db_field_name">
-                    <a-tree-select
-                      tree-node-filter-prop="title"
-                      v-model="formInline[item.db_field_name]"
-                      class="box-input"
-                      :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                      style="width: 100%"
-                      :tree-data="item.tree"
-                      tree-checkable
-                      :placeholder="$t('pleaseSelect')+item.db_field_txt"
-                      @change="changeTree"
-                    />
-
-                  </a-form-model-item>
-                </div>
-                <div class="box-title-text" v-else-if="item.field_show_type === 'CHECKBOX'">
-                  <div class="title-text">
-                    <span class="required" v-if="item.field_must_input === 1">*</span>
-                    <span class="title-text-text" :title="item.db_field_txt">{{ item.db_field_txt }}</span>
-                  </div>
-                  <a-form-model-item class="item-model-multi" :prop="item.db_field_name">
-                    <j-multi-select-tag class="box-input" v-model="formInline[item.db_field_name]"
-                                        :disabled="disabled"
-                                        :placeholder="$t('pleaseSelect')+item.db_field_txt"
-                                        :type="'checkbox'"
-                                        :triggerChange="false" :dictCode="item.dict_field" />
-                  </a-form-model-item>
-                </div>
-              </a-col>
-            </a-row>
-            <upload-file ref="uploadFile" @change="uploadFileChange" :return-url="false"></upload-file>
-
-            <span class="con-divider">{{ $t('docTool.split.clauseContent') }}</span>
-            <a-divider dashed />
-            <div class="table-operator">
-              <div class="operator-text" @click="splitAdd('-1')">
-                <a-icon type="plus" />
-                {{ $t('add') }}
+                <a-form-model-item class="item-model" :prop="item.dbFieldName">
+                  <!--   1, 日期单选  -->
+                  <a-date-picker v-if="item.fieldShowType === FieldType.DATE_SINGLE.value"
+                                 class="box-input"
+                                 :placeholder="$t('pleaseSelect')+item.dbFieldTxt"
+                                 :getCalendarContainer="(trigger) => trigger.parentNode"
+                                 format="YYYY-MM-DD"
+                                 value-format="YYYY-MM-DD"
+                                 v-model="formInline[item.dbFieldName]"
+                                 :disabled="disabled || disabledFieldList.includes(item.dbFieldName)"
+                                 style="width: 100%"/>
+                  <!--   2, 单选用户  -->
+                  <user-selection v-else-if="item.fieldShowType === FieldType.USER_SINGLE.value"
+                                  :placeholder="$t('pleaseSelect')+item.dbFieldTxt"
+                                  v-model="formInline[item.dbFieldName]"
+                                  :filedName="item.dbFieldName"
+                                  @nameChange="userSelectNameChange"
+                                  :nameStr="formInline[item.dbFieldName + '_dictText']"
+                                  type="radio"
+                                  :disabled="disabled || disabledFieldList.includes(item.dbFieldName)"/>
+                  <!--   3, 单选组织机构  -->
+                  <j-select-depart v-else-if="item.fieldShowType === FieldType.ORGAN_SINGLE.value"
+                                   v-model="formInline[item.dbFieldName]"
+                                   :backDepart="true"/>
+                  <!--   4, 日期多选  -->
+                  <j-multiple-date-picker v-else-if="item.fieldShowType === FieldType.DATE_MORE.value"
+                                          class="box-input"
+                                          v-model="formInline[item.dbFieldName]"
+                                          :fieldName="item.dbFieldName"
+                                          :disabled="disabled || disabledFieldList.includes(item.dbFieldName)"/>
+                  <!--   5, 多行文本  -->
+                  <a-textarea v-else-if="item.fieldShowType === FieldType.TEXTAREA.value"
+                              :placeholder="$t('pleaseEnter')+item.dbFieldTxt"
+                              :disabled="disabled || disabledFieldList.includes(item.dbFieldName)"
+                              :maxLength="500"
+                              v-model="formInline[item.dbFieldName]" :rows="4"/>
+                  <!--   6, 标准多选  -->
+                  <standard-selection v-else-if="item.fieldShowType === FieldType.STANDARD_MORE.value"
+                                      :source="flag"
+                                      :disabledSourceSearch="true"
+                                      :disabled="disabled || disabledFieldList.includes(item.dbFieldName)"
+                                      v-model="formInline[item.dbFieldName]"/>
+                  <!--   7, 多选组织机构  -->
+                  <j-select-depart v-else-if="item.fieldShowType === FieldType.ORGAN_MORE.value"
+                                   v-model="formInline[item.dbFieldName]"
+                                   :multi="true"
+                                   :backDepart="true"
+                                   :treeOpera="true"/>
+                  <!--   8, 上传文件  -->
+                  <a-button v-else-if="item.fieldShowType === FieldType.FILE_UP.value" type="primary" class="button-text"
+                            @click="clickButtonToUpload(item)">
+                    {{
+                      (formInline[item.dbFieldName] === 'null' || formInline[item.dbFieldName] === ''
+                        || formInline[item.dbFieldName] === null || formInline[item.dbFieldName] === undefined)
+                        ? $t('uploadFile.clickUpload')
+                        : $t('uploadFile.viewUploadedFiles')
+                    }}
+                  </a-button>
+                  <!--   9, 文本框  -->
+                  <a-input v-else-if="item.fieldShowType === FieldType.TEXT_BOX.value"
+                           class="box-input"
+                           :disabled="disabled || disabledFieldList.includes(item.dbFieldName)"
+                           v-model="formInline[item.dbFieldName]"
+                           :maxLength="50"
+                           :placeholder="specialPlaceholder[item.dbFieldName] || $t('pleaseEnter')+item.dbFieldTxt"/>
+                  <!--   10, 下拉单选（数据字典）  -->
+                  <j-dict-select-tag v-else-if="item.fieldShowType === FieldType.OPTION_SINGLE.value"
+                                     class="box-input"
+                                     v-model="formInline[item.dbFieldName]"
+                                     :disabled="disabled || disabledFieldList.includes(item.dbFieldName)"
+                                     :placeholder="$t('pleaseSelect')+item.dbFieldTxt"
+                                     :type="'select'"
+                                     :triggerChange="false"
+                                     :dictCode="item.dictField"/>
+                  <!--   11, 下拉多选（数据字典）  -->
+                  <j-multi-select-tag v-else-if="item.fieldShowType === FieldType.OPTION_MORE.value"
+                                      class="box-input"
+                                      v-model="formInline[item.dbFieldName]"
+                                      :disabled="disabled || disabledFieldList.includes(item.dbFieldName)"
+                                      :placeholder="$t('pleaseSelect')+item.dbFieldTxt"
+                                      :type="'select'"
+                                      :triggerChange="false"
+                                      :dictCode="item.dictField"/>
+                  <!--   12, 树选择       -->
+                  <a-tree-select
+                    v-else-if="item.fieldShowType === FieldType.TREE.value"
+                    v-model="formInline[item.dbFieldName]"
+                    :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                    style="width: 100%"
+                    :disabled="disabled || disabledFieldList.includes(item.dbFieldName)"
+                    :tree-data="optionsData[item.dbFieldName]"
+                    tree-checkable
+                    treeCheckStrictly
+                    :label-in-value="false"
+                    :placeholder="$t('pleaseSelect')+item.dbFieldTxt"/>
+                  <!--  14, 年份选择 -->
+                  <j-date v-else-if="item.fieldShowType === FieldType.YEAR_PICKER.value"
+                          show-type="year"
+                          :disabled="disabled || disabledFieldList.includes(item.dbFieldName)"
+                          v-model="formInline[item.dbFieldName]"
+                          :default-value="defaultValue[item.dbFieldName]"
+                          date-format="YYYY"
+                          :placeholder="$t('pleaseSelect')+item.dbFieldTxt"/>
+                  <!--   15, 树选择（单选）       -->
+                  <a-tree-select v-else-if="item.fieldShowType === FieldType.TREE_SINGLE.value"
+                                 v-model="formInline[item.dbFieldName]"
+                                 :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                                 style="width: 100%"
+                                 :disabled="disabled || disabledFieldList.includes(item.dbFieldName)"
+                                 :tree-data="optionsData[item.dbFieldName]"
+                                 :label-in-value="false"
+                                 :placeholder="$t('pleaseSelect')+item.dbFieldTxt"/>
+                </a-form-model-item>
               </div>
+            </template>
+          </div>
+          <upload-file ref="uploadFile" @change="uploadFileChange" :return-url="false"></upload-file>
+        </a-form-model>
+
+        <!--条款内容部分-->
+        <div class="header-text">
+          {{ $t('docTool.split.clauseContent') }}
+          <!--新增条款项-->
+          <a-button type="primary" icon="plus" ghost @click="handleAddClauseContent(1)">{{ $t('newlyAdded') }}</a-button>
+        </div>
+        <template v-if="contentList && contentList.length > 0">
+          <div class="clause-item" v-for="(clause, index) in contentList" :key="index + 'clause'">
+            <div class="clause-item-content">
+              <!--文本-->
+              <a-input type="textarea" :maxLength="1000" v-model="clause.itemContent" v-if="clause.type === TypeOfClauseItem.TEXT.value"/>
+              <!--图片-->
+              <viewer>
+                <img v-if="clause.type === TypeOfClauseItem.IMG.value" :src="clause.thumbUrl?clause.thumbUrl:clause.itemContent" alt="">
+              </viewer>
+              <!--表格-->
+              <div v-if="clause.type === TypeOfClauseItem.TABLE.value" v-html="clause.itemContent"></div>
             </div>
-            <a-row :gutter="24" class="split-content-row" id="split-content" v-for="(item, index) in contentList" :key="index">
-              <div class="split-row">
-                <div class="row-left">
-                  <a-textarea v-if="item.type==='TEXT'"
-                              v-model="item.itemContent"
-                              :show-count="true"
-                              :maxlength="1000"
-                              :placeholder="$t('pleaseEnter')+$t('content')" />
-                  <viewer>
-                    <img v-if="item.type==='IMG'" :src="item.thumbUrl?item.thumbUrl:item.itemContent" alt="">
-                  </viewer>
-                  <!--                        <img v-if="item.type==='IMG'" :src="item.thumbUrl?item.thumbUrl:item.itemContent" alt="" @click="preImg(item)">-->
-                  <div v-if="item.type==='TABLE'" v-html="item.itemContent" class="item-table"></div>
-                </div>
-                <div class="row-right">
-                  <a-button class="row-btn-add" @click="splitAdd(index)">{{ $t('add') }}</a-button>
-                  <a-button class="row-btn-edit" @click="splitEdit(index,item)" v-if="item.type==='TABLE'">{{ $t('edit') }}</a-button>
-                  <a-button @click="splitDelete(item,index)">{{ $t('delete') }}</a-button>
-                </div>
-              </div>
-            </a-row>
-          </a-form-model>
-        </a-form>
+            <div class="clause-item-operate">
+              <a-button @click="handleAddClauseContent(index)">{{ $t('newlyAdded') }}</a-button>
+              <a-button v-if="clause.type === TypeOfClauseItem.TABLE.value" @click="splitEdit(index,clause)">{{ $t('edit') }}</a-button>
+              <a-button @click="handleDeleteClauseContent(index, clause)">{{ $t('delete') }}</a-button>
+            </div>
+          </div>
+        </template>
       </a-spin>
     </div>
     <div class="custom-drawer-style-bottom-btn">
-      <a-button type="primary" class="footer-btn-save" @click="splitSave">{{ $t('preservation') }}</a-button>
-      <a-button @click="splitCancel">{{ $t('cancel') }}</a-button>
+      <a-button type="primary" class="footer-btn-save" @click="handleSave">{{ $t('preservation') }}</a-button>
+      <a-button @click="handleCancel">{{ $t('cancel') }}</a-button>
     </div>
+
     <!--  类型选择弹框  -->
-    <split-detail-add-type-check
-      ref="splitDetailAddTypeCheck"
-      @addTextOk="addTextOk"
-      @addTableOk="addTableOk"
-      @addImageOk="addImageOk"
-    >
-    </split-detail-add-type-check>
+    <split-detail-add-type-check ref="splitDetailAddTypeCheck" @ok="handleAddOk"/>
     <!--  编辑表格弹框 -->
-    <split-detail-add-table ref="splitDetailAddTable" @editOk="editTableOk"></split-detail-add-table>
+    <split-detail-add-table ref="splitDetailAddTable" @editOk="editTableOk"/>
   </a-drawer>
 </template>
 
@@ -241,11 +185,21 @@ import StandardSelection from '../../../../components/selection/StandardSelectio
 // 类型选择弹框
 import SplitDetailAddTypeCheck from './SplitDetailAddTypeCheck.vue'
 import SplitDetailAddTable from './SplitDetailAddTable.vue'
-import { getDocSplitEditForm, getDocSplitEditFormData, addClause, editClause, getEditClauseContent } from '../../../../api/documentToolApi.js'
+import {
+  getDocSplitEditForm,
+  getDocSplitEditFormData,
+  addClause,
+  editClause,
+  getEditClauseContent
+} from '../../../../api/documentToolApi.js'
+import UserSelection from '../../../../components/selection/UserSelection.vue'
+import JMultipleDatePicker from '../../../../components/JMultipleDatePicker.vue'
+import { FieldType, TypeOfClauseItem } from '../../../../enums/commonEnums'
 
 export default {
   name: 'SplitAddForm',
   components: {
+    JMultipleDatePicker, UserSelection,
     SplitDetailAddTable,
     UploadFile,
     StandardSelection,
@@ -253,10 +207,16 @@ export default {
   },
   data () {
     return {
+      FieldType,
+      TypeOfClauseItem,
+      hiddenFieldList: ['item_content'], // 隐藏的字段
+      disabledFieldList: [], // 禁用的字段
+      specialPlaceholder: {}, // 特殊的placeholder
+      optionsData: {}, // 通过接口获取的下拉数据
       formTitle: this.$t('newlyAdded'),
-      contentList: [],
+      contentList: [], // 条款内容数据
       visible: false,
-      addIndex: '',
+      addIndex: 0, // 新增条款的index
       disabled: false,
       formInline: {},
       isFormInline: false,
@@ -274,12 +234,6 @@ export default {
     }
   },
   props: {
-    url: {
-      type: Object,
-      default: () => {
-        return {}
-      }
-    },
     flag: {
       type: String,
       default: ''
@@ -298,196 +252,54 @@ export default {
     }
   },
   methods: {
-    loadData () {
+    /**
+     * 新增
+     */
+    add () {
+      this.formInline = {}
+      this.contentList = []
+      this.type = 'add'
+      this.getForm()
+      this.visible = true
+    },
+    /**
+     * 编辑
+     * @param item
+     */
+    edit (item) {
+      this.visible = true
+      this.type = 'edit'
+      this.itemVal = item
+      this.formInline = {}
+      this.getForm(() => {
+        this.loadFormInfo()
+        this.getClauseContentList()
+      })
+    },
+    /**
+     * 获取表单字段
+     * @param callBack
+     */
+    getForm (callBack) {
       this.loading = true
-      getEditClauseContent({ itemId: this.itemId }).then(res => {
+      const params = {
+        flag: this.flag,
+        type: this.type
+      }
+      getDocSplitEditForm(params).then((res) => {
         if (res.success) {
-          this.contentList = [...res.result]
-          this.contentList.forEach(item => {
-            const imgData = item.itemContent.split('fileUrl=')[1]
-            item.thumbUrl = window._CONFIG.domianURL + '/sys/split/file/getImage?fileUrl=' + imgData
-          })
+          this.dataList = res.result
+          this.ruleList = res.result
+          this.integrateData()
+          callBack && callBack()
         }
       }).finally(() => {
         this.loading = false
       })
     },
-    // 获取表单信息
-    loadFormInfo () {
-      getDocSplitEditFormData({ id: this.itemId }).then(res => {
-        if (res.success) {
-          this.formInline = [...res.result]
-        }
-      })
-    },
-    // 增加按钮
-    splitAdd (val) {
-      if (val === '-1') {
-        this.addIndex = this.contentList.length - 1
-      } else {
-        this.addIndex = val
-      }
-      this.$refs.splitDetailAddTypeCheck.open()
-    },
-    // 编辑按钮
-    splitEdit (index, item) {
-      // console.log('item',item)
-      this.addIndex = index
-      console.log('&&&&&&&&&&&&&&&&&&&&&&&', item.itemContent)
-      this.$refs.splitDetailAddTable.open(item.itemContent)
-      this.$refs.splitDetailAddTable.isTableEdit = true
-    },
-    // 删除按钮
-    splitDelete (item, index) {
-      if (item.id) {
-        this.deleteIds.push(item.id)
-      }
-      for (let i = index; i < this.contentList.length - 1; i++) {
-        this.contentList[index] = this.contentList[index + 1]
-      }
-      this.contentList.pop()
-    },
-    // 保存
-    splitSave () {
-      this.$refs.splitEditForm.validate(valid => {
-        if (valid) {
-          this.loading = true
-          if (!this.submitFlag) {
-            this.submitFlag = true
-            let submitFunc
-            if (this.formInline.id) {
-              submitFunc = editClause
-            } else {
-              submitFunc = addClause
-            }
-            const params = JSON.parse(JSON.stringify(this.formInline))
-            Object.keys(params).forEach(res => {
-              if (params[res] instanceof Array) {
-                params[res] = params[res].join(',')
-              }
-            })
-            params.info_id = this.infoId
-            params.menu_id = this.menuId
-            if (this.formInline.id) {
-              params.menu_id = this.itemVal.menu_id
-            }
-            const contentList = JSON.parse(JSON.stringify(this.contentList))
-            contentList.forEach((item, index) => {
-              if (item.type === 'IMG') {
-                this.$delete(item, 'thumbUrl')
-              }
-            })
-            params.itemValEOList = contentList
-            params.delItemIds = this.deleteIds.join(',')
-            submitFunc(params).then((res) => {
-              if (res.data.success) {
-                this.loading = false
-                this.$message.success(this.$t('operationSuccessful'))
-                this.visible = false
-                // this.$emit('closeVisible',false)
-                this.$emit('sumber')
-              } else {
-                this.$message.warning(this.$t('operationFailed'))
-              }
-            }).catch((error) => {
-              console.log(error)
-            }).finally(() => {
-              this.visible = false
-              this.$emit('closeVisible', false)
-              this.loading = false
-              this.submitFlag = false
-            })
-          }
-        }
-      })
-    },
-    // 取消
-    splitCancel () {
-      this.visible = false
-      this.$emit('closeVisible', false)
-    },
-    // 增加文本类型成功
-    addTextOk (number) {
-      for (let i = this.contentList.length; i > this.addIndex; i--) {
-        this.contentList[i + number - 1] = this.contentList[i - 1]
-      }
-      for (let j = 0; j < number; j++) {
-        this.contentList[++this.addIndex] = {
-          id: '',
-          type: 'TEXT',
-          itemContent: ''
-        }
-      }
-      this.contentList = JSON.parse(JSON.stringify(this.contentList))
-    },
-    // 增加表格类型成功
-    addTableOk (ueContent) {
-      for (let i = this.contentList.length; i > this.addIndex; i--) {
-        this.contentList[i + ueContent.length - 1] = this.contentList[i - 1]
-      }
-      this.contentList[++this.addIndex] = {
-        id: '',
-        type: 'TABLE',
-        itemContent: ueContent[0]
-      }
-      this.contentList = JSON.parse(JSON.stringify(this.contentList))
-    },
-    // 编辑表格类型成功
-    editTableOk (ueContent) {
-      console.log(ueContent)
-      this.contentList[this.addIndex] = {
-        id: '',
-        type: 'TABLE',
-        itemContent: ueContent[0]
-      }
-      this.contentList = JSON.parse(JSON.stringify(this.contentList))
-    },
-    // 增加图片类型成功
-    addImageOk (file, data, imgs) {
-      for (let i = this.contentList.length; i > this.addIndex; i--) {
-        this.contentList[i] = this.contentList[i - 1]
-      }
-      this.contentList[++this.addIndex] = {
-        id: '',
-        type: 'IMG',
-        itemContent: file.response.result.url,
-        thumbUrl: window._CONFIG.domianURL + '/sys/split/file/getImage?fileUrl=' + file.response.result.url.split('fileUrl=')[1]
-      }
-      this.contentList = JSON.parse(JSON.stringify(this.contentList))
-    },
-    onChange (item) {
-      if (this.queryParam[item] && this.queryParam[item].length > 0) {
-        const startDate = item + '_start'
-        const endDate = item + '_end'
-        this.queryParam[startDate] = this.queryParam[item][0]
-        this.queryParam[endDate] = this.queryParam[item][1]
-      } else {
-        this.queryParam[item] = []
-      }
-    },
-    // 点击点击上传按钮
-    clickButtonToUpload (item) {
-      this.$refs.uploadFile.open(this.formInline[item.db_field_name])
-      this.uploadName = item.db_field_name
-    },
-    // 文件上传改变后的回调
-    uploadFileChange (data) {
-      const attIdList = []
-      if (data && data.length > 0) {
-        data.map(item => {
-          attIdList.push(item.id || data.name)
-        })
-      }
-      /** 赋值给当前对应的表单文件 */
-      this.formInline[this.uploadName] = attIdList.join(',')
-      this.formInline = { ...this.formInline }
-    },
-    handleInput (value) {
-      this.$nextTick(() => {
-        this.formInline = { ...this.formInline }
-        this.$refs.splitEditForm.validateField([value])
-      })
-    },
+    /**
+     * 设置表单校验信息
+     */
     integrateData () {
       this.isFormInline = false
       const rules = {}
@@ -547,50 +359,115 @@ export default {
       this.loading = false
       // console.log('this.column',this.column)
     },
-    getForm (callBack) {
-      this.loading = true
-      const params = {
-        flag: this.flag,
-        type: this.type
-      }
-      getDocSplitEditForm(params).then((res) => {
+    /**
+     * 获取表单信息
+     */
+    loadFormInfo () {
+      getDocSplitEditFormData({ id: this.itemVal.id }).then(res => {
         if (res.success) {
-          this.dataList = res.result
-          this.ruleList = res.result
-          this.integrateData()
-          callBack && callBack()
+          this.formInline = Object.assign({}, res.result)
+        }
+      })
+    },
+    /**
+     * 获取条款内容列表
+     */
+    getClauseContentList () {
+      this.loading = true
+      getEditClauseContent({ id: this.itemVal.id }).then(res => {
+        if (res.success) {
+          this.contentList = [...res.result]
+          this.contentList.forEach(item => {
+            const imgData = item.itemContent.split('fileName=')[1]
+            item.thumbUrl = window._CONFIG.domianURL + '/sys/split/file/getImage?fileName=' + imgData
+          })
         }
       }).finally(() => {
         this.loading = false
       })
     },
-    edit (item) {
-      this.visible = true
-      this.type = 'edit'
-      this.itemVal = item
-      this.getForm(() => {
-        getDocSplitEditFormData({ id: item.id }).then((res) => {
-          if (res.success) {
-            this.formInline = res.result
+    /**
+     * 新增条款内容
+     * @param index
+     */
+    handleAddClauseContent (index) {
+      if (index === -1) {
+        this.addIndex = this.contentList.length - 1
+      } else {
+        this.addIndex = index
+      }
+      this.$refs.splitDetailAddTypeCheck.open()
+    },
+    // 增加条款内容成功
+    handleAddOk (type, content) {
+      const headerArr = this.contentList.splice(0, this.addIndex + 1)
+      const footerArr = this.contentList.splice(-this.addIndex)
+      const insertArr = []
+      switch (type) {
+        case TypeOfClauseItem.TEXT.value:
+          for (let i = 0; i < content; i++) {
+            insertArr.push({
+              id: '',
+              type: TypeOfClauseItem.TEXT.value,
+              itemContent: ''
+            })
           }
+          break
+        case TypeOfClauseItem.IMG.value:
+          insertArr[0] = {
+            id: '',
+            type: TypeOfClauseItem.IMG.value,
+            itemContent: content.file.response.result.url,
+            thumbUrl: window._CONFIG.domianURL + '/sys/split/file/getImage?fileName=' + content.file.response.result.url.split('fileName=')[1]
+          }
+          break
+        case TypeOfClauseItem.TABLE.value:
+          insertArr[0] = {
+            id: '',
+            type: 'TABLE',
+            itemContent: content[0]
+          }
+      }
+      this.contentList = [...headerArr, ...insertArr, ...footerArr]
+    },
+    /**
+     * 表格编辑
+     * @param index
+     * @param item
+     */
+    splitEdit (index, item) {
+      this.addIndex = index
+      this.$refs.splitDetailAddTable.open(item.itemContent)
+      this.$refs.splitDetailAddTable.isTableEdit = true
+    },
+    /**
+     * 编辑表格类型成功
+     * @param ueContent
+     */
+    editTableOk (ueContent) {
+      this.contentList[this.addIndex] = {
+        id: '',
+        type: 'TABLE',
+        itemContent: ueContent[0]
+      }
+      this.contentList = JSON.parse(JSON.stringify(this.contentList))
+    },
+    // 点击点击上传按钮
+    clickButtonToUpload (item) {
+      this.$refs.uploadFile.open(this.formInline[item.db_field_name])
+      this.uploadName = item.db_field_name
+    },
+    // 文件上传改变后的回调
+    uploadFileChange (data) {
+      const attIdList = []
+      if (data && data.length > 0) {
+        data.map(item => {
+          attIdList.push(item.id || data.name)
         })
-      })
-    },
-    add () {
-      this.getForm()
-      this.loadData()
-      this.loadFormInfo()
-      this.visible = true
-      this.formInline = {}
-      this.contentList = []
-      this.type = 'add'
-    },
-    // 树结果选择
-    changeTree (value, label, extra) {
-      // console.log('changeValue',value, label, extra)
-      const labelValues = label
-      labelValues.shift()
-      this.contentTrees = labelValues.join(',')
+      }
+      /** 赋值给当前对应的表单文件 */
+      this.formInline[this.uploadName] = attIdList.join(',')
+      this.formInline = { ...this.formInline }
     },
     // 正则替换小数点
     limitNumber (value) {
@@ -601,6 +478,134 @@ export default {
       } else {
         return 0
       }
+    },
+    /**
+     * 删除条款内容
+     * @param index
+     * @param clause
+     */
+    handleDeleteClauseContent (index, clause) {
+      this.contentList.splice(index, 1)
+      if (clause.id) {
+        this.deleteIds.push(clause.id)
+      }
+    },
+    handleCancel () {
+      this.close()
+    },
+    close () {
+      this.visible = false
+      this.formInline = {}
+      this.contentList = []
+    },
+    handleSave () {
+      if (this.submitFlag) {
+        return
+      }
+      this.$refs.ruleForm.validate(valid => {
+        console.log(valid)
+        if (valid) {
+          this.submitFlag = true
+          this.loading = true
+          // 判断新增编辑
+          let submitFunc
+          if (this.formInline.id) {
+            submitFunc = editClause
+          } else {
+            submitFunc = addClause
+          }
+          // 处理请求参数
+          const formData = JSON.parse(JSON.stringify(this.formInline))
+          // 处理动态表单多选的值
+          Object.keys(formData).forEach(res => {
+            if (formData[res] instanceof Array) {
+              if (formData[res][0] instanceof Object) {
+                // 说明是树选择
+                formData[res] = formData[res].map(item => item.value).join(',')
+              } else {
+                formData[res] = formData[res].join(',')
+              }
+            }
+          })
+          formData.info_id = this.infoId
+          formData.menu_id = this.menuId
+          const contentList = JSON.parse(JSON.stringify(this.contentList))
+          contentList.forEach((item, index) => {
+            if (item.type === 'IMG') {
+              delete item.thumbUrl
+            }
+          })
+          formData.itemValEOList = contentList
+          formData.delItemIds = this.deleteIds.join(',')
+          submitFunc(formData).then(res => {
+            if (res.success) {
+              this.$message.success(res.message)
+              this.$emit('ok')
+              this.close()
+            } else {
+              this.$message.warning(res.message)
+            }
+          }).finally(() => {
+            this.loading = false
+            this.submitFlag = false
+          })
+        }
+      })
+    },
+
+    // 保存
+    splitSave () {
+      this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          this.loading = true
+          if (!this.submitFlag) {
+            this.submitFlag = true
+            let submitFunc
+            if (this.formInline.id) {
+              submitFunc = editClause
+            } else {
+              submitFunc = addClause
+            }
+            const params = JSON.parse(JSON.stringify(this.formInline))
+            Object.keys(params).forEach(res => {
+              if (params[res] instanceof Array) {
+                params[res] = params[res].join(',')
+              }
+            })
+            params.info_id = this.infoId
+            params.menu_id = this.menuId
+            if (this.formInline.id) {
+              params.menu_id = this.itemVal.menu_id
+            }
+            const contentList = JSON.parse(JSON.stringify(this.contentList))
+            contentList.forEach((item, index) => {
+              if (item.type === 'IMG') {
+                this.$delete(item, 'thumbUrl')
+              }
+            })
+            params.itemValEOList = contentList
+            params.delItemIds = this.deleteIds.join(',')
+            submitFunc(params).then((res) => {
+              if (res.data.success) {
+                this.loading = false
+                this.$message.success(this.$t('operationSuccessful'))
+                this.visible = false
+                // this.$emit('closeVisible',false)
+                this.$emit('sumber')
+              } else {
+                this.$message.warning(this.$t('operationFailed'))
+              }
+            }).catch((error) => {
+              console.log(error)
+            }).finally(() => {
+              this.visible = false
+              this.$emit('closeVisible', false)
+              this.loading = false
+              this.submitFlag = false
+            })
+          }
+        }
+      })
     }
   }
 }
@@ -753,31 +758,41 @@ export default {
   }
 }
 
-.box-input {
-  /*min-width: 200px;*/
-  display: inline-block;
-  height: 38px;
-  margin-top: 2px;
+/*用到的css代码*/
+.form-flex-box {
+  display: flex;
+  flex-wrap: wrap;
 }
 
-.button-text {
-  height: 38px;
-  width: calc(100% - 100px);
-  line-height: 38px;
-  background: #fff;
-  border: 1px #00B3BE solid;
-  color: #00B3BE;
+.form-flex-item-half {
+  width: 50%;
 }
 
-/deep/ .ant-select-tree {
-  width: auto;
-  height: 300px;
-  overflow: auto;
-  position: absolute;
-  /*background: #fff;*/
+.header-text {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
 }
 
-/deep/ .ant-select-tree-dropdown {
-  min-height: 320px;
+.clause-item {
+  display: flex;
+  justify-content: space-between;
+  margin: 0 0 20px 20px;
+
+  &-content {
+    width: 0;
+    flex: 1;
+  }
+
+  &-operate {
+
+    .ant-btn {
+      margin-left: 15px
+    }
+  }
+}
+
+.clause-item:last-child {
+  margin-bottom: 0;
 }
 </style>
diff --git a/src/views/documentTool/documentSplit/modules/SplitClauseDetail.vue b/src/views/documentTool/documentSplit/modules/SplitClauseDetail.vue
index e4bfe61d..8675c00c 100644
--- a/src/views/documentTool/documentSplit/modules/SplitClauseDetail.vue
+++ b/src/views/documentTool/documentSplit/modules/SplitClauseDetail.vue
@@ -8,7 +8,7 @@
     switchFullscreen
     @cancel="handleCancel"
   >
-    <p v-html="contentValue"></p>
+    <div class="clause-content" v-html="contentValue"></div>
   </j-modal>
 </template>
 
@@ -35,5 +35,10 @@ export default {
 </script>
 
 <style scoped>
-
+.clause-content {
+  max-height: calc(100vh - 200px - 55px);
+  overflow: auto;
+  margin: 0 -24px;
+  padding: 0 24px;
+}
 </style>
diff --git a/src/views/documentTool/documentSplit/modules/SplitDetailAddTable.vue b/src/views/documentTool/documentSplit/modules/SplitDetailAddTable.vue
index f4da18f7..2bb1a0af 100644
--- a/src/views/documentTool/documentSplit/modules/SplitDetailAddTable.vue
+++ b/src/views/documentTool/documentSplit/modules/SplitDetailAddTable.vue
@@ -2,7 +2,7 @@
   <j-modal
     :title="title"
     class="split-table-title"
-    :visible="visible"
+    :visible="tableVisible"
     switchFullscreen
     :confirm-loading="confirmLoading"
     @ok="handleOkTable"
@@ -21,7 +21,7 @@ export default {
   data () {
     return {
       title: this.$t('docTool.split.table'),
-      visible: false,
+      tableVisible: false,
       confirmLoading: false,
       ueContent: '',
       // UE编辑器配置
@@ -123,7 +123,7 @@ export default {
   methods: {
     open (tableStr) {
       console.log('$$$$$$$$$$$$', tableStr)
-      this.visible = true
+      this.tableVisible = true
       this.ueContent = tableStr
       this.$nextTick(() => {
         this.$refs.ueditor.setContent(this.ueContent)
@@ -153,7 +153,7 @@ export default {
       this.close()
     },
     close () {
-      this.visible = false
+      this.tableVisible = false
       this.isTableEdit = false
       this.ueContent = ''
       this.$nextTick(() => {
diff --git a/src/views/documentTool/documentSplit/modules/SplitDetailAddTypeCheck.vue b/src/views/documentTool/documentSplit/modules/SplitDetailAddTypeCheck.vue
index 141cc9a5..22adce90 100644
--- a/src/views/documentTool/documentSplit/modules/SplitDetailAddTypeCheck.vue
+++ b/src/views/documentTool/documentSplit/modules/SplitDetailAddTypeCheck.vue
@@ -6,22 +6,22 @@
     :confirmLoading="confirmLoading"
     switchFullscreen
     @ok="handleOk"
-    @cancel="handleCancel"
-  >
+    @cancel="handleCancel">
+
     <div class="title-wraper">
       <div class="title-top">
         <span class="title-flex title-text-flex"
-              :class="{'title-flex-active':selected==='TEXT'}"
-              @click="selectTitle('TEXT')">{{ $t('docTool.split.text') }}</span>
+              :class="{'title-flex-active':selected===TypeOfClauseItem.TEXT.value}"
+              @click="selectTitle(TypeOfClauseItem.TEXT.value)">{{ $t('docTool.split.text') }}</span>
         <span class="title-flex title-pic"
-              :class="{'title-flex-active':selected==='IMG'}"
-              @click="selectTitle('IMG')">{{ $t('docTool.split.picture') }}</span>
+              :class="{'title-flex-active':selected===TypeOfClauseItem.IMG.value}"
+              @click="selectTitle(TypeOfClauseItem.IMG.value)">{{ $t('docTool.split.picture') }}</span>
         <span class="title-flex title-table"
-              :class="{'title-flex-active':selected==='TABLE'}"
-              @click="selectTitle('TABLE')">{{ $t('docTool.split.table') }}</span>
+              :class="{'title-flex-active':selected===TypeOfClauseItem.TABLE.value}"
+              @click="selectTitle(TypeOfClauseItem.TABLE.value)">{{ $t('docTool.split.table') }}</span>
       </div>
       <!--   选择文本类型时，需要填写个数  -->
-      <div class="title-num" v-if="selected==='TEXT'">
+      <div class="title-num" v-if="selected===TypeOfClauseItem.TEXT.value">
         <a-form>
           <a-form-model
             class="number-content"
@@ -44,7 +44,7 @@
         </a-form>
       </div>
       <!--   选择表格时，需要填写行列数  -->
-      <div class="title-num" v-if="selected==='TABLE'">
+      <div class="title-num" v-if="selected===TypeOfClauseItem.TABLE.value">
         <a-form>
           <a-form-model
             class="number-content"
@@ -97,13 +97,14 @@
 import SplitAddClauseUploadImage from '../../../../components/splitUpload/SplitAddClauseUploadImage.vue'
 // 编辑表格的弹框
 import SplitDetailAddTable from './SplitDetailAddTable.vue'
+import { TypeOfClauseItem } from '../../../../enums/commonEnums'
 
 export default {
   name: 'SplitDetailAddTypeCheck',
   components: { SplitAddClauseUploadImage, SplitDetailAddTable },
   watch: {
     selected (val) {
-      if (this.selected === 'TEXT') {
+      if (this.selected === TypeOfClauseItem.TEXT.value) {
         this.selectedNum = true
       } else {
         this.selectedNum = false
@@ -112,9 +113,10 @@ export default {
   },
   data () {
     return {
+      TypeOfClauseItem,
       visible: false,
       confirmLoading: false,
-      selected: 'TEXT',
+      selected: TypeOfClauseItem.TEXT.value,
       selectedNum: true,
       numberForm: {},
       validatorRules: {
@@ -146,39 +148,45 @@ export default {
     },
     selectTitle (val) {
       this.selected = val
-      if (val === 'TEXT') {
+      if (val === TypeOfClauseItem.TEXT.value) {
         this.$nextTick(() => {
-          this.$refs.numberForm.clearValidate()
+          this.$refs.numberForm && this.$refs.numberForm.clearValidate()
         })
-      } else if (val === 'TABLE') {
+      } else if (TypeOfClauseItem.TABLE.value) {
         this.$nextTick(() => {
-          this.$refs.numberRowColForm.clearValidate()
+          this.$refs.numberRowColForm && this.$refs.numberRowColForm.clearValidate()
         })
       }
     },
     // 上传文件
     uploadSuccess (file, data, imgs) {
-      this.$emit('addImageOk', file, data, imgs)
+      this.$emit('ok', TypeOfClauseItem.IMG.value, { file, data, imgs })
+      this.visible = false
+      // this.$emit('addImageOk', file, data, imgs)
     },
     // 确定增加的类型
     handleOk () {
       if (this.confirmLoading) {
         return
       }
-      if (this.selected === 'TEXT') { // 文本类型
+      if (this.selected === TypeOfClauseItem.TEXT.value) { // 文本类型
         this.$refs.numberForm.validate(valid => {
           if (valid) {
             this.confirmLoading = true
-            this.$emit('addTextOk', this.numberForm.textNumber)
+            this.$emit('ok', TypeOfClauseItem.TEXT.value, this.numberForm.textNumber)
             this.visible = false
             this.confirmLoading = false
             this.numberForm.textNumber = null
           }
         })
-      } else if (this.selected === 'IMG') { // 图片类型
+        return
+      }
+      if (this.selected === TypeOfClauseItem.IMG.value) { // 图片类型
         this.$refs.uploadFile.open()
-        this.visible = false
-      } else if (this.selected === 'TABLE') { // 表格类型
+        // this.visible = false
+        return
+      }
+      if (this.selected === TypeOfClauseItem.TABLE.value) { // 表格类型
         this.$refs.numberRowColForm.validate(valid => {
           if (valid) {
             if (this.rowColForm.rowCount > 0 && this.rowColForm.colCount > 0) {
@@ -205,7 +213,7 @@ export default {
                 this.$refs.splitDetailAddTable.isTableEdit = false
                 this.$refs.splitDetailAddTable.open(tableStr)
               })
-              this.visible = false
+              // this.visible = false
               this.rowColForm = {}
             }
           }
@@ -217,7 +225,8 @@ export default {
     },
     // 添加表格的回调
     tableAddOk (ueContent) {
-      this.$emit('addTableOk', ueContent)
+      this.$emit('ok', TypeOfClauseItem.TABLE.value, ueContent)
+      this.visible = false
     },
     // 正则替换小数点
     limitNumber (value) {
@@ -251,8 +260,8 @@ export default {
       }
 
       .title-flex-active {
-        background: #00B3BE;
-        border-color: #00B3BE;
+        background: @primary-color;
+        border-color: @primary-color;
         color: #FFFFFF;
       }
     }
diff --git a/src/views/documentTool/documentSplit/modules/SplitDetailNodeAdd.vue b/src/views/documentTool/documentSplit/modules/SplitDetailNodeAdd.vue
index c16e06cc..66ab8ece 100644
--- a/src/views/documentTool/documentSplit/modules/SplitDetailNodeAdd.vue
+++ b/src/views/documentTool/documentSplit/modules/SplitDetailNodeAdd.vue
@@ -6,22 +6,23 @@
     :confirm-loading="confirmLoading"
     switchFullscreen
     @cancel="handleCancel"
-    @ok="handleOk"
-  >
+    @ok="handleOk">
     <a-form-model
       class="split-click-right-form"
       ref="ruleForm"
       :model="form"
       :rules="rules"
       :label-col="labelCol"
-      :wrapper-col="wrapperCol"
-    >
+      :wrapper-col="wrapperCol">
+      <!--条款号-->
       <a-form-model-item :label="$t('docTool.split.clauseNo')" prop="name">
         <a-input class="box-input" v-model="form.name" :placeholder="$t('pleaseEnter')+$t('docTool.split.clauseNo')" :maxLength="200" />
       </a-form-model-item>
+      <!--条款名称-->
       <a-form-model-item :label="$t('docTool.split.clauseName')" prop="itemName">
         <a-input class="box-input" v-model="form.itemName" :placeholder="$t('pleaseEnter')+$t('docTool.split.clauseName')" :maxLength="200" />
       </a-form-model-item>
+      <!--序号-->
       <a-form-model-item :label="$t('serialNumber')" prop="displaySeq">
         <a-input-number v-model="form.displaySeq" :min="1" :max="99999"
                         class="box-input"
@@ -34,7 +35,8 @@
 </template>
 
 <script>
-import { postAction, putAction } from '../../../../api/manage.js'
+import { addClauseTreeNode,editClauseTreeNode } from '../../../../api/documentToolApi'
+
 export default {
   name: 'SplitDetailNodeAdd',
   data () {
@@ -57,7 +59,6 @@ export default {
           // { min: 1, max: 99999, message: this.$t('cantExeed') + '99999' + this.$t('characters'), trigger: 'blur' },
         ]
       },
-      isEdit: false,
       nodeItem: {},
       infoId: ''
     }
@@ -65,7 +66,6 @@ export default {
   methods: {
     add (nodeItem, infoId) {
       this.title = this.$t('add')
-      this.isEdit = false
       this.form = {}
       this.visible = true
       this.nodeItem = nodeItem
@@ -73,7 +73,6 @@ export default {
     },
     edit (nodeItem, infoId) {
       this.title = this.$t('edit')
-      this.isEdit = true
       this.nodeItem = nodeItem
       this.form.id = nodeItem.id
       this.form.pid = nodeItem.pid
@@ -91,55 +90,39 @@ export default {
       if (this.confirmLoading) {
         return
       }
-      const expandId = []
-      expandId.push(this.form.pid)
-      if (!this.isEdit) {
-        this.$refs.ruleForm.validate(valid => {
-          if (valid) {
-            this.confirmLoading = true
-            const params = {
-              infoId: this.infoId,
-              pid: this.nodeItem.id,
-              ...this.form
-            }
-            postAction(`split/sarFileSplitMenu/addMenu`, params).then(res => {
-              if (res.success) {
-                this.$message.success(this.$t('operationSuccessful'))
-                // this.onExpand(expandId)
-                this.form = {}
-                this.visible = false
+      this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          const expandId = []
+          expandId.push(this.form.pid)
+          let submitFunc
+          const params = Object.assign({
+            infoId: this.infoId,
+            pid: this.nodeItem.id
+          }, this.form)
+          if (this.form.id) {
+            submitFunc = editClauseTreeNode
+          } else {
+            submitFunc = addClauseTreeNode
+          }
+          this.confirmLoading = true
+          submitFunc(params).then(res => {
+            if (res.success) {
+              this.$message.success(res.message)
+              this.form = {}
+              this.visible = false
+              if (this.form.id) {
+                this.$emit('ok', expandId)
+              } else {
                 this.$emit('ok')
-              } else {
-                this.$message.warning(this.$t('operationFailed'))
               }
-            }).finally(() => {
-              this.confirmLoading = false
-            })
-          }
-        })
-      } else {
-        this.$refs.ruleForm.validate(valid => {
-          if (valid) {
-            this.confirmLoading = true
-            const params = {
-              info_id: this.infoId,
-              ...this.form
+            } else {
+              this.$message.warning(res.message)
             }
-            putAction(`split/sarFileSplitMenu/updateMenu`, params).then(res => {
-              if (res.success) {
-                this.$message.success(this.$t('operationSuccessful'))
-                this.form = {}
-                this.visible = false
-                this.$emit('update', expandId)
-              } else {
-                this.$message.warning(this.$t('operationFailed'))
-              }
-            }).finally(() => {
-              this.confirmLoading = false
-            })
-          }
-        })
-      }
+          }).finally(() => {
+            this.confirmLoading = false
+          })
+        }
+      })
     },
     // 正则替换小数点
     limitNumber (value) {