购物车列表、新增询价单和器件选择修改样式和弹框处理

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

src/main/webapp/resources/css/index.css

@@ -2765,4 +2765,7 @@ input:-webkit-autofill { box-shadow: 0 0 0 1000px white inset !important;}
 	position: absolute;
 	top: 0;
 	right: 15px;
+}
+#order-detail-list .list-menu>li:before{
+	top: 15px;
 }

src/main/webapp/resources/tpl/index/baseInfo/modal/Component_KindChoose_modal.html

@@ -15,12 +15,12 @@
 		<span class="content"><i class="fa fa-fw fa-edit text-primary"></i>器件选择</span>
 	</div>
 	<form class="form-horizontal">
-		<div class="form-group">
-			<label class="col-md-2 col-sm-2 control-label">筛选：</label>
+		<div class="form-group" id="window-search">
+			<div class="col-md-2 col-sm-2"></div>
 			<div class="col-md-8 col-sm-8">
 				<input ng-model="keyword" type="text" class="form-control input-sm" 
-					required placeholder="输入客户物料关键字查询" autofocus ng-search="onSearch()">
-				<span class="form-control-feedback text-simple"><i class="fa fa-search"></i></span>
+					required placeholder="输入客户物料关键字查询" autofocus ng-search="onSearch()" />
+				<a class="btn input-group-addon" ng-click="onSearch()">搜索</a>
 			</div>
 		</div>
 	</form>

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

@@ -136,6 +136,21 @@
 #cart-title {
 	font-size: 16px;
 }
+.addCart-btn{
+	width: 105px;
+	height: 36px;
+	display: inline-block;
+	background: #5078cb;
+	text-align: center;
+	color: #fff;
+	font-size: 14px;
+	line-height: 36px;
+}
+.addCart-btn:hover{
+	background: #3a89d1;
+	color: #fff;
+	text-decoration: none;
+}
 </style>
 <link rel="stylesheet" href="static/css/public.css">
 <div class="block" id="public">
@@ -171,7 +186,7 @@
 				<div class="text-muted"><h3><i class="fa fa-spinner"></i> 购物车空空如也</h3></div>
 				<br>
 				<div>
-					<a href="#/purc/addOrder">立即添加商品</a>
+					<a href="#/purc/addOrder" class="addCart-btn">立即添加商品</a>
 				</div>
 			</td>
 		</tr>

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

@@ -1,17 +1,20 @@
 <div class="loading" ng-class="{'in': loading}">
 	<i></i>
 </div>
-<div class="pane base-info">
-	<div class="pane-header f16">
-		购物车<!-- <a ng-click="print(cart)" class="pull-right text-simple"><i
+<div class="pane base-info" id="order-detail-list">
+	<div class="pub-com_head">
+		<span>购物车</span>
+		<div class="p-right">
+			<!-- <a ng-click="print(cart)" class="pull-right text-simple"><i
 			class="fa fa-print fa-fw"></i>打印</a> -->
+		</div>
 	</div>
 	<div class="pane-body">
-		<div class="headerline">
-			<span class="index">1</span> <span class="content">购物车信息</span>
+		<div class="title-div" style="border-bottom: 1px dashed #327ebe;">
+			<span class="f14">购物车信息</span>&nbsp;
 		</div>
 		<div class="row row-sm item">
-			<div class="col-xs-3">
+			<div class="col-xs-5">
 				<span class="title">供应商</span>
 				<div class="content" ng-bind="::cart.receiveName"></div>
 			</div>
@@ -45,19 +48,19 @@
 			</div>
 			<div class="col-xs-9">
 				<span class="title">交货地址</span>
-				<div class="content" ng-bind="::cart.shipAddress"></div>
+				<div class="content-hide content" ng-bind="::cart.shipAddress"></div>
 			</div>
 		</div>
-		<div class="headerline">
-			<span class="index">2</span> <span class="content">商品清单</span>
+		<div class="title-div" style="border-bottom: 1px dashed #327ebe;">
+			<span class="f14">商品清单</span>&nbsp;
 		</div>
 		<div class="block">
 			<table class="block table table-default table-striped table-hover">
 				<thead>
 					<tr class="header">
-						<th width="50" class="br-r">行号</th>
+						<th width="50">行号</th>
 						<th>商品</th>
-						<th width="80">单价</th>
+						<th width="100">单价</th>
 						<th width="100">数量</th>
 						<th width="120">交货日期</th>
 						<th width="180">备注</th>
@@ -66,7 +69,7 @@
 				</thead>
 				<tbody>
 					<tr ng-repeat="item in cart.cartDetails track by item.id">
-						<td class="text-center text-num text-bold f-16 text-success br-r">
+						<td class="text-center text-num text-bold f-16 text-success">
 							<span ng-bind="::item.number"></span>
 						</td>
 						<td>

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

