采购单页面 及去除以前com-title的导航

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

src/main/webapp/resources/css/add.css

@@ -474,7 +474,7 @@ input:focus, select:focus {
 .com_head {
     width: 100%;
     height: 40px;
-    line-height: 42px;
+    line-height: 43px;
     background: url(../img/purc/comm_bg01.png) no-repeat center;
     background-size: 100%;
 }

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

@@ -2465,7 +2465,7 @@ input.ng-invalid.ng-dirty,textarea.ng-invalid.ng-dirty {
 }
 #change-company{
 	min-width: inherit;
-	width: 222px;
+	min-width: 222px;
 	border: #ccc 1px solid;
 	padding: 0;
 	margin: 0;
@@ -2502,6 +2502,7 @@ input.ng-invalid.ng-dirty,textarea.ng-invalid.ng-dirty {
 	padding-left: 10px;
 	line-height: 50px;
 	border-bottom: #ccc 1px solid;
+	padding-right: 10px;
 }
 .todo .list-unstyled{
 	display: inline-block;

src/main/webapp/resources/css/public.css

@@ -20,13 +20,13 @@
 #public .form-group-sm .form-control{height: 36px;line-height: 36px;border: #327ebe 1px solid;border-radius: 0px;font-size: 14px;}
 #public .search-bg .col-xs-6{/*margin-left: 90px;*/}
 #public .search-bg .input-group-addon{width: 70px;height: 36px;display: inline-block;background: #327ebe;font-size: 16px;text-align: center;line-height: 36px;color: #fff;padding: 0;border: none;border-radius: 0;position: absolute;top: 0;right: 0;}
-#public .order-table .header th{height: 40px;line-height: 40px;background: none;font-size: 14px;}
-#public .order-table .order-hd{font-size: 14px;}
-#public .order-table .order-bd{height: 100px;}
-#public .order-table .order-bd .product{line-height: 30px;font-size: 14px;}
+#public .order-table .header th,#public .inquiry-table .header th{height: 40px;line-height: 40px;background: none;font-size: 14px;}
+#public .order-table .order-hd,#public .inquiry-table .inquiry-hd{font-size: 14px;}
+#public .order-table .order-bd,#public .inquiry-table .inquiry-bd{height: 100px;}
+#public .order-table .order-bd .product,#public .inquiry-table .inquiry-bd .product{line-height: 30px;font-size: 14px;}
 .height10{width: 100%;height: 10px;background: #f5f5f5;}
-#public .order-table .order-bd>td{ font-size: 14px;}
-#public .order-table{  background: #fff; }
+#public .order-table .order-bd>td,#public .inquiry-table .inquiry-bd>td{ font-size: 14px;}
+#public .order-table,#public .inquiry-table{  background: #fff; }
 /*购物车*/
 #public .cart-table .header th{height: 40px;line-height: 40px;background: none;font-size: 14px;}
 #public .cart-table .cart-hd{font-size: 14px;}

src/main/webapp/resources/tpl/index/approvalFlow/enterprise.html

@@ -228,7 +228,7 @@
 	overflow: hidden;
 }
 </style>
-<div class="com_title">设置&gt;企业设置<font>&gt;企业信息</font></div>
+<!--<div class="com_title">设置&gt;企业设置<font>&gt;企业信息</font></div>-->
 <div class="com_head"><span>企业信息</span></div>
 <div class="pane base-info" id="company">
 	<div class="com_title01"><span>基本信息</span></div>

src/main/webapp/resources/tpl/index/approvalFlow/home.html

@@ -20,7 +20,7 @@
         <!--左侧导航-->
         <!--左侧内容-->
         <div class="shenliu_right">
-        	<div class="com_title">设置>企业设置<font>>审批流</font></div>
+        	<!--<div class="com_title">设置>企业设置<font>>审批流</font></div>-->
             <div class="com_head"><span>审批流设置</span><a >+新增审批</a></div>
             <div class="com_content" >
             	<ul>

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

@@ -77,7 +77,7 @@
 </style>
 <div class="wrap">
 	<div class="content">
-		<div class="com_title">服务>销售模块<font>>产品资料</font></div>
+		<!--<div class="com_title">服务>销售模块<font>>产品资料</font></div>-->
 		<div class="com_head"><span>产品资料</span><span class="fr"><em>录入人：{{user.userName}}</em><time>日期：{{time}}</time></span></div>
 		<!--产品资料新增-->
         <form class="pro-add-tab pro-add-data clearfix" name="productInfo">

src/main/webapp/resources/tpl/index/home/pagingRelease.html

@@ -1,11 +1,14 @@
 <style>
+    body{
+        font-family: "Microsoft YaHei", "微软雅黑";
+    }
     .btn {
         border-radius: 0;
     }
 
     .modal-content {
         /*margin-top: 100px;*/
-        height: 500px;
+        min-height: 500px;
         width: 1058px;
         margin-left: auto;
         margin-right: auto;
@@ -21,7 +24,6 @@
         border: none;
         border-radius: 0;
         height: 36px;
-        font-family: "Microsoft Yahei Regular";
         margin: 0 5px 0 5px;
         padding: 0 15px 0 15px;
         border-bottom: 2px solid #fff;
@@ -87,7 +89,6 @@
 
     /* 消息表格 */
     .release-table thead tr th {
-        font-family: "Microsoft Yahei Regular";
         font-weight: 500;
         color: rgb(0, 0, 0);
         height: 50px;
@@ -100,17 +101,37 @@
     }
 
     .footer-click {
-
+        width: 200px;
+        position: relative;
+        top: -40px;
+    }
+    #notice-list .table{
+        border-top: #e8e8e8 1px solid;
+        border-left: #e8e8e8 1px solid;
+        border-right: #e8e8e8 1px solid;
+    }
+    #notice-list .table th,#notice-list .table td{
+        font-size: 14px;
+        vertical-align: middle;
+        border: none;
+        border-bottom: #e8e8e8 1px solid;
+    }
+    #notice-list input[type="checkbox"]{
+        vertical-align: sub;
+        margin-top: 0;
+    }
+    #notice-list .footer-click  input{
+        margin-right: 5px;
     }
 </style>
