Browse Source

企业圈行距缩小、按钮操作居右显示。

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@9375 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
ouxianqin 8 years ago
parent
commit
5c8870d952

+ 9 - 6
src/main/webapp/resources/css/index.css

@@ -3113,8 +3113,8 @@ input::-webkit-clear{display:none;}
 #myquest-public .customer-tab .customer-hd:first-child{
 	background: #fff;
 	font-size: 16px;
-	height: 55px;
-	line-height: 55px;
+	height: 40px;
+	line-height: 40px;
 	border-bottom: #ddd 1px solid;
 }
 #myquest-public .customer-tab .customer-hd span{
@@ -3152,16 +3152,16 @@ input::-webkit-clear{display:none;}
 	display: none;
 }
 #myquest-public  .all-btn a{
-	width: 70px;
+	width: 80px;
 	height: 24px;
-	line-height: 24px;
+	line-height: 22px;
 	border-radius: 4px;
 	text-align: center;
 	color: #327ebe;
 	font-size: 14px;
 	display: inline-block;
 	margin: 0 auto;
-	margin-left: 50px;
+	margin-left: 10px;
 	border: #327ebe 1px solid;
 }
 #myquest-public  .all-btn a.btn01{
@@ -3424,7 +3424,7 @@ input[required]:invalid, input:focus:invalid, textarea[required]:invalid, textar
 	font-size: 14px;
 }
 #myquest-public .customer-tab .customer-hd .checkbox span{
-	margin-top: 5px;
+	/*margin-top: 5px;*/
 }
 
 /*加入标准与非标标志*/
@@ -4173,4 +4173,7 @@ input[required]:invalid, input:focus:invalid, textarea[required]:invalid, textar
 }
 .line24{
 	line-height: 24px !important;
+}
+.height72{
+	height: 72px !important;
 }

+ 3 - 2
src/main/webapp/resources/tpl/index/baseInfo/customersInfo.html

@@ -40,6 +40,7 @@
 	vertical-align: inherit;
 	font-size: 14px;
 }
+
 #customer-tab tbody tr:hover{
 	/*border: #d32526 2px solid;*/
 }
@@ -139,7 +140,7 @@
 					<tr class="customer-hd">
 						<td colspan="4" class="text-left"><span ng-bind="::customer.myEnterprise.enName"></span></td>
 						<td>
-							<span class="checkbox" style="width: 100%;">
+							<span class="checkbox" style="width: 100%; margin: 0; height: 26px;">
 								<span class="off" ng-if="customer.custswitch == 1 " ng-click="disableCust(customer.id)" title="已启用"></span>
 								<span class="" ng-if="customer.custswitch == 0 " ng-click="activeCust(customer.id)" title="已禁用"></span>
 							</span>
@@ -153,7 +154,7 @@
 							<div><span class="text-muted">联系人:</span><span ng-bind="::customer.myUser.userName"></span></div>
 							<div><span class="text-muted">电话:</span><span ng-bind="::customer.myUser.userTel"></span></div>
 						</td>
-						<td width="200" class="text-center all-btn">
+						<td width="100" class="text-center all-btn">
 						</td>
 					</tr>
 			</tbody>

+ 7 - 4
src/main/webapp/resources/tpl/index/baseInfo/invitation.html

@@ -101,6 +101,9 @@
 #myquest-public #public .search-bg .input-group-addon{
 	width: 85px;
 }
+#myquest-public  .all-btn a{
+	margin-left: 0;
+}
 </style>
 <div style="margin-left: -240px; width: 1170px; background: #fff;" id="myquest-public">
 <div ng-include src="'static/tpl/index/baseInfo/addPartnerAndRecord.html'"></div>
@@ -161,13 +164,13 @@
 					<tr class="customer-hd">
 						<td colspan="3" class="text-left"><span ng-bind="::record.vendname"></span></td>
 						<td><div style="font-size: 14px;" ng-show="active == 'invitationTeam'" ><span class="text-muted"style="font-size: 14px;" >邀请人:</span>{{::record.user.userName}}</div></td>
-						<td class="text-center"><span ng-bind="::record.date| date: 'yyyy-MM-dd'" class="text-muted" style="margin-left: 0;"></span></td>
+						<td class="text-left"><span ng-bind="::record.date| date: 'yyyy-MM-dd'" class="text-muted" style="margin-left: 0;"></span></td>
 					</tr>
 					<tr class="customer-bd">
 						<td  class="first" colspan="4">
 							<div class="col-md-2"><span class="text-muted">联系人:</span><span ng-bind="::record.vendusername"></span></div>
