产品导入、采购物料调整列表布局。

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

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

@@ -74,6 +74,25 @@
 	background: #fff;
 	border-radius: 0;
 }
+.pro-list-tab{
+    font-size: 14px;
+    margin:10px 0;
+    line-height: 34px;
+}
+.pro-list-tab .col-md-2{
+    width: 120px;
+    margin-left: 5px;
+}
+.pro-list-tab .col-md-4 input{
+    border: #bfbfbf 1px solid !important;
+    padding-left: 10px;
+    height: 34px;
+    line-height: 34px;
+    border: none;
+    position: relative;
+    font-size: 14px;
+    width: 190px;
+}
 </style>
 <div class="wrap">
 	<div class="content">
@@ -81,8 +100,52 @@
 		<div class="com_head"><span>产品导入</span><span class="fr"><em>录入人：{{user.userName}}</em><time>日期：{{time}}</time></span></div>
 		<!--产品资料新增-->
         <form class="pro-add-tab pro-add-data clearfix" name="productInfo">
-            <div class="com_title01 sty01"><span>基本信息<em>*</em></span></div>
-            <dl>
+            <div class="com_title01 sty01" style="margin-bottom: 15px;"><span>基本信息<em>*</em></span></div>
+            <div class="pro-list-tab row">
+                <div class="col-md-2">产品编号：</div>
+                <div class="col-md-4"><input type="text" ng-model="prodInfo.code" style="cursor: pointer;" required="true"></div>
+                <div class="col-md-2">产品名称：</div>
+                <div class="col-md-4"><input type="text"  ng-model="prodInfo.title" style="cursor: pointer;" required="true"></div>
+            </div>
+            <div class="pro-list-tab row">
+                <div class="col-md-2">产品型号：</div>
+                <div class="col-md-4">
+                    <input type="text"  ng-model="prodInfo.cmpCode" style="cursor: pointer;" required="true" ng-click="selectKind()">
+                </div>
+                <div class="col-md-2">品牌：</div>
+                <div class="col-md-4"><input type="text" ng-model="prodInfo.brand" placeholder="品牌" style="cursor: pointer;" readonly="readonly"></div>
+            </div>
+            <div class="pro-list-tab row">
+                <div class="col-md-2">单位：</div>
+                <div class="col-md-4">
+                    <input type="text"  ng-model="prodInfo.unit" placeholder="单位" style="cursor: pointer;" list="unit">
+                    <datalist id="unit">
+                        <option value="PCS">
+                        <option value="KG">
+                        <option value="L">
+                        <option value="M">
+                    </datalist>
+                </div>
+                <div class="col-md-2">最小包装量：</div>
+                <div class="col-md-4">
+                    <input type="text" ng-model="prodInfo.minPack" placeholder="最小包装量" style="cursor: pointer;" ng-pattern="/^\+?[1-9]\d*$/">
+                </div>
+            </div>
+            <div class="pro-list-tab row">
+                <div class="col-md-2">最小订货量：</div>
+                <div class="col-md-4">
+                    <input type="text" ng-model="prodInfo.minOrder" placeholder="最小订货量" style="cursor: pointer;" ng-pattern="/^\+?[1-9]\d*$/">
+                </div>
+                <div class="col-md-2">交货周期：</div>
+                <div class="col-md-4">
+                    <input type="text" ng-model="prodInfo.leadtime" placeholder="交货周期" style="cursor: pointer;" ng-pattern="/^\+?[1-9]\d*$/">
+                </div>
+            </div>
+            <div class="pro-list-tab row">
+                <div class="col-md-2">状态：</div>
+                <div class="col-md-4">有效</div>
+            </div>
+           <!-- <dl>
                 <dd>
                     <div class="fl">产品编号：</div>
                     <div class="fr"><input type="text" ng-model="prodInfo.code" style="cursor: pointer;" required="true"><span>（建议与您系统的产品编号保持一致，便于追溯）</span></div>
@@ -95,10 +158,10 @@
                     <div class="fl">产品型号：</div>
                     <div class="fr"><input type="text"  ng-model="prodInfo.cmpCode" style="cursor: pointer;" required="true" ng-click="selectKind()"><span>（请填写详细）</span></div>
                 </dd>