-<div class="modal-body">
+<div class="modal-body" id="notice-list">
     <div class="col-xs-12" style="height: 14px;">
         <div class="pull-right" style="margin-right: -33px; margin-top: -5px;">
             <a ng-click="close()"><i class="fa fa-close fa-lg"></i></a>
         </div>
     </div>
     <div class="div-menu">
-        <div style="font-family: 'Microsoft Yahei Regular'; font-size: 14px; color: rgb(102,102,102); float: left; margin-top: 6px;margin-left: 6px;">
+        <div style="font-size: 14px; color: rgb(102,102,102); float: left; margin-top: 6px;margin-left: 6px;">
             <span>消息分类:</span>
         </div>
         <div class="btn-group menu-status">
@@ -155,7 +176,7 @@
             </td>
             <td>
                 <div ng-if="releaseDetail.readStatus == 1">已读</div>
-                <div ng-if="releaseDetail.readStatus != 1" style="font-family: 'Microsoft Yahei Regular'; color: #327EBE;">未读</div>
+                <div ng-if="releaseDetail.readStatus != 1" style="color: #327EBE;">未读</div>
             </td>
             <td>
                 <div>{{releaseDetail.readDate | date:'yyyy-MM-dd HH:mm'}}</div>
@@ -164,7 +185,7 @@
         </tbody>
     </table>
     <div class="footer-click">
-        <div ng-hide="active == 'done'" style="float: left; padding: 1px 5px 0 15px;">
+        <div ng-hide="active == 'done'" style="float: left;">
             <input type="checkbox" name="checkbox" ng-model="checks.checked" ng-click="checkAll()" />
         </div>
         <div ng-hide="active == 'done'" style="float: left; padding: 0 20px 0 0;">

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

@@ -125,7 +125,7 @@ width:146px;
 <div class="warp">
     <div class=" purchase">
         <div class="width100">
-            <div class="com_title">服务>采购模块><font>>代采订单</font></div>
+            <!--<div class="com_title">服务>采购模块><font>>代采订单</font></div>-->
             <div class="com_head"><span>代采订单</span></div>
             <div class="purchase_form">
                 <!--基本信息-->

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

@@ -93,7 +93,7 @@
 
 
 .inquiry-table .inquiry-bd {
-	binquiry-bottom: 1px solid #e6e6e6;
+	border-top: 1px solid #e6e6e6;
 }
 
 .inquiry-table .inquiry-bd>td {
@@ -170,6 +170,9 @@
 	background: #fff;
 	color: #d32526;
 }
+.inquiry-table>tbody:hover{
+	border: #d32526 1px solid;
+}
 .view-slide-in .group-container {
 	padding: 0;
 }
@@ -265,6 +268,9 @@
 	top: 0;
 	right: 0;
 }
