Главная Обзор Помощь
Регистрация Вход
usoft
/
platform-b2b
1
0
Ответвить 0
Файлы Задачи 0 Запросы на слияние 0 Вики
Просмотр исходного кода

企业圈相关页面修改。

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@8173 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
ouxianqin 8 лет назад
Родитель
c04321d1f4
Сommit
cd9b880283
9 измененных файлов с 318 добавлено и 91 удалено
Разделённый вид Показать статистику Diff
  1. 175 0
      src/main/webapp/resources/css/index.css
  2. 13 2
      src/main/webapp/resources/tpl/index/baseInfo/addPartners.html
  3. 32 38
      src/main/webapp/resources/tpl/index/baseInfo/customersInfo.html
  4. 2 2
      src/main/webapp/resources/tpl/index/baseInfo/enMenu.html
  5. 20 13
      src/main/webapp/resources/tpl/index/baseInfo/myRequest.html
  6. 7 4
      src/main/webapp/resources/tpl/index/baseInfo/searchresult.html
  7. 1 1
      src/main/webapp/resources/tpl/index/baseInfo/vendorAndCustomer.html
  8. 67 30
      src/main/webapp/resources/tpl/index/baseInfo/vendorsInfo.html
  9. 1 1
      src/main/webapp/resources/tpl/index/home/right.html

+ 175 - 0
src/main/webapp/resources/css/index.css
Просмотреть файл 

@@ -3001,4 +3001,179 @@ input::-webkit-clear{display:none;}
 
 }

 .btn-group button em{

 	font-style: inherit;

+}

+

+/*企业圈样式修改*/

+.myReuest .add{

+	font-size: 16px;

+	color: #5078cb;

+}

+.myReuest .add img{

+	margin-right: 5px;

+	vertical-align: middle;

+}

+.myReuest{

+	padding-left: 0;

+}

+.myReuest p{

+	font-size: 14px;

+	line-height: 40px;

+}

+.myReuest p em{

+	font-style: inherit;

+	color: #5078cb;

+	font-size: 14px;

+}

+.myReuest .col-xs-3{

+	text-align: right;

+	line-height: 40px;

+}

+.wid_1170{

+	margin-left: -240px;

+	width: 1170px;

+}

+/*

+#myquest-public .block{

+	background: none;

+}*/

+#myquest-public .group-container{

+	width: 100%;

+}

+#myquest-public .group-container .btn-group {

+	width: 160px;

+	border: none;

+	height: 45px;

+}

+#myquest-public .group-container .btn-group .btn {

+	border: none;

+	font-size: 16px;

+}

+#myquest-public  .group-container .btn-group .btn em {

+	color: #d32526;

+	font-style: inherit;

+}

+#myquest-public .group-container .btn-group .btn:hover {

+	background: #fff;

+	color: #d32526;

+}

+#myquest-public .group-container .btn-group .btn-info {

+	color: #d32526;

+	background: #fff;

+	border: none;

+}

+#myquest-public .margin-bot{

+	margin-bottom: 10px;

+}

+#myquest-public .group-container{

+	height: 45px;

+	padding: 0;

+	background: #fff;

+}

+#myquest-public #public .search-bg .input-group-addon{

+	width: 85px;

+}

+#myquest-public .customer-tab .customer-hd:first-child{

+	background: #fff;

+	font-size: 16px;

+	height: 55px;

+	line-height: 55px;

+	border-bottom: #ddd 1px solid;

+}

+#myquest-public .customer-tab .customer-hd span{

+	font-size: 16px;

+	margin-left: 20px;

+}

+.text-left{

+	text-align: left !important;

+}

+#myquest-public .customer-tab .customer-bd{

+	background: #fff;

+	line-height: 50px;

+}

+#myquest-public .customer-tab tbody{

+	border-bottom: #f5f5f5 16px solid;

+}

+#myquest-public .customer-tab .customer-bd.first {

+	line-height: 25px;

+	font-size: 14px;

+	padding-top: 10px;

+	padding-bottom: 10px;

+}

+#myquest-public .customer-tab .customer-bd td{

+	text-align: left;

+}

+#myquest-public .customer-tab .customer-bd div{

+	margin-left: 20px;

+	line-height: 30px;

+}

+#myquest-public .customer-tab .customer-bd div span{

+	font-size: 14px;

+}

+#myquest-public .customer-tab thead{

+	display: none;

+}

+#myquest-public  .all-btn a{

+	width: 94px;

+	height: 36px;

+	line-height: 36px;

+	text-align: center;

+	color: #fff;

