Pārlūkot izejas kodu

客户资料分配加搜索及显示下拉,客户资料详情新增操作位置变动、客户招标改动小样式。

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@7966 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
ouxianqin 9 gadi atpakaļ
vecāks
revīzija
0a1bf28b66

+ 25 - 2
src/main/webapp/resources/tpl/index/account/add_userInfo.html

@@ -1,9 +1,32 @@
+<style>
+	#user-lists{
+		max-height: 600px;
+		overflow-x: hidden;
+		overflow-y: scroll;
+	}
+	@media screen and (max-width: 1366px){
+		#user-lists{
+			max-height: 368px;
+		}
+	}
+	@media screen and (max-width: 1600px){
+		#user-lists{
+			max-height: 480px;
+		}
+	}
+</style>
 <div class="modal-header">
 	<h3 class="modal-title">
 		<i class="fa fa-user fa-fw text-default"></i>为企业分配用户
 	</h3>
 </div>
-<div class="modal-body">
+<div class="form-group" id="window-search" style="height: 36px; margin-bottom: 0; margin-top: 5px;">
+	<div class="col-sm-12">
+		<input type="text" class="form-control input-sm ng-pristine ng-invalid ng-invalid-required ng-touched" required="" placeholder="输入用户名关键词搜索" autofocus="" ng-model="keyword" ng-search="onSearch(keyword)" />
+		<a class="btn input-group-addon" ng-click="onSearch()">搜索</a>
+	</div>
+</div>
+<div class="modal-body" id="user-lists">
 	<div>
 		<table width="99%" class="block table table-bordered table-striped table-hover">
 		<thead>
@@ -13,7 +36,7 @@
 		</thead>
 		<tbody>
 				<div style="overflow-y:scroll; width:100%;max-height:500px">			
-					<tr ng-repeat="user in userinfos">
+					<tr ng-repeat="user in userinfos| filter: keyword">
 						<td width="40px;" style="text-align: center"><input ng-model="user.distribute" name="checkbox" ng-click="checkOne(user)" type="checkbox"></td>
 						<td width="100px;">{{user.userName}}</td>
 						<td width="80px;">{{user.userUU}}</td>

+ 8 - 6
src/main/webapp/resources/tpl/index/approvalFlow/step1.html

@@ -92,15 +92,17 @@
             </div>
             <div class="box_content01">
                 <h4>指定人员<font>(受人员异动的影响)</font></h4>
-                <div class="box_list" style="position: relative; overflow-y: auto; overflow-x: hidden;">
+                <div class="box_list">
                     <div class="sreach"><input type="search"  placeholder="请输入姓名/部门搜索" ng-model="keyword" ng-search="search(keyword)"><button></button> </div>
-                    <div class="zimu"><span>C</span></div>
-                   	<ul ng-repeat="user in users| filter: keyword">
-                   		<li ><span><em>{{user.username}}</em>
+                    <div style="position: relative; overflow-y: auto; overflow-x: hidden;max-height: 380px;">
+                        <div class="zimu"><span>C</span></div>
+                        <ul ng-repeat="user in users| filter: keyword">
+                            <li ><span><em>{{user.username}}</em>
                    			{{user.department}} {{user.role}}
                    			<a ng-click="SelectUser(user)">添加</a>
-                   		</li>
-                    </ul>
+                            </li>
+                        </ul>
+                    </div>
                 </div>
             </div>
         </div>

+ 29 - 13
src/main/webapp/resources/tpl/index/sale/customer_detail.html

@@ -9,6 +9,22 @@
 	<link rel="stylesheet" href="static/css/add.css "/>
 </head>
 <body>
+<style>
+    .com_title01 a{
+        float: right;
+        font-size: 14px;
+        color: #5078cb;
+        line-height: 50px;
+        margin-right: 10px;
+    }
+    .pro-add-data02{
+        display: none;
+        margin-top: 0;
+    }
+    .pro-add-data02.open{
+        display: inline-block;
+    }
+</style>
 <div class="wrap">
 	<div class="content">
 		<div class="com_head"><span>客户详情</span></div>
@@ -34,7 +50,7 @@
                 </dd>
             </dl>
             <!--客户联系人-->