+.inquiry-hd td{
+	border-bottom: #e8e8e8 1px solid;
+}
 .search-bg .form-group{
 	position: relative;
 }
@@ -282,8 +288,8 @@
 			<th width="80">编号</th>
 			<th width="100">录入人</th>
 			<th width="120">截止日期</th>
-			<th width="180">备注</th>
-			<th width="120">供应商</th>
+			<!--<th width="180">备注</th>-->
+			<th width="120" colspan="2">供应商</th>
 			<th width="100">操作</th>
 		</tr>
 		<tr class="sep-row">
@@ -327,7 +333,7 @@
 	</tbody>
 	<tbody ng-repeat="inquiry in $data track by inquiry.id">
 		<tr class="inquiry-hd" ng-dblclick="inquiry.$collapsed=!inquiry.$collapsed" ng-class="{'text-bold': inquiry.display>0}">
-			<td class="first">
+			<td class="first" width="200px">
 				<div class="inquiry-main">
 					<span> {{$index+1}}
 					</span> 
@@ -379,13 +385,13 @@
 			<td class="text-center br-l">
 				<div class="text-num" ng-bind="::item.toDate | date:'yyyy-MM-dd'"></div>
 			</td>
-			<td class="br-l">
+			<!--<td class="br-l">
 				<div style="margin: 0 auto" ng-if="item.$editing">
 					<br><br><input type="text" ng-model="item.reply.remark"
 						class="form-control input-xs" placeholder="回复备注" />
 				</div>
-			</td>
-			<td ng-bind="::item.enterprise.enName"></td>
+			</td>-->
+			<td ng-bind="::item.enterprise.enName" colspan="2"></td>
 			<td class="text-center"><a ng-click="deleteById(item.id)">删除</a></td>
 		</tr>
 	</tbody>

src/main/webapp/resources/tpl/index/purc/modal/contact_person_modal.html

@@ -10,6 +10,32 @@
 </head>
 <body>
 <!--B2B商务账号设置-个人信息-->
+<style>
+	.bomb-box .box01{
+		width: 600px;
+		padding-bottom: 10px;
+		height: 425px;
+	}
+	.per-data ul li span{
+		width: 120px;
+		line-height: 34px;
+	}
+	.modal-content{
+		border: none;
+	}
+	.per-data ul li.per-btn{
+		margin-top: 20px;
+	}
+	.per-data ul, .per-data ul li{
+		width: 90%;
+	}
+	.per-data{
+		margin-top: 10px;
+	}
+	.per-data ul{
+		padding-top: 3px;
+	}
+</style>
 <div class="bomb-box">
 	<div class="box01 box" >
 		<p>供应商联系人信息</p>

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

@@ -132,7 +132,12 @@
 .info-container .info:hover {
 	color: #CC3333;
 }
-
+.buy-cart{
+	font-size: 14px;
+}
+.buy-cart a{
+	color: #5078cb;
+}
 </style>
 <link rel="stylesheet" href="static/css/public.css">
 <div class="block" id="public">
@@ -141,7 +146,7 @@
 </div>
 <div class="menu condition block">
 		<div class="row">
-			<div class="col-xs-4">
+			<div class="col-xs-10">
 				<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"
@@ -168,6 +173,10 @@
 					</div>
 				</div>
 			</div>
+			<div class="buy-cart col-xs-2">
+				<a id="add" ui-sref="purc.newOrder"><i class="fa fa-cart-plus"></i>采购单</a>
+				<a id="add" ui-sref="purc.newOrder"><i class="fa fa-cart-plus"></i>购物车</a>
+			</div>
 		</div>
 	</div>
 <div class="height10">&nbsp;</div>
@@ -257,7 +266,7 @@
 		<tr class="header">
 			<th>商品</th>
 			<th width="80">含税单价</th>
-			<th width="80">税率（%）</th>
+			<th width="100">税率（%）</th>
 			<th width="100">数量</th>
 			<th width="120">交货日期</th>
 			<th width="180">单据状态</th>
@@ -267,7 +276,7 @@
 			<td colspan="5"></td>
 		</tr>
 		<tr class="toolbar toolbar-top">
-			<td colspan="5">
+			<td colspan="6">
 				<div>
 					<label><input type="checkbox" class="selector select_all"
 						ng-model="checkboxes.checked" ng-click="checkAll()">全选</label>

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

@@ -436,7 +436,7 @@
 <div class="ng-scope">
     <form name="tenderForm">
         <div class="purc-tender">
