代码合并修改

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

@@ -64,7 +64,6 @@
         <EF:EFGrid blockId="detail" autoDraw="no">
             <EF:EFColumn ename="id" cname="主键" hidden="true"/>
             <EF:EFColumn ename="parentId" cname="父ID" hidden="true"/>
-            <EF:EFComboColumn ename="prdtType" cname="零部件类型" width="90" align="center" readonly="true">
             <EF:EFComboColumn ename="prdtType" cname="零件类型" width="90" align="center" readonly="true">
                 <EF:EFCodeOption codeName="hpjx.hpkc.inventType" />
             </EF:EFComboColumn>
@@ -78,10 +77,8 @@
             </EF:EFComboColumn>
             <EF:EFColumn enable="false" ename="num" readonly="true" cname="计划数量"/>
             <EF:EFColumn enable="false" ename="unitWt" readonly="true" cname="计划重量"/>
-            <EF:EFColumn ename="planCommentDate" required='true' cname="计划开始时间" editType="date" dateFormat="yyyy/MM/dd" width="150"
-                         />
-            <EF:EFColumn ename="planCompletionDate" required='true' cname="计划结束时间" editType="date" dateFormat="yyyy/MM/dd" width="150"
-                         />
+            <EF:EFColumn ename="planCommentDate" required='true' cname="计划开始时间" editType="date" dateFormat="yyyy/MM/dd" width="150"/>
+            <EF:EFColumn ename="planCompletionDate" required='true' cname="计划结束时间" editType="date" dateFormat="yyyy/MM/dd" width="150"/>
             <EF:EFColumn ename="actualCompletionDate" cname="实际完成时间" editType="date" dateFormat="yyyy/MM/dd" width="150"
                          enable="false"/>
             <EF:EFColumn enable="false" ename="actualCompletionNum" cname="实际完工数量" readonly="true"/>
@@ -90,8 +87,6 @@
         </EF:EFGrid>
     </EF:EFRegion>
 </EF:EFPage>
-
-
 <script>
     var ctx = "${ctx}";
 </script>