-                <!--  <dd>
+                &lt;!&ndash;  <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> &ndash;&gt;
                 <dd>
                     <div class="fl">品牌：</div>
                     <div class="fr"><input type="text" ng-model="prodInfo.brand" placeholder="品牌" style="cursor: pointer;" readonly="readonly"><span>（关联器件物料品牌，不可编辑）</span></div>
@@ -129,7 +192,7 @@
                     <div class="fl">状态：</div>
                     <div class="fr">有效</div>
                 </dd>
-            </dl>
+            </dl>-->
             <div class="com_title01"><span>图片和详细说明</span></div>
             <dl>
                 <dd class="upload-pro">

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

@@ -78,14 +78,102 @@
     .readonly-pointer {
         cursor: pointer;
     }
+    .pro-list-tab{
+        font-size: 14px;
+        margin:10px 0;
+        line-height: 34px;
+    }
+    .pro-list-tab .col-md-2{
+        width: 120px;
+        margin-left: 5px;
+    }
+.pro-list-tab .col-md-4 input{
+    border: #bfbfbf 1px solid !important;
+    padding-left: 10px;
+    height: 34px;
+    line-height: 34px;
+    border: none;
+    position: relative;
+    font-size: 14px;
+    width: 190px;
+}
+#order-detail-list .table-default th,#order-detail-list .table-default td{
+    font-size: 14px;
+    text-align: center;
+}
+#order-detail-list .table-default td a{
+    color: #327ebe ;
+}
+#order-detail-list .table-default tbody tr{
+    height: 50px;
+}
+#order-detail-list .table-default td{
+    border-bottom: #ddd 1px solid;
+}
 </style>
 <div class="wrap">
 	<div class="content">
 		<div class="com_head"><span>产品导入</span><span class="fr"><em>录入人：{{user.userName}}</em><time>日期：{{time}}</time></span></div>
 		<!--产品资料新增-->
         <div class="pro-add-tab pro-add-data clearfix">
