diff --git a/crm/src/main/resources/template/js/crmContract/crmContractList.js b/crm/src/main/resources/template/js/crmContract/crmContractList.js
index cf81738c08b1859505f3342ef4d91dfbc0a7af04..71277328f5426c929a48e359b8ad087f4bdd0449 100644
--- a/crm/src/main/resources/template/js/crmContract/crmContractList.js
+++ b/crm/src/main/resources/template/js/crmContract/crmContractList.js
@@ -132,7 +132,7 @@ layui.config({
     	parent._openNewWindows({
 			url: systemCommonUtil.getUrl('FP2023030500001&objectId=' + objectId + '&objectKey=' + objectKey, null),
 			title: systemLanguage["com.skyeye.addPageTitle"][languageType],
-			pageId: "contactsAdd",
+			pageId: "crmContractAdd",
 			area: ['90vw', '90vh'],
 			callBack: function (refreshCode) {
 				winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
@@ -145,7 +145,7 @@ layui.config({
 		parent._openNewWindows({
 			url: systemCommonUtil.getUrl('FP2023030500002&objectId=' + objectId + '&objectKey=' + objectKey + '&id=' + data.id, null),
 			title: systemLanguage["com.skyeye.editPageTitle"][languageType],
-			pageId: "contactsEdit",
+			pageId: "crmContractEdit",
 			area: ['90vw', '90vh'],
 			callBack: function (refreshCode) {
 				winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
@@ -158,7 +158,7 @@ layui.config({
 		parent._openNewWindows({
 			url: systemCommonUtil.getUrl('FP2023030600001&objectId=' + objectId + '&objectKey=' + objectKey + '&id=' + data.id, null),
 			title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
-			pageId: "crmcontractdetails",
+			pageId: "crmContractDetails",
 			area: ['90vw', '90vh'],
 			callBack: function (refreshCode) {
 			}});
diff --git a/crm/src/main/resources/template/js/crmOpportunity/crmOpportunityList.js b/crm/src/main/resources/template/js/crmOpportunity/crmOpportunityList.js
index a8c37c6f58d71d3295d8ad6589d0ca45d6bc58b5..4e0d1be7b0a3dccd7e3ae17558f32a72475a19d4 100644
--- a/crm/src/main/resources/template/js/crmOpportunity/crmOpportunityList.js
+++ b/crm/src/main/resources/template/js/crmOpportunity/crmOpportunityList.js
@@ -113,7 +113,7 @@ layui.config({
     	parent._openNewWindows({
 			url: systemCommonUtil.getUrl('FP2023030900001&objectId=' + objectId + '&objectKey=' + objectKey, null),
 			title: systemLanguage["com.skyeye.addPageTitle"][languageType],
-			pageId: "contactsAdd",
+			pageId: "crmOpportunityAdd",
 			area: ['90vw', '90vh'],
 			callBack: function (refreshCode) {
 				winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
@@ -126,7 +126,7 @@ layui.config({
 		parent._openNewWindows({
 			url: systemCommonUtil.getUrl('FP2023030900002&objectId=' + objectId + '&objectKey=' + objectKey + '&id=' + data.id, null),
 			title: systemLanguage["com.skyeye.editPageTitle"][languageType],
-			pageId: "contactsEdit",
+			pageId: "crmOpportunityEdit",
 			area: ['90vw', '90vh'],
 			callBack: function (refreshCode) {
 				winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
@@ -139,7 +139,7 @@ layui.config({
 		parent._openNewWindows({
 			url: systemCommonUtil.getUrl('FP2023030900003&objectId=' + objectId + '&objectKey=' + objectKey + '&id=' + data.id, null),
 			title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
-			pageId: "crmcontractdetails",
+			pageId: "crmOpportunityDetails",
 			area: ['90vw', '90vh'],
 			callBack: function (refreshCode) {
 			}});
diff --git a/crm/src/main/resources/template/js/documentary/crmDocumentaryList.js b/crm/src/main/resources/template/js/documentary/crmDocumentaryList.js
new file mode 100644
index 0000000000000000000000000000000000000000..1acd291366b7b93fc56cf41f0fe4b0bb0328b8f2
--- /dev/null
+++ b/crm/src/main/resources/template/js/documentary/crmDocumentaryList.js
@@ -0,0 +1,142 @@
+
+var objectKey = "";
+var objectId = "";
+
+layui.config({
+    base: basePath,
+    version: skyeyeVersion
+}).extend({
+    window: 'js/winui.window'
+}).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) {
+    winui.renderColor();
+    var $ = layui.$,
+        form = layui.form,
+        table = layui.table;
+    objectKey = GetUrlParam("objectKey");
+    objectId = GetUrlParam("objectId");
+    if (isNull(objectKey) || isNull(objectId)) {
+        winui.window.msg("请传入适用对象信息", {icon: 2, time: 2000});
+        return false;
+    }
+
+    var authPermission = teamObjectPermissionUtil.checkTeamBusinessAuthPermission(objectId, 'crmDocumentaryAuthEnum');
+
+    table.render({
+        id: 'messageTable',
+        elem: '#messageTable',
+        method: 'post',
+        url: sysMainMation.crmBasePath + 'queryDocumentaryList',
+        where: getTableParams(),
+        even: true,
+        page: true,
+        limits: getLimits(),
+        limit: getLimit(),
+        cols: [[
+            { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
+            { field: 'title', title: '名称', align: 'left', width: 300, templet: function (d) {
+                return '<a lay-event="details" class="notice-title-click">' + d.title + '</a>';
+            }},
+            { field: 'typeId', title: '类型', align: 'center', width: 120, templet: function (d) {
+                return sysDictDataUtil.getDictDataNameByCodeAndKey('CRM_DOCUMENTARY_TYPE', d.typeId);
+            }},
+            { field: 'documentaryTime', title: '跟单时间', align: 'center', width: 150 },
+            { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], align: 'left', width: 120 },
+            { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 },
+            { field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], align: 'left', width: 120 },
+            { field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', width: 150 },
+            { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 150, templet: function (d) {
+                var str = '';
+                if (authPermission['edit']) {
+                    str += '<a class="layui-btn layui-btn-xs" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>'
+                }
+                if (authPermission['delete']) {
+                    str += '<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="delete"><language showName="com.skyeye.deleteBtn"></language></a>'
+                }
+                return str;
+            }}
+        ]],
+        done: function(json) {
+            matchingLanguage();
+            initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入名称", function () {
+                table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
+            });
+        }
+    });
+
+    table.on('tool(messageTable)', function (obj) {
+        var data = obj.data;
+        var layEvent = obj.event;
+        if (layEvent === 'edit') {
+            edit(data);
+        } else if (layEvent === 'delete') {
+            del(data);
+        } else if (layEvent === 'details') {
+            details(data);
+        }
+    });
+
+
+    // 新增
+    $("body").on("click", "#addBean", function() {
+        parent._openNewWindows({
+            url: systemCommonUtil.getUrl('FP2023031100001&objectId=' + objectId + '&objectKey=' + objectKey, null),
+            title: systemLanguage["com.skyeye.addPageTitle"][languageType],
+            pageId: "crmDocumentaryAdd",
+            area: ['90vw', '90vh'],
+            callBack: function (refreshCode) {
+                winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
+                loadTable();
+            }});
+    });
+
+    // 编辑
+    function edit(data) {
+        parent._openNewWindows({
+            url: systemCommonUtil.getUrl('FP2023031100002&objectId=' + objectId + '&objectKey=' + objectKey + '&id=' + data.id, null),
+            title: systemLanguage["com.skyeye.editPageTitle"][languageType],
+            pageId: "crmDocumentaryEdit",
+            area: ['90vw', '90vh'],
+            callBack: function (refreshCode) {
+                winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
+                loadTable();
+            }});
+    }
+
+    // 详情
+    function details(data) {
+        parent._openNewWindows({
+            url: systemCommonUtil.getUrl('FP2023031100003&objectId=' + objectId + '&objectKey=' + objectKey + '&id=' + data.id, null),
+            title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
+            pageId: "crmDocumentaryDetails",
+            area: ['90vw', '90vh'],
+            callBack: function (refreshCode) {
+                winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
+                loadTable();
+            }});
+    }
+
+    // 删除
+    function del(data, obj) {
+        layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function (index) {
+            layer.close(index);
+            AjaxPostUtil.request({url: sysMainMation.crmBasePath + "deleteDocumentaryById", params: {id: data.id}, type: 'json', method: 'DELETE', callback: function (json) {
+                winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000});
+                loadTable();
+            }});
+        });
+    }
+
+    form.render();
+    $("body").on("click", "#reloadTable", function() {
+        loadTable();
+    });
+    function loadTable() {
+        table.reloadData("messageTable", {where: getTableParams()});
+    }
+
+    function getTableParams() {
+        return $.extend(true, {objectKey: objectKey, objectId: objectId}, initTableSearchUtil.getSearchValue("messageTable"));
+    }
+
+    exports('crmDocumentaryList', {});
+});
\ No newline at end of file
diff --git a/crm/src/main/resources/template/js/documentarymanage/documentaryAdd.js b/crm/src/main/resources/template/js/documentarymanage/documentaryAdd.js
deleted file mode 100644
index fc91e69f843ee8197e1152c37341fd719d1ee860..0000000000000000000000000000000000000000
--- a/crm/src/main/resources/template/js/documentarymanage/documentaryAdd.js
+++ /dev/null
@@ -1,65 +0,0 @@
-
-// 商机管理
-layui.config({
-	base: basePath, 
-	version: skyeyeVersion
-}).extend({
-    window: 'js/winui.window'
-}).define(['window', 'jquery', 'winui', 'laydate', 'textool'], function (exports) {
-	winui.renderColor();
-	layui.use(['form'], function (form) {
-		var index = parent.layer.getFrameIndex(window.name);
-	    var $ = layui.$,
-	    	laydate = layui.laydate,
-	    	textool = layui.textool;
-
-	    // 跟单时间
-		laydate.render({elem : '#documentaryTime', type : 'datetime', trigger : 'click'});
-		
-		textool.init({eleId: 'detail', maxlength: 200});
-
-		// 跟单分类
-		sysDictDataUtil.showDictDataListByDictTypeCode(sysDictData["crmDocumentaryType"]["key"], 'select', "typeId", '', form);
-
-		opportunityFrom();
-		//商机
-		function opportunityFrom(){
-			showGrid({
-			 	id: "opportunityId",
-			 	url: flowableBasePath + "opportunity008",
-			 	params: {},
-			 	pagination: false,
-			 	template: getFileContent('tpl/template/select-option.tpl'),
-			 	ajaxSendLoadBefore: function(hdb) {
-			 	},
-			 	ajaxSendAfter:function(j){
-			 		form.render('select');
-			 	}
-			});
-		}
-
-		skyeyeEnclosure.init('enclosureUpload');
-		matchingLanguage();
- 		form.render();
- 	    form.on('submit(formAddBean)', function (data) {
- 	        if (winui.verifyForm(data.elem)) {
- 	        	var params = {
-        			detail: $("#detail").val(),
-        			documentaryTime: $("#documentaryTime").val(),
-					typeId: $("#typeId").val(),
-					opportunityId: $("#opportunityId").val(),
-					enclosureInfo: skyeyeEnclosure.getEnclosureIdsByBoxId('enclosureUpload')
- 	        	};
- 	        	AjaxPostUtil.request({url: flowableBasePath + "documentary002", params: params, type: 'json', callback: function (json) {
-					parent.layer.close(index);
-					parent.refreshCode = '0';
-	 	   		}});
- 	        }
- 	        return false;
- 	    });
- 	    
-	    $("body").on("click", "#cancle", function() {
-	    	parent.layer.close(index);
-	    });
-	});
-});
\ No newline at end of file
diff --git a/crm/src/main/resources/template/js/documentarymanage/documentaryDetails.js b/crm/src/main/resources/template/js/documentarymanage/documentaryDetails.js
deleted file mode 100644
index 1a72ae481c3afdfa15eae422f634c4327258e6b1..0000000000000000000000000000000000000000
--- a/crm/src/main/resources/template/js/documentarymanage/documentaryDetails.js
+++ /dev/null
@@ -1,30 +0,0 @@
-
-layui.config({
-	base: basePath, 
-	version: skyeyeVersion
-}).extend({
-    window: 'js/winui.window'
-}).define(['window', 'jquery', 'winui'], function (exports) {
-	winui.renderColor();
-	layui.use(['form'], function (form) {
-		var index = parent.layer.getFrameIndex(window.name);
-	    var $ = layui.$;
-	    
-	    showGrid({
-		 	id: "showForm",
-		 	url: flowableBasePath + "documentary005",
-		 	params: {rowId: parent.rowId},
-		 	pagination: false,
-		 	template: getFileContent('tpl/documentarymanage/documentarydetailsTemplate.tpl'),
-		 	ajaxSendLoadBefore: function(hdb) {
-		 	},
-		 	ajaxSendAfter: function (json) {
-				// 附件回显
-				skyeyeEnclosure.showDetails({"enclosureUploadBtn": json.bean.enclosureInfo});
-
- 	        	matchingLanguage();
-		 		form.render();
-		 	}
-		});
-	});
-});
\ No newline at end of file
diff --git a/crm/src/main/resources/template/js/documentarymanage/documentaryedit.js b/crm/src/main/resources/template/js/documentarymanage/documentaryedit.js
deleted file mode 100644
index 69f96535cb0dfd7784d638bb48d2cf661ff41b26..0000000000000000000000000000000000000000
--- a/crm/src/main/resources/template/js/documentarymanage/documentaryedit.js
+++ /dev/null
@@ -1,79 +0,0 @@
-
-// 商机管理
-layui.config({
-	base: basePath, 
-	version: skyeyeVersion
-}).extend({
-    window: 'js/winui.window'
-}).define(['window', 'jquery', 'winui', 'laydate', 'textool'], function (exports) {
-	winui.renderColor();
-	layui.use(['form'], function (form) {
-		var index = parent.layer.getFrameIndex(window.name);
-	    var $ = layui.$,
-	    	laydate = layui.laydate,
-	    	textool = layui.textool;
-
-	    showGrid({
-		 	id: "showForm",
-		 	url: flowableBasePath + "documentary003",
-		 	params: {rowId: parent.rowId},
-		 	pagination: false,
-		 	template: getFileContent('tpl/documentarymanage/documentaryeditTemplate.tpl'),
-		 	ajaxSendLoadBefore: function(hdb) {
-		 	},
-		 	ajaxSendAfter: function (json) {
-		 		textool.init({eleId: 'detail', maxlength: 200});
-		 		
-		 		// 跟单时间
-				laydate.render({elem : '#documentaryTime', type : 'datetime', trigger : 'click'});
-
-				// 跟单分类
-				sysDictDataUtil.showDictDataListByDictTypeCode(sysDictData["crmDocumentaryType"]["key"], 'select', "typeId", json.bean.typeId, form);
-
-				opportunityFrom();
-				//商机
-				function opportunityFrom(){
-					showGrid({
-					 	id: "opportunityId",
-					 	url: flowableBasePath + "opportunity008",
-					 	params: {},
-					 	pagination: false,
-					 	template: getFileContent('tpl/template/select-option.tpl'),
-					 	ajaxSendLoadBefore: function(hdb) {
-					 	},
-					 	ajaxSendAfter:function(j){
-					 		$("#opportunityId").val(json.bean.opportunityId);
-					 		form.render('select');
-					 	}
-					});
-				}
-				// 附件回显
-				skyeyeEnclosure.initTypeISData({'enclosureUpload': json.bean.enclosureInfo});
-
- 	        	matchingLanguage();
-		 		form.render();
-		 	    form.on('submit(formEditBean)', function (data) {
-		 	        if (winui.verifyForm(data.elem)) {
-		 	        	var params = {
-		 	        		rowId: parent.rowId,
-	 	        			detail: $("#detail").val(),
-	 	        			documentaryTime: $("#documentaryTime").val(),
-							typeId: $("#typeId").val(),
-							opportunityId: $("#opportunityId").val(),
-							enclosureInfo: skyeyeEnclosure.getEnclosureIdsByBoxId('enclosureUpload')
-	 	 	        	};
-	 	 	        	AjaxPostUtil.request({url: flowableBasePath + "documentary004", params: params, type: 'json', callback: function (json) {
-							parent.layer.close(index);
-							parent.refreshCode = '0';
-	 		 	   		}});
-		 	        }
-		 	        return false;
-		 	    });
-		 	}
-		});
-	    
-	    $("body").on("click", "#cancle", function() {
-	    	parent.layer.close(index);
-	    });
-	});
-});
\ No newline at end of file
diff --git a/crm/src/main/resources/template/js/documentarymanage/documentarylist.js b/crm/src/main/resources/template/js/documentarymanage/documentarylist.js
deleted file mode 100644
index 66c864765f193caaf0e5b73c96e120a5013555ee..0000000000000000000000000000000000000000
--- a/crm/src/main/resources/template/js/documentarymanage/documentarylist.js
+++ /dev/null
@@ -1,102 +0,0 @@
-var rowId = "";
-
-layui.config({
-	base: basePath, 
-	version: skyeyeVersion
-}).extend({
-    window: 'js/winui.window'
-}).define(['window', 'table', 'jquery', 'winui', 'form', 'laydate'], function (exports) {
-	winui.renderColor();
-	var $ = layui.$,
-		form = layui.form,
-		laydate = layui.laydate,
-		table = layui.table;
-
-	// 跟单分类
-	sysDictDataUtil.showDictDataListByDictTypeCode(sysDictData["crmDocumentaryType"]["key"], 'select', "typeId", '', form);
-
-	// 跟单时间
-	laydate.render({elem: '#documentaryTime', range: '~'});
-	
-	// 所有跟单列表
-	table.render({
-	    id: 'messageTable',
-	    elem: '#messageTable',
-	    method: 'post',
-	    url: flowableBasePath + 'documentary007',
-	    where: getTableParams(),
-	    even: true,
-	    page: true,
-	    limits: [8, 16, 24, 32, 40, 48, 56],
-	    limit: 8,
-	    cols: [[
-	        { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
-	        { field: 'opportunityName', title: '商机', align: 'left', width: 300, templet: function (d) {
-	        	return '<a lay-event="details" class="notice-title-click">' + d.opportunityName + '</a>';
-	        }},
-	        { field: 'typeName', title: '类型', align: 'center', width: 120 },
-	        { field: 'documentaryTime', title: '跟单时间', align: 'center', width: 150 },
-	        { field: 'createName', title: '跟单人', align: 'center', width: 120 },
-	        { field: 'detail', title: '详细内容', align: 'center', width: 220 }
-	    ]],
-	    done: function(json) {
-	    	matchingLanguage();
-	    }
-	});
-	
-	table.on('tool(messageTable)', function (obj) {
-        var data = obj.data;
-        var layEvent = obj.event;
-        if (layEvent === 'details'){ // 详情
-        	details(data);
-        }
-    });
-	
-	// 详情
-	function details(data) {
-		rowId = data.id;
-		_openNewWindows({
-			url: "../../tpl/documentarymanage/documentaryDetails.html",
-			title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
-			pageId: "documentaryDetails",
-			area: ['90vw', '90vh'],
-			callBack: function (refreshCode) {
-			}});
-	}
-
-	form.render();
-	form.on('submit(formSearch)', function (data) {
-		if (winui.verifyForm(data.elem)) {
-			table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
-		}
-		return false;
-	});
-
-	$("body").on("click", "#reloadTable", function() {
-		loadTable();
-	});
-
-	function loadTable() {
-		table.reloadData("messageTable", {where: getTableParams()});
-	}
-	
-	function getTableParams() {
-		var startTime = "";
-		var endTime = "";
-		if(isNull($("#documentaryTime").val())) {
-    		startTime = "";
-    		endTime = "";
-    	} else {
-    		startTime = $("#documentaryTime").val().split('~')[0].trim();
-    		endTime = $("#documentaryTime").val().split('~')[1].trim();
-    	}
-    	return {
-    		opportunityName: $("#opportunityName").val(),
-    		typeId: $("#typeId").val(),
-    		startTime: startTime,
-    		endTime: endTime
-    	};
-	}
-	
-    exports('documentarylist', {});
-});
\ No newline at end of file
diff --git a/crm/src/main/resources/template/js/documentarymanage/mydocumentarylist.js b/crm/src/main/resources/template/js/documentarymanage/mydocumentarylist.js
deleted file mode 100644
index 94e645cebe81f96a42da9376b19140b1a9df6fdc..0000000000000000000000000000000000000000
--- a/crm/src/main/resources/template/js/documentarymanage/mydocumentarylist.js
+++ /dev/null
@@ -1,143 +0,0 @@
-var rowId = "";
-
-layui.config({
-	base: basePath, 
-	version: skyeyeVersion
-}).extend({
-    window: 'js/winui.window'
-}).define(['window', 'table', 'jquery', 'winui', 'form', 'laydate'], function (exports) {
-	winui.renderColor();
-	var $ = layui.$,
-		form = layui.form,
-		laydate = layui.laydate,
-		table = layui.table;
-	
-	authBtn('1572595572098');
-
-	// 跟单分类
-	sysDictDataUtil.showDictDataListByDictTypeCode(sysDictData["crmDocumentaryType"]["key"], 'select', "typeId", '', form);
-
-	// 跟单时间
-	laydate.render({elem: '#documentaryTime', range: '~'});
-	
-	table.render({
-	    id: 'messageTable',
-	    elem: '#messageTable',
-	    method: 'post',
-	    url: flowableBasePath + 'documentary001',
-	    where: getTableParams(),
-	    even: true,
-	    page: true,
-	    limits: [8, 16, 24, 32, 40, 48, 56],
-	    limit: 8,
-	    cols: [[
-	        { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
-	        { field: 'opportunityName', title: '商机', align: 'left', width: 300, templet: function (d) {
-	        	return '<a lay-event="details" class="notice-title-click">' + d.opportunityName + '</a>';
-	        }},
-	        { field: 'typeName', title: '类型', align: 'center', width: 120 },
-	        { field: 'documentaryTime', title: '跟单时间', align: 'center', width: 150 },
-	        { field: 'createName', title: '跟单人', align: 'center', width: 120 },
-	        { field: 'detail', title: '详细内容', align: 'center', width: 220 },
-	        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 200, toolbar: '#tableBar'}
-	    ]],
-	    done: function(json) {
-	    	matchingLanguage();
-	    }
-	});
-	
-	table.on('tool(messageTable)', function (obj) {
-        var data = obj.data;
-        var layEvent = obj.event;
-        if (layEvent === 'edit') { // 编辑
-        	edit(data);
-        } else if (layEvent === 'delete'){ // 删除
-        	del(data);
-        } else if (layEvent === 'details'){ // 详情
-        	details(data);
-        }
-    });
-	
-	// 新增
-	$("body").on("click", "#addBean", function() {
-    	_openNewWindows({
-			url: "../../tpl/documentarymanage/documentaryAdd.html",
-			title: "新增跟单",
-			pageId: "documentaryAdd",
-			area: ['90vw', '90vh'],
-			callBack: function (refreshCode) {
-				winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
-				loadTable();
-			}});
-    });
-	
-	// 编辑
-	function edit(data) {
-		rowId = data.id;
-		_openNewWindows({
-			url: "../../tpl/documentarymanage/documentaryedit.html", 
-			title: "编辑跟单",
-			pageId: "documentaryedit",
-			area: ['90vw', '90vh'],
-			callBack: function (refreshCode) {
-				winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
-				loadTable();
-			}});
-	}
-	
-	// 详情
-	function details(data) {
-		rowId = data.id;
-		_openNewWindows({
-			url: "../../tpl/documentarymanage/documentaryDetails.html",
-			title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
-			pageId: "documentaryDetails",
-			area: ['90vw', '90vh'],
-			callBack: function (refreshCode) {
-			}});
-	}
-	
-	// 删除
-	function del(data, obj) {
-		layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function (index) {
-			layer.close(index);
-            AjaxPostUtil.request({url: flowableBasePath + "documentary006", params: {rowId: data.id}, type: 'json', callback: function (json) {
-				winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000});
-				loadTable();
-    		}});
-		});
-	}
-
-	form.render();
-	form.on('submit(formSearch)', function (data) {
-		if (winui.verifyForm(data.elem)) {
-			table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
-		}
-		return false;
-	});
-
-	$("body").on("click", "#reloadTable", function() {
-		loadTable();
-	});
-
-	function loadTable() {
-		table.reloadData("messageTable", {where: getTableParams()});
-	}
-
-	function getTableParams() {
-		var startTime = "";
-		var endTime = "";
-		if (!isNull($("#documentaryTime").val())) {
-			startTime = $("#documentaryTime").val().split('~')[0].trim();
-			endTime = $("#documentaryTime").val().split('~')[1].trim();
-		}
-		return {
-			opportunityName: $("#opportunityName").val(),
-			typeId: $("#typeId").val(),
-			startTime: startTime,
-			endTime: endTime
-		};
-	}
-	
-    exports('mydocumentarylist', {});
-});
\ No newline at end of file
diff --git a/crm/src/main/resources/template/tpl/documentary/crmDocumentaryList.html b/crm/src/main/resources/template/tpl/documentary/crmDocumentaryList.html
new file mode 100644
index 0000000000000000000000000000000000000000..64709d9fc49fd9cd4ad3e757926a27ae43de51c2
--- /dev/null
+++ b/crm/src/main/resources/template/tpl/documentary/crmDocumentaryList.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title></title>
+    <link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
+    <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
+</head>
+<body>
+    <div class="winui-toolbar">
+        <div class="winui-tool">
+            <button id="reloadTable" class="winui-toolbtn search-table-btn-right"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
+            <button id="addBean" class="winui-toolbtn search-table-btn-right" auth="add"><i class="fa fa-plus" aria-hidden="true"></i><language showName="com.skyeye.addBtn"></language></button>
+        </div>
+    </div>
+    <div style="margin:auto 10px;">
+        <table id="messageTable" lay-filter="messageTable"></table>
+    </div>
+    <script src="../../assets/lib/layui/layui.js"></script>
+    <script src="../../assets/lib/layui/custom.js"></script>
+    <script type="text/javascript">
+        layui.config({base: '../../js/documentary/'}).use('crmDocumentaryList');
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/crm/src/main/resources/template/tpl/documentarymanage/documentaryAdd.html b/crm/src/main/resources/template/tpl/documentarymanage/documentaryAdd.html
deleted file mode 100644
index 84822f54c7740d1a109969e4e398180a4b916d08..0000000000000000000000000000000000000000
--- a/crm/src/main/resources/template/tpl/documentarymanage/documentaryAdd.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8" />
-    <title></title>
-    <link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
-    <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
-</head>
-<body>
-	<div style="padding:20px; margin:0 auto;">
-	    <form class="layui-form" action="" id="showForm">
-		    <div class="layui-form-item layui-col-xs12">
-		        <label class="layui-form-label">商机<i class="red">*</i></label>
-		        <div class="layui-input-block">
-					<select id="opportunityId" name="opportunityId" win-verify="required" lay-filter="opportunityId" lay-search="">
-						
-					</select>
-	            </div>
-		    </div>
-		    <div class="layui-form-item layui-col-xs6">
-		        <label class="layui-form-label">分类<i class="red">*</i></label>
-		        <div class="layui-input-block">
-					<select id="typeId" name="typeId" win-verify="required" lay-filter="typeId" lay-search="">
-						
-					</select>
-	            </div>
-		    </div>
-		    <div class="layui-form-item layui-col-xs6">
-		        <label class="layui-form-label">跟单时间<i class="red">*</i></label>
-		        <div class="layui-input-block">
-		        	<input type="text" id="documentaryTime" name="documentaryTime" win-verify="required" placeholder="请输入跟单时间" class="layui-input"/>
-		        </div>
-		    </div>
-		    <div class="layui-form-item layui-col-xs12">
-		        <label class="layui-form-label">详细内容<i class="red">*</i></label>
-		        <div class="layui-input-block">
-		        	<textarea id="detail" name="detail" placeholder="请输入详细内容" win-verify="required" class="layui-textarea" style="height: 100px;" maxlength="200"></textarea>
-		        </div>
-		    </div>
-		    <div class="layui-form-item layui-col-xs12">
-		        <label class="layui-form-label">附件资料</label>
-				<div class="layui-input-block" id="enclosureUpload">
-		        </div>
-		    </div>
-		    <div class="layui-form-item layui-col-xs12">
-		        <div class="layui-input-block">
-		            <button class="winui-btn" id="cancle"><language showName="com.skyeye.cancel"></language></button>
-		            <button class="winui-btn" lay-submit lay-filter="formAddBean"><language showName="com.skyeye.save"></language></button>
-		        </div>
-		    </div>
-	    </form>
-	</div>
-	<script src="../../assets/lib/layui/layui.js"></script>
-   	<script src="../../assets/lib/layui/custom.js"></script>
-   	<script type="text/javascript">
-        layui.config({base: '../../js/documentarymanage/'}).use('documentaryAdd');
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/crm/src/main/resources/template/tpl/documentarymanage/documentaryDetails.html b/crm/src/main/resources/template/tpl/documentarymanage/documentaryDetails.html
deleted file mode 100644
index 81ab33576fcb58931fe4ab7ec7f7c99801cd5e6c..0000000000000000000000000000000000000000
--- a/crm/src/main/resources/template/tpl/documentarymanage/documentaryDetails.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8" />
-    <title></title>
-    <link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
-    <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
-</head>
-<body>
-	<div style="padding:20px; margin:0 auto;">
-	    <form class="layui-form" action="" id="showForm">
-	        
-	    </form>
-	</div>
-	<script src="../../assets/lib/layui/layui.js"></script>
-   	<script src="../../assets/lib/layui/custom.js"></script>
-   	<script type="text/javascript">
-        layui.config({base: '../../js/documentarymanage/'}).use('documentaryDetails');
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/crm/src/main/resources/template/tpl/documentarymanage/documentarydetailsTemplate.tpl b/crm/src/main/resources/template/tpl/documentarymanage/documentarydetailsTemplate.tpl
deleted file mode 100644
index 588fe91c7695995294f9da6eeb4caf0593eb4c6a..0000000000000000000000000000000000000000
--- a/crm/src/main/resources/template/tpl/documentarymanage/documentarydetailsTemplate.tpl
+++ /dev/null
@@ -1,31 +0,0 @@
-{{#bean}}
-    <div class="layui-form-item layui-col-xs12">
-        <label class="layui-form-label">商机：</label>
-        <div class="layui-input-block ver-center">
-            {{opportunityName}}
-        </div>
-    </div>
-    <div class="layui-form-item layui-col-xs6">
-        <label class="layui-form-label">类型：</label>
-        <div class="layui-input-block ver-center">
-            {{typeName}}
-        </div>
-    </div>
-    <div class="layui-form-item layui-col-xs6">
-        <label class="layui-form-label">跟单时间：</label>
-        <div class="layui-input-block ver-center">
-            {{documentaryTime}}
-        </div>
-    </div>
-    <div class="layui-form-item layui-col-xs12">
-        <label class="layui-form-label">详细内容：</label>
-        <div class="layui-input-block ver-center">
-            {{detail}}
-        </div>
-    </div>
-    <div class="layui-form-item layui-col-xs12">
-        <label class="layui-form-label">相关附件：</label>
-        <div class="layui-input-block ver-center" id="enclosureUploadBtn">
-        </div>
-    </div>
-{{/bean}}
\ No newline at end of file
diff --git a/crm/src/main/resources/template/tpl/documentarymanage/documentaryedit.html b/crm/src/main/resources/template/tpl/documentarymanage/documentaryedit.html
deleted file mode 100644
index c7aade2375bcf550853f9c0629164df0d1cd26b6..0000000000000000000000000000000000000000
--- a/crm/src/main/resources/template/tpl/documentarymanage/documentaryedit.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8" />
-    <title></title>
-    <link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
-    <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
-</head>
-<body>
-	<div style="padding:20px; margin:0 auto;">
-	    <form class="layui-form" action="" id="showForm">
-	        
-	    </form>
-	</div>
-	<script src="../../assets/lib/layui/layui.js"></script>
-   	<script src="../../assets/lib/layui/custom.js"></script>
-   	<script type="text/javascript">
-        layui.config({base: '../../js/documentarymanage/'}).use('documentaryedit');
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/crm/src/main/resources/template/tpl/documentarymanage/documentaryeditTemplate.tpl b/crm/src/main/resources/template/tpl/documentarymanage/documentaryeditTemplate.tpl
deleted file mode 100644
index 8e1d0fc75c17feca061e0ec7502c44e384c4b4a1..0000000000000000000000000000000000000000
--- a/crm/src/main/resources/template/tpl/documentarymanage/documentaryeditTemplate.tpl
+++ /dev/null
@@ -1,41 +0,0 @@
-{{#bean}}
-	<div class="layui-form-item layui-col-xs12">
-        <label class="layui-form-label">商机<i class="red">*</i></label>
-        <div class="layui-input-block">
-			<select id="opportunityId" name="opportunityId" win-verify="required" lay-filter="opportunityId" lay-search="">
-				
-			</select>
-        </div>
-    </div>
-    <div class="layui-form-item layui-col-xs6">
-        <label class="layui-form-label">分类<i class="red">*</i></label>
-        <div class="layui-input-block">
-			<select id="typeId" name="typeId" win-verify="required" lay-filter="typeId" lay-search="">
-				
-			</select>
-        </div>
-    </div>
-    <div class="layui-form-item layui-col-xs6">
-        <label class="layui-form-label">跟单时间<i class="red">*</i></label>
-        <div class="layui-input-block">
-        	<input type="text" id="documentaryTime" name="documentaryTime" win-verify="required" placeholder="请输入跟单时间" class="layui-input" value="{{documentaryTime}}"/>
-        </div>
-    </div>
-    <div class="layui-form-item layui-col-xs12">
-        <label class="layui-form-label">详细内容</label>
-        <div class="layui-input-block">
-        	<textarea id="detail" name="detail"  placeholder="请输入详细内容" class="layui-textarea" style="height: 100px;" maxlength="200">{{detail}}</textarea>
-        </div>
-    </div>
-    <div class="layui-form-item layui-col-xs12">
-        <label class="layui-form-label">附件资料</label>
-        <div class="layui-input-block" id="enclosureUpload">
-        </div>
-    </div>
-    <div class="layui-form-item layui-col-xs12">
-		<div class="layui-input-block">
-			<button class="winui-btn" id="cancle"><language showName="com.skyeye.cancel"></language></button>
-			<button class="winui-btn" lay-submit lay-filter="formEditBean"><language showName="com.skyeye.save"></language></button>
-		</div>
-	</div>
-{{/bean}}
\ No newline at end of file
diff --git a/crm/src/main/resources/template/tpl/documentarymanage/documentarylist.html b/crm/src/main/resources/template/tpl/documentarymanage/documentarylist.html
deleted file mode 100644
index 392ca548cfd8d57c6ce1e0a6bd9db024b9fe27ba..0000000000000000000000000000000000000000
--- a/crm/src/main/resources/template/tpl/documentarymanage/documentarylist.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8" />
-    <title></title>
-    <link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
-    <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
-</head>
-<body>
-	<div class="txtcenter" style="margin:0 auto;padding-top:10px;">
-	    <form class="layui-form layui-form-pane" action="" autocomplete="off">
-	        <div class="layui-form-item">
-	            <div class="layui-inline">
-	            	<label class="layui-form-label">商机</label>
-					<div class="layui-input-inline">
-						<input type="text" id="opportunityName" name="opportunityName" placeholder="请输入商机" class="layui-input" />
-					</div>
-					<label class="layui-form-label">分类</label>
-					<div class="layui-input-inline">
-						<select id="typeId" name="typeId" lay-filter="typeId" lay-search="">
-						</select>
-					</div>
-					<label class="layui-form-label">跟单时间</label>
-					<div class="layui-input-inline">
-						<input type="text" id="documentaryTime" name="documentaryTime" placeholder="请输入跟单时间" class="layui-input" />
-					</div>
-					<button type="reset" class="layui-btn layui-btn-primary list-form-search"><language showName="com.skyeye.reset"></language></button>
-					<button class="layui-btn list-form-search" lay-submit lay-filter="formSearch"><language showName="com.skyeye.search2"></language></button>
-	            </div>
-	        </div>
-	    </form>
-	</div>
-    <div class="winui-toolbar">
-        <div class="winui-tool">
-            <button id="reloadTable" class="winui-toolbtn"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
-        </div>
-    </div>
-    <div style="margin:auto 10px;">
-        <table id="messageTable" lay-filter="messageTable"></table>
-    </div>
-    <script src="../../assets/lib/layui/layui.js"></script>
-    <script src="../../assets/lib/layui/custom.js"></script>
-    <script type="text/javascript">
-        layui.config({base: '../../js/documentarymanage/'}).use('documentarylist');
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/crm/src/main/resources/template/tpl/documentarymanage/mydocumentarylist.html b/crm/src/main/resources/template/tpl/documentarymanage/mydocumentarylist.html
deleted file mode 100644
index 5a14c1196763dce778356ee116e6339c34b6a0d7..0000000000000000000000000000000000000000
--- a/crm/src/main/resources/template/tpl/documentarymanage/mydocumentarylist.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8" />
-    <title></title>
-    <link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
-    <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
-</head>
-<body>
-	<div class="txtcenter" style="margin:0 auto;padding-top:10px;">
-	    <form class="layui-form layui-form-pane" action="" autocomplete="off">
-	        <div class="layui-form-item">
-	            <div class="layui-inline">
-	            	<label class="layui-form-label">商机</label>
-					<div class="layui-input-inline">
-						<input type="text" id="opportunityName" name="opportunityName" placeholder="请输入商机" class="layui-input" />
-					</div>
-					<label class="layui-form-label">分类</label>
-					<div class="layui-input-inline">
-						<select id="typeId" name="typeId" lay-filter="typeId" lay-search="">
-						</select>
-					</div>
-					<label class="layui-form-label">跟单时间</label>
-					<div class="layui-input-inline">
-						<input type="text" id="documentaryTime" name="documentaryTime" placeholder="请输入跟单时间" class="layui-input" />
-					</div>
-					<button type="reset" class="layui-btn layui-btn-primary list-form-search"><language showName="com.skyeye.reset"></language></button>
-					<button class="layui-btn list-form-search" lay-submit lay-filter="formSearch"><language showName="com.skyeye.search2"></language></button>
-	            </div>
-	        </div>
-	    </form>
-	</div>
-    <div class="winui-toolbar">
-        <div class="winui-tool">
-            <button id="reloadTable" class="winui-toolbtn"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
-            <button id="addBean" class="winui-toolbtn" auth="1572595572098"><i class="fa fa-plus" aria-hidden="true"></i><language showName="com.skyeye.addBtn"></language></button>
-        </div>
-    </div>
-    <div style="margin:auto 10px;">
-        <table id="messageTable" lay-filter="messageTable"></table>
-        	<script type="text/html" id="tableBar">
-				{{# if(auth('1572595603226')){ }}
-            		<a class="layui-btn layui-btn-xs" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>
-				{{# } }}
-				{{# if(auth('1572595617827')){ }}
-            		<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="delete"><language showName="com.skyeye.deleteBtn"></language></a>
-				{{# } }}
-        	</script>
-    </div>
-    <script src="../../assets/lib/layui/layui.js"></script>
-    <script src="../../assets/lib/layui/custom.js"></script>
-    <script type="text/javascript">
-        layui.config({base: '../../js/documentarymanage/'}).use('mydocumentarylist');
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/web/src/main/resources/template/assets/lib/winui/css/customer/skyeye-custom.css b/web/src/main/resources/template/assets/lib/winui/css/customer/skyeye-custom.css
index 11744e0de1c1c260ec0eebd49bf63e085a4f8d70..1386b70dcdec7df600c5d7ddedadeadfeecee24e 100644
--- a/web/src/main/resources/template/assets/lib/winui/css/customer/skyeye-custom.css
+++ b/web/src/main/resources/template/assets/lib/winui/css/customer/skyeye-custom.css
@@ -3,6 +3,7 @@
     margin-bottom: 5px;
     color: #46799b !important;
     background-color: #e0eaf1 !important;
+    margin-left: 5px;
 }
 
 /*图片预览时底部操作按钮所在DOM的样式*/
diff --git a/web/src/main/resources/template/json/skyeyeClassEnum.json b/web/src/main/resources/template/json/skyeyeClassEnum.json
index 4f25c3bd65e3c810b1d39407887e228e097a3a2d..0ffaf7c3072b70e86fd5a741678494e09db1f00c 100644
--- a/web/src/main/resources/template/json/skyeyeClassEnum.json
+++ b/web/src/main/resources/template/json/skyeyeClassEnum.json
@@ -50,5 +50,7 @@
     "crmContractStateEnum": {"name": "合同状态", "className": "skyeye-crm#com.skyeye.contract.classenum.CrmContractStateEnum"},
     "crmContractAuthEnum": {"name": "合同权限", "className": "skyeye-crm#com.skyeye.contract.classenum.CrmContractAuthEnum", "pageUrl": "../../tpl/crmContract/crmContractList.html"},
     "crmOpportunityStateEnum": {"name": "商机状态", "className": "skyeye-crm#com.skyeye.opportunity.classenum.CrmOpportunityStateEnum"},
-    "crmOpportunityAuthEnum": {"name": "商机权限", "className": "skyeye-crm#com.skyeye.opportunity.classenum.CrmOpportunityAuthEnum", "pageUrl": "../../tpl/crmOpportunity/crmOpportunityList.html"}
+    "crmOpportunityAuthEnum": {"name": "商机权限", "className": "skyeye-crm#com.skyeye.opportunity.classenum.CrmOpportunityAuthEnum", "pageUrl": "../../tpl/crmOpportunity/crmOpportunityList.html"},
+    "crmDocumentaryAuthEnum": {"name": "跟单权限", "className": "skyeye-crm#com.skyeye.documentary.classenum.CrmDocumentaryAuthEnum", "pageUrl": "../../tpl/documentary/crmDocumentaryList.html"}
+
 }
\ No newline at end of file