Преглед изворни кода

询价单首页导航栏调整

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@7983 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
hejq пре 9 година
родитељ
комит
1b3305b118

+ 120 - 119
src/main/webapp/resources/tpl/index/purc/inquiry.html

@@ -135,142 +135,153 @@
 	position: relative;
 }
 
-	.order-table .header>th {
-		height: 38px;
-		text-align: center;
-		background: #f5f5f5;
-		border-top: 1px solid #e8e8e8;
-		border-bottom: 1px solid #e8e8e8;
-	}
+.order-table .header>th {
+	height: 38px;
+	text-align: center;
+	background: #f5f5f5;
+	border-top: 1px solid #e8e8e8;
+	border-bottom: 1px solid #e8e8e8;
+}
 
-	.order-table .sep-row {
-		height: 10px;
-	}
+.order-table .sep-row {
+	height: 10px;
+}
 
-	.order-table .selector {
-		vertical-align: middle;
-		margin: 0 0 2px 0;
-	}
+.order-table .selector {
+	vertical-align: middle;
+	margin: 0 0 2px 0;
+}
 
-	.toolbar label {
-		margin-right: 10px;
-		margin-bottom: 0;
-	}
+.toolbar label {
+	margin-right: 10px;
+	margin-bottom: 0;
+}
 
-	.toolbar .select_all {
-		margin: 0 6px 0 10px;
-		line-height: 20px;
-	}
+.toolbar .select_all {
+	margin: 0 6px 0 10px;
+	line-height: 20px;
+}
 
-	.toolbar .btn {
-		-moz-border-radius: 2px;
-		margin-right: 5px;
-		border: 1px solid #dcdcdc;
-		border-radius: 2px;
-		-webkit-border-radius: 2px;
-	}
+.toolbar .btn {
+	-moz-border-radius: 2px;
+	margin-right: 5px;
+	border: 1px solid #dcdcdc;
+	border-radius: 2px;
+	-webkit-border-radius: 2px;
+}
 
-	.order-table .order-hd {
-		background: #f5f5f5;
-		height: 40px;
-		line-height: 40px;
-	}
+.order-table .order-hd {
+	background: #f5f5f5;
+	height: 40px;
+	line-height: 40px;
+}
 
-	.order-table .order-hd td.first {
-		padding-left: 20px;
-	}
+.order-table .order-hd td.first {
+	padding-left: 20px;
+}
 
-	.order-table .order-hd .order-main span {
-		margin-right: 8px;
-	}
+.order-table .order-hd .order-main span {
+	margin-right: 8px;
+}
 
-	.order-table .order-hd .order-code {
-		font-style: normal;
-		font-family: verdana;
-	}
+.order-table .order-hd .order-code {
+	font-style: normal;
+	font-family: verdana;
+}
 
-	.order-table .order-hd .order-sum {
-		padding: 0 5px;
-	}
+.order-table .order-hd .order-sum {
+	padding: 0 5px;
+}
 
-	.order-table>tbody {
-		border: 1px solid transparent;
-	}
+.order-table>tbody {
+	border: 1px solid transparent;
+}
 
-	.order-table>tbody:hover {
-		border-color: #d32526;
-		border-width: 2px;
-	}
+.order-table>tbody:hover {
+	border-color: #d32526;
+	border-width: 2px;
+}
 
-	.order-table .operates {
-		display: none;
-	}
+.order-table .operates {
+	display: none;
+}
 
-	.order-table>tbody:hover .operates {
-		display: block;
-	}
+.order-table>tbody:hover .operates {
+	display: block;
+}
 
-	.order-table .order-bd {
-		border-bottom: 1px solid #e6e6e6;
-	}
+.order-table .order-bd {
+	border-bottom: 1px solid #e6e6e6;
+}
 
-	.order-table .order-bd>td {
-		padding: 10px 5px;
-		vertical-align: top;
-		position: relative;
-	}
+.order-table .order-bd>td {
+	padding: 10px 5px;
+	vertical-align: top;
+	position: relative;
+}
 
-	.order-table .order-bd .product {
-		padding-left: 20px;
-	}
+.order-table .order-bd .product {
+	padding-left: 20px;
+}
 