-            <div class="com_title01 sty01"><span>基本信息<em>*</em></span></div>
-            <dl>
+            <div class="com_title01 sty01" style="margin-bottom: 15px;"><span>基本信息<em>*</em></span></div>
+            <div class="pro-list-tab row">
+                <div class="col-md-2">产品编号：</div>
+                <div class="col-md-4">
+                    <input type="text" ng-model="prodInfo.code" ng-class="{'readonly-pointer': !prodInfo.$editing}" required="true" ng-readonly="!prodInfo.$editing">
+                </div>
+                <div class="col-md-2">产品名称：</div>
+                <div class="col-md-4">
+                    <input type="text"  ng-model="prodInfo.title" ng-class="{'readonly-pointer': !prodInfo.$editing}" required="true" ng-readonly="!prodInfo.$editing" ng-if="prodInfo.kind == null">
+                    <input type="text"  ng-model="prodInfo.kind" ng-class="{'readonly-pointer': !prodInfo.$editing}" required="true" readonly="readonly" ng-if="prodInfo.kind != null">
+                </div>
+            </div>
+            <div class="pro-list-tab row">
+                <div class="col-md-2">产品型号：</div>
+                <div class="col-md-4">
+                    <input type="text"  ng-model="prodInfo.cmpCode" ng-class="{'readonly-pointer': !prodInfo.$editing}" required="true" ng-readonly="!prodInfo.$editing"  ng-click="selectKind()" ng-disabled="!prodInfo.$editing" ng-if="prodInfo.pcmpcode == null">
+                    <input type="text"  ng-model="prodInfo.pcmpcode" ng-class="{'readonly-pointer': !prodInfo.$editing}"  ng-disabled="!prodInfo.$editing" ng-if="prodInfo.pcmpcode != null" readonly>
+                </div>
+                <div class="col-md-2" ng-if="prodInfo.pbranden == null">品牌：</div>
+                <div class="col-md-4" ng-if="prodInfo.pbranden == null">
+                    <input type="text" ng-model="prodInfo.brand" type="text" placeholder="品牌" style="cursor: pointer;" ng-readonly="prodInfo.cmpUuId != null">
+                </div>
+                <div class="col-md-2" ng-if="prodInfo.pbranden != null">品牌：</div>
+                <div class="col-md-4" ng-if="prodInfo.pbranden != null">
+                    <input type="text" ng-model="prodInfo.pbranden" type="text" placeholder="品牌" style="cursor: pointer;" readonly>
+                </div>
+            </div>
+            <div class="pro-list-tab row">
+                <div class="col-md-2">单位：</div>
+                <div class="col-md-4">
+                    <input type="text"  ng-model="prodInfo.unit" placeholder="单位" ng-class="{'readonly-pointer': !prodInfo.$editing}" ng-readonly="!prodInfo.$editing" list="unit">
+                    <datalist id="unit">
+                        <option value="PCS">
+                        <option value="KG">
+                        <option value="L">
+                        <option value="M">
+                    </datalist>
+                </div>
+                <div class="col-md-2">最小包装量： </div>
+                <div class="col-md-4">
+                    <input type="text" ng-model="prodInfo.minPack" placeholder="最小包装量" ng-class="{'readonly-pointer': !prodInfo.$editing}" ng-readonly="!prodInfo.$editing" ng-pattern="/^\+?[1-9]\d*$/">
+                </div>
+            </div>
+            <div class="pro-list-tab row">
+                <div class="col-md-2">最小订货量：</div>
+                <div class="col-md-4">
+                    <input type="text" ng-model="prodInfo.minOrder" placeholder="最小订货量" ng-class="{'readonly-pointer': !prodInfo.$editing}" ng-readonly="!prodInfo.$editing" ng-pattern="/^\+?[1-9]\d*$/">
+                </div>
+                <div class="col-md-2">交货周期：</div>
+                <div class="col-md-4">
+                    <input type="text" ng-model="prodInfo.leadtime" placeholder="交货周期" ng-class="{'readonly-pointer': !prodInfo.$editing}" ng-readonly="!prodInfo.$editing" ng-pattern="/^\+?[1-9]\d*$/">
+                </div>
+            </div>
+            <div class="pro-list-tab row">
+                <div class="col-md-2">状态：</div>
+                <div class="col-md-4">有效</div>
+            </div>
+           <!-- <dl>
                 <dd>
                     <div class="fl">产品编号：</div>
                     <div class="fr"><input type="text" ng-model="prodInfo.code" ng-class="{'readonly-pointer': !prodInfo.$editing}" required="true" ng-readonly="!prodInfo.$editing"><span>（建议与您系统的产品编号保持一致，便于追溯）</span></div>
@@ -93,26 +181,26 @@
                 <dd>
                     <div class="fl">产品名称：</div>
                     <div class="fr">
-                    	<input type="text"  ng-model="prodInfo.title" ng-class="{'readonly-pointer': !prodInfo.$editing}" required="true" ng-readonly="!prodInfo.$editing" ng-if="prodInfo.kind == null">
-                    	<input type="text"  ng-model="prodInfo.kind" ng-class="{'readonly-pointer': !prodInfo.$editing}" required="true" readonly="readonly" ng-if="prodInfo.kind != null">
+                        <input type="text"  ng-model="prodInfo.title" ng-class="{'readonly-pointer': !prodInfo.$editing}" required="true" ng-readonly="!prodInfo.$editing" ng-if="prodInfo.kind == null">
+                        <input type="text"  ng-model="prodInfo.kind" ng-class="{'readonly-pointer': !prodInfo.$editing}" required="true" readonly="readonly" ng-if="prodInfo.kind != null">
                     </div>
                 </dd>
                 <dd>
                     <div class="fl">产品型号：</div>
                     <div class="fr">
