解决项目任务树加载时html乱码的问题，解决项目任命时提示XXX不能为空的问题

pro/src/main/resources/template/js/proproject/proappoint.js

@@ -36,14 +36,14 @@ layui.config({
 				skyeyeEnclosure.showDetails({"businessEnclosureUpload": json.bean.businessEnclosureInfoList});
 
 				ue = ueEditorUtil.initEditor('container');
-				planUe = ueEditorUtil.initEditor('planContainer');
 			    ue.addListener("ready", function () {
 			    	if (!isNull(json.bean.projectContent))
 			    		ue.setContent(json.bean.projectContent);
 			    	else
 			    		ue.setContent("在此处填写您的[分工明细]");
 			    });
-			    
+
+				planUe = ueEditorUtil.initEditor('planContainer');
 			    planUe.addListener("ready", function () {
 			    	if (!isNull(json.bean.planContent))
 			    		planUe.setContent(json.bean.planContent);
@@ -101,10 +101,10 @@ layui.config({
 			    
 			    matchingLanguage();
 		 		form.render();
-		 	    form.on('submit(formAppointBean)', function (data) {
-		 	        if (winui.verifyForm(data.elem)) {
-		 	        	var params = {
-	 	        			rowId: parent.rowId,
+				form.on('submit(formAppointBean)', function (data) {
+					if (winui.verifyForm(data.elem)) {
+						var params = {
+							rowId: parent.rowId,
 							toProjectManager: systemCommonUtil.tagEditorGetAllData('projectManager', toProjectManager), // 项目经理
 							toProjectSponsor: systemCommonUtil.tagEditorGetAllData('projectSponsor', toProjectSponsor), // 项目赞助人
 							toProjectMembers: systemCommonUtil.tagEditorGetAllData('projectMembers', toProjectMembers), // 项目组成员
@@ -112,18 +112,26 @@ layui.config({
 							planEnclosureInfoStr: skyeyeEnclosure.getEnclosureIdsByBoxId('planEnclosureUpload'),
 							projectContent: encodeURIComponent(ue.getContent()),
 							planContent: encodeURIComponent(planUe.getContent())
-	 	 	        	};
-		 	        	if(isNull(params.projectContent)){
-			        		winui.window.msg("请填写业务需求和目标", {icon: 2, time: 2000});
-			        		return false;
-			        	}
-	 	 	        	AjaxPostUtil.request({url: flowableBasePath + "proproject014", params: params, type: 'json', callback: function(json) {
+						};
+						if (isNull(params.toProjectManager)) {
+							winui.window.msg("请选择项目经理", {icon: 2, time: 2000});
+							return false;
+						}
+						if (isNull(params.toProjectMembers)) {
+							winui.window.msg("请选择项目成员", {icon: 2, time: 2000});
+							return false;
+						}
+						if (isNull(params.projectContent)) {
+							winui.window.msg("请填写业务需求和目标", {icon: 2, time: 2000});
+							return false;
+						}
+						AjaxPostUtil.request({url: flowableBasePath + "proproject014", params: params, type: 'json', callback: function (json) {
 							parent.layer.close(index);
 							parent.refreshCode = '0';
-	 		 	   		}});
-		 	        }
-		 	        return false;
-		 	    });
+						}});
+					}
+					return false;
+				});
 		 	}
 		});
 		

pro/src/main/resources/template/js/protask/protasklist.js

@@ -29,32 +29,30 @@ layui.config({
 	    where: getTableParams(),
 	    cols: [[
 	        { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers', rowspan: 2},
-	        { field: 'taskName', title: '名称', rowspan: 2, width: 200, templet: function (d) {
-	        	return '<a lay-event="details" class="notice-title-click">' + d.taskName + '</a>';
-	        }},
+	        { field: 'taskName', title: '名称', rowspan: 2, width: 200 },
 	        { field: 'processInstanceId', title: '流程ID', rowspan: 2, width: 70 , templet: function (d) {
 	        	return '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
 	        }},
 	        { field: 'state', title: '审批状态', rowspan: 2, width: 80, templet: function (d) {
-	        	if (d.state == '0'){
-	        		return "草稿";
-	        	} else if (d.state == '1'){
-	        		return "<span class='state-new'>审核中</span>";
-	        	} else if (d.state == '2'){
-	        		return "<span class='state-new'>执行中</span>";
-	        	} else if (d.state == '3'){
-	        		return "<span class='state-new'>执行完成</span>";
-	        	} else if (d.state == '4'){
-	        		return "<span class='state-error'>关闭</span>";
-	        	} else if (d.state == '5'){
-	        		return "<span class='state-error'>撤销</span>";
-	        	} else if (d.state == '6'){
-	        		return "<span class='state-down'>作废</span>";
-	        	} else if (d.state == '11'){
-	        		return "<span class='state-up'>审核通过</span>";
-	        	} else if (d.state == '12'){
-	        		return "<span class='state-down'>审核不通过</span>";
-	        	} 
+				if (d.state == '0') {
+					return "草稿";
+				} else if (d.state == '1') {
+					return "<span class='state-new'>审核中</span>";
+				} else if (d.state == '2') {
+					return "<span class='state-new'>执行中</span>";
+				} else if (d.state == '3') {
+					return "<span class='state-new'>执行完成</span>";
+				} else if (d.state == '4') {
+					return "<span class='state-error'>关闭</span>";
+				} else if (d.state == '5') {
+					return "<span class='state-error'>撤销</span>";
+				} else if (d.state == '6') {
+					return "<span class='state-down'>作废</span>";
+				} else if (d.state == '11') {
+					return "<span class='state-up'>审核通过</span>";
+				} else if (d.state == '12') {
+					return "<span class='state-down'>审核不通过</span>";
+				}
 	        }},
 	        { field: 'projectName', title: '所属项目', rowspan: 2, width: 120 },
 	        { field: 'performId', title: '执行人', rowspan: 2, width: 200 },

pro/src/main/resources/template/js/protaskall/protasklist.js

@@ -24,9 +24,7 @@ layui.config({
 	    where: getTableParams(),
 	    cols: [[
 	        { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers', rowspan: 2},
-	        { field: 'taskName', title: '名称', rowspan: 2, width: 200, templet: function (d) {
-	        	return '<a lay-event="details" class="notice-title-click">' + d.taskName + '</a>';
-	        }},
+	        { field: 'taskName', title: '名称', rowspan: 2, width: 200 },
 	        { field: 'processInstanceId', title: '流程ID', rowspan: 2, width: 70 , templet: function (d) {
 	        	return '<a lay-event="processDetails" class="notice-title-click">' + d.processInstanceId + '</a>';
 	        }},

pro/src/main/resources/template/tpl/protask/protasklist.html

@@ -108,6 +108,7 @@
 						<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="revoke">撤销</a>
 					{{# } }}
 				{{# } }}
+				<a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="details">详情</a>
         	</script>
     	</div>
     </div>

pro/src/main/resources/template/tpl/protaskall/protasklist.html

@@ -41,6 +41,9 @@
     <div style="margin:auto 10px;">
         <div style="margin:auto 10px;">
 	        <table id="messageTable" lay-filter="messageTable"></table>
+			<script type="text/html" id="tableBar">
+				<a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="details">详情</a>
+			</script>
     	</div>
     </div>
     <script src="../../assets/lib/layui/layui.js"></script>

web/src/main/resources/template/assets/lib/layui/customer/ueEditorUtil.js

 var ueEditorUtil = {
 
-    initEditor: function (id){
-        var ue = UE.getEditor(id,{
+    ueEditorMap: {},
+
+    initEditor: function (id) {
+        ueEditorUtil.ueEditorMap[id] = UE.getEditor(id, {
             initialFrameWidth: '100%', //初始化编辑器宽度,默认1000
             initialFrameHeight: 800,
             maximumWords: 100000,
             autoHeightEnabled: false, // 禁止自动增高，改用滚动条
             enableAutoSave: false, // 自动保存
         });
-
-        UE.Editor.prototype._bkGetActionUrl = UE.Editor.prototype.getActionUrl;
-        UE.Editor.prototype.getActionUrl = function(action){
-            if (action == 'uploadimage' || action == 'uploadfile' || action == 'uploadvideo' || action == 'uploadimage'){//上传单个图片,上传附件,上传视频,多图上传
-                return reqBasePath + '/upload/editUploadController/uploadContentPic';
-            } else if(action == 'listimage'){
-                return reqBasePath + '/upload/editUploadController/downloadContentPic';
-            } else {
-                return this._bkGetActionUrl.call(this, action);
-            }
-        };
-        return ue;
+        if (ueEditorUtil.ueEditorMap.length == 1) {
+            UE.Editor.prototype._bkGetActionUrl = UE.Editor.prototype.getActionUrl;
+            UE.Editor.prototype.getActionUrl = function (action) {
+                if (action == 'uploadimage' || action == 'uploadfile' || action == 'uploadvideo' || action == 'uploadimage') {//上传单个图片,上传附件,上传视频,多图上传
+                    return reqBasePath + '/upload/editUploadController/uploadContentPic';
+                } else if (action == 'listimage') {
+                    return reqBasePath + '/upload/editUploadController/downloadContentPic';
+                } else {
+                    return this._bkGetActionUrl.call(this, action);
+                }
+            };
+        }
+        return ueEditorUtil.ueEditorMap[id];
     },
 
 };
\ No newline at end of file