-	.input-xs,.input-group-xs>.form-control,.input-group-xs>.input-group-addon,.input-group-xs>.input-group-btn>.btn
-	{
-		height: 26px;
-		padding: 0 5px;
-		font-size: 12px;
-		line-height: 1.5;
-		border-radius: 3px;
-	}
+.input-xs,.input-group-xs>.form-control,.input-group-xs>.input-group-addon,.input-group-xs>.input-group-btn>.btn
+{
+	height: 26px;
+	padding: 0 5px;
+	font-size: 12px;
+	line-height: 1.5;
+	border-radius: 3px;
+}
 
-	.input-group-xs .form-control:last-child,.input-group-addon:last-child,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:last-child>.btn {
-		border-top-left-radius: 0;
-		border-bottom-left-radius: 0;
-	}
+.input-group-xs .form-control:last-child,.input-group-addon:last-child,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:last-child>.btn {
+	border-top-left-radius: 0;
+	border-bottom-left-radius: 0;
+}
 
-	@media ( min-width : 768px) {
-		.form-horizontal .form-group-xs .control-label {
-			padding-top: 5px;
-		}
+@media ( min-width : 768px) {
+	.form-horizontal .form-group-xs .control-label {
+		padding-top: 5px;
 	}
+}
 
-	.info-container .info:hover {
-		color: #CC3333;
-	}
-	.input-error{
-		background-color: #fff8ee;
-		border-color: #CC0033;
-	}
-	input.input-error:focus {
-		background-color: #fff8ee;
-		border-color: #CC0033;
-	}
-	.block{
-		/*background: #f5f5f5;*/
-	}
-	.order-table{
-		background: #fff;
-	}
+.info-container .info:hover {
+	color: #CC3333;
+}
+.input-error{
+	background-color: #fff8ee;
+	border-color: #CC0033;
+}
+input.input-error:focus {
+	background-color: #fff8ee;
+	border-color: #CC0033;
+}
+.block{
+	/*background: #f5f5f5;*/
+}
+.order-table{
+	background: #fff;
+}
+.inquiry-todo {
+font-size: 14px;
+padding: 0;
+margin-left: 55px;
+}
+
+.inquiry-todo a{
+	float: left;
+	margin-left: 15px;
+	font-size: 16px;
+    font-family: "Microsoft YaHei", "微软雅黑";
+}
 </style>
 <link rel="stylesheet" href="static/css/public.css">
-<div ng-include src="'static/tpl/index/purc/enMenu.html'"></div>
 <div class="block" id="public">
 	<div class="loading in" ng-class="{'in': loading}">
 		<i></i>
 	</div>
 	<div class="menu condition block">
 		<div class="row">
-			<div class="col-xs-4">
+			<div class="col-xs-8">
 				<div class="btn-group btn-group-sm btn-group-justified">
 					<div class="btn-group btn-group-sm">
 						<button type="button" class="btn btn-default btn-line"
@@ -289,20 +300,10 @@
 					</div>
 				</div>
 			</div>
-			<!--<div class="col-xs-5">
-				<div class="search">
-					<div class="form-group form-group-sm has-feedback">
-						<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入商品、客户名称或单据流水号搜索" /><span
-							class="form-control-feedback text-simple"><i
-							class="fa fa-search"></i></span>
-					</div>
-				</div>
+			<div class=" inquiry-todo col-xs-2 pull-right" style="padding-left: 0;">
+				<a id="add" ui-sref="purc.inquiry_unapply" title="待提交">待提交</a>
+				<a id="add" ui-sref="purc.inquiry_new" title="新增">新增</a>
 			</div>
-			<div class="col-xs-1">
-				<div class="text-default f14 total">
-					共 <span ng-bind="tableParams.total()" class="text-num"></span>
-				</div>
-			</div>-->
 		</div>
 	</div>
 	<div class="condition block" style="padding-top: 0; padding-bottom: 0; background: #fff;">

+ 0 - 1
src/main/webapp/resources/tpl/index/purc/inquiry_new.html

@@ -833,7 +833,6 @@ input[type="radio"], input[type="checkbox"] {
     font-size: 14px;
 }
 </style>
-<div ng-include src="'static/tpl/index/purc/enMenu.html'"></div>
 <div class="ng-scope">
     <form name="tenderForm">
         <div class="purc-tender">

+ 0 - 1
src/main/webapp/resources/tpl/index/purc/inquiry_unapply.html

@@ -275,7 +275,6 @@
 	position: relative;
 }
 </style>
-<div ng-include src="'static/tpl/index/purc/enMenu.html'"></div>
 <link rel="stylesheet" href="static/css/public.css">
 <div class="block" id="public">
 <div class="loading in" ng-class="{'in': loading}">