-                    	<input type="text"  ng-model="prodInfo.cmpCode" ng-class="{'readonly-pointer': !prodInfo.$editing}" required="true" ng-readonly="!prodInfo.$editing"  ng-click="selectKind()" ng-disabled="!prodInfo.$editing" ng-if="prodInfo.pcmpcode == null">
-                    	<input type="text"  ng-model="prodInfo.pcmpcode" ng-class="{'readonly-pointer': !prodInfo.$editing}"  ng-disabled="!prodInfo.$editing" ng-if="prodInfo.pcmpcode != null" readonly>
-                    	<span>（请填写详细）</span></div>
+                        <input type="text"  ng-model="prodInfo.cmpCode" ng-class="{'readonly-pointer': !prodInfo.$editing}" required="true" ng-readonly="!prodInfo.$editing"  ng-click="selectKind()" ng-disabled="!prodInfo.$editing" ng-if="prodInfo.pcmpcode == null">
+                        <input type="text"  ng-model="prodInfo.pcmpcode" ng-class="{'readonly-pointer': !prodInfo.$editing}"  ng-disabled="!prodInfo.$editing" ng-if="prodInfo.pcmpcode != null" readonly>
+                        <span>（请填写详细）</span></div>
                 </dd>
-               <!--  <dd>
-                    <div class="fl">原厂型号：</div>
-                    <div class="fr"><input type="text" readonly="prodInfo.cmpUuId != null" ng-disabled="!prodInfo.$editing" placeholder="点击选择原厂型号" style="cursor: pointer;" ng-model="prodInfo.cmpCode" ng-click="selectKind(prodInfo.cmpCode)"><span></span></div>
-                </dd> -->
+                &lt;!&ndash;  <dd>
+                     <div class="fl">原厂型号：</div>
+                     <div class="fr"><input type="text" readonly="prodInfo.cmpUuId != null" ng-disabled="!prodInfo.$editing" placeholder="点击选择原厂型号" style="cursor: pointer;" ng-model="prodInfo.cmpCode" ng-click="selectKind(prodInfo.cmpCode)"><span></span></div>
+                 </dd> &ndash;&gt;
                 <dd ng-if="prodInfo.pbranden == null">
                     <div class="fl">品牌：</div>
                     <div class="fr"><input type="text" ng-model="prodInfo.brand" type="text" placeholder="品牌" style="cursor: pointer;" ng-readonly="prodInfo.cmpUuId != null"><span></span></div>
                 </dd>
-                 <dd ng-if="prodInfo.pbranden != null">
+                <dd ng-if="prodInfo.pbranden != null">
                     <div class="fl">品牌：</div>
                     <div class="fr"><input type="text" ng-model="prodInfo.pbranden" type="text" placeholder="品牌" style="cursor: pointer;" readonly><span></span></div>
                 </dd>
@@ -120,11 +208,11 @@
                     <div class="fl">单位：</div>
                     <div class="fr"><input type="text"  ng-model="prodInfo.unit" placeholder="单位" ng-class="{'readonly-pointer': !prodInfo.$editing}" ng-readonly="!prodInfo.$editing" list="unit"><span>（请填写详细）</span></div>
                     <datalist id="unit">
-			            <option value="PCS">
-			            <option value="KG">
-			            <option value="L">
-			            <option value="M">
-			        </datalist>
+                        <option value="PCS">
+                        <option value="KG">
+                        <option value="L">
+                        <option value="M">
+                    </datalist>
                 </dd>
                 <dd>
                     <div class="fl">最小包装量： </div>
@@ -142,7 +230,7 @@
                     <div class="fl">状态：</div>
                     <div class="fr">有效</div>
                 </dd>
-            </dl>
+            </dl>-->
             <div class="com_title01"><span>图片和详细说明</span></div>
             <dl>
                 <dd class="upload-pro">
@@ -193,7 +281,29 @@
                 </dd> -->
             </dl>
              <div class="com_title01" ng-if="matchresults.length > 0"><span>匹配结果</span></div>
-            <dl ng-repeat="result in matchresults">
+            <div id="order-detail-list">
+                <table class="block table table-default table-striped table-hover">
+                       <thead>
+                            <tr class="header">
+                                <th>类目</th>
+                                <th>品牌</th>
+                                <th>原厂型号</th>
+                                <th>标准料号</th>
+                                <th>操作</th>
+                            </tr>
+                       </thead>
+                    <tbody ng-repeat="result in matchresults">
+                        <tr>
+                            <td>{{result.kindcn}}</th>
+                            <td>{{result.branden}}</td>
+                            <td>{{result.cmpcode}}</td>
+                            <td>{{result.uuid}}</td>
+                            <td><a ng-click="updateone(result.id)">匹配</a></td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+            <!--<dl ng-repeat="result in matchresults">
             	<dd>
             		 <div class="fl">类目：</div>
             		 <div class="fr">{{result.kindcn}}</div>