-							<div ng-if="::record.vendusertel != null"  class="col-md-3"><span class="text-muted">电话:</span><span ng-bind="::record.vendusertel"></span></div>
-							<div ng-if="::record.venduseremail != null"  class="col-md-4"><span class="text-muted">邮箱:</span><span ng-bind="::record.venduseremail"></span></div>
+							<div ng-if="::record.vendusertel != null"  class="col-md-2"><span class="text-muted">电话:</span><span ng-bind="::record.vendusertel"></span></div>
+							<div ng-if="::record.venduseremail != null"  class="col-md-3"><span class="text-muted">邮箱:</span><span ng-bind="::record.venduseremail"></span></div>
 							<div class="text-icon" ng-if="record.active == 1">已注册</div>
 							<div class="text-icon" ng-if="record.active == 0" style="border: #327ebe 1px solid; color: #327ebe;">未注册</div>
 							<!--<div><span class="text-muted">次数:</span><span ng-bind="::record.count"></span></div>-->
@@ -179,7 +182,7 @@
 								提示:当前企业名称匹配到多个企业,<a ng-click="search(record.vendname)">点击查看</a>
 							</div> -->
 						</td>
-						<td width="200" class="text-center all-btn">
+						<td width="120" class="text-center all-btn">
 							<a ng-click="reInvite(record.id)" class="btn" ng-if="record.active == 0" style="padding: 0; background: #327ebe; color: #fff;">再次添加</a>
 						</td>
 					</tr>

+ 25 - 12
src/main/webapp/resources/tpl/index/baseInfo/myRequest.html

@@ -50,11 +50,23 @@
 	line-height: 50px;
 }
 .order-table .order-hd p{
-	line-height: 34px;
+	line-height: 26px;
+	height: 26px;
 }