-            <div class="com_title">服务>招标<font>>招标单</font></div>
+            <!--<div class="com_title">服务>招标<font>>招标单</font></div>-->
             <!--<div class="loading in" ng-class="{'in': loading}">
             <i></i>
             </div>-->

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

@@ -194,14 +194,9 @@
     }
 
     .prod-number { /* 数字居右 */
-        text-align: right;
-    }
-
-    .prod-center { /* 数字居右 */
         text-align: center;
     }
 
-
     .tender-list02 .comment-oder-list dl dt span {
         text-align: center;
     }
@@ -213,7 +208,7 @@
             <!--<div class="col-xs-12" style="font-size: 14px; height: 36px; padding-top: 10px;">
                 <span style="font-family: 'Microsoft Yahei Regular'; font-weight: 600; color: rgb(0,0,0);">服务>招标></span><span style="color: #327EBE;">待投标</span>
             </div>-->
-            <div class="com_title">服务>招标<font>>待评标</font></div>
+            <!--<div class="com_title">服务>招标<font>>待评标</font></div>-->
             <div class="com_head"><span>评标单</span></div>
             <div class="bid-content ng-scope" ng-controller="PurcEvaluationCtrl">
                 <div class="title-div" style="border-bottom: 1px dashed #327ebe;">
@@ -232,7 +227,7 @@
                         <div class="bid-desc">联系电话：</div>
                         <div class="unchanged-info">{{tender.userTel}}</div>
                     </div>
-                    <div class="col-xs-12">
+                    <div class="col-xs-8">
                         <div class="bid-desc">收货地址：</div>
                         <div class="unchanged-info">{{tender.shipAddress}}</div>
                     </div>
@@ -257,7 +252,7 @@
                         <div class="bid-desc">付款方式：</div>
                         <div class="unchanged-info">{{tender.payment}}</div>
                     </div>
-                    <div class="col-xs-12">
+                    <div class="col-xs-8">
                         <div class="bid-desc">证照要求：</div>
                         <div class="unchanged-info">{{tender.certificate}}</div>
                     </div>
@@ -332,12 +327,12 @@
                         <div class="comment-oder-text">
                             <ul>
                                 <li class="list-unstyled">
-                                    <span><em>产品型号：</em><b>{{tenderProd.prodCode}}</b></span>
+                                    <span><em style="width: 80px;">产品型号：</em><b>{{tenderProd.prodCode}}</b></span>
                                     <span><em>产品名称：</em><b>{{tenderProd.prodTitle}}</b></span>
                                     <span><em>品牌：</em><b>{{tenderProd.brand}}</b></span>
                                 </li>
                                 <li class="list-unstyled">
-                                    <span><em>采购数量：</em><b>{{tenderProd.qty}}</b></span>
+                                    <span><em style="width: 80px;">采购数量：</em><b>{{tenderProd.qty}}</b></span>
                                     <span><em>单位：</em><b>{{tenderProd.unit}}</b></span>
                                 </li>
                             </ul>
@@ -356,7 +351,7 @@
                                     <span>不定标</span>
                                 </dt>
                                 <dd ng-if="tenderProd.saleTenderItems == '' || tenderProd.saleTenderItems == null">
-                                    <div style="font-family: 'Microsoft Yahei Regular'; font-size: 14px; color: #969595; text-align: center;">
+                                    <div style="font-size: 14px; color: #969595; text-align: center;">
                                         暂无企业参加招标
                                     </div>
                                 </dd>
@@ -369,13 +364,13 @@
                                     <span class="prod-number" ng-show="tender.overdue == 1">{{saleTenderItem.price || 0}}</span>
                                     <span class="prod-number" ng-show="tender.overdue == 1">{{saleTenderItem.price * tenderProd.qty  || 0 | number: 2}}</span>
                                     <span class="prod-number" ng-show="tender.overdue == 1">{{saleTenderItem.cycle || 0}}</span>