+	font-size: 14px;

+	display: inline-block;

+	margin: 0 auto;

+	margin-left: 50px;

+}

+#myquest-public  .all-btn a.btn01{

+	background: #27b6da;

+	margin-bottom: 5px;

+}

+#myquest-public  .all-btn a.btn02{

+	background: #327ebe;

+}

+#myquest-public  .all-btn a:hover{

+	background: #5078cb;

+	color: #fff;

+}

+.sreach-index{

+	background: #f5f5f5;

+	text-align: center;

+	width: 1170px;

+	margin-left: -240px;

+}

+.sreach-index .form-control{

+	height: 36px;

+	line-height: 36px;

+	border: #327ebe 1px solid;

+	border-radius: 0px;

+	font-size: 14px;

+	text-align: center;

+	padding-right: 85px;

+}

+.sreach-index .row:first-child{

+	margin-top: 15%;

+	margin-bottom: 80px;

+}

+.sreach-index .serach-btn{

+	width: 85px;

+	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;

+}

+.new-dot{

+	width: 14px;

+	height: 14px;

+	display: inline-block;

+	background: #ea5a60;

+	position: absolute;

+	border-radius: 100%;

 }

+ 13 - 2
src/main/webapp/resources/tpl/index/baseInfo/addPartners.html
Просмотреть файл 

@@ -5,7 +5,18 @@
 
 <title>Insert title here</title>

 </head>

 <body>

-	<input type="search" ng-model="keyword" ng-search="onSearch(keyword)" placeholder="输入企业名称、简称搜索" />

-	<a ng-click="onSearch(keyword)">搜索</a>

+<div class="sreach-index">

+	<div class="row">

+		<img src="resources/img/home/sreach-logo.png"/>

+	</div>

+	<div class="row">

+		<div class="col-xs-3"></div>

+		<div class="col-xs-6">

+			<input type="search" ng-model="keyword" ng-search="onSearch(keyword)" placeholder="输入企业名称、简称搜索" class="form-control" />

+			<a ng-click="onSearch(keyword)" class="serach-btn">搜索</a>

+		</div>

+		<div class="col-xs-3"></div>

+	</div>

+</div>

 </body>

 </html>

+ 32 - 38
src/main/webapp/resources/tpl/index/baseInfo/customersInfo.html
Просмотреть файл 

@@ -41,7 +41,7 @@
 
 	font-size: 14px;

 }

 #customer-tab tbody tr:hover{

-	border: #d32526 2px solid;

+	/*border: #d32526 2px solid;*/

 }

 #customer-tab .form-horizontal .form-control{

 	height: 36px;

@@ -55,7 +55,7 @@
 
 	padding: 10px 0;

 }

 #customer-tab .form-horizontal .form-group .input-group-addon{

-	width: 70px;

+	width: 85px;

 	height: 36px;

 	display: inline-block;

 	background: #327ebe;

@@ -67,7 +67,7 @@
 
 	border: none;

 	border-radius: 0;

 	position: absolute;

-	top: 10px;

+	top: 0;

 	right: 0;

 }

 #customer-tab table tr td a{

@@ -78,37 +78,31 @@
 
 	line-height: 55px;

 }

 </style>

+<div style="margin-left: -240px; width: 1170px; background: #f5f5f5;" id="myquest-public">

 <div ng-include src="'static/tpl/index/baseInfo/vendorAndCustomer.html'"></div>

 <div class="loading in" ng-class="{'in': loading}">

 	<i></i>

 </div>

-<div class="pane base-info" style="max-height: 900px;overflow-y: auto; overflow-x: hidden;" id="customer-tab">

-	<div class="pub-com_head">

-		<span>客户资料</span>

-		<div class="p-right">

-			<a href="vendor/customer/xls" target="_self" class="text-simple bule"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>

-		</div>

-	</div>

+<div class="pane base-info" id="customer-tab">

 	<form class="form-horizontal">

-		<div class="form-group">

-			<div class="col-md-6 col-sm-6">

-				<div id="topSearch" style="float: left">

-					<span class="text-muted"><i class="fa fa-search fa-lg"></i> 搜索"{{tip}}",为您找到结果:</span>

-					单据{{::totalCount}}条

+		<div class="myReuest form-group" style="background: #f5f5f5;">

+			<div class="row">

+				<div class="col-xs-5">

+					<div class="search">

+						<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入企业名称搜索" />

+						<a class="btn  input-group-addon" ng-click="onSearch()">搜索</a>

+					</div>

+				</div>

+				<div class="col-xs-4">

