2024-04-10 物料清单左侧树进行数据过滤优化，输入搜索框，下拉框点击在不输入内容的时候直接展开优化

src/main/java/com/baosight/hpjx/common/DdynamicEnum.java

@@ -351,6 +351,12 @@ public enum DdynamicEnum {
      */
     GROUP_RECORD1_BLOCK_ID("group_record_block_id","orgId","orgCname","HPSC010.queryGroupComboBox"),
 
+    FACTORY_CODE_BOX_BLOCK_ID("factoryCodeBox_block_id","factoryCode","factoryName","HPSB001.queryFactoryCodeBox"),
+
+    GROUP_CODE_BOX_BLOCK_ID("groupCodeBox_block_id","groupCode","groupName","factoryCode","factoryName","HPSB001.queryGroupCodeBox"),
+
+    USER_ID_BOX_BLOCK_ID("userIdBox_block_id","userId","userName","HPSB001.queryUserIdBox"),
+
     /**
      * 模块：工人管理
      * 用途：工人管理下拉框

src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC002.xml

@@ -329,6 +329,7 @@
 		hpjx.t_hpsc002
 		WHERE
 		1=1
+		<include refid="authCondition"/>
 		<isNotEmpty prepend=" AND " property="pEname">
 			PARENT_ID = #pEname#
 		</isNotEmpty>
@@ -363,6 +364,7 @@
 		hpjx.t_hpsc002
 		WHERE
 		1=1 AND PARENT_ID NOT IN ('root') AND LV != 3
+		<include refid="authCondition"/>
 		<isNotEmpty prepend=" AND " property="pEname">
 			PARENT_ID = #pEname#
 		</isNotEmpty>
@@ -398,6 +400,7 @@
 		hpjx.t_hpsc002
 		WHERE
 		1=1
+		<include refid="authCondition"/>
 		<isNotEmpty prepend=" AND " property="pEname">
 			PARENT_ID = #pEname#
 		</isNotEmpty>

src/main/webapp/HP/KC/HPKC001.js

@@ -119,16 +119,19 @@ $(function() {
 	            }
             }],
             loadComplete: function (grid) {
+
                 // 此grid对象
                 grid.dataSource.bind("change", function(e) {
 					if (e.field == "inventName") {
+						console.log();
 						var tr,index;
 						// 获取此model元素信息
 						var item = e.items[0];
+						for (let k = 0; k < resultGrid.getCheckedRowsIndex()+1; k++) {
 							for (let i = 0; i < inventNameGlobalData.length; i++) {
 								if (inventNameGlobalData[i]['textField'] === item.inventName) {
 									//dataItem['spec'] = inventNameGlobalData[i]['param2Field'];
-/*								dataItem['material'] = inventNameGlobalData[i]['param3Field'];
+									/*								dataItem['material'] = inventNameGlobalData[i]['param3Field'];
                                                                     dataItem['unit'] = inventNameGlobalData[i]['param4Field'];
                                                                     dataItem['length'] = inventNameGlobalData[i]['param5Field'];
                                                                     dataItem['width'] = inventNameGlobalData[i]['param6Field'];
@@ -143,14 +146,19 @@ $(function() {
 									resultGrid.setCellValue(item, 'width', inventNameGlobalData[i]['param6Field']);
 									resultGrid.setCellValue(item, 'thick', inventNameGlobalData[i]['param7Field']);
 									resultGrid.setCellValue(item, 'coefficient', inventNameGlobalData[i]['param8Field']);
-								resultGrid.refresh();
+									//resultGrid.refresh();
+									$("#locked_datacell_0_"+k+" input").attr("checked",true);
+									break;
+								}
 							}
+
 						}
 					}
                     if (e.field == "spec") {
                         var tr,index;
                         // 获取此model元素信息
                         var item = e.items[0];
+						for (let k = 0; k < resultGrid.getCheckedRowsIndex()+1; k++) {
 							for (let i = 0; i < inventAllGlobalData.length; i++) {
 								if (inventAllGlobalData[i]['textField'] === item.spec) {
 									resultGrid.setCellValue(item, 'material', inventAllGlobalData[i]['param1Field']);
@@ -159,9 +167,13 @@ $(function() {
 									resultGrid.setCellValue(item, 'width', inventAllGlobalData[i]['param4Field']);
 									resultGrid.setCellValue(item, 'thick', inventAllGlobalData[i]['param5Field']);
 									resultGrid.setCellValue(item, 'coefficient', inventAllGlobalData[i]['param6Field']);
-	                            resultGrid.refresh();
+									$("#locked_datacell_0_"+k+" input").attr("checked",true);
+									//resultGrid.refresh();
+									break;
 								}
 							}
+
+						}
                     }
                 });
             },

src/main/webapp/HP/KC/HPKC006.js

@@ -127,6 +127,7 @@ $(function() {
 						var tr,index;
 						// 获取此model元素信息
 						var item = e.items[0];
+						for (let k = 0; k < resultGrid.getCheckedRowsIndex()+1; k++) {
 							for (let i = 0; i < inventNameGlobalData.length; i++) {
 								if (inventNameGlobalData[i]['textField'] === item.inventName) {
 									resultGrid.setCellValue(item, 'inventName', inventNameGlobalData[i]['param1Field']);
@@ -137,7 +138,10 @@ $(function() {
 									resultGrid.setCellValue(item, 'width', inventNameGlobalData[i]['param6Field']);
 									resultGrid.setCellValue(item, 'thick', inventNameGlobalData[i]['param7Field']);
 									resultGrid.setCellValue(item, 'coefficient', inventNameGlobalData[i]['param8Field']);
-								resultGrid.refresh();
+									$("#locked_datacell_0_"+k+" input").attr("checked",true);
+									//resultGrid.refresh();
+									break;
+								}
 							}
 						}
 					}
@@ -145,6 +149,7 @@ $(function() {
 						var tr,index;
 						// 获取此model元素信息
 						var item = e.items[0];
+						for (let k = 0; k < resultGrid.getCheckedRowsIndex()+1; k++) {
 							for (let i = 0; i < inventAllGlobalData.length; i++) {
 								if (inventAllGlobalData[i]['textField'] === item.spec) {
 									resultGrid.setCellValue(item, 'material', inventAllGlobalData[i]['param1Field']);
@@ -153,7 +158,10 @@ $(function() {
 									resultGrid.setCellValue(item, 'width', inventAllGlobalData[i]['param4Field']);
 									resultGrid.setCellValue(item, 'thick', inventAllGlobalData[i]['param5Field']);
 									resultGrid.setCellValue(item, 'coefficient', inventAllGlobalData[i]['param6Field']);
-								resultGrid.refresh();
+									$("#locked_datacell_0_"+k+" input").attr("checked",true);
+									//resultGrid.refresh();
+									break;
+								}
 							}
 						}
 					}

src/main/webapp/HP/PZ/HPPZ015A.js

@@ -283,6 +283,7 @@ $(function () {
                             template: "#:textField#",
                             filter: "contains"
                         });
+                        input.data("kendoAutoComplete").search();
                     }
                 }, {
                     field: "parentPrdtName",

src/main/webapp/HP/SC/HPSC001.js

@@ -80,6 +80,7 @@ $(function () {
                             template: "#:textField#",
                             filter: "contains"
                         });
+                        input.data("kendoAutoComplete").search();
                     },
                     /*afterEdit: function (e) {
                         for (let i = 0; i < princ2Data.length; i++) {
@@ -255,6 +256,7 @@ $(function () {
                             template: "#:textField#",
                             filter: "contains"
                         });
+                        input.data("kendoAutoComplete").search();
                     }
                 }
             ]

src/main/webapp/HP/SC/HPSC002.js

@@ -288,16 +288,20 @@ $(function () {
 				        }
 			        }, {async: false});
 			        input.kendoAutoComplete({
-				        valuePrimitive: true,
 				        dataSource: dataSource,
+                        minLength: 0,
 				        dataTextField: "textField",
 				        dataValueField: "valueField",
-				        required: "true",
 				        optionLabelTemplate: "#:textField#",
 				        valueTemplate: "#:valueField#",
 				        template: "#:textField#",
 				        filter: "contains"
 			        });
+                    input.data("kendoAutoComplete").search();
+                    //input.trigger("change", {sender: input, open: true});
+                    //enforceMinLength: true,
+                    //suggest: false,
+                    //open: true,
 		        }
 	        }, {
 		        field: "parentPrdtName",

src/main/webapp/HP/SC/HPSC006.js

@@ -198,6 +198,7 @@ $(function () {
                             template: "#:textField#",
                             filter: "contains"
                         });
+                        input.data("kendoAutoComplete").search();
                     }
                 },
                 {

src/main/webapp/HP/SC/HPSC096.js

@@ -110,11 +110,7 @@ $(function (){
      */
     $('#confirm').on('click', function () {
         let resultRows = resultGrid.getDataItems();
-        let detailRows = resultGrid.getDataItems();
-        if (rows.length < 1) {
-            message("请选择数据");
-            return;
-        }
+        let detailRows = detailGrid.getDataItems();
         let methodType = $("#inqu_status-0-methodType").val();
         let registerDate = $("#inqu_status-0-registerDate").val();
         if (registerDate.length<=0){
@@ -150,7 +146,7 @@ $(function (){
             }
         });
         if(flag) {
-            JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"保存\"操作? ", {
+            JSUtils.confirm("确定对数据做\"保存\"操作? ", {
                 ok: function () {
                     var info = new EiInfo();
                     info.set("inqu_status-0-userCount",$("#inqu_status-0-userCount").val());

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

@@ -208,6 +208,7 @@ function refreshInputSelect(container, inInfo) {
 		template: "#:textField#",
 		filter: "contains"
 	});
+	input.data("kendoAutoComplete").search();
 	return dataSource;
 }