Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly

src/main/webapp/HG/CG/HGCG002.js

@@ -35,16 +35,16 @@ $(function () {
 						return dataItem["purUserName"];
 					},
 					editor: function (container, options) {
-						let inInfo = new EiInfo();
-						inInfo.set("inqu_status-0-companyCode", options.model["companyCode"]);
-						inInfo.set("field", options.field);
-						EiCommunicator.send("HGSC001", "userByCompanyComboBox", inInfo, {
-							onSuccess: function (ei) {
-								userByCompany = ei.getBlock("userByCompany").getMappedRows();
-							},
-							onFail: function (ei) {
-							}
-						}, {async: false});
+						// let inInfo = new EiInfo();
+						// inInfo.set("inqu_status-0-companyCode", options.model["companyCode"]);
+						// inInfo.set("field", options.field);
+						// EiCommunicator.send("HGSC001", "userByCompanyComboBox", inInfo, {
+						// 	onSuccess: function (ei) {
+						// 		userByCompany = ei.getBlock("userByCompany").getMappedRows();
+						// 	},
+						// 	onFail: function (ei) {
+						// 	}
+						// }, {async: false});
 						var input = $('<input />');
 						input.attr("name", options.field);
 						input.attr("id", options.field);

src/main/webapp/HG/CG/HGCG002.jsp

@@ -50,8 +50,8 @@
 			                  filter="contains" required="true">
 				<EF:EFOptions blockId="sup_record_block_id" valueField="valueField" textField="textField"/>
 			</EF:EFComboColumn>
-			<EF:EFColumn ename="supName" cname="供应商名称" enable="false" width="100" align="center" hidden="true"/>
-			<EF:EFColumn ename="purUserName" cname="采购员" width="100" align="center" required="true"/>
+			<EF:EFColumn ename="supName" cname="供应商名称" enable="false" width="120" align="center" hidden="true"/>
+			<EF:EFColumn ename="purUserName" cname="采购员" width="120" align="center" required="true"/>
 			<EF:EFColumn ename="purQty" cname="采购数量" width="120" align="right" format="{0:N0}" enable="false"/>
 			<EF:EFColumn ename="purWeight" cname="采购重量" width="120" align="right" format="{0:N3}" enable="false"/>
 			<EF:EFColumn ename="receiveQty" cname="已收货数量" enable="false" width="120" align="right" format="{0:N0}"/>

src/main/webapp/HG/CG/HGCG002B.js

@@ -23,16 +23,16 @@ $(function () {
 						return dataItem["purUserName"];
 					},
 					editor: function (container, options) {
-						let inInfo = new EiInfo();
-						inInfo.set("inqu_status-0-companyCode", options.model["companyCode"]);
-						inInfo.set("field", options.field);
-						EiCommunicator.send("HGSC001", "userByCompanyComboBox", inInfo, {
-							onSuccess: function (ei) {
-								userByCompany = ei.getBlock("userByCompany").getMappedRows();
-							},
-							onFail: function (ei) {
-							}
-						}, {async: false});
+						// let inInfo = new EiInfo();
+						// inInfo.set("inqu_status-0-companyCode", options.model["companyCode"]);
+						// inInfo.set("field", options.field);
+						// EiCommunicator.send("HGSC001", "userByCompanyComboBox", inInfo, {
+						// 	onSuccess: function (ei) {
+						// 		userByCompany = ei.getBlock("userByCompany").getMappedRows();
+						// 	},
+						// 	onFail: function (ei) {
+						// 	}
+						// }, {async: false});
 						var input = $('<input />');
 						input.attr("name", options.field);
 						input.attr("id", options.field);

src/main/webapp/HG/CG/HGCG003.js

@@ -51,16 +51,16 @@ $(function () {
 						return dataItem["purUserName"];
 					},
 					editor: function (container, options) {
-						let inInfo = new EiInfo();
-						inInfo.set("inqu_status-0-companyCode", options.model["companyCode"]);
-						inInfo.set("field", options.field);
-						EiCommunicator.send("HGSC001", "userByCompanyComboBox", inInfo, {
-							onSuccess: function (ei) {
-								userByCompany = ei.getBlock("userByCompany").getMappedRows();
-							},
-							onFail: function (ei) {
-							}
-						}, {async: false});
+						// let inInfo = new EiInfo();
+						// inInfo.set("inqu_status-0-companyCode", options.model["companyCode"]);
+						// inInfo.set("field", options.field);
+						// EiCommunicator.send("HGSC001", "userByCompanyComboBox", inInfo, {
+						// 	onSuccess: function (ei) {
+						// 		userByCompany = ei.getBlock("userByCompany").getMappedRows();
+						// 	},
+						// 	onFail: function (ei) {
+						// 	}
+						// }, {async: false});
 						var input = $('<input />');
 						input.attr("name", options.field);
 						input.attr("id", options.field);

src/main/webapp/HG/CG/HGCG003.jsp

@@ -65,8 +65,8 @@
 							  filter="contains" required="true">
 				<EF:EFOptions blockId="sup_record_block_id" valueField="valueField" textField="textField"/>
 			</EF:EFComboColumn>
-			<EF:EFColumn ename="supName" cname="供应商名称" enable="false" width="100" align="center" hidden="true"/>
-			<EF:EFColumn ename="purUserName" cname="采购员" width="100" align="center" required="true"/>
+			<EF:EFColumn ename="supName" cname="供应商名称" enable="false" width="120" align="center" hidden="true"/>
+			<EF:EFColumn ename="purUserName" cname="采购员" width="120" align="center" required="true"/>
 			<EF:EFColumn ename="receiveQty" cname="收货数量" enable="false" width="120" align="right" format="{0:N0}"/>
 			<EF:EFColumn ename="deliverQty" cname="退货数量" enable="false" width="120" align="right" format="{0:N0}"/>
 			<EF:EFColumn ename="depositQty" cname="入库数量" enable="false" width="120" align="right" format="{0:N0}"/>