+					<p style="margin: 0;">搜索到<em>{{customerParams.total()}}</em>条</p>

 				</div>

-			</div>

-			<div class="col-md-6 col-sm-6">

-				<div class="form-group form-group-sm has-feedback">

-					<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入企业名称搜索" />

-               	 	<a class="btn  input-group-addon" ng-click="onSearch()">搜索</a>

-                </div>

 			</div>

 		</div>

 	</form>

 	<div class="pane-body">

-		<table class="table table-bordered table-striped table-hover"

+		<table class="customer-tab table table-bordered table-striped table-hover"

 			ng-table="customerParams">

-			<thead>

+			<!--<thead>

 				<tr class="header">

 					<th width="80">UU</th>

 					<th width="180">客户名称</th>

@@ -118,21 +112,21 @@
 
 					<th width="80">我方联系人</th>

 					<th width="110">用户分配</th>

 				</tr>

-			</thead>

-			<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>

-						<td class="text-center" ng-bind="::customer.myUser.userName"></td>

-						<td ng-bind="::customer.myUser.userTel"></td>

-						<td class="text-center" ng-bind="::customer.vendorUser.userName"></td>

-						<td class="text-center">

-								<!--<a title="展开" class="text-muted" ng-click="open(customer,$index)"><i class="fa fa-toggle-down fa-lg"></i></a>-->

-								<a ng-click="viewDetail(customer.id)">查看详情</a><br/>

-								<a title="新增" style="color: #327ebe;" ng-click="addUserInfo(customer)"><!--<i class="fa fa-plus-circle fa-lg">-->分配</i></a>

-								<a ng-click="relieve(customer.id)">取消合作关系</a>

-							</div>

+			</thead>-->

+			<tbody ng-repeat="customer in $data">

+					<tr class="customer-hd">

+						<td colspan="4" class="text-left"><span ng-bind="::customer.myEnterprise.enName"></span></td>

+						<td width="200" class="text-center"><a ng-click="relieve(customer.id)">取消合作关系</a></td>

+					</tr>

+					<tr class="customer-bd">

+						<td  class="first" colspan="4">

+							<div>企业地址：<span ng-bind="::customer.myEnterprise.enAddress"></span></div>

+							<div>联系人：<span ng-bind="::customer.myUser.userName"></span></div>

+							<div>电话：<span ng-bind="::customer.myUser.userTel"></span></div>

+						</td>

+						<td width="200" class="text-center all-btn">

+							<a ng-click="viewDetail(customer.id)" title="查看详情">查看详情</a><br/>

+							<a  ng-click="addUserInfo(customer)" class="btn02" title="分配">分配</a>

 						</td>

 					</tr>

 			</tbody>

+ 2 - 2
src/main/webapp/resources/tpl/index/baseInfo/enMenu.html
Просмотреть файл 

@@ -1,4 +1,4 @@
 
-<div class="group-container condition block">

+<div class="margin-bot group-container condition">

 	<div class="row">

 		<div class="col-xs-6">

 			<div class="btn-group btn-group-sm btn-group-justified">

@@ -8,7 +8,7 @@
 
 				</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=='send'}" >新的合作伙伴<!-- （<em>5</em>） --></a>

+						ng-class="{'btn-info':status=='send'}" >新的合作伙伴<b class="new-dot"></b></a>

 				</div>

 			</div>

 		</div>

+ 20 - 13
src/main/webapp/resources/tpl/index/baseInfo/myRequest.html
Просмотреть файл 

@@ -175,7 +175,6 @@
 
 }

 .view-slide-in .search-bg {

 	margin-top: 15px;

-	margin-bottom: 15px;

 }

 #topSearch {

 	font-size: 18px;

@@ -268,6 +267,15 @@
 
 .search-bg .form-group{

 	position: relative;

 }

+.order-table>tbody{

+	border-bottom: #f5f5f5 16px solid !important;

+}

+.label-success {

+	background: #27b6da;

+}

+.label-danger {

+	background: #327ebe;

+}

 </style>

 <div class="block" style="margin-left: -240px; width: 1170px;">

 <div class="loading in" ng-class="{'in': loading}">

@@ -276,7 +284,7 @@
 
 <div ng-include src="'static/tpl/index/baseInfo/enMenu.html'"></div>

 <div class="group-container 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"

@@ -296,20 +304,11 @@
 
 					</div>

 				</div>

 			</div>

-			<div class="col-xs-4">

-				<div class="btn-group btn-group-sm">

-					<a href="#/baseInfo/partner">添加合作伙伴</a>

-				</div>

