我的合作伙伴（全部合作伙伴、供应商、客户）加入控制开关按钮。

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

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

@@ -3332,4 +3332,61 @@ input[required]:invalid, input:focus:invalid, textarea[required]:invalid, textar
 .no-record-tab tr td h3 img{
 	vertical-align: sub;
 	margin-right: 10px;
+}
+
+
+/*开关按钮*/
+.checkbox{
+	width:54px;
+	margin:0px auto;
+	text-align: center;
+}
+.checkbox span{
+	width:54px;
+	height: 26px;
+	display: inline-block;
+	border-radius: 18px;
+	border: #e4e4e4 1px solid;
+	background-color: #fff;
+	cursor: pointer;
+	position: relative;
+	box-shadow: 1px 1px 5px #eee;
+	transition: background-color .1s ease-out;
+}
+.checkbox span:after{
+	content: "";
+	position: absolute;
+	width:22px;
+	top:1px;
+	left:0;
+	height: 22px;
+	line-height: 22px;
+	background-color: #fff;
+	border:#eee 1px solid;
+	border-radius: 50%;
+	box-shadow: -1px 2px 1px #999;
+	transition: background-color .1s ease-out;
+	color: #666;
+	font-size: 12px;
+}
+.checkbox span.off{
+	background-color: #4bd562;
+	transition: background-color .1s ease-in;
+	border: #4bd562 1px solid;
+}
+.checkbox span.off:after{
+	content: "";
+	left: 29px;
+	transition: left .1s ease-in;
+	box-shadow: 1px 1px -1px #ccc;
+}
+.switch .checkbox{
+	padding-top: 6px;
+}
+.switch{
+	padding-left: 48px;
+	line-height: 35px;
+}
+.switch span:first-child{
+	font-size: 14px;
 }

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

@@ -80,6 +80,9 @@
 .ng-isolate-scope{
 	display : none;
 }
+#myquest-public .customer-tab .customer-hd .checkbox,#myquest-public .customer-tab .customer-hd .checkbox span{
+	margin-left: 0 !important;
+}
 </style>
 <div style="margin-left: -240px; width: 1170px; background: #f5f5f5;" id="myquest-public">
 <div ng-include src="'static/tpl/index/baseInfo/vendorAndCustomer.html'"></div>
@@ -108,8 +111,14 @@
 			<tbody ng-repeat="customer in $data" ng-if="customerParams.total() > 0">
 					<tr class="customer-hd">
 						<td colspan="4" class="text-left"><span ng-bind="::customer.myEnterprise.enName"></span></td>
-						<td width="200" class="text-center" ng-if="customer.custswitch == 1 "><a ng-click="disableCust(customer.id)">已启用</a></td>
-						<td width="200" class="text-center" ng-if="customer.custswitch == 0 "><a ng-click="activeCust(customer.id)">已禁用</a></td>
+						<td>
+							<span class="checkbox" style="width: 100%;">
+								<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>
+						</td>
+						<!--<td width="200" class="text-center" ng-if="customer.custswitch == 1 "><a ng-click="disableCust(customer.id)">已启用</a></td>
+						<td width="200" class="text-center" ng-if="customer.custswitch == 0 "><a ng-click="activeCust(customer.id)">已禁用</a></td>-->
 					</tr>
 					<tr class="customer-bd">
 						<td  class="first" colspan="4">

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

@@ -355,17 +355,31 @@
 					<span ng-bind="request.reason" ng-if="request.statusCode!=311"></span>
 				</div> -->
 			<td width="200" class="text-center">
-				<p><a class="btn label-success white" ng-click="addSupplier(request.vendUID)" ng-if="request.statusCode==313 && request.vendor == 0">添加供应商 </a></p>
-				<p><span class="btn01 btn label-danger white" ng-if="request.vendor == 1 && request.vendswitch == 1">供应商启用 状态<a ng-click="relieve(request.vendorId)">禁用</a></span></p>
-				<p><span class="btn01 btn label-danger white" ng-if="request.vendor == 1 && request.vendswitch == 0">供应商禁用 状态<a ng-click="activeVend(request.vendorId)">启用</a></span></p>
-				<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><a class="btn label-danger white" ng-click="addCust(request.vendUID)" ng-if="request.statusCode==313 && request.customer == 0">添加客户</a></p>
-				<p><a  class="btn label-success white" ng-click="agree(request.id)" ng-if="request.statusCode==311 && request.method==0">同意</a></p>
-				<p><a  class="btn  label-danger white" ng-click="refuse(request.id, request.reason)" ng-if="request.statusCode==311 && request.method==0">拒绝</a></p>
-				<span class="btn01 btn label-info white" ng-if="request.statusCode==311 && request.method==1">待回复</span>
-				<span class="btn01 btn label-danger white" ng-if="request.statusCode==310 && request.method==1">对方已拒绝</span>
-				<span class="btn01 btn label-danger white" ng-if="request.statusCode==310 && request.method==0">已拒绝对方</span>
+				<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.vendor == 1">
+					<span style="float: left;">供应商</span>
+					<span class="checkbox">
+						<span class="off" ng-if="request.vendor == 1 && request.vendswitch == 1" ng-click="relieve(request.vendorId)" title="已启用"></span>
+						<span class=""  ng-if="request.vendor == 1 && request.vendswitch == 0" ng-click="activeVend(request.vendorId)" title="已禁用"></span>
+					</span>
+				</p>
+			<p class="switch"  ng-if="request.customer == 1">
+				<span style="float: left;">客户</span>
+				<span class="checkbox">
+						<span class="off" ng-if="request.customer == 1 && request.custswitch == 1" ng-click="disableCust(request.custId)" title="已启用"></span>
+						<span class=""  ng-if="request.customer == 1 && request.custswitch == 0" ng-click="activeCust(request.custId)" title="已禁用"></span>
+					</span>
+			</p>
+				<!--<p><span class="btn01 btn label-danger white" ng-if="request.vendor == 1 && request.vendswitch == 1">供应商启用 状态<a ng-click="relieve(request.vendorId)">禁用</a></span></p>
+				<p><span class="btn01 btn label-danger white" ng-if="request.vendor == 1 && request.vendswitch == 0">供应商禁用 状态<a ng-click="activeVend(request.vendorId)">启用</a></span></p>-->
+				<!--<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==1"><span class="btn01 btn label-info white">待回复</span></p>
+				<p ng-if="request.statusCode==310 && request.method==1"><span class="btn01 btn label-danger white" >对方已拒绝</span></p>
+				<p ng-if="request.statusCode==310 && request.method==0"><span class="btn01 btn label-danger white" >已拒绝对方</span></p>
 			</td>
 		</tr>
 	</tbody>

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