@@ -829,6 +829,9 @@ input[type="radio"], input[type="checkbox"] {
 .base-info{
     box-shadow: none;
 }
+.tender-content input{
+    font-size: 14px;
+}
 </style>
 <div ng-include src="'static/tpl/index/purc/enMenu.html'"></div>
 <div class="ng-scope">
@@ -847,44 +850,48 @@ input[type="radio"], input[type="checkbox"] {
                     <span style="color: rgb(211,37,38);">*</span>
                 </div>
                 <div class="row base-info">
-                    <div class = "col-xs-4">
-                        <div class="tender-desc">询价单号：</div>
-                        <input class="tender-input01" type="text" name="title" ng-model="inquiry.code" required readonly/>
-                    </div>
-                    <div class = "col-xs-4">
-                        <div class="tender-desc">询价日期：</div>
-                        <input class="tender-input01" type="text" name="user" ng-model="inquiry.showdate" required readonly/>
-                    </div>
-                    <div class = "col-xs-4">
-                        <div class="tender-desc">价格类型：</div>
-                        <select class="select-menu" data-style="btn-primary" ng-model="inquiry.priceType" ng-init="inquiry.priceType = '委外'">
-                            <option value ="委外">委外</option>
-                            <option value ="采购">采购</option>
-                        </select>
-                    </div>
-                    <div class = "col-xs-4">
-                        <div class="tender-desc">备注：</div>
-                        <input class="tender-input01" type="text" name="user" ng-model="inquiry.remark"/>
+                    <div class="row" style="margin-bottom: 15px;">
+                        <div class = "col-xs-4">
+                            <div class="tender-desc">询价单号：</div>
+                            <input class="tender-input01" type="text" name="title" ng-model="inquiry.code" required readonly/>
+                        </div>
+                        <div class = "col-xs-4">
+                            <div class="tender-desc">询价日期：</div>
+                            <input class="tender-input01" type="text" name="user" ng-model="inquiry.showdate" required readonly/>
+                        </div>
+                        <div class = "col-xs-4">
+                            <div class="tender-desc">价格类型：</div>
+                            <select class="select-menu" data-style="btn-primary" ng-model="inquiry.priceType" ng-init="inquiry.priceType = '委外'" style="padding: 0; margin: 0;">
+                                <option value ="委外">委外</option>
+                                <option value ="采购">采购</option>
+                            </select>
+                        </div>
                     </div>
-                    <div class="col-xs-4">
-                        <span class="tender-desc f14">报价截止时间:</span>
-                        <div class="input-group input-trigger date-picker">
-                            <input type="text" ng-model="inquiry.endDate" required
-                                   class="form-control" placeholder="点击选择截止日期" readonly="readonly"
-                                   datepicker-popup="yyyy-MM-dd" is-open="inquiry.$fromOpened"
-                                   ng-required="true" current-text="今天" min-date = "currentDay()"
-                                   clear-text="清除" close-text="关闭"
-                                   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-                                   ng-click="openDatePicker($event, condition, '$fromOpened')"> <span
-                                class="input-group-btn">
+                    <div class="row">
+                        <div class = "col-xs-4">
+                            <div class="tender-desc">备注：</div>
+                            <input class="tender-input01" type="text" name="user" ng-model="inquiry.remark"/>
+                        </div>
+                        <div class="col-xs-4">
+                            <span class="tender-desc f14">报价截止时间:</span>
+                            <div class="input-group input-trigger date-picker">
+                                <input type="text" ng-model="inquiry.endDate" required
+                                       class="form-control" placeholder="点击选择截止日期" readonly="readonly"
+                                       datepicker-popup="yyyy-MM-dd" is-open="inquiry.$fromOpened"
+                                       ng-required="true" current-text="今天" min-date = "currentDay()"
+                                       clear-text="清除" close-text="关闭"
+                                       datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+                                       ng-click="openDatePicker($event, condition, '$fromOpened')"> <span
+                                    class="input-group-btn">
 							<button type="button" class="btn btn-default btn-open"
                                     ng-click="openEndDatePicker($event, inquiry, '$fromOpened')">
 								<i class="fa fa-calendar"></i>
 							</button>
 						</span>
+                            </div>
+                        </div>
+                        <div class="col-xs-4">
                         </div>
-                    </div>
-                    <div class="col-xs-4">
                     </div>
                    <!--  <div class="col-xs-12">
                         <div class="tender-desc">上传附件：</div>

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

@@ -178,7 +178,7 @@
 			</div>
 			<div class="buy-cart col-xs-1">
 				<a id="add" ui-sref="purc.newOrder" title="新增采购单"><img src="resources/img/icon/add.png"/></a>
-				<a id="add" ui-sref="purc.newOrder" title="购物车"><img src="resources/img/icon/cart.png"/></a>
+				<a id="add" ui-sref="purc.cart" title="购物车"><img src="resources/img/icon/cart.png"/></a>
 			</div>
 		</div>
 	</div>

src/main/webapp/resources/tpl/index/sale/inquiry_detail.html

@@ -77,7 +77,7 @@
 					<tr class="header">
 						<th width="270">商品</th>
 						<th width="90"><span class="text-default">≥</span>分段数</th>
-						<th width="90">价格</th>
+						<th width="100">价格</th>
 						<th width="50">币别</th>
 						<th width="60">税率</th>
 						<th width="80">最小订购</th>
@@ -139,7 +139,7 @@
 									class="btn btn-default btn-xs" ng-show="!inquiryItem.custLap">添加分段</a>
 							</div>
 						</td>
-						<td class="text-center" width="90">
+						<td class="text-center" width="100">
 							<div ng-show="!inquiryItem.$editing">
 								<div ng-repeat="reply in inquiryItem.replies">
 									<span ng-bind="reply.price | number:6"></span> <span

src/main/webapp/resources/tpl/index/sale/send.html

@@ -219,7 +219,7 @@
 	<thead>
 		<tr class="header">
 			<th width="500">商品</th>
-			<th width="170">商品价格</th>
+			<th width="180">商品价格</th>
 			<th width="120">发货数量</th>
 			<th width="140">单据信息</th>
 			<th width="70">操作</th>