Browse Source

主动报价标题和内容绑定,不单独提出

wangmh 8 years ago
parent
commit
df6369e653

+ 9 - 8
src/main/webapp/resources/tpl/index/sale/quotation.html

@@ -1,4 +1,4 @@
-<style>
+<!--<style>
 .order-table .header>th {
 	height: 38px;
 	text-align: center;
@@ -27,11 +27,11 @@
 }
 
 .toolbar .btn {
-	-moz-border-radius: 2px;
+	  -moz-border-radius: 2px;
 	margin-right: 5px;
 	border: 1px solid #dcdcdc;
 	border-radius: 2px;
-	-webkit-border-radius: 2px;
+	  -webkit-border-radius: 2px;
 }
 
 .order-table .order-hd {
@@ -160,13 +160,13 @@
 <div class="block">
 	<div class="pub-com_head" ng-controller="SaleQuotationNewCtrl">
 		<span>主动报价</span>
-		<!-- <div class="p-right" ng-if="!enteryStatus">
+		&lt;!&ndash; <div class="p-right" ng-if="!enteryStatus">
 			<a  ui-sref="sale.quotation.new" ui-sref-active="btn-info">
 				<i class="fa fa-plus-square-o"></i> 新增
 			</a>
-			<!--<a ui-sref="sale.quotation.list" ui-sref-active="btn-info">-->
-				<!--<i class="fa fa-list"></i> 列表-->
-			<!--</a>-->
+			&lt;!&ndash;<a ui-sref="sale.quotation.list" ui-sref-active="btn-info">&ndash;&gt;
+				&lt;!&ndash;<i class="fa fa-list"></i> 列表&ndash;&gt;
+			&lt;!&ndash;</a>&ndash;&gt;
 		<span class="time-per fr"  ng-if="enteryStatus"><em>录入人:{{::item.quotation.user.userName}}</em><time>日期:{{::item.quotation.date | date:'yyyy-MM-dd HH:mm:ss'}}</time></span>
 		<div class="p-right" ng-if="!enteryStatus">
 			<a ui-sref="sale.quotation.new" title="新增主动报价单"><img src="static/img/icon/add.png"/>新增</a>
@@ -175,4 +175,5 @@
 		</div>
 	</div>
 	<div ui-view style="background: #fff;"></div>
-</div>
+</div>-->
+<div ui-view style="background: #fff;"></div>

+ 192 - 1
src/main/webapp/resources/tpl/index/sale/quotation_list.html

@@ -20,9 +20,186 @@
 	.inquiry-cz a img{
 		margin-right: 3px;
 	}
+
+	/*sssssssssssssssssssssssssssssssss*/
+	.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 .selector {
+		vertical-align: middle;
+		margin: 0 0 2px 0;
+	}
+
+	.toolbar label {
+		margin-right: 10px;
+		margin-bottom: 0;
+	}
+
+	.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;
+	}
+
+	.order-table .order-hd {
+		background: #f5f5f5;
+		height: 40px;
+		line-height: 40px;
+	}
+
+	.order-table .order-hd td.first {
+		padding-left: 20px;
+	}
+
+	.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-sum {
+		padding: 0 5px;
+	}
+
+	.order-table>tbody {
+		border: 1px solid transparent;
+	}
+
+	.order-table>tbody:hover {
+		border-color: #56a022;
+		border-width: 2px;
+	}
+
+	.order-table .operates {
+		display: none;
+	}
+
+	.order-table>tbody:hover .operates {
+		display: block;
+	}
+
+	.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 .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-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-dbfind {
+		cursor: pointer;
+	}
+
+	@media ( min-width : 768px) {
+		.form-horizontal .form-group-xs .control-label {
+			padding-top: 5px;
+		}
+	}
+
+	.inline-show {
+		display: inline-block;
+	}
+
+	.inline-hide {
+		display: none;
+	}
+	.btn-group-justified .btn{
+		border: none;
+		font-size: 14px;
+		outline: none;
+	}
+	.btn-group-justified .btn-info{
+		background: none;
+		color: #3a89d1;
+	}
+	.btn-group-justified .btn:hover{
+		background: none;
+		color: #3a89d1;
+	}
+	.btn-group-justified .btn:active{
+		background: none;
+	}
+	.pub-com_head  .p-right a.btn-info{
+		background: none;
+		color: #999;
+		cursor: default;
+	}
+	.pub-com_head  .p-right a.btn-info:hover{
+		text-decoration: none;
+		color: #999;
+	}
+	.pub-com_head  .time-per{
+		margin-right: 20px;
+		color: #959595 !important;
+		float: right;
+	}
+	.pub-com_head  .time-per em,.pub-com_head  .time-per time{
+		font-style : normal;
+	}
+	.pub-com_head span.fr em {
+		margin-right: 50px;
+		font-size: 14px;
+	}
+
+
 </style>
 <link rel="stylesheet" href="static/css/public.css">
