页面样式调整

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

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

@@ -10,7 +10,7 @@
 }
 
 .headerline {
-	font-size: 16px;
+	font-size: 14px;
   	font-family: Microsoft YaHei,SimHei,Verdana;
   	font-weight: 500;
   	line-height: 22px;
@@ -23,7 +23,7 @@
 
 .headerline .content {
 	position: absolute;
-	top: -12px;
+	top: 12px;
 	left: 20px;
 	line-height: 24px;
   	padding: 0 15px 0 10px;
@@ -33,7 +33,7 @@
 
 .headerline .end {
 	position: absolute;
-	top: -12px;
+	top: 12px;
 	right: 20px;
 	line-height: 24px;
   	padding-left: 15px;
@@ -94,72 +94,81 @@
 				<button class="btn btn-success btn-sm" ng-click="selectKind()" style="width: 100%;">选择类目</button>
 			</div> -->
 		</div>
+		<div class="headerline">
 			<div class="form-group form-group-sm has-feedback">
-			<label for="customerUser" class="col-sm-2 control-label">原厂型号</label>
-			<div class="col-sm-4">
-				<div class="">
-					<input ng-model="prodInfo.cmpCode" type="text" readonly="readonly" class="form-control input-dbfind" id="custUser" 
-						placeholder="点击选择原厂型号" style="cursor: pointer;" ng-click="selectKind()">
-					<span class="form-control-feedback text-simple"><i class="fa fa-search"></i></span>
+				<label for="customerUser" class="col-sm-2 control-label"></label>
+				<div class="col-sm-4">
+					<div class="">
+					</div>
 				</div>
 			</div>
-		</div>
-		<div class="form-group form-group-sm has-feedback">
-			<label for="customerUser" class="col-sm-2 control-label">标准料号</label>
-			<div class="col-sm-4">
-				<div class="">
-					<input ng-model="prodInfo.cmpUuId" type="text" class="form-control input-dbfind" id="custUser" 
-						placeholder="标准料号" style="cursor: pointer;" readonly="readonly">
-					<span class="form-control-feedback text-simple"></span>
+			<div class="form-group form-group-sm has-feedback">
+				<label for="customerUser" class="col-sm-2 control-label">原厂型号</label>
+				<div class="col-sm-4">
+					<div class="">
+						<input ng-model="prodInfo.cmpCode" type="text" readonly="readonly" class="form-control input-dbfind" id="custUser" 
+							placeholder="点击选择原厂型号" style="cursor: pointer;" ng-click="selectKind()">
+						<span class="form-control-feedback text-simple"><i class="fa fa-search"></i></span>
+					</div>
 				</div>
 			</div>
-		</div>
-		<div class="form-group form-group-sm has-feedback">
-			<label for="customerUser" class="col-sm-2 control-label">物料品牌</label>
-			<div class="col-sm-4">
-				<div class="">
-					<input ng-model="prodInfo.brand" type="text" class="form-control input-dbfind" id="custUser" 
-						placeholder="物料品牌" style="cursor: pointer;" readonly="readonly">
-					<span class="form-control-feedback text-simple"></span>
+			<div class="form-group form-group-sm has-feedback">
+				<label for="customerUser" class="col-sm-2 control-label">标准料号</label>
+				<div class="col-sm-4">
+					<div class="">
+						<input ng-model="prodInfo.cmpUuId" type="text" class="form-control input-dbfind" id="custUser" 
+							placeholder="标准料号" style="cursor: pointer;" readonly="readonly">
+						<span class="form-control-feedback text-simple"></span>
+					</div>
 				</div>
 			</div>
-		</div>
-		<div class="form-group form-group-sm has-feedback">
-			<label for="customer" class="col-sm-2 control-label"><span class="text-inverse text-bold">* </span>物料名称</label>
-			<div class="col-sm-4">
-				<div class="">
-					<input ng-model="prodInfo.title" type="text" class="form-control" id="customer" 
-						placeholder="物料名称" style="cursor: pointer;" ng-click="dbfindCust()" required="true">
-					<span class="form-control-feedback text-simple"><!-- <i class="fa fa-search"></i> --></span>
+			<div class="form-group form-group-sm has-feedback">
+				<label for="customerUser" class="col-sm-2 control-label">物料品牌</label>
+				<div class="col-sm-4">
+					<div class="">
+						<input ng-model="prodInfo.brand" type="text" class="form-control input-dbfind" id="custUser" 
+							placeholder="物料品牌" style="cursor: pointer;" readonly="readonly">
+						<span class="form-control-feedback text-simple"></span>
+					</div>
 				</div>
 			</div>
-		</div>
-		<div class="form-group form-group-sm has-feedback">
-			<label for="customerUser" class="col-sm-2 control-label"><span class="text-inverse text-bold">* </span>物料编号</label>
-			<div class="col-sm-4">
-				<div class="">
-					<input ng-model="prodInfo.code" type="text" class="form-control input-dbfind" id="custUser" 
-						placeholder="物料编号"  style="cursor: pointer;" required="true">
-					<span class="form-control-feedback text-simple"></span>
+			<div class="form-group form-group-sm has-feedback">
+				<label for="customer" class="col-sm-2 control-label"><span class="text-inverse text-bold">* </span>物料名称</label>
+				<div class="col-sm-4">
+					<div class="">
+						<input ng-model="prodInfo.title" type="text" class="form-control" id="customer" 
+							placeholder="物料名称" style="cursor: pointer;" ng-click="dbfindCust()" required="true">
+						<span class="form-control-feedback text-simple"><!-- <i class="fa fa-search"></i> --></span>
+					</div>
 				</div>
 			</div>
-		</div>
-		<div class="form-group form-group-sm has-feedback">
-			<label for="product" class="col-sm-2 control-label"><span class="text-inverse text-bold">* </span>物料规格</label>
-			<div class="col-sm-4">
-				<div class="productSpec">
-					<textarea ng-model="prodInfo.spec" type="text"  id="product"  class="input-dbfind"
-						placeholder="物料规格" style="cursor: pointer;"
-						ng-click="dbfindCustProd()" required="true"></textarea>
+			<div class="form-group form-group-sm has-feedback">
+				<label for="customerUser" class="col-sm-2 control-label"><span class="text-inverse text-bold">* </span>物料编号</label>
+				<div class="col-sm-4">
+					<div class="">
+						<input ng-model="prodInfo.code" type="text" class="form-control input-dbfind" id="custUser" 
+							placeholder="物料编号"  style="cursor: pointer;" required="true">
+						<span class="form-control-feedback text-simple"></span>
+					</div>
 				</div>
 			</div>
-		</div>
-		<div class="form-group form-group-sm has-feedback">
-			<label for="customerUser" class="col-sm-2 control-label">单位</label>
-			<div class="col-sm-4">
-				<div class="">
-					<input ng-model="prodInfo.unit" type="text" class="form-control input-dbfind" id="custUser" 
-						placeholder="单位" style="cursor: pointer;" required="true">
+			<div class="form-group form-group-sm has-feedback">
+				<label for="product" class="col-sm-2 control-label"><span class="text-inverse text-bold">* </span>物料规格</label>
+				<div class="col-sm-4">
+					<div class="productSpec">
+						<textarea ng-model="prodInfo.spec" type="text"  id="product"  class="input-dbfind"
+							placeholder="物料规格" style="cursor: pointer;"
+							ng-click="dbfindCustProd()" required="true"></textarea>
+					</div>
+				</div>
+			</div>
+			<div class="form-group form-group-sm has-feedback">
+				<label for="customerUser" class="col-sm-2 control-label">单位</label>
+				<div class="col-sm-4">
+					<div class="">
+						<input ng-model="prodInfo.unit" type="text" class="form-control input-dbfind" id="custUser" 
+							placeholder="单位" style="cursor: pointer;" required="true">
+					</div>
 				</div>
 			</div>
 		</div>

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

@@ -155,7 +155,7 @@
 				<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="baseInfo.newProdInfo">新增<i class="fa fa-plus-square"></i></a>
+				<a ui-sref="baseInfo.newProdInfo">新增 <i class="fa fa-lg fa-plus-square"></i></a>
 			</td>
 		</tr>
 		<tr class="sep-row">
@@ -166,7 +166,7 @@
 		<tr class="order-hd">
 			<td class="first text-center" width="120">
 				<div class="order-main">
-					<span ng-bind="::product.title" ></span>
+					<a ng-bind="::product.title" ui-sref="baseInfo.productDetail({id:product.id})" target="_self"></a>
 				</div>
 			</td>
 			<td width="120" class="text-center"><span title="{{product.code}}" ng-bind="::product.code"></span></td>
@@ -179,7 +179,7 @@
 			<td width="70" class="text-center"><span title="标准料号" ng-bind="::product.cmpUuId"></span></td>
 			<td width="120" class="text-center"><span title="原厂型号" ng-bind="::product.cmpCode"></span></td>
 			<td width="70" class="text-center"><span title="单位" ng-bind="::product.unit"></span></td>
-			<td width="100" class="text-center"><a ui-sref="baseInfo.productDetail({id:product.id})" target="_self">编辑<i class="fa fa-edit"></i></a>|<a ng-click="deleteById(product.id)">删除<i class="fa fa-trash"></i></a></td>
+			<td width="100" class="text-center"><a ui-sref="baseInfo.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>
 		</tr>
 	</tbody>
 </table>

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

@@ -10,7 +10,7 @@
 }
 
 .headerline {
-	font-size: 16px;
+	font-size: 14px;
   	font-family: Microsoft YaHei,SimHei,Verdana;
   	font-weight: 500;
   	line-height: 22px;
@@ -23,7 +23,7 @@
 
 .headerline .content {
 	position: absolute;
-	top: -12px;
+	top: 12px;
 	left: 20px;
 	line-height: 24px;
   	padding: 0 15px 0 10px;
@@ -33,7 +33,7 @@
 
 .headerline .end {
 	position: absolute;
-	top: -12px;
+	top: 12px;
 	right: 20px;
 	line-height: 24px;
   	padding-left: 15px;
@@ -88,7 +88,15 @@
 				<i class="fa fa-angle-down"></i>&nbsp;&nbsp;
 			</div>
 		</div>
-			<div class="form-group form-group-sm has-feedback">
+		<div class="headerline">
+		<div class="form-group form-group-sm has-feedback">
+			<label for="customerUser" class="col-sm-2 control-label"></label>
+			<div class="col-sm-4">
+				<div class="">
+				</div>
+			</div>
+		</div>
+		<div class="form-group form-group-sm has-feedback">
 			<label for="customerUser" class="col-sm-2 control-label">物料品牌</label>
 			<div class="col-sm-4">
 				<div class="">
@@ -156,6 +164,7 @@
 				</div>
 			</div>
 		</div>
+		</div>
 		<div class="form-group form-group-sm">
 			<div class="col-sm-2"></div>
 			<div class="col-sm-3" ng-if="!prodInfo.$editing">

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

@@ -26,7 +26,7 @@
 
 .headerline .index {
 	position: absolute;
-    top: -12px;
+    top: 12px;
     left: 0;
     width: 6px;
     height: 24px;
@@ -40,7 +40,7 @@
 
 .headerline .content {
 	position: absolute;
-    top: -12px;
+    top: 12px;
     left: 6px;
     line-height: 24px;
     padding: 0 15px 0 10px;
@@ -258,21 +258,11 @@ table.table.table-striped  thead {
   /* 分页 End */
 
 </style>
-<!-- location start -->
-<!-- location end -->
 <!-- block start -->
 <div class="block">
 	<div class="headerline">
 		<div class="index"></div>
 		<div class="content f16 text-bold">第一步、下载Excel模板</div>
-		<!-- <div class="end">
-			<a ng-click="closeBox('box1Closed')"
-				class="btn btn-default btn-sm text-simple"> <span
-				ng-if="!box1Closed">收拢 <i class="fa fa-angle-double-up"></i></span>
-				<span ng-if="box1Closed">展开 <i
-					class="fa fa-angle-double-down"></i></span>
-			</a>
-		</div> -->
 	</div>
 	<div class="box-item" ng-hide="box1Closed">
 		<p>
@@ -280,9 +270,6 @@ table.table.table-striped  thead {
 				class="fa fa-download"></i></button> 在Excel模板上录入商品发布信息，上传
 			<a class="f14 text-default" ng-click="showImg()">查看表格示例</a>。
 		</p>
-		<p>
-			<span class="text-inverse">*提示： 红色的为必填</span>
-		</p>
 	</div>
 	<div id="image-box" style="display: none">
 		<div class="x-close-wrap" title="关闭">
@@ -296,15 +283,6 @@ table.table.table-striped  thead {
 	<div class="headerline">
 		<div class="index"></div>
 		<div class="content f16 text-bold">第二步、上传已经填好的Excel文件</div>
-		<!-- <div class="end">
-			<a ng-click="closeBox('box2Closed')"
-				class="btn btn-default btn-sm text-simple"> <span
-				ng-if="!box2Closed">收拢 <i class="fa fa-angle-double-up"></i></span>
-				<span ng-if="box2Closed">展开 <i
-					class="fa fa-angle-double-down"></i></span>
-			</a>
-		</div> -->
-		<!-- <input role="button" class="btn btn-primary" value="上传文件" /> -->
 	</div>
 	<div class="box-item" ng-hide="box2Closed">
 		<form class="form-horizontal">
@@ -328,22 +306,26 @@ table.table.table-striped  thead {
 		</form>
 	</div>
 	<div class="headerline">
-	<div class="index"></div>
-	<div class="content f16 text-bold">第三部、信息提示</div>
-</div>
-<div class="box-item" ng-hide="box3Closed">
-	<p ng-if="result">
-		物料 <span class="text-inverse">{{alters}}</span> 已存在，上传失败
-	</p>
-</div>
-<div id="image-box" style="display: none">
-	<div class="x-close-wrap" title="关闭">
-		<a href="javascript:void(0);">&times;</a>
+		<div class="index"></div>
+		<div class="content f16 text-bold">第三部、信息提示</div>
 	</div>
-	<div class="x-floating-wrap"></div>
-	<div class="x-floating">
-		<img />
+	<div class="box-item" ng-hide="box3Closed">
+		<p ng-if="result">
+			<div ng-repeat="alter in alters">
+				物料 <span class="text-inverse">{{alter}}</span> 已存在，上传失败
+			</div>
+		</p>
+	</div>
+	<div class="headerline">
+	</div>
+	<div id="image-box" style="display: none">
+		<div class="x-close-wrap" title="关闭">
+			<a href="javascript:void(0);">&times;</a>
+		</div>
+		<div class="x-floating-wrap"></div>
+		<div class="x-floating">
+			<img />
+		</div>
 	</div>
-</div>
 </div>
 <!-- block end -->