@@ -205,7 +315,7 @@
             		 <div class="fr">{{result.uuid}}</div>
             		 <div class="fr"><a ng-click="updateone(result.id)">匹配</a></div>
             	</dd>
-            </dl>
+            </dl>-->
             <div class="many-file-btn">
                 <button class="btn01" ng-if="!prodInfo.$editing" ng-click="update()">修改</button>
                 <button class="btn01" ng-if="prodInfo.$editing" ng-click="cancel()">取消</button>

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

@@ -74,6 +74,25 @@
 	background: #fff;
 	border-radius: 0;
 }
+.pro-list-tab{
+    font-size: 14px;
+    margin:10px 0;
+    line-height: 34px;
+}
+.pro-list-tab .col-md-2{
+    width: 120px;
+    margin-left: 5px;
+}
+.pro-list-tab .col-md-4 input{
+    border: #bfbfbf 1px solid !important;
+    padding-left: 10px;
+    height: 34px;
+    line-height: 34px;
+    border: none;
+    position: relative;
+    font-size: 14px;
+    width: 190px;
+}
 </style>
 <div class="wrap">
 	<div class="content">
@@ -81,8 +100,54 @@
 		<div class="com_head"><span>产品导入</span><span class="fr"><em>录入人：{{user.userName}}</em><time>日期：{{time}}</time></span></div>
 		<!--产品资料新增-->
         <form class="pro-add-tab pro-add-data clearfix" name="productInfo">
-            <div class="com_title01 sty01"><span>基本信息<em>*</em></span></div>
-            <dl>
+            <div class="com_title01 sty01" style="margin-bottom: 15px;"><span>基本信息<em>*</em></span></div>
+            <div class="pro-list-tab row">
+                <div class="col-md-2">物料编号：</div>
+                <div class="col-md-4"><input type="text" ng-model="prodInfo.code" style="cursor: pointer;" required="true"></div>
+                <div class="col-md-2">物料名称：</div>
+                <div class="col-md-4"><input type="text"  ng-model="prodInfo.title" style="cursor: pointer;" required="true"></div>
+            </div>
+            <div class="pro-list-tab row">
+                <div class="col-md-2">物料型号：</div>
+                <div class="col-md-4">
+                    <input type="text"  ng-model="prodInfo.cmpCode" style="cursor: pointer;" required="true" ng-click="selectKind()">
+                </div>
+                <div class="col-md-2">品牌：</div>
+                <div class="col-md-4">
+                    <input type="text" ng-model="prodInfo.brand" placeholder="品牌" style="cursor: pointer;" readonly="readonly">
+                </div>
+            </div>
+            <div class="pro-list-tab row">
+                <div class="col-md-2">单位：</div>
+                <div class="col-md-4">
+                    <input type="text"  ng-model="prodInfo.unit" placeholder="单位" style="cursor: pointer;" list="unit">
+                    <datalist id="unit">
+                        <option value="PCS">
+                        <option value="KG">
+                        <option value="L">
+                        <option value="M">
+                    </datalist>
+                </div>
+                <div class="col-md-2">最小包装量：</div>
+                <div class="col-md-4">
+                    <input type="text" ng-model="prodInfo.minPack" placeholder="最小包装量" style="cursor: pointer;" ng-pattern="/^\+?[1-9]\d*$/">
+                </div>
+            </div>
+            <div class="pro-list-tab row">
+                <div class="col-md-2">最小订货量：</div>
+                <div class="col-md-4">
+                    <input type="text" ng-model="prodInfo.minOrder" placeholder="最小订货量" style="cursor: pointer;" ng-pattern="/^\+?[1-9]\d*$/">
+                </div>
+                <div class="col-md-2">交货周期：</div>
+                <div class="col-md-4">
+                    <input type="text" ng-model="prodInfo.leadtime" placeholder="交货周期" style="cursor: pointer;" ng-pattern="/^\+?[1-9]\d*$/">
+                </div>
+            </div>
+            <div class="pro-list-tab row">
+                <div class="col-md-2">状态：</div>
+                <div class="col-md-4">有效</div>
+            </div>
+            <!--<dl>
                 <dd>
                     <div class="fl">产品编号：</div>
                     <div class="fr"><input type="text" ng-model="prodInfo.code" style="cursor: pointer;" required="true"><span>（建议与您系统的产品编号保持一致，便于追溯）</span></div>