-                                    <span class="bid-desc prod-number" ng-show="tender.overdue != 1">*</span>
-                                    <span class="bid-desc prod-number" ng-show="tender.overdue != 1">*</span>
-                                    <span class="bid-desc prod-number" ng-show="tender.overdue != 1">*</span>
-                                    <span class="bid-desc prod-number" ng-show="tender.overdue != 1">*</span>
-                                    <span class="wid02 prod-center"><input type="text" ng-model="saleTenderItem.description" class="explain" placeholder="请输入说明文字"/></span>
-                                    <span class="prod-center"><input type="radio" ng-model="saleTenderItem.applyStatus" value="1"/></span>
-                                    <span class="prod-center"><input type="radio" ng-model="saleTenderItem.applyStatus" value="0"/></span>
+                                    <span class="bid-desc" ng-show="tender.overdue != 1">*</span>
+                                    <span class="bid-desc" ng-show="tender.overdue != 1">*</span>
+                                    <span class="bid-desc" ng-show="tender.overdue != 1">*</span>
+                                    <span class="bid-desc" ng-show="tender.overdue != 1">*</span>
+                                    <span class="wid02"><input type="text" ng-model="saleTenderItem.description" class="explain" placeholder="请输入说明文字"/></span>
+                                    <span class="prod-number"><input type="radio" ng-model="saleTenderItem.applyStatus" value="1"/></span>
+                                    <span class="prod-number"><input type="radio" ng-model="saleTenderItem.applyStatus" value="0"/></span>
                                 </dd>
                             </dl>
                         </div>
@@ -390,7 +385,7 @@
                     </div>
                 </div>
                 <div class="col-xs-12" style="padding:0 0 30px 0;">
-                    <div class="col-xs-3 pull-right"><i class="fa fa-info-circle"></i><span style="font-family: 'Microsoft Yahei Regular'; font-size: 12px; color: #969595;">投标截止之后，才可进行评标</span></div>
+                    <div class="col-xs-3 pull-right"><i class="fa fa-info-circle"></i><span style="font-size: 12px; color: #969595;">投标截止之后，才可进行评标</span></div>
                 </div>
             </div>
         </div>

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

@@ -69,8 +69,8 @@
 					<th width="70">用户分配</th>
 				</tr>
 			</thead>
-			<tbody>
-					<tr ng-repeat="customer in $data" ng-mouseenter="showUserInfo(customer,true)" ng-mouseleave="showUserInfo(customer,false)">
+			<tbody ng-repeat="customer in $data" ng-mouseenter="showUserInfo(customer,true)" ng-mouseleave="showUserInfo(customer,false)">
+					<tr>
 						<td class="text-center" ng-bind="::customer.myEnterprise.uu"></td>
 						<td class="text-center" ng-bind="::customer.myEnterprise.enName"></td>
 						<td class="text-center" ng-bind="::customer.myEnterprise.enAddress"></td>
@@ -99,8 +99,8 @@
 							<th class="text-center" width="50">操作</th>
 						</tr>
 					</thead>
-					<tbody>
-						<tr ng-repeat="userinfo in userdata.content">
+					<tbody ng-repeat="userinfo in userdata.content">
+						<tr>
 							<td class="text-center" ng-bind="::userinfo.userUU"></td>
 							<td class="text-center" ng-bind="::userinfo.user.userName"></td>
 							<td class="text-center" ng-bind="::userinfo.user.userEmail"></td>

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

@@ -381,7 +381,7 @@
 	</tbody>
 	<tbody ng-repeat="order in $data track by order.id">
 		<tr class="order-hd" ng-dblclick="order.$collapsed=!order.$collapsed" ng-class="{'text-bold': order.display>0}">
-			<td class="first">
+			<td class="first" colspan="2">
 				<div class="order-main">
 					<span> <input type="checkbox" class="selector"
 						ng-model="order.$selected" ng-click="checkOne(order)">
@@ -400,7 +400,7 @@
 						class="text-num" ng-bind="::order.code" ui-sref="sale.order_detail({id:order.id})" target="_self"></a></span>
 				</div>
 			</td>
-			<td colspan="3"><a ng-bind="::order.enterprise.enName"></a></td>
+			<td colspan="2"><a ng-bind="::order.enterprise.enName"></a></td>
 			<td colspan="1" class="order-sum">{{::order.currency}}： <span
 				ng-bind="::getOrderTotal(order.orderItems) | number : 2"
 				class="text-num text-bold"></span>

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

@@ -13,7 +13,6 @@
     /* 主体 */
     .purc-bid {
         line-height: 2;
-        font-family: "Microsoft Yahei Regular";
         font-size: 14px;
     }
     .purc-bid .row {
@@ -33,13 +32,11 @@
 
     /* 读取显示无法修改的数据 */
     .unchanged-info {
-        font-family: "Microsoft Yahei Regular";
         color: #969595;
         overflow: hidden;
     }
     /* 二级标题栏 */
     .title-div {
-        font-family: "Microsoft Yahei Regular";
         font-size: 14px;
         font-weight: 600;
         padding-left: 30px;