Merge remote-tracking branch 'origin/feature-b2b-ssr-wangcz' into feature-b2b-ssr-wangcz

src/main/webapp/WEB-INF/views/normal/user_center.html

@@ -24,6 +24,7 @@
 <link rel="stylesheet" href="static/lib/angular/ng-table.css">
     <link rel="stylesheet" href="static/css/commonComponent.css" />
 	<link rel="stylesheet" href="static/css/common/linkSaler.css" />
+	<link rel="stylesheet" href="static/css/b2bCommon.css">
 </head>
 <body>
 

src/main/webapp/WEB-INF/views/normal/vendor_center.html

@@ -21,6 +21,7 @@
 <link rel="stylesheet" type="text/css" href="static/lib/keyboard/css/softkeys-0.0.1.css">
 <link rel="stylesheet" href="static/css/commonComponent.css" />
 	<link rel="stylesheet" href="static/css/common/linkSaler.css" />
+	<link rel="stylesheet" href="static/css/b2bCommon.css">
 </head>
 <body>
 	<!-- 消息提示框  Start-->

src/main/webapp/resources/view/vendor/b2b/sale/customer_detail.html

@@ -1,168 +1,200 @@
-
 <style>
-    .com_title01 a{
-        float: right;
+    .cus-detail {
+        background: #fff;
+    }
+    .cus-detail .head {
+        background: #5078cb;
+        color: #f5f5f5;
+        height: 30px;
+        line-height: 30px;
+        padding-left: 15px;
+        font-size: 14px;
+    }
+    .cus-detail .head .head-link {
+        font-size: 14px;
+        color: #f5f5f5;
+    }
+    .cus-detail .com_title01 {
+        padding: 21px 7px;
         font-size: 14px;
         color: #5078cb;
-        line-height: 50px;
-        margin-right: 10px;
+        font-weight: bold;
+        position: relative;
+        margin: 0 16px;
+    }
+    .cus-detail .com_title01::before {
+        content: '';
+        background: #5078cb;
+        width: 3px;
+        height: 14px;
+        position: absolute;
+        left: 0;
+        top: 22px;
+    }
+    .cus-detail .com_title01 .operate {
+        float: right;
+        color: #30a603;
+        font-weight: normal;
     }
-    .pro-add-data02{
-        display: none;
-        margin-top: 0;
+    .cus-detail .base-info {
+        margin: 0 16px;
+        background: #fef9f4;
+        border: 1px solid #e8e8e8;
+        border-radius: 5px;
+        padding: 0 16px;
     }
-    .pro-add-data02.open{
-        display: inline-block;
+    .cus-detail .base-info dd {
+        font-size: 14px;
+        line-height: 30px;
     }
-    .pro-add-data02 table tbody tr td{
-        padding: 15px;
+    .cus-detail .base-info .title {
+        color: #666;
+        padding-right: 25px;
     }
 </style>
-<div class="user_right fr">
-    <div class="wrap">
-        <div class="content">
-            <div class="com_head"><span>客户详情</span></div>
-            <!--供应商详情-->
-            <div class="pro-add-data clearfix">
-                <div class="com_title01 sty01"><span>基本信息</span></div>
-                <dl>
-                    <dd>
-                        <div class="fl">企业名称：</div>
-                        <div class="fr grey">{{customer.enName}}</div>
-                    </dd>
-                    <dd>
-                        <div class="fl">简称：</div>
-                        <div class="fr grey">{{customer.enShortname}}</div>
-                    </dd>
-                    <dd>
-                        <div class="fl">地址：</div>
-                        <div class="fr grey">{{customer.enAddress}}</div>
-                    </dd>
-                    <dd>
-                        <div class="fl">主营：</div>
-                        <div class="fr grey">{{customer.enType}}</div>
-                    </dd>
-                </dl>
-                <!--客户联系人-->
-                <div class="com_title01"><span>客户联系人</span><a ng-click="addContact(customer.uu)"><i class="fa fa-plus-square fa-fw"></i>新增客户联系人</a></div>
-                <div class="supply-list01 pro-info clearfix">
-                    <dl>
-                        <dt>
-                            <span class="wid01">姓名</span>
-                            <span class="wid01">性别</span>
-                            <span class="wid01">职务</span>
-                            <span>手机</span>
-                            <span>电话</span>
-                            <span>邮箱</span>
-                            <span class="wid02">操作</span>
-                        </dt>
-                        <dd ng-repeat = "contact in Contacts| orderBy:'-id'">
-                            <span class="wid01">{{contact.venduser}}</span>
-                            <span class="wid01" ng-bind="contact.sex == 'F' ? '女' : '男'"></span>
-                            <span class="wid01">{{contact.position}}</span>
-                            <span>{{contact.tel}}</span>
-                            <span>{{contact.phone}}</span>
-                            <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 ng-if="Contacts.length == 0">
-                            <span style="width: 100%; color: #999;">您还未添加客户联系人!</span>
-                        </dd>
-                    </dl>
-                </div>
-                <div class="com_title01"><span>已分配人员</span><a ng-click="addUserInfo()"><i class="fa fa-plus-square fa-fw"></i>新增分配人员</a></div>
-                <div class="supply-list01 pro-info clearfix">
-                    <dl>
-                        <dt>
-                            <span class="wid01">姓名</span>
-                            <span class="wid01">性别</span>
-                            <span class="wid01">职务</span>
-                            <span>手机</span>
-                            <span>UU</span>
-                            <span>邮箱</span>
-                            <span class="wid02"><!--操作--></span>
-                        </dt>
-                        <dd  ng-repeat="userinfo in userdata.content">
-                            <span class="wid01" ng-bind="::userinfo.user.userName"></span>
-                            <span class="wid01" ng-bind="::userinfo.sex == 'F' ? '女' : '男'"></span>
-                            <span class="wid01" ng-bind="::userinfo.position"></span>
-                            <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>
-                        </dd>
-                        <dd ng-if="userdata.content.length == 0">
-                            <span style="width: 100%; color: #999;">当前客户还未分配人员!</span>
-                        </dd>
-                        <dd ng-if="custInfos.length > 5">
-                            <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>
-                                <div class="col-md-8 col-sm-6 col-xs-4 text-center f14"
-                                     style="line-height: 34px;">{{userdata.page}}/{{userdata.totalPage}}页</div>
-                                <a ng-disabled="userdata.last"
-                                   class="btn btn-default col-md-2 col-sm-3 col-xs-4"
-                                   ng-click="last()">下一页</a>
-                            </div>
-                        </dd>
-                    </dl>
-                </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-class="{'open': $open}">
-                <div class="pro-search" >
-                    <div class="search-result fl"><img src="static/img/purc/search01.png"/>搜索“{{tip}}”，为您找到<em>{{total}}</em>个结果</div>
-                    <div class="search fr">
-                        <input type="text" placeholder="输入供应商物料关键字查询" ng-model="keyword" autofocus ng-search="onSearch(keyword)"/>
-                        <a class="seek" ng-click="onSearch(keyword)">搜索</a>
+<div class="user_right fr cus-detail">
+    <div class="head"><a class="head-link" href="vendor#/sale/customer">基础资料</a> > <span>客户详情</span></div>
+    <!--供应商详情-->
+    <div class="pro-add-data clearfix">
+        <div class="com_title01 sty01">基本信息</div>
+        <dl class="base-info">
+            <dd>
+                <span class="title">企业名称：</span>{{customer.enName}}
+            </dd>
+            <dd>
+                <span class="title">简称：</span>{{customer.enShortname}}
+            </dd>
+            <dd>
+                <span class="title">地址：</span>{{customer.enAddress}}
+            </dd>
+            <dd>
+                <span class="title">主营：</span>{{customer.enType}}
+            </dd>
+        </dl>
+        <!--客户联系人-->
+        <div class="com_title01">
+            客户联系人({{Contacts.length || 0}})
+            <a class="operate" ng-click="addContact(customer.uu)"><i class="fa fa-plus-square fa-fw"></i>新增客户联系人</a>
+        </div>
+        <div class="supply-list01 pro-info clearfix">
+            <dl>
+                <dt>
+                    <span class="wid01">姓名</span>
+                    <span class="wid01">性别</span>
+                    <span class="wid01">职务</span>
+                    <span>手机</span>
+                    <span>电话</span>
+                    <span>邮箱</span>
+                    <span class="wid02">操作</span>
+                </dt>
+                <dd ng-repeat = "contact in Contacts| orderBy:'-id'">
+                    <span class="wid01">{{contact.venduser}}</span>
+                    <span class="wid01" ng-bind="contact.sex == 'F' ? '女' : '男'"></span>
+                    <span class="wid01">{{contact.position}}</span>
+                    <span>{{contact.tel}}</span>
+                    <span>{{contact.phone}}</span>
+                    <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 ng-if="Contacts.length == 0">
+                    <span style="width: 100%; color: #999;">您还未添加客户联系人!</span>
+                </dd>
+            </dl>
+        </div>
+        <div class="com_title01">
+            <span>已分配人员({{userdata.content.length || 0}})</span>
+            <a ng-click="addUserInfo()" class="operate"><i class="fa fa-plus-square fa-fw"></i>新增分配人员</a>
+        </div>
+        <div class="supply-list01 pro-info clearfix">
+            <dl>
+                <dt>
+                    <span class="wid01">姓名</span>
+                    <span class="wid01">性别</span>
+                    <span class="wid01">职务</span>
+                    <span>手机</span>
+                    <span>UU</span>
+                    <span>邮箱</span>
+                    <span class="wid02"><!--操作--></span>
+                </dt>
+                <dd  ng-repeat="userinfo in userdata.content">
+                    <span class="wid01" ng-bind="::userinfo.user.userName"></span>
+                    <span class="wid01" ng-bind="::userinfo.sex == 'F' ? '女' : '男'"></span>
+                    <span class="wid01" ng-bind="::userinfo.position"></span>
+                    <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>
+                </dd>
+                <dd ng-if="userdata.content.length == 0">
+                    <span style="width: 100%; color: #999;">当前客户还未分配人员!</span>
+                </dd>
+                <dd ng-if="custInfos.length > 5">
+                    <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>
+                        <div class="col-md-8 col-sm-6 col-xs-4 text-center f14"
+                             style="line-height: 34px;">{{userdata.page}}/{{userdata.totalPage}}页</div>
+                        <a ng-disabled="userdata.last"
+                           class="btn btn-default col-md-2 col-sm-3 col-xs-4"
+                           ng-click="last()">下一页</a>
                     </div>
-                </div>
-                <table class="block table table-default table-striped" ng-table="tableParams" >
-                    <thead>
-                    <tr class="header">
-                        <th width="160">编号</th>
-                        <th width="200">名称</th>
-                        <th>规格</th>
-                        <th width="80">单位</th>
-                        <th width="80">操作</th>
-                    </tr>
-                    </thead>
-                    <tbody ng-if="tableParams.total() == 0">
-                    <tr>
-                        <td colspan="5">
-                            <div id="empty">
-                                <div class="left_img">
-                                    <a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
-                                    <a href="#/index" title="B2B商务首页">B2B 商务</a>
-                                </div>
-                                <div class="right_link">
-                                    <p ng-if="tip != null">搜索"{{tip}}"未找到产品信息，请重新输入搜索条件</p>
-                                    <p ng-if="tip == null">您的客户还未添加商品信息，请尽快通知客户</p>
-                                </div>
-                            </div>
-                        </td>
-                    </tr>
-                    </tbody>
-                    <tbody>
-                    <tr ng-repeat="product in $data">
-                        <td class="text-center" ng-bind="::product.code"></td>
-                        <td class="text-center" ng-bind="::product.title"></td>
-                        <td class="text-center f12" ng-bind="::product.spec"></td>
-                        <td class="text-center" ng-bind="::product.unit"></td>
-                        <td class="text-center" ><a title="主动报价" href="javascript:void(0)" style="text-decoration: none; color: #3f84f6;" id="click" class="add01" ng-click="Quotation(customer.uu, product.id)">报价</a>
-                        </td>
-                    </tr>
-                    </tbody>
-                </table>
+                </dd>
+            </dl>
+        </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-class="{'open': $open}">
+        <div class="pro-search" >
+            <div class="search-result fl"><img src="static/img/purc/search01.png"/>搜索“{{tip}}”，为您找到<em>{{total}}</em>个结果</div>
+            <div class="search fr">
+                <input type="text" placeholder="输入供应商物料关键字查询" ng-model="keyword" autofocus ng-search="onSearch(keyword)"/>
+                <a class="seek" ng-click="onSearch(keyword)">搜索</a>
             </div>
         </div>
+        <table class="block table table-default table-striped" ng-table="tableParams" >
+            <thead>
+            <tr class="header">
+                <th width="160">编号</th>
+                <th width="200">名称</th>
+                <th>规格</th>
+                <th width="80">单位</th>
+                <th width="80">操作</th>
+            </tr>
+            </thead>
+            <tbody ng-if="tableParams.total() == 0">
+            <tr>
+                <td colspan="5">
+                    <div id="empty">
+                        <div class="left_img">
+                            <a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+                            <a href="#/index" title="B2B商务首页">B2B 商务</a>
+                        </div>
+                        <div class="right_link">
+                            <p ng-if="tip != null">搜索"{{tip}}"未找到产品信息，请重新输入搜索条件</p>
+                            <p ng-if="tip == null">您的客户还未添加商品信息，请尽快通知客户</p>
+                        </div>
+                    </div>
+                </td>
+            </tr>
+            </tbody>
+            <tbody>
+            <tr ng-repeat="product in $data">
+                <td class="text-center" ng-bind="::product.code"></td>
+                <td class="text-center" ng-bind="::product.title"></td>
+                <td class="text-center f12" ng-bind="::product.spec"></td>
+                <td class="text-center" ng-bind="::product.unit"></td>
+                <td class="text-center" ><a title="主动报价" href="javascript:void(0)" style="text-decoration: none; color: #3f84f6;" id="click" class="add01" ng-click="Quotation(customer.uu, product.id)">报价</a>
+                </td>
+            </tr>
+            </tbody>
+        </table>
     </div>
 </div>