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

src/main/webapp/HP/SC/HPSC003A.jsp

@@ -10,7 +10,6 @@
 		<EF:EFInput ename="inqu_status-0-planInfoNo" cname="生产计划单号" type="hidden"/>
 		<div class="row">
 			<EF:EFSelect cname="厂区" ename="factoryCode" blockId="inqu_status" row="0" colWidth="3" filter="contains">
-				<EF:EFOption label="全部" value=""/>
 				<EF:EFOptions blockId="factory_record_block_id" textField="textField" valueField="valueField"/>
 			</EF:EFSelect>
 		</div>

src/main/webapp/HP/SC/HPSC003B.jsp

@@ -20,7 +20,7 @@
 			<EF:EFColumn ename="num" cname="数量" enable="false" width="100" align="right" format="{0:N0}"/>
 			<EF:EFColumn ename="unitWt" cname="单重(T)" enable="false" width="100" align="right" format="{0:N3}"/>
 			<EF:EFColumn ename="totalWt" cname="重量(T)" enable="false" width="100" align="right" format="{0:N3}"/>
-			<EF:EFColumn ename="remark1" cname="零件备注"/>
+			<EF:EFColumn ename="remark1" cname="零件备注" width="100" align="right" enable="false"/>
 			<EF:EFColumn ename="factoryName" cname="厂区" enable="false" width="140" align="center"/>
 			<EF:EFColumn ename="factoryCode" cname="厂区" enable="false" width="140" align="center" hidden="true"/>
 			<EF:EFColumn ename="orgName" cname="生产组" enable="false" width="140" align="center" hidden="true"/>

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

@@ -6,6 +6,15 @@ $(function () {
 		        pageSize: 20,
 		        pageSizes: [10, 20, 50, 70, 100],
 	        },
+			columns:[{
+				field:"actualCompletionDate",
+				attributes: {
+					class: "i-input-readonly",
+				},
+				defaultValue: function () {
+					return currDate();
+				}
+			}],
 	        onDelete: function (e) {
 		        // 阻止后台删除请求，使用自定义删除
 		        e.preventDefault();

src/main/webapp/HP/SC/HPSC007.jsp

@@ -43,17 +43,17 @@
 		<EF:EFInput ename="productionOrderNo"  type="hidden"/>
 		<EF:EFGrid blockId="result" autoDraw="override" checkMode="row">
 			<EF:EFColumn ename="id" cname="主键" hidden="true"/>
-			<EF:EFColumn ename="actualCompletionDate" editType="date" required="true"  cname="完成日期" dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" />
+			<EF:EFColumn ename="actualCompletionDate" editType="date" required="true" align="center" cname="完成日期" dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" />
 			<EF:EFColumn ename="hpsc006Id" cname="生产下料ID" hidden="true"/>
 			<EF:EFComboColumn ename="userId" cname="完成人" width="100" align="center"
 							  filter="contains" readonly="true" required="true">
 				<EF:EFOptions blockId="worker_block_id" valueField="valueField" textField="textField"/>
 			</EF:EFComboColumn>
 			<EF:EFColumn ename="userName" cname="完成名称" hidden="true"/>
-			<EF:EFColumn ename="actualCompletionNum" cname="完成数量" required="true" format="{0:N3}" maxLength="12" displayType="0.000"
+			<EF:EFColumn ename="actualCompletionNum" cname="完成数量" required="true" format="{0:N3}" maxLength="12" displayType="0.000" align="center"
 						 data-regex="/^-?[0-9]{1,9}$/"
 						 data-errorprompt="请输入数字，该值最大可设置9位整数！"/>
-			<EF:EFColumn ename="actualCompletionTotalWt" cname="完成重量(T)" enable="false" format="{0:N3}" maxLength="12" displayType="0.000"
+			<EF:EFColumn ename="actualCompletionTotalWt" cname="完成重量(T)" enable="false" format="{0:N3}" maxLength="12" displayType="0.000" align="center"
 						 data-regex="/^-?[0-9]{1,9}([.][0-9]{1,3})?$/"
 						 data-errorprompt="请输入数字，该值最大可设置9位整数和3位小数！"/>
 		</EF:EFGrid>

src/main/webapp/HP/SC/HPSC098.jsp

@@ -12,12 +12,12 @@
 <%--			<EF:EFInput cname="厂区名称" ename="factoryName" blockId="inqu_status" row="0" colWidth="3"/>--%>
 <%--			<EF:EFInput cname="组织名称" ename="groupName" blockId="inqu_status" row="0" colWidth="3"/>--%>
 
-			<EF:EFSelect ename="inqu_status-0-factoryCode" cname="厂区名称" colWidth="3" filter="contains"
+			<EF:EFSelect ename="inqu_status-0-factoryCode" cname="厂区名称" colWidth="2" filter="contains"
 						 template="#=textField#" valueTemplate="#=textField#">
 				<EF:EFOption label="全部" value=""/>
 				<EF:EFOptions blockId="factory_record_block_id" textField="textField" valueField="valueField"/>
 			</EF:EFSelect>
-			<EF:EFSelect ename="inqu_status-0-groupCode" cname="组织名称" filter="contains" required="false" colWidth="3"
+			<EF:EFSelect ename="inqu_status-0-groupCode" cname="组织名称" filter="contains" required="false" colWidth="2"
 						 template="#=textField#" valueTemplate="#=valueField#" defaultValue="请选择">
 				<EF:EFOption label="请选择" value=""/>
 				<EF:EFOptions blockId="group_record_block_id" textField="textField" valueField="valueField"/>
@@ -27,9 +27,9 @@
 
 	<EF:EFRegion id="result" title="明细信息">
 		<EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="single,row">
-			<EF:EFColumn ename="factoryCode" cname="厂区编码" enable="false" width="120" align="center"/>
-			<EF:EFColumn ename="factoryName" cname="厂区名称" enable="false" width="120" align="center"/>
-			<EF:EFColumn ename="groupCode" cname="组织编码" enable="false" width="120" align="center"/>
+			<EF:EFColumn ename="factoryCode" cname="厂区编码" enable="false" width="120" align="center" hidden="true"/>
+			<EF:EFColumn ename="factoryName" cname="厂区名称" enable="false" width="120" align="center" />
+			<EF:EFColumn ename="groupCode" cname="组织编码" enable="false" width="120" align="center" hidden="true"/>
 			<EF:EFColumn ename="groupName" cname="组织名称" enable="false" width="120" align="center"/>
 		</EF:EFGrid>
 	</EF:EFRegion>