Merge branch 'dev'

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

@@ -11,11 +11,11 @@
 			<%--<EF:EFInput cname="项目编号" blockId="inqu_status" ename="projCode" row="0" colWidth="3"/>--%>
 			<EF:EFInput cname="项目名称" blockId="inqu_status" ename="projName" row="0" colWidth="3"/>
 			<EF:EFInput cname="部件名称" blockId="inqu_status" ename="prdtName" row="0" colWidth="3"/>
-		    <EF:EFInput cname="生产计划单号" blockId="inqu_status" ename="planInfoNo" row="0" colWidth="3"/>
+<%--		    <EF:EFInput cname="生产计划单号" blockId="inqu_status" ename="planInfoNo" row="0" colWidth="3"/>--%>
             <EF:EFDatePicker cname="计划完成日期" blockId="inqu_status" ename="planCompletionDate" row="0" colWidth="3"
                                  format="yyyy-MM-dd" readonly="true"/>
-        </div>
-		<div class="row">
+<%--        </div>--%>
+<%--		<div class="row">--%>
 			<EF:EFSelect cname="状态" blockId="inqu_status" ename="status" row="0" colWidth="3" optionLabel="全部">
 				<EF:EFOption label="未提交" value="0"/>
 				<EF:EFOption label="已提交" value="1"/>
@@ -28,7 +28,7 @@
 	        <EF:EFColumn ename="id" cname="主键" hidden="true"/>
 	        <EF:EFColumn ename="operator" cname="操作" locked="true" enable="false" width="100" align="center"/>
 	        <EF:EFColumn enable="false" ename="projCode" cname="项目号" readonly="true" hidden="true"/>
-	        <EF:EFColumn enable="false" ename="planInfoNo" cname="生产计划单号" readonly="true" width="100"/>
+	        <EF:EFColumn enable="false" ename="planInfoNo" cname="生产计划单号" readonly="true" hidden="true" width="100"/>
             <EF:EFColumn enable="false" ename="projName" cname="项目名称" width="120" readonly="true"/>
             <EF:EFComboColumn ename="prdtType" cname="部件类型" hidden = 'true' width="90" align="center" enable="false">
                 <EF:EFCodeOption codeName="hpjx.hpkc.inventType" />