Browse Source

新增采购单表格样式调整。

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@7546 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
ouxianqin 9 years ago
parent
commit
1e3ea2eb09

+ 38 - 0
src/main/webapp/resources/css/add.css

@@ -2201,3 +2201,41 @@ scale
 	position: relative;
 	position: relative;
 	left: -10px;
 	left: -10px;
 }
 }
+.oder-change dl .editable{
+	text-align: center;
+}
+.oder-change dl dd b{
+	height: auto;
+}
+.oder-change .save button:disabled{
+	background: #ccc !important;
+}
+.pro-add-data02 table tbody{
+	font-size: 14px;
+}
+.pro-add-data02 .table-default .header{
+	background: #fff;
+	border: none;
+	font-size: 14px;
+}
+.pro-add-data02 .table-default .header th{
+	border-bottom: #e8e8e8 1px solid;
+}
+.pro-add-data02 table tbody tr td{
+	line-height: 50px;
+	height: 50px;
+	padding: 0;
+	font-size: 14px !important;
+	border-bottom: #e8e8e8 1px solid;
+	background: #fff;
+}
+.pro-add-data02 table tbody tr{
+	margin-top: 1px;
+	background: #f5f5f5;
+}
+.pro-add-data02 table tbody tr td a:hover{
+	color: #f00 !important;
+}
+.pro-add-data02 table tbody tr:hover td{
+	background: #f5f5f5;
+}

+ 2 - 2
src/main/webapp/resources/css/index.css

@@ -2303,8 +2303,8 @@ ul>li.item-link>a {
 }
 }
 /*form valid*/
 /*form valid*/
 input.ng-invalid.ng-dirty,textarea.ng-invalid.ng-dirty {
 input.ng-invalid.ng-dirty,textarea.ng-invalid.ng-dirty {
-	background-color: #fff8ee;
-	border-color: #CC0033;
+	box-shadow: 0 0 2px #f00;
+	border: #f00 1px solid;
 }
 }
 
 
 .form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control {
 .form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control {

+ 6 - 10
src/main/webapp/resources/tpl/index/baseInfo/prodList.html

@@ -116,12 +116,12 @@
 .condition{
 .condition{
     padding: 10px 0;
     padding: 10px 0;
 }
 }
-.line-h20{
+.order-hd td{
     line-height: 20px;
     line-height: 20px;
 }
 }
- .order-table .order-hd a{
-     margin: 0 5px;
- }
+.toolbar td a{
+    margin-left: 18px;
+}
 </style>
 </style>
 <div class="block">
 <div class="block">
     <div class="loading in" ng-class="{'in': loading}">
     <div class="loading in" ng-class="{'in': loading}">
@@ -162,14 +162,10 @@
             <tr class="toolbar toolbar-top">
             <tr class="toolbar toolbar-top">
                 <td colspan="5">
                 <td colspan="5">
                 </td>
                 </td>
-                <td class="text-center">
+                <td colspan="3" class="text-center">
                     <a href="product/baseInfo/xls?keyword={{keywordXls}}" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
                     <a href="product/baseInfo/xls?keyword={{keywordXls}}" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
-                </td>
-                <td colspan="1" class="text-center">
                     <a ui-sref="sale.newProdInfo">新增 <i class="fa fa-lg fa-plus-square"></i></a>
                     <a ui-sref="sale.newProdInfo">新增 <i class="fa fa-lg fa-plus-square"></i></a>
-                </td>
-                <td colspan="1" class="text-center">
-                    <a ui-sref="sale.uploadByBatch">批量导入 <i class="fa fa-file-excel-o"></i></a>
+                    <a ui-sref="sale.uploadByBatch" title="批量导入">批量导入 <i class="fa fa-file-excel-o"></i></a>
                 </td>
                 </td>
             </tr>
             </tr>
             <tr class="sep-row">
             <tr class="sep-row">

+ 4 - 5
src/main/webapp/resources/tpl/index/purc/addOrder.html

@@ -138,10 +138,10 @@
 				<thead>
 				<thead>
 					<tr class="header">
 					<tr class="header">
 						<th width="160px">编号</th>
 						<th width="160px">编号</th>
-						<th width="160px">名称</th>
+						<th width="120px">名称</th>
 						<th>规格</th>
 						<th>规格</th>
-						<th width="80px">单位</th>
-						<th width="50px">选择</th>
+						<th width="120px">单位</th>
+						<th width="80px">选择</th>
 					</tr>
 					</tr>
 				</thead>
 				</thead>
 				<tbody ng-if="tableParams.total() == 0">
 				<tbody ng-if="tableParams.total() == 0">
@@ -154,7 +154,6 @@
 							<br>
 							<br>
 							<div class="text-muted" style="font-size: 14px;"><i class="fa fa-spinner"></i> 您的供应商还未添加商品信息,请尽快通知供应商</div>
 							<div class="text-muted" style="font-size: 14px;"><i class="fa fa-spinner"></i> 您的供应商还未添加商品信息,请尽快通知供应商</div>
 						</td>
 						</td>
-						<br>
 					</tr>
 					</tr>
 				</tbody>
 				</tbody>
 				<tbody>
 				<tbody>
@@ -163,7 +162,7 @@
 						<td class="text-center" ng-bind="::product.title"></td>
 						<td class="text-center" ng-bind="::product.title"></td>
 						<td class="text-center f12" ng-bind="::product.spec"></td>
 						<td class="text-center f12" ng-bind="::product.spec"></td>
 						<td class="text-center" ng-bind="::product.unit"></td>
 						<td class="text-center" ng-bind="::product.unit"></td>
-						<td class="text-center" ><a title="选择" href="javascript:void(0)" ng-click="check(product)" style="text-decoration: none; color: #327ebe;" id="click" class="add01">添加</a>
+						<td class="text-center" ><a title="添加" href="javascript:void(0)" ng-click="check(product)" style="text-decoration: none; color: #327ebe;" id="click" class="add01">添加</a>
 						<div class="add-tanchuang">
 						<div class="add-tanchuang">
 		                        <ul>
 		                        <ul>
 		                            <li>
 		                            <li>