-            <div class="com_title01"><span>客户联系人</span></div>
+            <div class="com_title01"><span>客户联系人</span><a ng-click="addContact(customer.uu)">+新增客户联系人</a></div>
             <div class="supply-list01 pro-info clearfix">
                 <dl>
                     <dt>
@@ -55,12 +71,9 @@
                         <span>{{contact.email}}</span>
                         <span class="wid02"><a ng-click="edit(contact)" class="edit">编辑</a><a ng-click="deleteById(contact.id, $index)">删除</a></span>
                     </dd>
-                    <dd>
-                        <span class="add-wl"><a ng-click="addContact(customer.uu)">+新增客户联系人</a></span>
-                    </dd>
                 </dl>
             </div>
-            <div class="com_title01"><span>已分配人员</span></div>
+            <div class="com_title01"><span>已分配人员</span><a ng-click="addUserInfo()">+新增分配人员</a></div>
             <div class="supply-list01 pro-info clearfix">
                 <dl>
                     <dt>
@@ -70,7 +83,7 @@
                         <span>手机</span>
                         <span>UU</span>
                         <span>邮箱</span>
-                        <span class="wid02">操作</span>
+                        <span class="wid02"><!--操作--></span>
                     </dt>
                     <dd  ng-repeat="userinfo in userdata.content">
                         <span class="wid01" ng-bind="::userinfo.user.userName"></span>
@@ -79,10 +92,10 @@
                         <span ng-bind="::userinfo.user.userTel"></span>
                         <span ng-bind="::userinfo.userUU"></span>
                         <span ng-bind="::userinfo.user.userEmail"></span>
-                        <span class="wid02"><a>删除</a></span>
+                        <span class="wid02"><!--<a>删除</a>--></span>
                     </dd>
                     <dd>
-                       <div class="col-md-8 col-md-offset-1 col-sm-10 col-sm-offset-0 col-xs-12 col-xs-offset-0">
+                       <div class="col-md-8 col-md-offset-1 col-sm-10 col-sm-offset-0 col-xs-12 col-xs-offset-0" style="margin-top: 10px;">
 						<a ng-disabled="userdata.first"
 							class="btn btn-default col-md-2 col-sm-3 col-xs-4"
 							ng-click="first()">上一页</a>
@@ -93,15 +106,18 @@
 							ng-click="last()">下一页</a>
 						</div>
                     </dd>
-                    <dd>
-                        <span class="add-wl"><a ng-click="addUserInfo()">+新增分配人员</a></span>
-                    </dd>
                 </dl>
             </div>
-            <div class="com_title01" ng-if="uu==null"><span><a ng-click="viewProdList(customer.uu)">查看客户物料信息</a></span></div>
+            <div class="com_title01">
+                <span>查看客户物料信息</span>
+                <a ng-click="$open=!$open;viewProdList(customer.uu)">
+                    <em ng-bind="$open ? '收起':'展开'" class="f14">展开</em>
+                    <i class="fa fa-fw" ng-class="{'fa-angle-up': $open, 'fa-angle-down': !$open}"></i>
+                </a>
+            </div>
             <!--已分配人员-->
         </div>
-        <div class="pro-add-data02" ng-if="uu!=null">
+        <div class="pro-add-data02" ng-class="{'open': $open}">
            	<div class="pro-search" >
                  <div class="search-result fl"><img src="resources/img/purc/search01.png"/>搜索“{{tip}}”,为您找到<em>{{total}}</em>个结果</div>
                  <div class="search fr">

+ 7 - 2
src/main/webapp/resources/tpl/index/sale/tenderlist.html

@@ -129,7 +129,9 @@
         background-color: #f5f5f5;
         border-bottom: 1px solid #e8e8e8;
     }
-
+    .tender-table > tbody.is-done > tr:first-child td{
+        padding: 10px 0;
+    }
     .tender-table > tbody.is-done > tr {
         border-bottom: 1px solid #e8e8e8;
     }
@@ -141,6 +143,7 @@
 
     .tender-table tbody tr td a {
         color: #327ebe;
+        border: #e8e8e8 1px solid;
     }
 
     .main-content .btn-group {
@@ -156,7 +159,9 @@
         text-align: left;
         padding-left: 20px;
     }
-
+    .list-notnum div{
+        padding-left: 5px;
+    }
     .list-num {
         text-align: right;
     }