Merge branch 'dev-sx' of http://129.211.46.84:8800/platform/hg-smart into master-dc

src/main/webapp/HG/WD/HGWD001.js

@@ -875,32 +875,40 @@ let showAuthButton = function () {
     let parentId = IPLATUI.EFTree.categoryTree.selectTreeNode.fileId;
     let leafLevel = IPLATUI.EFTree.categoryTree.selectTreeNode.leafLevel;
 	let isAuth = IPLATUI.EFTree.categoryTree.selectTreeNode.isAuth;
-    let changeRecord = $("#CHANGE_RECORD").hide();
-    if (!isBlank(leafLevel) && leafLevel == 0){
-        changeRecord.show();
-        $("#COPY_PROT_FILE").show();
+	// 隐藏变更记录按钮
+	if (!isBlank(leafLevel) && leafLevel === 0) {
+		CommonUtils.showButton("CHANGE_RECORD");
+		CommonUtils.showButton("COPY_PROT_FILE");
+	} else {
+		CommonUtils.hideButton("CHANGE_RECORD");
 	}
 	// C:目录
-    if (isBlank(leafType) || leafType != "C") {
-        $("#RELEASE").hide();
-        $("#UPLOAD_FILE").hide();
-        $("#COPY_FILE").hide();
-        //$("#COPY_PROT_FILE").hide();
-        $("#PREVIEW").hide();
-        $("#BATCH_DOWNLOAD").hide();
+	if (isBlank(leafType) || leafType !== "C") {
+		CommonUtils.hideButton("RELEASE");
+		CommonUtils.hideButton("UPLOAD_FILE");
+		CommonUtils.hideButton("COPY_FILE");
+		CommonUtils.hideButton("PREVIEW");
+		CommonUtils.hideButton("BATCH_DOWNLOAD");
 		return
 	}
 	// 0：不授权
-	if (isAuth == 0) {
-		$("#RELEASE").show();
-		$("#UPLOAD_FILE").show();
-		$("#COPY_FILE").show();
-		$("#COPY_PROT_FILE").show();
-		$("#PREVIEW").show();
-		$("#BATCH_DOWNLOAD").show();
-		return;
-	}
+	if (isAuth === 0) {
+		notAuthShowButton();
+	} else {
 		isProjectManager(parentId);
+	}
+}
+
+/**
+ * 不授权显示按钮
+ */
+function notAuthShowButton() {
+	CommonUtils.showButton("RELEASE");
+	CommonUtils.showButton("UPLOAD_FILE");
+	CommonUtils.showButton("COPY_FILE");
+	CommonUtils.showButton("COPY_PROT_FILE");
+	CommonUtils.showButton("PREVIEW");
+	CommonUtils.showButton("BATCH_DOWNLOAD");
 }
 
 /**
@@ -1054,32 +1062,37 @@ let showPreview = function (docId, docType, docName) {
 	addRecordWindow(fileId, docId, docType, docName);
 }
 
+/**
+ * 项目管理人员
+ *
+ * @param parentId
+ */
 let isProjectManager = function (parentId) {
     let inEiInfo = new EiInfo();
     inEiInfo.set("inqu_status-0-fileId", parentId);
-    $("#COPY_PROT_FILE").show();
-    $("#BATCH_DOWNLOAD").show();
-    $("#RELEASE").show();
-    $("#UPLOAD_FILE").show();
-    $("#COPY_FILE").show();
-    $("#PREVIEW").show();
     EiCommunicator.send("HGWD001", "queryProjectManager", inEiInfo, {
         onSuccess(ei) {
-            if (ei.status != -1){
-                switch (ei.extAttr.isManager) {
-                    case 1:
-                    case 2:
-                        break
-                    case 3:
-                        $("#RELEASE").hide();
-                        break
-                    default:
-                        $("#RELEASE").hide();
-                        $("#UPLOAD_FILE").hide();
-                        $("#COPY_FILE").hide();
-                        $("#PREVIEW").hide();
-                        $("#COPY_PROT_FILE").hide();
+            if (ei.status < 0){
+	            return;
+            }
+	        let isManager = ei.extAttr.isManager;
+	        if (isManager === 1 || isManager === 2 || isManager === 3) {
+		        if (isManager === 1 || isManager === 2) {
+			        CommonUtils.showButton("RELEASE");
+		        } else {
+			        CommonUtils.hideButton("RELEASE");
 		        }
+		        CommonUtils.showButton("COPY_PROT_FILE");
+		        CommonUtils.showButton("BATCH_DOWNLOAD");
+		        CommonUtils.showButton("UPLOAD_FILE");
+		        CommonUtils.showButton("COPY_FILE");
+		        CommonUtils.showButton("PREVIEW");
+	        } else {
+		        CommonUtils.showButton("RELEASE");
+		        CommonUtils.showButton("UPLOAD_FILE");
+		        CommonUtils.showButton("COPY_FILE");
+		        CommonUtils.showButton("PREVIEW");
+		        CommonUtils.showButton("COPY_PROT_FILE");
 	        }
         }
     }, {async: false})

src/main/webapp/HG/WD/HGWD003.js

@@ -2,24 +2,22 @@ $(function () {
 
 	IPLATUI.EFTree = {
 		"docTree": {
-			select: function (e) {
-				var nodeData = this.dataItem(e.node);
-				let value = nodeData.label;
-				let leafType = nodeData.leafType;
-				IPLATUI.EFTree.docTree.selectNode.treeId = value;
-				IPLATUI.EFTree.docTree.selectNode.leaf = nodeData.leaf;
-				IPLATUI.EFTree.docTree.selectNode.leafType = leafType;
-				// leafType=C:目录
-				if (leafType == 'C') {
-					$("#inqu_status-0-fileId").val(value);
-					$("#inqu_status-0-fileName").val(nodeData.text);
-				} else {
-					$("#inqu_status-0-fileId").val('');
-					$("#inqu_status-0-fileName").val('');
+			query: function (inInfo, model) {
+				if (model == null) {
+					return inInfo;
 				}
-				resultGrid.dataSource.page(1);
-				// 显示授权按钮
-				showAuthButton();
+				let label = model.label;
+				// 选中树节点
+				selectTreeId(label);
+				// 设置选中节点
+				treeSelectClick(model);
+				inInfo.set("inqu_status-0-projCode", model.projCode);
+				return inInfo;
+			},
+			select: function (e) {
+				let nodeData = this.dataItem(e.node);
+				// 设置选中节点
+				treeSelectClick(nodeData);
 			},
 			template: function (node) {
 				var item = node.item;
@@ -294,3 +292,66 @@ let checkSelectMain = function () {
 	}
 	return true;
 }
+
+/**
+ * 选中树节点
+ *
+ * @param treeId
+ */
+let selectTreeId = function (treeId) {
+	// 刷新树节点
+	const tree = $("#docTree").data("kendoTreeView");
+	// 选中的节点
+	selectTreeNode(tree, treeId);
+}
+
+/**
+ * 选中树节点
+ *
+ * @param tree
+ * @param treeId
+ */
+let selectTreeNode = (tree, treeId) => {
+	if (!tree || treeId == null) {
+		return
+	}
+	setTimeout(() => {
+		let barDataItem = tree.dataSource.get(treeId);
+		if (barDataItem) {
+			let barElement = tree.findByUid(barDataItem.uid);
+			// 刷新完成后选中对应的树节点
+			tree.select(barElement);
+		} else {
+			selectTreeNode(tree, treeId)
+		}
+	}, 300)
+}
+
+/**
+ * 树点击事件
+ *
+ * @param nodeData
+ */
+let treeSelectClick = function (nodeData) {
+	// 设置选择的树节点信息
+	setTreeNodeValue(nodeData);
+	// 显示授权按钮
+	showAuthButton();
+	// 刷新列表
+	query();
+}
+
+/**
+ * 设置树节点的值
+ *
+ * @param nodeData
+ */
+let setTreeNodeValue = function (nodeData) {
+	IPLATUI.EFTree.docTree.selectNode.treeId = nodeData.label;
+	IPLATUI.EFTree.docTree.selectNode.leaf = nodeData.leaf;
+	IPLATUI.EFTree.docTree.selectNode.leafType = nodeData.leafType;
+	// leafType=C:目录
+	$("#inqu_status-0-fileId").val(nodeData.label);
+	$("#inqu_status-0-fileName").val(nodeData.text);
+	$("#inqu_status-0-projCode").val(nodeData.projCode);
+}
\ No newline at end of file

src/main/webapp/HG/WD/HGWD003.jsp

@@ -26,7 +26,8 @@
 
 		<div class="col-md-8">
 			<EF:EFRegion title="查询区" id="inqu">
-				<EF:EFInput cname="文件ID" ename="fileId" blockId="inqu_status" row="0" type="hidden"/>
+				<EF:EFInput cname="项目" ename="projCode" blockId="inqu_status" row="0"/>
+				<EF:EFInput cname="文件ID" ename="fileId" blockId="inqu_status" row="0"/>
 				<div class="row">
 					<EF:EFInput cname="文件名称" ename="fileName" blockId="inqu_status" row="0" colWidth="3"
 					            readonly="true"/>

src/main/webapp/common/js/common.js

@@ -734,13 +734,45 @@ function loadChange(grid,e,field) {
 			data === 'undefined' || data === 'unknown';
 	}
 
+	/**
+	 * 隐藏按钮
+	 *
+	 * @param name
+	 */
+	function hideButton(name) {
+		let button = $("#" + name);
+		button.hide();
+		// 隐藏父级标签，防止按钮重叠
+		let parent = button.parent();
+		parent.css("display", "none");
+	}
+
+	/**
+	 * 显示按钮
+	 *
+	 * @param name
+	 */
+	function showButton(name) {
+		let button = $("#" + name);
+		let parent = button.parent();
+		if (!CommonUtils.isBlank(button.attr("uuid"))) {
+			button.show();
+			parent.css("display", "");
+		} else {
+			// 隐藏父级标签，防止按钮重叠
+			parent.css("display", "none");
+		}
+	}
+
 	// export 到全局作用域 window对象
 	$.extend(window, {
 		CommonUtils: {
 			uploadFile: uploadFile,
 			downloadFile: downloadFile,
 			previewFile: previewFile,
-			isBlank: isBlank
+			isBlank: isBlank,
+			hideButton: hideButton,
+			showButton: showButton
 		}
 	});
 })(window.jQuery);