-<div id="public">
+<div class="block">
+	<div class="pub-com_head" ng-controller="SaleQuotationNewCtrl">
+		<span>主动报价</span>
+		<!-- <div class="p-right" ng-if="!enteryStatus">
+			<a  ui-sref="sale.quotation.new" ui-sref-active="btn-info">
+				<i class="fa fa-plus-square-o"></i> 新增
+			</a>
+			<!--<a ui-sref="sale.quotation.list" ui-sref-active="btn-info">-->
+		<!--<i class="fa fa-list"></i> 列表-->
+		<!--</a>-->
+		<div class="p-right">
+			<a ui-sref="sale.quotation.new" title="新增主动报价单"><img src="static/img/icon/add.png"/>新增</a>
+			<a href="sale/quotation/xls?_state={{active}}&searchFilter={{searchFilterXls}}" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+		</div>
+	</div>
+</div></div>
+	<div id="public">
 	<div class="loading in" ng-class="{'in': loading}">
 		<i></i>
 	</div>
@@ -147,6 +324,20 @@
 		<tr class="sep-row">
 			<td colspan="7"></td>
 		</tr>
+		<tr class="toolbar toolbar-top">
+			<td colspan="6">
+				<!--<div>
+					<label><input ng-disabled="true" type="checkbox" class="selector select_all"
+								  ng-model="selectAll">全选</label>
+				</div> &lt;!&ndash; 分页 &ndash;&gt;-->
+			</td>
+			<td class="text-center">
+				<a href="sale/quotation/xls?_state={{active}}&searchFilter={{searchFilterXls}}" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+			</td>
+		</tr>
+		<tr class="sep-row">
+			<td colspan="7"></td>
+		</tr>
 		</thead>
 		<tbody ng-if="tableParams.total() == 0">
 		<tr>

+ 172 - 0
src/main/webapp/resources/tpl/index/sale/quotation_new.html

@@ -112,10 +112,182 @@
 		right: 5px;
 		top: 12px;
 	}
+
+	/*sssssssssssssssssss*/
+	.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 .selector {
+		vertical-align: middle;
+		margin: 0 0 2px 0;
+	}
+
+	.toolbar label {
+		margin-right: 10px;
+		margin-bottom: 0;
+	}
+
+	.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;
+	}
+
+	.order-table .order-hd {
+		background: #f5f5f5;
+		height: 40px;
+		line-height: 40px;
+	}
+
+	.order-table .order-hd td.first {
+		padding-left: 20px;
+	}
+
+	.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-sum {
+		padding: 0 5px;
+	}
+
+	.order-table>tbody {
+		border: 1px solid transparent;
+	}
+
+	.order-table>tbody:hover {
+		border-color: #56a022;
+		border-width: 2px;
+	}
+
+	.order-table .operates {
+		display: none;
+	}
+
+	.order-table>tbody:hover .operates {
+		display: block;
+	}
+
+	.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 .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-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-dbfind {
+		cursor: pointer;
+	}
+
+	@media ( min-width : 768px) {
+		.form-horizontal .form-group-xs .control-label {
+			padding-top: 5px;
+		}
+	}
+
+	.inline-show {
+		display: inline-block;
+	}
+
+	.inline-hide {
+		display: none;
+	}
+	.btn-group-justified .btn{
+		border: none;
+		font-size: 14px;
+		outline: none;
+	}
+	.btn-group-justified .btn-info{
+		background: none;
+		color: #3a89d1;
+	}
+	.btn-group-justified .btn:hover{
+		background: none;
+		color: #3a89d1;
+	}
+	.btn-group-justified .btn:active{
+		background: none;
+	}
+	.pub-com_head  .p-right a.btn-info{
+		background: none;
+		color: #999;
+		cursor: default;
+	}
+	.pub-com_head  .p-right a.btn-info:hover{
+		text-decoration: none;
+		color: #999;
+	}
+	.pub-com_head  .time-per{
+		margin-right: 20px;
+		color: #959595 !important;
+		float: right;
+	}
+	.pub-com_head  .time-per em,.pub-com_head  .time-per time{
+		font-style : normal;
+	}
+	.pub-com_head span.fr em {
+		margin-right: 50px;
+		font-size: 14px;
+	}
 </style>
 <div class="loading" ng-class="{'in': loading}">
 	<i></i>
 </div>
+<div class="block">
+	<div class="pub-com_head" ng-controller="SaleQuotationNewCtrl">
+		<span>主动报价</span>
+		<!-- <div class="p-right" ng-if="!enteryStatus">
+			<a  ui-sref="sale.quotation.new" ui-sref-active="btn-info">
+				<i class="fa fa-plus-square-o"></i> 新增
+			</a>
+			<!--<a ui-sref="sale.quotation.list" ui-sref-active="btn-info">-->
+		<!--<i class="fa fa-list"></i> 列表-->
+		<!--</a>-->
+		<span class="time-per fr"><em>录入人:{{::item.quotation.user.userName}}</em><time>日期:{{::item.quotation.date | date:'yyyy-MM-dd HH:mm:ss'}}</time></span>
+	</div>
+</div>
 <div class="title-div" style="border-bottom: 1px dashed #327ebe; margin-bottom: 10px;">
 	<span class="f14">基本信息</span>&nbsp;
 </div>