-.order-table .order-hd td{
-	padding-bottom: 10px;
+.order-table .order-hd p.switch span:first-child{
+	line-height: 26px;
+}
+.order-table .order-hd p.switch{
+	padding-left: 10px;
+}
+.order-table .order-hd p.switch .checkbox{
+	padding-top: 0;
+	float: right;
+	margin-right: 30px;
 }
+/*.order-table .order-hd td{
+	padding-bottom: 10px;
+}*/
 .order-table .order-hd td.first {
 	padding-left: 20px;
 }
@@ -212,8 +224,8 @@
 .order-table .company-list,.order-table .order-hd:first-child {
 	background: #fff;
 	font-size: 16px;
-	height: 55px;
-	line-height: 55px;
+	height: 40px;
+	line-height: 40px;
 	border-bottom: #ddd 1px solid;
 }
 .order-table .company-list {
@@ -237,12 +249,13 @@
 	text-align: center;
 }
 .order-table .btn {
-	min-width: 70px;
+	min-width: 80px;
 	height: 24px;
 	color: #fff;
 	border-radius: 4px;
 	padding: 0;
-	line-height: 24px;
+	line-height: 22px !important;
+	margin-bottom: 2px;
 }
 .order-table .btn:hover{
 	background: #5078cb;
@@ -289,7 +302,7 @@
 	background: #327ebe;
 }
 .order-table .order-hd .text-center p{
-	margin: 0;
+	margin: 5px 0;
 }
 .new-dot{
 	top: 15px;
@@ -369,7 +382,7 @@
 	<tbody ng-repeat="request in $data" class="company-list">
 		<tr class="order-hd" ng-dblclick="order.$collapsed=!order.$collapsed" ng-class="{'text-bold': order.display>0}">
 			<td colspan="4" style="position: relative;"><span ng-bind="request.vendName" class="margin-left20"></span><b class="new-dot" ng-if="request.statusCode==311 && request.method==0"></b><img src="static/img/logo/youruanrenzheng.png" id="logo" ng-if="enterprise.status == 313"></td>
-			<td width="200" class="text-center">
+			<td width="140" class="text-center">
 				<!--<span class="grey01" ng-if="request.statusCode==311 && request.method==1">等待处理</span>-->
 				<!--<span class="grey01" ng-if="request.statusCode==313">已通过</span>
 				<span class="grey01" ng-if="request.statusCode==310 && request.method==1">未通过</span>
@@ -380,9 +393,9 @@
 			<td width="200" class="grey01"ng-if="request.statusCode==310 && request.method==1">未通过</td>
 			<td width="200" class="grey01"ng-if="request.statusCode==310 && request.method==0">已拒绝</td>-->
 		</tr>
-		<tr class="order-hd" ng-dblclick="order.$collapsed=!order.$collapsed" ng-class="{'text-bold': order.display>0}">
+		<tr class="height72 order-hd" ng-dblclick="order.$collapsed=!order.$collapsed" ng-class="{'text-bold': order.display>0}">
 			<td class="first" colspan="4">
-				<div class="col-md-4"><span class="text-muted">营业执照:</span><span ng-bind="::request.vendUID"></span></div>
+				<div class="col-md-3"><span class="text-muted">营业执照:</span><span ng-bind="::request.vendUID"></span></div>
 				<div class="col-md-2"><span class="text-muted">申请人:</span><span ng-bind="::request.custUserName"></span></div>
 				<div ng-if="::request.vendUserName != null" class="col-md-2"><span class="text-muted">审核人:</span><span ng-bind="::request.vendUserName"></span></div>
 				<!-- <div>
@@ -390,7 +403,7 @@
 					<input class="form-control" ng-model="request.reason" ng-if="request.statusCode==311 && request.method==0" style="width: 90%; float: right;">
 					<span ng-bind="request.reason" ng-if="request.statusCode!=311"></span>
 				</div> -->
-			<td width="200" class="text-center">
+			<td width="140" class="text-center">
 				<p ng-if="request.statusCode==313 && request.vendor == 0"><a class="btn label-success white" ng-click="addSupplier(request.vendUID)">添加供应商 </a></p>
 				<p class="switch"  ng-if="request.statusCode==313 && request.vendor == 1">
 					<span style="float: left;">供应商</span>

+ 38 - 15
src/main/webapp/resources/tpl/index/baseInfo/newPartner.html

@@ -49,6 +49,24 @@
         height: 50px;
         line-height: 50px;
     }
+    .order-table .order-hd p{
+        line-height: 26px;
+        height: 26px;
+    }
+    .order-table .order-hd p.switch span:first-child{
+        line-height: 26px;
+    }
+    .order-table .order-hd p.switch{
+        padding-left: 10px;
+    }
+    .order-table .order-hd p.switch .checkbox{
+        padding-top: 0;
+        float: right;
+        margin-right: 30px;
+    }
+    /*.order-table .order-hd td{
+        padding-bottom: 10px;
+    }*/
     .order-table .order-hd td.first {
         padding-left: 20px;
     }
@@ -206,8 +224,8 @@
     .order-table .company-list,.order-table .order-hd:first-child {
         background: #fff;
         font-size: 16px;
-        height: 55px;
-        line-height: 55px;
+        height: 40px;
+        line-height: 40px;
         border-bottom: #ddd 1px solid;
     }
     .order-table .company-list {
@@ -231,12 +249,19 @@
         text-align: center;
     }
     .order-table .btn {
-        width: 70px;
+        width: 80px;
         height: 24px;
         color: #fff;
         border-radius: 4px;
         padding: 0;
-        line-height: 24px;
+        line-height: 22px;
+        margin-bottom: 2px;
+    }
+    /*.order-table .btn:hover{
+        background: #5078cb;
+    }*/
+    .order-table .btn:hover{
+        opacity: 0.9;
     }
     .order-table .btn01 {
         color: #327ebe;
@@ -271,6 +296,7 @@
     }
     .order-table>tbody{
         border-bottom: #f5f5f5 16px solid !important;
+        /*border: #f5f5f5 16px solid !important;*/
     }
     .label-success {
         background: #27b6da;
@@ -279,13 +305,10 @@
         background: #327ebe;
     }
     .order-table .order-hd .text-center p{
-        margin: 0;
+        margin: 5px 0;
     }
-   /* .new-dot{
+    .new-dot{
         top: 15px;
-    }*/
-    .order-table thead{
-        display: none;
     }
     .order-table .company-list, .order-table .order-hd:first-child{
         border-top:#e8e8e8 1px solid;
@@ -362,7 +385,7 @@
         <tbody ng-repeat="request in $data | orderBy :'method'" class="company-list">
         <tr class="order-hd" ng-dblclick="order.$collapsed=!order.$collapsed" ng-class="{'text-bold': order.display>0}">
             <td colspan="4" style="position: relative;"><span ng-bind="request.vendName" class="margin-left20"></span><b class="new-dot" ng-if="request.statusCode==311 && request.method==0"></b><img src="static/img/logo/youruanrenzheng.png" id="logo" ng-if="enterprise.status == 313"></td>
-            <td width="200" class="text-center">
+            <td width="140" class="text-center">
                 <!--<span class="grey01" ng-if="request.statusCode==311 && request.method==1">等待处理</span>-->
                 <!--<span class="grey01" ng-if="request.statusCode==313 && request.method == 1">已通过</span>
                 <span class="grey01" ng-if="request.statusCode==310 && request.method==1">未通过</span>
@@ -374,9 +397,9 @@
             <td width="200" class="grey01"ng-if="request.statusCode==310 && request.method==1">未通过</td>
             <td width="200" class="grey01"ng-if="request.statusCode==310 && request.method==0">已拒绝</td>-->
         </tr>
-        <tr class="order-hd" ng-dblclick="order.$collapsed=!order.$collapsed" ng-class="{'text-bold': order.display>0}">
+        <tr class="height72 order-hd" ng-dblclick="order.$collapsed=!order.$collapsed" ng-class="{'text-bold': order.display>0}">
             <td class="first" colspan="4">
-                <div class="col-md-4"><span class="text-muted">营业执照:</span><span ng-bind="::request.vendUID"></span></div>
+                <div class="col-md-3"><span class="text-muted">营业执照:</span><span ng-bind="::request.vendUID"></span></div>
                 <div class="col-md-2"><span class="text-muted">申请人:</span><span ng-bind="::request.custUserName"></span></div>
                 <div ng-if="::request.vendUserName != null" class="col-md-2"><span class="text-muted">审核人:</span><span ng-bind="::request.vendUserName"></span></div>
                 <span class="text-icon" ng-if="request.statusCode==313 && request.method == 1">已通过</span>
@@ -388,7 +411,7 @@
                     <input class="form-control" ng-model="request.reason" ng-if="request.statusCode==311 && request.method==0" style="width: 90%; float: right;">
                     <span ng-bind="request.reason" ng-if="request.statusCode!=311"></span>
                 </div> -->
-            <td width="200" class="text-center">
+            <td width="140" class="text-center">
                 <p ng-if="request.statusCode==313 && request.vendor == 0"><a class="btn label-success white" ng-click="addSupplier(request.vendUID)">添加供应商 </a></p>
                 <p class="switch"  ng-if="request.statusCode==313 && request.vendor == 1">
                     <span style="float: left;">供应商</span>
@@ -409,8 +432,8 @@
                 <!--<p><span class="btn01 btn label-danger white" ng-if="request.customer == 1 && request.custswitch == 1">客户启用状态<a ng-click="disableCust(request.custId)">禁用</a></span></p>
                 <p><span class="btn01 btn label-danger white" ng-if="request.customer == 1 && request.custswitch == 0">客户禁用状态<a ng-click="activeCust(request.custId)">启用</a></span></p>-->
                 <p ng-if="request.statusCode==313 && request.customer == 0"><a class="btn label-danger white" ng-click="addCust(request.vendUID)">添加客户</a></p>
-                <p ng-if="request.statusCode==311 && request.method==0"><a  class="btn label-success white" ng-click="agree(request.id)">同意</a></p>
-                <p  ng-if="request.statusCode==311 && request.method==0"><a  class="btn  label-danger white" ng-click="refuse(request.id, request.reason)">拒绝</a></p>
+                <p ng-if="request.statusCode==311 && request.method==0"><a  class="btn label-success white" ng-click="agree(request.id)" style="width: 70px; background: #327ebe;">同意</a></p>
+                <p  ng-if="request.statusCode==311 && request.method==0"><a  class="btn  label-danger white" ng-click="refuse(request.id, request.reason)" style="width: 70px; background: #e07b7c;">拒绝</a></p>
                 <p ng-if="request.statusCode==311 && request.method==1"><span class="btn01 btn label-info white">待回复</span></p>
                 <p ng-if="request.statusCode==310 && request.method==1">未通过<br><a class="btn label-danger white" ng-click="addAgain(request.vendName, request.vendUID)" >再次添加</a></p>
                 <p ng-if="request.statusCode==310 && request.method==0"><span class="btn01 btn label-danger white" >已拒绝</span></p>

+ 8 - 7
src/main/webapp/resources/tpl/index/baseInfo/searchresult.html

@@ -211,8 +211,8 @@
 .enterprise-table .company-list,.enterprise-table .enterprise-hd{
 	background: #fff;
 	font-size: 16px;
-	height: 55px;
-	line-height: 55px;
+	height: 40px;
+	line-height: 40px;
 	border-bottom: #ddd 1px solid;
 }
 .enterprise-table .company-list,.enterprise-table .enterprise-bd{
@@ -233,12 +233,12 @@
 	font-size: 14px;
 	}
 .enterprise-table .btn{
-	width: 70px;
+	width: 80px;
 	height: 24px;
 	color: #fff;
 	border-radius: 4px;
 	padding: 0;
-	line-height: 24px;
+	line-height: 22px;
 }
 .enterprise-table .btn01{
 	color: #327ebe;
@@ -338,8 +338,8 @@
 	<tbody ng-repeat="enterprise in $data" class="company-list">
 		<tr class="enterprise-hd" ng-dblclick="enterprise.$collapsed=!enterprise.$collapsed">
 			<td colspan="4"><span ng-bind-html="::enterprise.name| getkey:keyword" class="text-center"></span><span ng-if="::enterprise.shortName != null">(<em ng-bind-html="::enterprise.shortName| getkey:keyword"></em>)</span><img src="static/img/logo/youruanrenzheng.png" id="logo" ng-if="enterprise.status == 313"></td>
-			<td width="200" class="grey01 text-center" ng-if="enterprise.status != 313">当前企业不是优软云用户</td>
-			<td width="200" class="grey01 text-center" ng-if="enterprise.status == 313">优软云用户</td>
+			<td width="180" class="grey01 text-center" ng-if="enterprise.status != 313">当前企业不是优软云用户</td>
+			<td width="140" class="grey01 text-center" ng-if="enterprise.status == 313">优软云用户</td>
 		</tr>
 		<tr class="enterprise-bd" ng-if="!enterprise.$collapsed ">
 			<td class="product" colspan="4">
@@ -355,7 +355,8 @@
 			<td width="100" class="text-center">
 				<a class="btn btn-primary" ng-click="addPartner(enterprise.name,enterprise.businessCode)" ng-if="(enterprise.requestStatus==null||enterprise.requestStatus==310) && enterprise.status == 313">立即添加</a>
 				<a class="btn btn-primary" ng-click="invite(enterprise.name)" ng-if="(enterprise.requestStatus==null||enterprise.requestStatus==310) && enterprise.status != 313">邀请注册</a>
-				<span class="btn label-info btn-primary" ng-if="enterprise.requestStatus==311 && enterprise.method==0">已收到申请<br><a ng-click="view(enterprise.name)">立即查看</a></span>
+				<span class="btn01 label-info btn-primary" ng-if="enterprise.requestStatus==311 && enterprise.method==0">已收到申请</span>
+				<p class="line24" ng-if="enterprise.requestStatus==311 && enterprise.method==0"><span class="btn btn-primary" ng-click="view(enterprise.name)">立即查看</span></p>
 				<span class="btn01 label-info btn-primary" ng-if="enterprise.requestStatus==311 && enterprise.method==1">已发出申请</span>
 				<!-- <br><a ng-click="view(enterprise.name)">立即查看</a> -->
 				<span class="btn label-info" ng-if="enterprise.requestStatus==313">已添加</span><br/>

+ 5 - 2
src/main/webapp/resources/tpl/index/baseInfo/vendorsInfo.html

@@ -50,6 +50,9 @@
 	vertical-align: inherit;
 	font-size: 14px;
 }
+/*#customer-tab tbody tr:first-child td{
+	padding: 0;
+}*/
 /*#customer-tab tbody tr:hover{
 	border: #d32526 2px solid;
 }*/
@@ -157,7 +160,7 @@
 					<tr class="customer-hd">
 						<td colspan="4" class="text-left"><span ng-bind="::vendor.vendorEnterprise.enName"></span></td>
 						<td>
-							<span class="checkbox" style="width: 100%;">
+							<span class="checkbox" style="width: 100%; margin: 0; height: 26px;">
 								<span class="off" ng-if="vendor.vendswitch == 1" ng-click="relieve(vendor.id)" title="已启用"></span>
 								<span class="" ng-if="vendor.vendswitch == 0" ng-click="activeVend(vendor.id)" title="已禁用"></span>
 							</span>
@@ -171,7 +174,7 @@
 							<div><span class="text-muted">联系人:</span><span ng-bind="::vendor.vendorUser.userName"></span></div>
 							<div><span class="text-muted">电话:</span><span ng-bind="::vendor.vendorUser.userTel"></span></div>
 						</td>
-						<td width="200" class="text-center all-btn">
+						<td width="120" class="text-center all-btn">
 							<a ng-if="vendor.vendswitch == 1" href="#/purc/purcinquiry/{{vendor.vendorEnterprise.enBussinessCode}}" class="btn01">立即询价</a><br/>
 							<a ng-if="vendor.vendswitch == 1" ng-click="purcByEn(vendor.vendorEnterprise.enBussinessCode)" class="btn02">下采购单</a>
 						</td>