新增物料与批量导入物料增加字段

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

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

@@ -117,18 +117,26 @@
                         </select>
                     </div> -->
                 </dd>
-                <!-- <dd>
+                <dd>
                     <div class="fl">最小包装量： </div>
-                    <div class="fr"><input type="text" value="1212122"></div>
+                    <div class="fr"><input type="text" ng-model="prodInfo.minPack" placeholder="最小包装量" style="cursor: pointer;" ng-pattern="/^\+?[1-9]\d*$/"></div>
                 </dd>
                 <dd>
                     <div class="fl">最小订货量：</div>
-                    <div class="fr"><input type="text" value="12130"></div>
+                    <div class="fr"><input type="text" ng-model="prodInfo.minOrder" placeholder="最小订货量" style="cursor: pointer;" ng-pattern="/^\+?[1-9]\d*$/"></div>
                 </dd>
                 <dd>
-                    <div class="fl">采购周期：</div>
-                    <div class="fr"><input type="text" value="10天"></div>
-                </dd> -->
+                    <div class="fl">交货周期：</div>
+                    <div class="fr"><input type="text" ng-model="prodInfo.leadtime" placeholder="交货周期" style="cursor: pointer;" ng-pattern="/^\+?[1-9]\d*$/"></div>
+                </dd>
+                <dd>
+                    <div class="fl">交货提前期：</div>
+                    <div class="fr"><input type="text" ng-model="prodInfo.ltinstock" placeholder="交货提前期" style="cursor: pointer;" ng-pattern="/^\+?[1-9]\d*$/"></div>
+                </dd>
+                <dd>
+                    <div class="fl">状态：</div>
+                    <div class="fr"><input type="text" value="有效" readonly></div>
+                </dd>
             </dl>
             <div class="com_title01"><span>图片和详细说明</span></div>
             <dl>

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

@@ -180,7 +180,7 @@
             <tr class="order-hd">
                 <td class="line-h20 first text-center" width="140">
                     <div class="order-main">
-                        <a ng-bind="::product.title" ui-sref="sale.productDetail({id:product.id})" target="_self"></a>
+                        <a ng-bind="::product.title" ui-sref="sale.productDetail({id:product.id})" target="_self"  title="查看详情"></a>
                     </div>
                 </td>
                 <td class="text-center" title="{{product.code}}" ng-bind="::product.code"></td>
@@ -189,7 +189,7 @@
                 <td class="text-center" title="标准料号" ng-bind="::product.cmpUuId"></td>
                 <td class="text-center" title="原厂型号" ng-bind="::product.cmpCode"></td>
                 <td class="text-center" title="单位" ng-bind="::product.unit"></td>
-                <td class="text-center"><a ui-sref="sale.productDetail({id:product.id})" target="_self"><i class="fa fa-lg fa-edit"></i></a>|<a ng-click="deleteById(product.id)"><i class="fa fa-lg fa-trash"></i></a></td>
+                <td class="text-center"><a ui-sref="sale.productDetail({id:product.id})" target="_self" title="编辑"><i class="fa fa-lg fa-edit"></i></a>|<a ng-click="deleteById(product.id)"  title="删除"><i class="fa fa-lg fa-trash"></i></a></td>
             </tr>
             </tbody>
         </table>

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

@@ -93,7 +93,7 @@
                 </dd>
                 <dd>
                     <div class="fl">产品品牌：</div>
-                    <div class="fr"><input type="text" g-model="prodInfo.brand" type="text" placeholder="产品品牌" style="cursor: pointer;" readonly="readonly"><span></span></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>
@@ -117,18 +117,26 @@
                         </select>
                     </div> -->
                 </dd>
-                <!-- <dd>
+                <dd>
                     <div class="fl">最小包装量： </div>
-                    <div class="fr"><input type="text" value="1212122"></div>
+                    <div class="fr"><input type="text" ng-model="prodInfo.minPack" placeholder="最小包装量" style="cursor: pointer;" ng-readonly="!prodInfo.$editing" ng-pattern="/^\+?[1-9]\d*$/"></div>
                 </dd>
                 <dd>
                     <div class="fl">最小订货量：</div>
-                    <div class="fr"><input type="text" value="12130"></div>
+                    <div class="fr"><input type="text" ng-model="prodInfo.minOrder" placeholder="最小订货量" style="cursor: pointer;" ng-readonly="!prodInfo.$editing" ng-pattern="/^\+?[1-9]\d*$/"></div>
                 </dd>
                 <dd>
-                    <div class="fl">采购周期：</div>
-                    <div class="fr"><input type="text" value="10天"></div>
-                </dd> -->
+                    <div class="fl">交货周期：</div>
+                    <div class="fr"><input type="text" ng-model="prodInfo.leadtime" placeholder="交货周期" style="cursor: pointer;" ng-readonly="!prodInfo.$editing" ng-pattern="/^\+?[1-9]\d*$/"></div>
+                </dd>
+                <dd>
+                    <div class="fl">交货提前期：</div>
+                    <div class="fr"><input type="text" ng-model="prodInfo.ltinstock" placeholder="交货提前期" style="cursor: pointer;" ng-readonly="!prodInfo.$editing" ng-pattern="/^\+?[1-9]\d*$/"></div>
+                </dd>
+                <dd>
+                    <div class="fl">状态：</div>
+                    <div class="fr"><input type="text" value="有效" readonly></div>
+                </dd>
             </dl>
             <div class="com_title01"><span>图片和详细说明</span></div>
             <dl>
@@ -180,7 +188,7 @@
                 <button class="btn01" ng-if="!prodInfo.$editing" ng-click="update()">修改</button>
                 <button class="btn01" ng-if="prodInfo.$editing" ng-click="cancel()">取消</button>
                 <a ui-sref="sale.uploadByBatch"  class="btn02" ng-if="!prodInfo.$editing">批量导入</a>
-                <a class="btn02" ng-click="submit(prodInfo)" ng-if="prodInfo.$editing">提交</a>
+                <a class="btn02" ng-click="submit(prodInfo)" ng-if="prodInfo.$editing" ng-disabled="productInfo.$invalid">提交</a>
             </div>
             <div id="image-box" style="display: none">
 				<div class="x-close-wrap" title="关闭">

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

@@ -268,9 +268,9 @@ table.table.table-striped  thead {
 	</div>
 	<div class="box-item" ng-hide="box1Closed">
 		<p>
-			<button class="btn btn-success btn-sm" ng-click="download()">下载Excel模板 <i
-				class="fa fa-download"></i></button> 在Excel模板上录入商品发布信息。
-			<a class="f14 text-default" ng-click="showImg()">查看表格示例</a>。
+			<a class="f14 text-inverse" ng-click="download()">下载Excel模板 <i
+				class="fa fa-download"></i></a> 在Excel模板上录入商品发布信息。
+			<a class="f14 text-inverse" ng-click="showImg()">查看表格示例</a>。
 		</p>
 	</div>
 	<div id="image-box" style="display: none">
@@ -313,7 +313,7 @@ table.table.table-striped  thead {
 	</div>
 	<div class="box-item" ng-hide="box3Closed">
 		<p ng-if="result">
-			<div ng-if="resutl.total">
+			<div ng-if="result.total">
 				总共上传物料<span class="text-inverse">{{result.total}}</span>个，上传成功<span class="text-inverse">{{result.success}}</span>个
 			</div>
 			<div ng-repeat="alter in alters">