产品导入、退出登录。

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

src/main/webapp/resources/tpl/index/account/logout.html

@@ -1,7 +1,7 @@
 <style>
 	.modal-content {
 		width: 350px;
-		height: 200px;
+		height: 150px;
 		top: 100px;
 		left: 100px;
 	}
@@ -15,7 +15,7 @@
 	}
 	.modal-body .tip-content{
 		font-size: 16px;
-		line-height: 55px;
+		line-height: 49px;
 		margin-top: 5px;
 	}
 	.modal-body .btn {
@@ -28,7 +28,7 @@
 		border-radius: 0;
 	}
 	.modal-btn{
-		margin-top: 25px;
+		margin-top: 5px;
 	}
 	.modal-btn .btn-danger{
 		background: #5078cb;
@@ -42,6 +42,13 @@
 		background: #327ebe;
 		color: #fff;
 	}
+	.modal-header{
+		height: 40px;
+	}
+	.modal-body{
+		height: 110px;
+		padding: 0;
+	}
 </style>
 <div class="modal-header">
 	<span class="modal-title">
@@ -51,7 +58,7 @@
 <div class="modal-body">
 	<div class="tip-content">是否确认退出？</div>
 	<div class="modal-btn">
-		<button class="btn btn-danger" ng-click="close(true)">确认</button>
-		<button class="btn btn-default" ng-click="close(false)" type="button">取消</button>
+		<button class="btn btn-danger" ng-click="close(true)">是</button>
+		<button class="btn btn-default" ng-click="close(false)" type="button">否</button>
 	</div>
 </div>

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

@@ -128,6 +128,27 @@
 .order-hd td a{
     margin: 0 8px;
 }
+   .order-table .header th label{
+       margin-left: 34px;
+   }
+    .order-table .header th label input{
+        margin: 0;
+        position: relative;
+        top: 3px;
+    }
+    .order-table tr.header th:first-child{
+        text-align: left;
+    }
+    .edit.col-xs-3{
+        padding-right: 0;
+        width: 215px;
+        float: right;
+    }
+    .edit.col-xs-3 a{
+        font-size: 14px;
+        line-height: 34px;
+        color: #5078cb;
+    }
 </style>
 <link rel="stylesheet" href="static/css/public.css">
 <div class="block" id="public">
@@ -147,7 +168,7 @@
     <div class="condition block" style="padding: 10px 15px;">
         <div class="search-bg condition block"  style="padding: 10px 15px;">
             <div class="row">
-                <div id="topSearch" style="float: left">
+                <div id="topSearch"  class="col-xs-6" style="float: left;width: 35%;">
                     <span class="text-muted"><i class="fa fa-search fa-lg"></i> 搜索"{{tip}}",为您找到结果:</span>
                   	  单据{{tableParams.total()}}条
                 </div>
@@ -159,13 +180,14 @@
                         </div>
                     </div>
                 </div>
-                 <a ng-click="">批量修改</a>
-                 <select type="select" ng-model="product.updatetype" ng-init="product.updatetype = '品牌'">
-                 	<option value="品牌">品牌</option>
-                 	<option value="名称（类目）">名称（类目）</option>
-                 	<option value="产品型号">产品型号</option>
-                 </select>
-                 <a ng-click="updateByBatch(product.updatetype)">确定</a>
+                <div class="edit col-xs-3">
+                    <select type="select" class="fl form-control" ng-model="product.updatetype" ng-init="product.updatetype = '品牌'" style="width: 130px;">
+                        <option value="品牌">品牌</option>
+                        <option value="名称（类目）">名称（类目）</option>
+                        <option value="产品型号">产品型号</option>
+                    </select>
+                    <a ng-click="updateByBatch(product.updatetype)" class="fr">批量修改</a>
+                </div>
             </div>
         </div>
     </div>
@@ -173,7 +195,7 @@
         <table class="order-table block " ng-table="tableParams">
             <thead>
             <tr class="header">
