Merge remote-tracking branch 'origin/dev' into dev

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

@@ -12,6 +12,7 @@ $(function() {
 		"result": {
 			columns: [{
 				field: "whCode",
+				title: "仓库名称",
 				template: function (dataItem) {
 					for (let i = 0; i < whNameGlobalData.length; i++) {
 						if (whNameGlobalData[i]['valueField'] === dataItem['whCode']) {
@@ -32,6 +33,7 @@ $(function() {
 				}
 			}, {
 				field: "inventName",
+				title: "存货名称",
 				template: function (dataItem) {
 					//let flag = false;
 					for (let i = 0; i < inventNameGlobalData.length; i++) {
@@ -54,7 +56,7 @@ $(function() {
 
 					var eiInfo = new EiInfo();
 					eiInfo.set("inqu_status-0-inventTypes", [1, 2, 5]);
-					eiInfo.set("inqu_status-0-inventType", options.model["inventType"]);
+					eiInfo.set("inventType", options.model["inventType"]);
 					eiInfo.set("isSplicingSymbol",false);
 					//eiInfo.set("inqu_status-0-inventTypes", [1, 2, 5]);
 					//eiInfo.set("inqu_status-0-inventCode", options.model["inventCode"]);
@@ -92,6 +94,7 @@ $(function() {
 				}*/
 			}, {
 				field: "inventRecordId",
+				title: "规格",
 				template: function (dataItem) {
 					for (let i = 0; i < specGlobalData.length; i++) {
 						if (specGlobalData[i]['valueField'] === dataItem['inventRecordId']) {

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

@@ -211,6 +211,7 @@ $(function () {
             columns: [
                 {
                     field: "operator",
+                    title: "操作",
                     template: function (item) {
                         console.log(item)
                         let auditStatus = item.status;
@@ -235,6 +236,7 @@ $(function () {
                     }
                 },{
                     field: "prdtName",
+                    title: "部件名称",
                     /*query: function (container, options) {
                         let eiInfo = new EiInfo();
                         eiInfo.set("inqu_status-0-inventTypes", [3, 4]);
@@ -259,7 +261,14 @@ $(function () {
                         input.attr("id", options.field);
                         input.appendTo(container);
                         let eiInfo = new EiInfo();
-                        eiInfo.set("inventType", 4);
+                        let selectTreeNode = IPLATUI.EFTree.materialTree.selectTreeNode;
+                        if (selectTreeNode.lv == 1){
+                            eiInfo.set("inventType", 4);
+                        }else if (selectTreeNode.lv == 2){
+                            eiInfo.set("inventType", 3);
+                        }else {
+                            eiInfo.set("inventTypes", [3,4]);
+                        }
                         eiInfo.set("isSplicingSymbol",false);
                         var dataSource;
                         EiCommunicator.send("HPPZ004", "queryComboBox", eiInfo, {