-			</div>

 	</div>

 </div>

-<div class="search-bg condition block">

+<div class="myReuest search-bg condition block">

 		<div class="row">

-			<div id="topSearch" style="float: left">

-				<span class="text-muted"><i class="fa fa-search fa-lg"></i> 搜索"{{tip}}",为您找到结果:</span>

-				企业{{tableParams.total()}}家

-			</div>

-			<div class="col-xs-6" style="float: right">

+			<div class="col-xs-5">

 				<div class="search">

 					<div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick" on-toggle="searchAdvance=open">

 						<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入企业名称、简称或申请人搜索" />

@@ -317,6 +316,14 @@
 
 					</div>

 				</div>

 			</div>

+			<div class="col-xs-4">

+				<p>搜索到<em>{{tableParams.total()}}</em>条</p>

+			</div>

+			<div class="col-xs-3">

+				<div class="btn-group btn-group-sm">

+					<a href="#/baseInfo/partner" class="add"><img src="resources/img/icon/add.png">添加合作伙伴</a>

+				</div>

+			</div>

 		</div>

 </div>

 <table class="order-table block" ng-table="tableParams">

+ 7 - 4
src/main/webapp/resources/tpl/index/baseInfo/searchresult.html
Просмотреть файл 

@@ -268,13 +268,13 @@
 
 <div class="loading in" ng-class="{'in': loading}">

 	<i></i>

 </div>

-<div class="search-bg condition block">

+<div class="myReuest search-bg condition block">

 		<div class="row">

-			<div id="topSearch" style="float: left">

+			<!--<div id="topSearch" style="float: left">

 				<span class="text-muted"><i class="fa fa-search fa-lg"></i> 搜索"{{tip}}",为您找到结果:</span>

 				企业{{tableParams.total()}}家

-			</div>

-			<div class="col-xs-6" style="float: right">

+			</div>-->

+			<div class="col-xs-6">

 				<div class="search">

 					<div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick" on-toggle="searchAdvance=open">

 						<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入企业名称、简称、管理员姓名进行搜索" />

@@ -284,6 +284,9 @@
 
 					</div>

 				</div>

 			</div>

+			<div class="col-xs-4">

+				<p>搜索到<em>{{tableParams.total()}}</em>条</p>

+			</div>

 		</div>

 	</div>

 <table class="enterprise-table block" ng-table="tableParams">

+ 1 - 1
src/main/webapp/resources/tpl/index/baseInfo/vendorAndCustomer.html
Просмотреть файл 

@@ -1,5 +1,5 @@
 
 <div ng-include src="'static/tpl/index/baseInfo/enMenu.html'"></div>

-<div class="group-container condition block">

+<div class="margin-bot group-container condition">

 	<div class="row">

 		<div class="col-xs-6">

 			<div class="btn-group btn-group-sm btn-group-justified">

+ 67 - 30
src/main/webapp/resources/tpl/index/baseInfo/vendorsInfo.html
Просмотреть файл 

@@ -61,9 +61,9 @@
 
 	vertical-align: inherit;

 	font-size: 14px;

 }

-#customer-tab tbody tr:hover{

+/*#customer-tab tbody tr:hover{

 	border: #d32526 2px solid;

-}

+}*/

 #customer-tab .com_title{

 	margin-bottom: 10px;

 }

@@ -73,23 +73,54 @@
 
 #customer-tab tbody tr td a:hover{

 	color: #d32526;

 }

+#customer-tab .content{

+	width: 100%;

+}

+#myquest-public .group-container{

+	width: 100%;

+}

+#myquest-public .group-container .btn-group {

+	width: 160px;

+	border: none;

+	height: 45px;

+}

+#myquest-public .group-container .btn-group .btn {

+	border: none;

+	font-size: 16px;

+}

+#myquest-public  .group-container .btn-group .btn em {

+	color: #d32526;

+	font-style: inherit;

+}

+ #myquest-public .group-container .btn-group .btn:hover {

+	background: #fff;

+	color: #d32526;

+}

+#myquest-public .group-container .btn-group .btn-info {

+	color: #d32526;

+	background: #fff;

+	border: none;

+}

+#myquest-public .margin-bot{

+	margin-bottom: 10px;

+}

+#myquest-public .group-container{

+	height: 45px;

+	padding: 0;

+	background: #fff;

+}

+#myquest-public #public .search-bg .input-group-addon{

+	width: 85px;

+}

 </style>