-            	<th><input type="checkbox" ng-model="checks.checked" ng-click="checkAll()"></th>
+            	<th width="80"><label><input type="checkbox" ng-model="checks.checked" ng-click="checkAll()">&nbsp;全选</label></th>
                 <th width="140">产品编号</th>
                 <th>产品名称(类目)</th>
                 <th width="160">产品型号</th>
@@ -190,7 +212,7 @@
             </thead>
             <tbody ng-repeat="product in $data">
             <tr class="order-hd">
-            	<td><input type="checkbox" ng-model="product.checked" ng-click="checkOne(product)" ng-disabled="product.cmpUuId != null"></td>
+            	<td class="text-center"><input type="checkbox" ng-model="product.checked" ng-click="checkOne(product)" ng-disabled="product.cmpUuId != null"></td>
                 <td class="text-center" title="{{product.code}}" ng-bind="::product.code"></td>
                 <td class="line-h20 first text-center">
                     <div class="order-main">

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

@@ -129,6 +129,27 @@
 .order-hd td a{
     margin: 0 8px;
 }
+.order-table .header th label{
+    margin-left: 34px;
+}
+.order-table .header th label input{
+    margin: 0;
+    position: relative;
+    top: 3px;
+}
+.order-table tr.header th:first-child{
+    text-align: left;
+}
+.edit.col-xs-3{
+    padding-right: 0;
+    width: 215px;
+    float: right;
+}
+.edit.col-xs-3 a{
+    font-size: 14px;
+    line-height: 34px;
+    color: #5078cb;
+}
 </style>
 <link rel="stylesheet" href="static/css/public.css">
 <div class="block" id="public">
@@ -148,7 +169,7 @@
     <div class="condition block" style="padding: 10px 15px;">
         <div class="search-bg condition block"  style="padding: 10px 15px;">
             <div class="row">
-                <div id="topSearch" style="float: left">
+                <div id="topSearch" class="col-xs-6" style="float: left;width: 35%;">
                     <span class="text-muted"><i class="fa fa-search fa-lg"></i> 搜索"{{tip}}",为您找到结果:</span>
                   	  单据{{tableParams.total()}}条
                 </div>
@@ -160,13 +181,14 @@
                         </div>
                     </div>
                 </div>
-                 <a ng-click="">批量修改</a>
-                 <select type="select" ng-model="product.updatetype" ng-init="product.updatetype = '品牌'">
-                 	<option value="品牌">品牌</option>
-                 	<option value="名称（类目）">名称（类目）</option>
-                 	<option value="物料型号">物料型号</option>
-                 </select>
-                 <a ng-click="updateByBatch(product.updatetype)">确定</a>
+                <div class="edit col-xs-3">
+                     <select type="select"class="fl form-control"  ng-model="product.updatetype" ng-init="product.updatetype = '品牌'" style="width: 130px;">
+                        <option value="品牌">品牌</option>
+                        <option value="名称（类目）">名称（类目）</option>
+                        <option value="物料型号">物料型号</option>
+                     </select>
+                     <a ng-click="updateByBatch(product.updatetype)" class="fr">批量修改</a>
+                </div>
             </div>
         </div>
     </div>
@@ -174,7 +196,7 @@
         <table class="order-table block " ng-table="tableParams">
             <thead>
             <tr class="header">
-          		<th><input type="checkbox" ng-model="checks.checked" ng-click="checkAll()"></th>
+          		<th width="80"><label><input type="checkbox" ng-model="checks.checked" ng-click="checkAll()">&nbsp;全选</label></th>
                 <th width="140">物料编号</th>
                 <th>物料名称(类目)</th>
                 <th width="160">物料型号</th>
@@ -191,7 +213,7 @@
             </thead>
             <tbody ng-repeat="product in $data">
             <tr class="order-hd">
-            	<td><input type="checkbox" ng-model="product.checked" ng-click="checkOne(product)" ng-disabled="product.cmpUuId != null"></td>
+            	<td class="text-center"><input type="checkbox" ng-model="product.checked" ng-click="checkOne(product)" ng-disabled="product.cmpUuId != null"></td>
                 <td class="text-center" title="{{product.code}}" ng-bind="::product.code"></td>
                 <td class="line-h20 first text-center">
                     <div class="order-main">