@@ -3,6 +3,10 @@
 	<div class="row" ng-controller="RequestAmountCtrl">
 		<div class="col-xs-6">
 			<div class="btn-group btn-group-sm btn-group-justified">
+				<div class="btn-group btn-group-sm">
+					<a type="button" class="btn btn-default btn-line" ui-sref="baseInfo.myRequest"
+					   ng-class="{'btn-info':status=='partner'}" style="width: 120px;">全部合作伙伴<b class="new-dot" ng-if="requestTodo.todo>0"></b></a>
+				</div>
 				<div class="btn-group btn-group-sm">
 					<a type="button" class="btn btn-default btn-line" ui-sref="baseInfo.vendorInfo"
 						ng-class="{'btn-info':status=='vendor'}" >供应商</a>
@@ -11,10 +15,6 @@
 					<a type="button" class="btn btn-default btn-line" ui-sref="baseInfo.customerInfo"
 						ng-class="{'btn-info':status=='customer'}" >客户<!-- （<em>5</em>） --></a>
 				</div>
-				<div class="btn-group btn-group-sm">
-					<a type="button" class="btn btn-default btn-line" ui-sref="baseInfo.myRequest"
-						ng-class="{'btn-info':status=='partner'}">合作伙伴<b class="new-dot" ng-if="requestTodo.todo>0"></b></a>
-				</div>
 				<div class="btn-group btn-group-sm">
 					<a type="button" class="btn btn-default btn-line" ui-sref="baseInfo.invitation"
 						ng-class="{'btn-info':status=='invitation'}">邀请记录</a>

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

@@ -101,6 +101,9 @@
 #myquest-public #public .search-bg .input-group-addon{
 	width: 85px;
 }
+#myquest-public .customer-tab .customer-hd .checkbox,#myquest-public .customer-tab .customer-hd .checkbox span{
+	margin-left: 0 !important;
+}
 </style>
 <div style="margin-left: -240px; width: 1170px; background: #f5f5f5;" id="myquest-public">
 <div ng-include src="'static/tpl/index/baseInfo/vendorAndCustomer.html'"></div>
@@ -132,8 +135,14 @@
 			<tbody ng-repeat="vendor in $data">
 					<tr class="customer-hd">
 						<td colspan="4" class="text-left"><span ng-bind="::vendor.vendorEnterprise.enName"></span></td>
-						<td width="200" class="text-center" ng-if="vendor.vendswitch == 1"><a ng-click="relieve(vendor.id)">已启用</a></td>
-						<td width="200" class="text-center" ng-if="vendor.vendswitch == 0"><a ng-click="activeVend(vendor.id)">已禁用</a></td>
+						<td>
+							<span class="checkbox" style="width: 100%;">
+								<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>
+						</td>
+						<!--<td width="200" class="text-center" ng-if="vendor.vendswitch == 1"><a ng-click="relieve(vendor.id)">已启用</a></td>
+						<td width="200" class="text-center" ng-if="vendor.vendswitch == 0"><a ng-click="activeVend(vendor.id)">已禁用</a></td>-->
 					</tr>
 					<tr class="customer-bd">
 						<td  class="first" colspan="4">

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

@@ -134,7 +134,7 @@
 		<div class="enterprise-btn">
 			<img src="static/img/home/entLib.png" >
 			<div ng-controller="RequestAmountCtrl">
-				<a title="我的合作伙伴" ui-sref="baseInfo.vendorInfo">我的合作伙伴<em ng-if="requestTodo.todo>0"></em></a><br/>
+				<a title="我的合作伙伴" ui-sref="baseInfo.myRequest">我的合作伙伴<em ng-if="requestTodo.todo>0"></em></a><br/>
 				<a title="新的合作伙伴" ui-sref="baseInfo.partner_searchresult">添加合作伙伴</a>
 			</div>
 		</div>