@@ -95,10 +160,10 @@
                     <div class="fl">产品型号：</div>
                     <div class="fr"><input type="text"  ng-model="prodInfo.cmpCode" style="cursor: pointer;" required="true" ng-click="selectKind()"><span>（请填写详细）</span></div>
                 </dd>
-                <!--  <dd>
+                &lt;!&ndash;  <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> &ndash;&gt;
                 <dd>
                     <div class="fl">品牌：</div>
                     <div class="fr"><input type="text" ng-model="prodInfo.brand" placeholder="品牌" style="cursor: pointer;" readonly="readonly"><span>（关联器件物料品牌，不可编辑）</span></div>
@@ -129,7 +194,7 @@
                     <div class="fl">状态：</div>
                     <div class="fr">有效</div>
                 </dd>
-            </dl>
+            </dl>-->
             <div class="com_title01"><span>图片和详细说明</span></div>
             <dl>
                 <dd class="upload-pro">

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

@@ -75,14 +75,89 @@
 	background: #fff;
 	border-radius: 0;
 }
+.pro-list-tab{
+    font-size: 14px;
+    margin:10px 0;
+    line-height: 34px;
+}
+.pro-list-tab .col-md-2{
+    width: 120px;
+    margin-left: 5px;
+}
+.pro-list-tab .col-md-4 input{
+    border: #bfbfbf 1px solid !important;
+    padding-left: 10px;
+    height: 34px;
+    line-height: 34px;
+    border: none;
+    position: relative;
+    font-size: 14px;
+    width: 190px;
+}
 </style>
 <div class="wrap">
 	<div class="content">
 		<div class="com_head"><span>产品导入</span><span class="fr"><em>录入人：{{user.userName}}</em><time>日期：{{time}}</time></span></div>
 		<!--产品资料新增-->
         <div class="pro-add-tab pro-add-data clearfix">