+<div style="margin-left: -240px; width: 1170px; background: #f5f5f5;" id="myquest-public">

 <div ng-include src="'static/tpl/index/baseInfo/vendorAndCustomer.html'"></div>

 <link rel="stylesheet" href="static/css/public.css">

-<div class="pub-com_head">

-	<span>供应商资料</span>

-	<div class="p-right">

-	</div>

-</div>

-<div id="public">

-	<div class="condition block" style="padding: 10px 15px;">

-		<div class="search-bg condition block"  style="padding: 10px 15px;">

+<div id="public" style="background: #f5f5f5;">

+	<div class="condition" style="padding: 0;">

+		<div class="myReuest search-bg condition" >

 			<div class="row">

-				<div id="topSearch" style="float: left">

-					<span class="text-muted f16"><i class="fa fa-search fa-lg"></i> 搜索"{{tip}}",为您找到结果:</span>

-					单据{{total}}条

-				</div>

-				<div class="col-xs-6">

+				<div class="col-xs-5">

 					<div class="search">

 						<div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick" on-toggle="searchAdvance=open">

 							<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch(keyword)" placeholder="输入企业名称、简称或申请人搜索"  style="width: 100%"/>

@@ -97,6 +128,9 @@
 
 						</div>

 					</div>

 				</div>

+				<div class="col-xs-4">

+					<p>搜索到<em>{{customerParams.total()}}</em>条</p>

+				</div>

 			</div>

 		</div>

 	</div>

@@ -104,9 +138,9 @@
 
 <div class="wrap" id="customer-tab">

 	<div class="content">

 		<!--供应商列表-->

-		<table class="table  table-hover"

+		<table class="table  table-hover customer-tab"

 			ng-table="customerParams">

-			<thead>

+			<!--<thead>

 				<tr class="pane-header">

 					<th width="180" class="text-center">企业名称</th>

 					<th width="120" class="text-center">简称</th>

@@ -116,24 +150,27 @@
 
 					<th width="80" class="text-center">联系方式</th>

 					<th width="170" class="text-center">操作</th>

 				</tr>

-			</thead>

-			<tbody>

-					<tr ng-repeat="vendor in $data">

-						<td class="text-center" ng-bind="::vendor.vendorEnterprise.enName"></td>

-						<td class="text-center" ng-bind="::vendor.vendorEnterprise.enShortname"></td>

-						<td class="text-center" ng-bind="::vendor.vendorEnterprise.enAddress"></td>

-						<td class="text-center" ng-bind="::vendor.vendorUser.userName"></td>

-						<td ng-bind="::vendor.vendorUser.position"></td>

-						<td class="text-center" ng-bind="::vendor.vendorUser.userTel"></td>

-						<td class="text-center">

-							<a  href="#/purc/vendor/{{vendor.id}}">查看详情</a><br/>

-							<a ng-click="purcByEn(vendor.vendorEnterprise.enBussinessCode)">下达采购单</a>

-							<a ng-click="relieve(vendor.id)">取消合作关系</a>

+			</thead>-->

+			<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"><a ng-click="relieve(vendor.id)">取消合作关系</a></td>

+					</tr>

+					<tr class="customer-bd">

+						<td  class="first" colspan="4">

+							<div>企业地址：<span ng-bind="::vendor.vendorEnterprise.enAddress"></span></div>

+							<div>联系人：<span ng-bind="::vendor.vendorUser.userName"></span></div>

+							<div>电话：<span ng-bind="::vendor.vendorUser.userTel"></span></div>

+						</td>

+						<td width="200" class="text-center all-btn">

+							<a  href="#/purc/vendor/{{vendor.id}}" class="btn01">查看详情</a><br/>

+							<a ng-click="purcByEn(vendor.vendorEnterprise.enBussinessCode)" class="btn02">下达采购单</a>

 						</td>

 					</tr>

 			</tbody>

 		</table>

 	</div>

 </div>

+</div>

 </body>

 </html>

+ 1 - 1
src/main/webapp/resources/tpl/index/home/right.html
Просмотреть файл 

@@ -135,7 +135,7 @@
 
 			<img src="static/img/home/entLib.png" >

 			<div>

 				<a title="我的合作伙伴" ui-sref="baseInfo.vendorInfo">我的合作伙伴</a><br/>

-				<a title="添加合伙伙伴" ui-sref="baseInfo.partner">添加合伙伙伴<em></em></a>

+				<a title="新的合作伙伴" ui-sref="baseInfo.partner">新的合作伙伴<em></em></a>

 			</div>

 		</div>

 		<!--<a href="#/baseInfo/enterpriseList"><img src="static/img/home/entLib.png" ></a>-->