新增物料和物料详情UI顺序调整

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@8020 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/webapp/resources/tpl/index/baseInfo/newProdInfo.html

@@ -83,18 +83,6 @@
         <form class="pro-add-tab pro-add-data clearfix" name="productInfo">
             <div class="com_title01 sty01"><span>基本信息<em>*</em></span></div>
             <dl>
-                <dd>
-                    <div class="fl">原厂型号：</div>
-                    <div class="fr"><input type="text" readonly="readonly" placeholder="点击选择原厂型号" style="cursor: pointer;" ng-model="prodInfo.cmpCode"  ng-click="selectKind()"><span>（关联器件原厂型号，不可编辑）</span></div>
-                </dd>
-                <dd>
-                    <div class="fl">标准料号：</div>
-                    <div class="fr"><input type="text" ng-model="prodInfo.cmpUuId" placeholder="标准料号" style="cursor: pointer;" readonly="readonly"><span>（关联器件标准料号，不可编辑）</span></div>
-                </dd>
-                <dd>
-                    <div class="fl">产品品牌：</div>
-                    <div class="fr"><input type="text" ng-model="prodInfo.brand" placeholder="产品品牌" style="cursor: pointer;" readonly="readonly"><span>（关联器件物料品牌，不可编辑）</span></div>
-                </dd>
                 <dd>
                     <div class="fl">产品编号：</div>
                     <div class="fr"><input type="text" ng-model="prodInfo.code" style="cursor: pointer;" required="true"><span>（建议与您系的产品编号保持一致，便于追溯）</span></div>
@@ -106,6 +94,14 @@
                 <dd>
                     <div class="fl">产品规格：</div>
                     <div class="fr"><input type="text"  ng-model="prodInfo.spec" style="cursor: pointer;" required="true"><span>（请填写详细）</span></div>
+                </dd>
+                 <dd>
+                    <div class="fl">原厂型号：</div>
+                    <div class="fr"><input type="text" readonly="readonly" placeholder="点击选择原厂型号" style="cursor: pointer;" ng-model="prodInfo.cmpCode"  ng-click="selectKind()"><span>（关联器件原厂型号，不可编辑）</span></div>
+                </dd>
+                <dd>
+                    <div class="fl">产品品牌：</div>
+                    <div class="fr"><input type="text" ng-model="prodInfo.brand" placeholder="产品品牌" style="cursor: pointer;" readonly="readonly"><span>（关联器件物料品牌，不可编辑）</span></div>
                 </dd>
                 <dd>
                     <div class="fl">单位：</div>
@@ -135,7 +131,7 @@
                 </dd>
                 <dd>
                     <div class="fl">状态：</div>
-                    <div class="fr"><input type="text" value="有效" readonly></div>
+                    <div class="fr">有效</div>
                 </dd>
             </dl>
             <div class="com_title01"><span>图片和详细说明</span></div>

src/main/webapp/resources/tpl/index/baseInfo/productDetail.html

@@ -83,18 +83,6 @@
         <div class="pro-add-tab pro-add-data clearfix">
             <div class="com_title01 sty01"><span>基本信息<em>*</em></span></div>
             <dl>
-            	<dd>
-                    <div class="fl">原厂型号：</div>
-                    <div class="fr"><input type="text" readonly="readonly" placeholder="点击选择原厂型号" style="cursor: pointer;" ng-model="prodInfo.cmpCode" ><span></span></div>
-                </dd>
-                <dd>
-                    <div class="fl">标准料号：</div>
-                    <div class="fr"><input type="text" ng-model="prodInfo.cmpUuId" placeholder="标准料号" style="cursor: pointer;" readonly="readonly"><span></span></div>
-                </dd>
-                <dd>
-                    <div class="fl">产品品牌：</div>
-                    <div class="fr"><input type="text" ng-model="prodInfo.brand" type="text" placeholder="产品品牌" style="cursor: pointer;" readonly="readonly"><span></span></div>
-                </dd>
                 <dd>
                     <div class="fl">产品编号：</div>
                     <div class="fr"><input type="text" ng-model="prodInfo.code" style="cursor: pointer;" required="true" ng-readonly="!prodInfo.$editing"><span>（建议与您系的产品编号保持一致，便于追溯）</span></div>
@@ -107,6 +95,14 @@
                     <div class="fl">产品规格：</div>
                     <div class="fr"><input type="text"  ng-model="prodInfo.spec" style="cursor: pointer;" required="true" ng-readonly="!prodInfo.$editing"><span>（请填写详细）</span></div>
                 </dd>
+                <dd>
+                    <div class="fl">原厂型号：</div>
+                    <div class="fr"><input type="text" readonly="readonly" placeholder="点击选择原厂型号" style="cursor: pointer;" ng-model="prodInfo.cmpCode" ><span></span></div>
+                </dd>
+                <dd>
+                    <div class="fl">产品品牌：</div>
+                    <div class="fr"><input type="text" ng-model="prodInfo.brand" type="text" placeholder="产品品牌" style="cursor: pointer;" readonly="readonly"><span></span></div>
+                </dd>
                 <dd>
                     <div class="fl">单位：</div>
                     <div class="fr"><input type="text"  ng-model="prodInfo.unit" placeholder="单位" style="cursor: pointer;" ng-readonly="!prodInfo.$editing" list="unit"><span>（请填写详细）</span></div>
@@ -135,7 +131,7 @@
                 </dd>
                 <dd>
                     <div class="fl">状态：</div>
-                    <div class="fr"><input type="text" value="有效" readonly></div>
+                    <div class="fr">有效</div>
                 </dd>
             </dl>
             <div class="com_title01"><span>图片和详细说明</span></div>