-            <div class="com_title01 sty01"><span>基本信息<em>*</em></span></div>
-            <dl>
+            <div class="com_title01 sty01" style="margin-bottom: 15px;"><span>基本信息<em>*</em></span></div>
+            <div class="pro-list-tab row">
+                <div class="col-md-2">物料编号：</div>
+                <div class="col-md-4">
+                    <input type="text" ng-model="prodInfo.code" style="cursor: pointer;" required="true" ng-readonly="!prodInfo.$editing">
+                </div>
+                <div class="col-md-2">物料名称：</div>
+                <div class="col-md-4">
+                    <input type="text"  ng-model="prodInfo.title" ng-class="{'readonly-pointer': !prodInfo.$editing}" required="true" ng-readonly="!prodInfo.$editing" ng-if="prodInfo.kind == null">
+                    <input type="text"  ng-model="prodInfo.kind" ng-class="{'readonly-pointer': !prodInfo.$editing}" required="true" readonly="readonly" ng-if="prodInfo.kind != null">
+                </div>
+            </div>
+            <div class="pro-list-tab row">
+                <div class="col-md-2">物料型号：</div>
+                <div class="col-md-4">
+                    <input type="text"  ng-model="prodInfo.cmpCode" ng-class="{'readonly-pointer': !prodInfo.$editing}" required="true" ng-readonly="!prodInfo.$editing"  ng-click="selectKind(prodInfo.pcmpcode)" ng-disabled="!prodInfo.$editing" ng-if="prodInfo.pcmpcode == null">
+                    <input type="text"  ng-model="prodInfo.pcmpcode" ng-class="{'readonly-pointer': !prodInfo.$editing}" readonly="readonly"  ng-disabled="!prodInfo.$editing" ng-if="prodInfo.pcmpcode != null">
+                </div>
+                <div class="col-md-2" ng-if="prodInfo.pbranden == null">品牌：</div>
+                <div class="col-md-4" ng-if="prodInfo.pbranden == null">
+                    <input type="text" ng-model="prodInfo.brand" type="text" placeholder="品牌" style="cursor: pointer;" ng-readonly="prodInfo.cmpUuId != null">
+                </div>
+                <div class="col-md-2" ng-if="prodInfo.pbranden != null">品牌：</div>
+                <div class="col-md-4" ng-if="prodInfo.pbranden != null">
+                    <input type="text" ng-model="prodInfo.pbranden" type="text" placeholder="品牌" style="cursor: pointer;" readonly>
+                </div>
+            </div>
+            <div class="pro-list-tab row">
+                <div class="col-md-2">单位：</div>
+                <div class="col-md-4">
+                    <input type="text"  ng-model="prodInfo.unit" placeholder="单位" style="cursor: pointer;" ng-readonly="!prodInfo.$editing" list="unit">
+                    <datalist id="unit">
+                        <option value="PCS">
+                        <option value="KG">
+                        <option value="L">
+                        <option value="M">
+                    </datalist>
+                </div>
+                <div class="col-md-2">最小包装量：</div>
+                <div class="col-md-4">
+                    <input type="text" ng-model="prodInfo.minPack" placeholder="最小包装量" style="cursor: pointer;" ng-readonly="!prodInfo.$editing" ng-pattern="/^\+?[1-9]\d*$/">
+                </div>
+            </div>
+            <div class="pro-list-tab row">
+                <div class="col-md-2">最小订货量：</div>
+                <div class="col-md-4">
+                    <input type="text" ng-model="prodInfo.minOrder" placeholder="最小订货量" style="cursor: pointer;" ng-readonly="!prodInfo.$editing" ng-pattern="/^\+?[1-9]\d*$/">
+                </div>
+                <div class="col-md-2">交货周期：</div>
+                <div class="col-md-4">
+                    <input type="text" ng-model="prodInfo.leadtime" placeholder="交货周期" style="cursor: pointer;" ng-readonly="!prodInfo.$editing" ng-pattern="/^\+?[1-9]\d*$/">
+                </div>
+            </div>
+            <div class="pro-list-tab row">
+                <div class="col-md-2">状态：</div>
+                <div class="col-md-4">有效</div>
+            </div>
+           <!-- <dl>
                 <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>
@@ -101,10 +176,10 @@
                     	<input type="text"  ng-model="prodInfo.pcmpcode" ng-class="{'readonly-pointer': !prodInfo.$editing}" readonly="readonly"  ng-disabled="!prodInfo.$editing" ng-if="prodInfo.pcmpcode != null">
                     	<span>（请填写详细）</span></div>
                 </dd>
-               <!--  <dd>
+               &lt;!&ndash;  <dd>
                     <div class="fl">原厂型号：</div>
                     <div class="fr"><input type="text"  ng-readonly="prodInfo.cmpUuId != null" placeholder="点击选择原厂型号" style="cursor: pointer;" ng-model="prodInfo.cmpCode" ng-click="selectKind(prodInfo.cmpCode)" ng-disabled="!prodInfo.$editing"><span></span></div>
-                </dd> -->
+                </dd> &ndash;&gt;
                 <dd ng-if="prodInfo.pbranden == null">
                     <div class="fl">品牌：</div>
                     <div class="fr"><input type="text" ng-model="prodInfo.brand" type="text" placeholder="品牌" style="cursor: pointer;" ng-readonly="prodInfo.cmpUuId != null"><span></span></div>
@@ -139,7 +214,7 @@
                     <div class="fl">状态：</div>
                     <div class="fr">有效</div>
                 </dd>
-            </dl>
+            </dl>-->
             <div class="com_title01"><span>图片和详细说明</span></div>
             <dl>
                 <dd class="upload-pro">