平台UI更新，导航调整

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

src/main/webapp/resources/tpl/index/account/left.html

@@ -1,9 +1,3 @@
-<div class="left-nav left-home">
-	<div class="nav-home">
-		<a ui-sref="account.home" class="text-default"><span
-			class="glyphicon glyphicon-home icon-left"></span>账户</a>
-	</div>
-</div>
 <div class="left-nav">
 	<div class="nav-label">
 		<i></i>企业空间
@@ -33,21 +27,4 @@
 		<li><a >商机库</a></li>
 		<li><a >我的物流</a></li>
 	</ul>
-</div>
-<div class="left-nav">
-	<div class="nav-label">
-		<i></i>自定义菜单
-	</div>
-	<ul class="list-unstyled">
-		<li><a >添加自定义菜单<span class="pull-right"><i
-					class="fa fa-plus icon-right"></i></span></a></li>
-	</ul>
-</div>
-<div class="left-nav">
-	<ul class="list-unstyled">
-		<li><a ng-click="showModal()">问题反馈<span class="pull-right"><i
-					class="fa fa-bell-o icon-right"></i></span></a></li>
-		<li><a href="serve">客服中心<span class="pull-right"><i
-					class="fa fa-headphones icon-right"></i></span></a></li>
-	</ul>
 </div>

src/main/webapp/resources/tpl/index/approvalFlow/enterprise.html

@@ -0,0 +1,198 @@
+<div class="loading" ng-class="{'in': loading}">
+	<i></i>
+</div>
+<div class="pane base-info">
+	<div class="pane-header">
+		注册信息<!-- <a ng-disabled class="pull-right text-simple"><i
+			class="fa fa-pencil fa-fw"></i>编辑</a> -->
+	</div>
+	<div class="pane-body">
+		<div class="row row-sm item">
+			<div class="col-xs-6">
+				<span class="title">企业UU号</span>
+				<div class="content" ng-bind="::enterprise.uu"></div>
+			</div>
+		</div>
+		<div class="row row-sm item">
+			<div class="col-xs-6">
+				<span class="title">企业名称</span>
+				<div class="content" ng-bind="::enterprise.enName"></div>
+			</div>
+			<div class="col-xs-6">
+				<span class="title">企业简称</span>
+				<div class="content" ng-bind="::enterprise.enShortname"></div>
+			</div>
+		</div>
+		<div class="row row-sm item">
+			<div class="col-xs-6">
+				<span class="title">营业执照</span>
+				<div class="content" ng-bind="::enterprise.enBussinessCode"></div>
+			</div>
+			<div class="col-xs-6">
+				<span class="title">注册地区</span>
+				<div class="content" ng-bind="::enterprise.enArea"></div>
+			</div>
+		</div>
+	</div>
+</div>
+<div class="row row-sm">
+	<div class="col-xs-6">
+		<div class="pane base-info">
+			<div class="pane-header">
+				详细信息<a ng-show="!connectionEditing" ng-click="connectionEditing = true" class="pull-right text-simple"><i
+					class="fa fa-pencil fa-fw"></i>编辑</a>
+					<a ng-show="connectionEditing" ng-click="connectionEditing = false" class="pull-right text-simple"><i
+					class="fa fa-reply-all fa-fw"></i>取消</a>
+					<a ng-show="connectionEditing" ng-click="updateDetailInfo()" class="pull-right text-simple"><i
+					class="fa fa-save fa-fw"></i>保存</a>
+			</div>
+			<div class="pane-body">
+				<form name="detailForm">
+					<div class="row row-sm item">
+						<div class="col-xs-12">
+							<span class="title">企业官网</span> <a ng-show="!connectionEditing" class="content"
+								ng-bind="::enterprise.enUrl" href="http://{{::enterprise.enUrl}}"
+								target="_blank"></a>
+							<div class="content" ng-show="connectionEditing">
+								<div class="input-group input-group-xs" style="width: 240px;">
+							      	<span class="input-group-addon">http://</span>
+									<input required="required" ng-model="enterprise.enUrl" type="text" class="form-control input-xs" placeholder="企业官方网站网址">
+								</div>
+							</div>
+						</div>
+					</div>
+					<div class="row row-sm item">
+						<div class="col-xs-12">
+							<span class="title">企业传真</span> <div ng-show="!connectionEditing" class="content"
+								ng-bind="::enterprise.enFax"></div>
+							<div class="content" ng-show="connectionEditing">
+								<div class="input-group input-group-xs" style="width: 240px;">
+									<input required="required" ng-model="enterprise.enFax" type="text" class="form-control input-xs" placeholder="企业传真信息">
+								</div>
+							</div>
+						</div>
+					</div>
+					<div class="row row-sm item">
+						<div class="col-xs-12">
+							<span class="title"><i class="fa fa-fw fa-map-marker"></i>&nbsp;地&nbsp;址</span>
+							<div ng-show="!connectionEditing" class="content" ng-bind="::enterprise.enAddress"></div>
+							<div class="content" ng-show="connectionEditing" style="width: 240px;">
+								<input ng-model="enterprise.enAddress" placeholder="详细地址"
+									class="form-control input-xs" type="text" />
+							</div>
+						</div>
+					</div>
+					<div class="row row-sm item">
+						<div class="col-xs-12">
+							<span class="title"><i class="fa fa-fw fa-trophy"></i>&nbsp;行&nbsp;业</span>
+							<div ng-show="!connectionEditing" class="content">
+								{{enterprise.enIndustry=='make'?'制造型':'贸易型'}}
+							</div>
+							<div class="content" ng-show="connectionEditing">
+								<select ng-model="enterprise.enIndustry" placeholder="所属行业"
+									class="form-control input-xs" type="text" style="width: 240px;">
+									<option value="make">制造型</option>
+					      			<option value="trade">贸易型</option>
+					      		</select>
+							</div>
+						</div>
+					</div>
+				</form>
+			</div>
+		</div>
+	</div>
+	<div class="col-xs-6">
+		<div class="pane base-info">
+			<div class="pane-header">
+				企业管理员<!-- <a href="#" class="pull-right text-simple"><i
+					class="fa fa-pencil fa-fw"></i>编辑</a> -->
+			</div>
+			<div class="pane-body">
+				<div class="row row-sm item">
+					<div class="col-xs-12">
+						<span class="title">姓名</span>
+						<div class="content" ng-bind="::enterprise.admin.userName"></div>
+					</div>
+				</div>
+				<div class="row row-sm item">
+					<div class="col-xs-12">
+						<span class="title">性别</span>
+						<div class="content"
+							>{{enterprise.admin.userSex === 'F' ? '女' : '男'}}</div>
+					</div>
+				</div>
+				<div class="row row-sm item">
+					<div class="col-xs-12">
+						<span class="title">电话</span>
+						<div class="content" ng-bind="::enterprise.admin.userTel"></div>
+					</div>
+				</div>
+				<div class="row row-sm item">
+					<div class="col-xs-12">
+						<span class="title">邮箱</span>
+						<div class="content" ng-bind="::enterprise.admin.userEmail"></div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+<div class="pane base-info">
+	<div class="pane-header">
+		优企云服<!-- <a ng-disabled class="pull-right text-simple"><i
+			class="fa fa-pencil fa-fw"></i>编辑</a> -->
+	</div>
+	<div class="pane-body">
+		<div class="row row-sm item">
+			<div class="col-xs-6">
+				<span class="title">优企云服域名</span>
+				<div class="content">
+					<div ng-if="enterprise.enSaasUrl">
+						<a href="http://{{::enterprise.enSaasUrl}}.saas.ubtob.com">http://{{::enterprise.enSaasUrl}}.saas.ubtob.com</a>
+						<label> [{{::enterprise.enSaasStatus | status}}] </label>
+					</div>
+					<div ng-if="!enterprise.enSaasUrl"><a href="https://account.ubtob.com/userspace/applyApp?appId=saas">立即申请</a></div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+<div class="pane base-info">
+	<div class="pane-header">
+		成长历程
+		<div class="pull-right">
+			<!-- <a href="#" class="text-simple"><i class="fa fa-bolt fa-fw"></i>同行PK</a>
+			<a href="#" class="text-simple"><i class="fa fa-code-fork fa-fw"></i>企业诊断</a>
+			<a href="#" class="text-simple"><i class="fa fa-rss fa-fw"></i>寻找合伙人</a> -->
+		</div>
+	</div>
+	<div class="pane-body">
+		<dl class="events">
+			<dd ng-repeat="grow in growth">
+				<div ng-if="grow.year">
+					<div class="year">
+						<span ng-bind="::grow.year"></span><span class="character">年</span>
+					</div>
+					<div class="icon year-icon"></div>
+				</div>
+				<div ng-if="grow.title">
+					<div class="date" ng-bind="::grow.date"></div>
+					<div class="icon">
+						<i class="fa"
+							ng-class="{'fa-user':grow.type=='about-user','fa-shopping-cart':grow.type=='about-order','fa-line-chart':grow.type=='about-sale'}"></i>
+					</div>
+					<div class="event">
+						<div class="event_tit-wrapper">
+							<div class="event_tit" ng-bind-html="::grow.title"></div>
+						</div>
+						<div class="event_cnt" ng-if="grow.description">
+							<span ng-bind-html="::grow.description"></span> <a
+								href="#{{::grow.detail}}" target="_blank" class="pull-right"
+								ng-if="grow.detail">详细&gt;&gt;</a>
+						</div>
+					</div>
+				</div>
+			</dd>
+		</dl>
+	</div>
+</div>

src/main/webapp/resources/tpl/index/approvalFlow/left.html

@@ -5,15 +5,18 @@
 		企业设置
 	</div>
 	<ul class="list-unstyled">
-		<li ui-sref-active="active"><a ui-sref="baseInfo.enterpriseList">企业信息</a></li>
+		<li ui-sref-active="active"><a ui-sref="approvalflow.enterprise">企业信息</a></li>
 	</ul>
 	<ul class="list-unstyled">
-		<li ui-sref-active="active"><a ui-sref="baseInfo.enterpriseList">角色权限</a></li>
+		<li ui-sref-active="active"><a ui-sref="approvalflow.user">人员信息</a></li>
 	</ul>
 	<ul class="list-unstyled">
-		<li ui-sref-active="active"><a ui-sref="baseInfo.enterpriseList">审批流</a></li>
+		<li ui-sref-active="active"><a ui-sref="approvalflow.role">角色权限</a></li>
 	</ul>
 	<ul class="list-unstyled">
-		<li ui-sref-active="active"><a ui-sref="baseInfo.enterpriseList">操作日志</a></li>
+		<li ui-sref-active="active"><a ui-sref="approvalflow.flow">审批流</a></li>
+	</ul>
+	<ul class="list-unstyled">
+		<li ui-sref-active="active"><a ui-sref="approvalflow.log">操作日志</a></li>
 	</ul>
 </div>

src/main/webapp/resources/tpl/index/approvalFlow/log.html

@@ -0,0 +1,69 @@
+<div class="loading in" ng-class="{'in': loading}">
+	<i></i>
+</div>
+<div class="pane base-info" style="max-height: 500px;overflow: auto;">
+	<div class="pane-header">
+		数据传输日志
+		<div class="pull-right">
+			<a href="log/erp/xls" target="_self" class="text-simple"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+		</div>
+	</div>
+	<div class="pane-body">
+		<table class="block table table-default table-striped"
+			ng-table="erpParams">
+			<thead>
+				<tr class="header">
+					<th width="130">时间</th>
+					<th width="130">客户端IP</th>
+					<th width="80">操作人员</th>
+					<th width="120">请求资源</th>
+					<th>请求动作</th>
+					<th width="60">数据包</th>
+				</tr>
+			</thead>
+			<tbody>
+				<tr ng-repeat="erp in $data">
+					<td class="text-center" ng-bind="::erp.time | date:'MM-dd HH:mm:ss'"></td>
+					<td class="text-center" ng-bind="::erp.ip"></td>
+					<td class="text-center" ng-bind="::erp.user.userName"></td>
+					<td class="text-center" ng-bind="::erp.title"></td>
+					<td ng-bind="::erp.message"></td>
+					<td class="text-center" ng-bind="::erp.total"></td>
+				</tr>
+			</tbody>
+		</table>
+	</div>
+</div>
+<div class="pane base-info" style="max-height: 500px;overflow: auto;">
+	<div class="pane-header">
+		平台使用日志
+		<div class="pull-right">
+			<a href="log/usage/xls" target="_self" class="text-simple"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+		</div>
+	</div>
+	<div class="pane-body">
+		<table class="block table table-default table-striped"
+			ng-table="usageParams">
+			<thead>
+				<tr class="header">
+					<th width="130">时间</th>
+					<th width="130">客户端IP</th>
+					<th width="80">操作人员</th>
+					<th width="120">请求资源</th>
+					<th>请求动作</th>
+					<th>备注</th>
+				</tr>
+			</thead>
+			<tbody>
+				<tr ng-repeat="usage in $data">
+					<td class="text-center" ng-bind="::usage.time | date:'MM-dd HH:mm:ss'"></td>
+					<td class="text-center" ng-bind="::usage.ip"></td>
+					<td class="text-center" ng-bind="::usage.user.userName"></td>
+					<td class="text-center" ng-bind="::usage.title"></td>
+					<td ng-bind="::usage.message"></td>
+					<td ng-bind="::usage.detail"></td>
+				</tr>
+			</tbody>
+		</table>
+	</div>
+</div>

src/main/webapp/resources/tpl/index/approvalFlow/resource.html

@@ -0,0 +1,18 @@
+<div class="block resource-container">
+	<div ng-repeat="resource in resources track by resource.id" class="resource-item" ng-class="{'active': resource.$open}">
+		<div class="headerline">
+			<div class="index f14" ng-bind="$index+1"></div>
+			<div class="content f14" ng-bind="::resource.name"></div>
+			<div class="center text-default f12" ng-bind="::resource.desc"></div>
+			<div class="end">
+				<a class="btn btn-default btn-sm text-simple" ng-click="resource.$open=!resource.$open">{{resource.$open ? '收拢' : '展开'}}</a>
+			</div>
+		</div>
+		<ul class="list-unstyled list-inline simple-list">
+			<li ng-repeat="item in resource.items track by item.id">
+				<div class="title" ng-bind="::item.name"></div>
+				<div class="content" ng-bind="::item.desc"></div>
+			</li>
+		</ul>
+	</div>
+</div>

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

@@ -0,0 +1 @@
+<div ui-view class="account-view view-slide-in"></div>

src/main/webapp/resources/tpl/index/approvalFlow/role.html

@@ -0,0 +1,38 @@
+<div class="block role-container">
+	<h1 class="page-header">默认角色</h1>
+	<div class="role-list">
+		<div class="item" ng-repeat="role in roles.defaults track by role.id">
+			<a class="icon" ng-click="editRole(role)">
+				<i class="fa fa-user"
+					ng-class="{'fa-user-md': role.name=='ROLE_ADMIN','fa-male': role.name=='ROLE_SALE','fa-street-view': role.name=='ROLE_USER'}"></i>
+			</a>
+			<div class="desc">
+				<h3><a ng-click="editRole(role)" ng-bind="role.desc" class="none"></a></h3>
+				<div class="text-muted" ng-bind="role.duty"></div>
+			</div>
+		</div>
+	</div>
+	<h1 class="page-header">自定义角色</h1>
+	<div class="role-list">
+		<div class="item" ng-repeat="role in roles.custom track by role.id">
+			<a class="icon" ng-click="editRole(role)">
+				<i class="fa fa-user"></i>
+			</a>
+			<div class="desc">
+				<h3><a ng-click="editRole(role)" ng-bind="role.desc" class="none"></a></h3>
+				<div class="text-muted" ng-bind="role.duty"></div>
+			</div>
+		</div>
+		<div class="item">
+			<a class="icon" ng-click="editRole()"> <i
+				class="fa fa-plus text-warning"></i>
+			</a>
+			<div class="desc">
+				<h3><a ng-click="editRole()" class="none">自定义角色</a></h3>
+				<div class="text-muted">
+					某个角色的职责和默认角色差异较大时，可以<a ng-click="editRole()">自定义角色</a>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>

src/main/webapp/resources/tpl/index/approvalFlow/role_detail.html

@@ -0,0 +1,71 @@
+<div class="modal-header">
+	<h3 class="modal-title">
+		<i class="fa fa-user fa-fw text-default"></i><span
+			ng-bind="role.id?'编辑角色':'添加自定义角色'"></span>
+	</h3>
+</div>
+<form name="roleForm" novalidate ng-submit="save()">
+	<div class="modal-body">
+		<div class="form-group">
+			<label>角色名称</label> <input type="text" name="desc"
+				ng-model="role.desc" class="form-control" placeholder="输入3-8个中文字描述"
+				required autofocus ng-readonly="role.isdefault">
+			<div class="tooltip in left control-tooltip"
+				ng-show="roleForm.desc.$dirty && roleForm.desc.$invalid">
+				<div class="tooltip-arrow"></div>
+				<span class="tooltip-inner">请输入3-8个中文字描述一下自定义角色</span>
+			</div>
+		</div>
+		<div class="form-group">
+			<label>职责范围</label>
+			<textarea class="form-control" name="duty" ng-model="role.duty"
+				placeholder="角色的具体职责(50个中文字以内)" required
+				ng-readonly="role.isdefault"></textarea>
+			<div class="tooltip in left control-tooltip"
+				ng-show="roleForm.duty.$dirty && roleForm.duty.$invalid">
+				<div class="tooltip-arrow"></div>
+				<span class="tooltip-inner">请描述一下角色的具体职责，内容保持在50个中文字以内</span>
+			</div>
+		</div>
+		<div class="form-group role-resources" ng-if="role.issys != 1">
+			<label>权限分配</label>
+			<p class="help-block">
+				给角色分配允许操作的资源<span class="pull-right"><input type="checkbox"
+					checked="checked" disabled>勾选表示允许操作</span>
+			</p>
+			<div>
+				<div class="choose-inline">
+					<div class="item">
+						<ul class="list-unstyled">
+							<li ng-repeat="resource in resources"
+								ng-class="{active: resource.$active}"
+								ng-click="onItemClick(resource)"><input id="check_{{resource.id}}" type="checkbox"
+								ng-model="resource.$checked"
+								ng-change="onResourceChange(resource)"/><a>{{::resource.name}}<span
+									class="caret"></span></a></li>
+						</ul>
+					</div>
+					<div class="item">
+						<ul class="list-unstyled">
+							<li ng-repeat="item in resourceItems"><input type="checkbox"
+								ng-model="item.$checked" ng-change="onItemChange()" />{{::item.name}}</li>
+						</ul>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+	<div class="modal-footer" ng-if="role.issys != 1">
+		<p class="pull-left text-muted" ng-show="role.isdefault == 1">
+			<i class="fa fa-fw fa-warning"></i>默认角色不允许删除，只能修改权限分配
+		</p>
+		<button class="btn btn-primary" type="submit"
+			ng-disabled="roleForm.$invalid || !isChanged(role)">确认并保存</button>
+		<button class="btn btn-default" type="button"
+			ng-show="role.id && role.isdefault == 0" ng-click="del()">删除角色</button>
+		<button class="btn btn-default" ng-click="cancel()" type="button">取消</button>
+	</div>
+	<div class="modal-footer" ng-if="role.issys == 1">
+		<button class="btn btn-default" ng-click="cancel()" type="button">关闭</button>
+	</div>
+</form>

src/main/webapp/resources/tpl/index/approvalFlow/user.html

@@ -0,0 +1,340 @@
+<style>
+.base-info .title {
+	width: 56px;
+	line-height: 30px;
+}
+
+.base-info .content {
+	line-height: 30px;
+}
+
+.radio input[type="radio"],.radio-inline input[type="radio"],.checkbox input[type="checkbox"],.checkbox-inline input[type="checkbox"]
+	{
+	margin-top: 10px;
+}
+
+.password label {
+	
+}
+
+.password .col {
+	line-height: 30px;
+}
+
+.password .line {
+	margin-bottom: 15px;
+}
+
+.row-operator2 {
+	position: relative;
+}
+
+.row-operator2>.operator-menu2 {
+	position: absolute;
+	width: 140px;
+	height: 60;
+	line-height: 30px;
+	padding: 0 10px;
+	top: 30;
+	background-color: #333;
+	border-radius: 0 3px 3px 0;
+	opacity: 0;
+}
+
+.row-operator2>.operator-menu2 a {
+	color: #fff;
+}
+
+.row-operator2>.operator-menu2 a:hover {
+	color: #56a022;
+}
+
+.row-operator2:hover>.operator-menu2 {
+	z-index:100;
+	height: 60px;
+	opacity: .75;
+	-webkit-transition: all 0s ease-in-out;
+	-moz-transition: all 0s ease-in-out;
+	transition: all 0s ease-in-out;
+}
+
+.row-operator2>.operator-menu3 {
+	position: absolute;
+	width: 125px;
+	height: 60;
+	line-height: 30px;
+	padding: 0 10px;
+	top: 30;
+	background-color: #333;
+	border-radius: 0 3px 3px 0;
+	opacity: 0;
+}
+
+.row-operator2>.operator-menu3 a {
+	color: #fff;
+}
+
+.row-operator2>.operator-menu3 a:hover {
+	color: #56a022;
+}
+
+.row-operator2:hover>.operator-menu3 {
+	z-index:100;
+	height: 40px;
+	opacity: .75;
+	-webkit-transition: all 0s ease-in-out;
+	-moz-transition: all 0s ease-in-out;
+	transition: all 0s ease-in-out;
+}
+</style>
+<div class="loading in" ng-class="{'in': loading}">
+	<i></i>
+</div>
+<div class="pane base-info">
+	<div class="pane-header">
+		我的个人资料
+		<div class="pull-right">
+			<a ng-disabled="userForm.$invalid" class="text-simple text-success"
+				ng-show="editing" ng-click="saveUser()"><i
+				class="fa fa-save fa-fw"></i>保存修改</a> <a class="text-simple"
+				ng-show="editing" ng-click="editing=false"><i
+				class="fa fa-reply-all fa-fw"></i>取消编辑</a> <a class="text-simple"
+				ng-show="!editing" ng-click="editing=true"><i
+				class="fa fa-pencil fa-fw"></i>编辑</a> <a class="text-simple text-danger"
+				ng-click="updatePassword()"><i class="fa fa-lock fa-fw"></i>修改密码</a>
+		</div>
+	</div>
+	<div class="pane-body">
+		<form ng="userForm" class="form-inline">
+			<div class="row row-sm item">
+				<div class="col-xs-3">
+					<span class="title">姓名</span>
+					<div class="content" ng-show="!editing" ng-bind="user.userName"></div>
+					<div class="content" ng-show="editing">
+						<input reqired ng-model="user.userName"
+							class="form-control input-sm" type="text" />
+					</div>
+				</div>
+				<div class="col-xs-3">
+					<span class="title">性别</span>
+					<div class="content" ng-show="!editing"
+						ng-bind="user.userSex == 'F' ? '女' : '男'"></div>
+					<div class="content" ng-show="editing">
+						<label class="radio-inline"><input ng-model="user.userSex"
+							value="F" type="radio" /> 女 </label> <label class="radio-inline"><input
+							ng-model="user.userSex" value="M" type="radio" /> 男 </label>
+					</div>
+				</div>
+				<div class="col-xs-6">
+					<span class="title">身份证号</span>
+					<div class="content" ng-show="!editing" ng-bind="user.userIdcode"></div>
+					<div class="content" ng-show="editing">
+						<input ng-model="user.userIdcode" class="form-control input-sm"
+							type="text" />
+					</div>
+				</div>
+			</div>
+			<div class="row row-sm item">
+				<div class="col-xs-3">
+					<span class="title">UU</span>
+					<div class="content" ng-bind="::user.userUU"></div>
+				</div>
+				<div class="col-xs-3">
+					<span class="title">电话</span>
+					<div class="content" ng-show="!editing" ng-bind="user.userTel"></div>
+					<div class="content" ng-show="editing">
+						<input reqired ng-model="user.userTel"
+							class="form-control input-sm" type="text" />
+					</div>
+				</div>
+				<div class="col-xs-6">
+					<span class="title">邮箱</span>
+					<div class="content" ng-show="!editing" ng-bind="user.userEmail"></div>
+					<div class="content" ng-show="editing">
+						<input reqired ng-model="user.userEmail"
+							class="form-control input-sm" type="text" />
+					</div>
+				</div>
+			</div>
+		</form>
+	</div>
+</div>
+<div class="pane base-info">
+	<div class="pane-header">
+		我的客户
+		<div class="pull-right">
+			共&nbsp;{{distributes.length}}&nbsp;客户
+		</div>
+	</div>
+	<div class="pane-body">
+		<table class="block table table-default table-striped">
+			<tr class="header">
+				<th width="90">UU</th>
+				<th width="120">企业名称</th>
+				<th width="80">简称</th>
+			</tr>
+			<tr ng-repeat="distribute in distributes">
+				<td ng-bind="distribute.myEnterprise.uu" class="text-center"></td>
+				<td ng-bind="distribute.myEnterprise.enName" class="text-center"></td>
+				<td ng-bind="distribute.myEnterprise.enShortname" class="text-center"></td>
+			</tr>
+		</table>
+	</div>
+</div>
+
+<script type="text/ng-template" id="updatePassword.html">
+        <div class="modal-header">
+            <h3 class="modal-title"><i class="fa fa-lock fa-fw"></i>修改密码</h3>
+        </div>
+		<form class="password" name="sampleSendForm" ng-submit="ok()">
+        	<div class="modal-body">
+				<div class="row">
+					<label class="col-md-4 col-sm-4 col text-right">用户：</label>
+					<div class="col-md-4 col-sm-4 col">{{::user.userUU}} - {{::user.userName}} </div>
+				</div>
+				<div class="row line form-group" ng-class="{'has-success': checkSuccess, 'has-error': checkFailed}">
+					<label class="col-md-4 col-sm-4 col text-right">原密码：</label>
+					<div class="col-md-4 col-sm-4 col"><input ng-model="user.password" class="form-control input-sm" type="password" ng-blur="checkPassword(user.password)" required placeholder="当前密码"></div>
+					<div class="col-md-4 col-sm-4 col">
+						<span ng-show="checking">验证密码...</span>
+						<i ng-show="checkSuccess" class="fa fa-check" style="color:#339933"></i>
+						<i ng-show="checkFailed" class="fa fa-close" style="color:#CC3333;"></i>
+					</div>
+				</div>
+				<div class="row">
+					<label class="col-md-4 col-sm-4 col text-right">新密码：</label>
+					<div class="col-md-4 col-sm-4 col">
+						<input ng-model="user.newPassword" ng-pattern="/^([\w~!@#$%^&\*\(\)-_\+=,.;\[\]{}\<\>]){6,20}$/" class="form-control input-sm" type="password" required  placeholder="6~20位字母、数字、符号">
+						<!-- <div>密码复杂度</div> -->
+					</div>
+					<div class="col-md-4 col-sm-4 col">
+						
+					</div>
+				</div>
+				<div class="row line form-group" ng-class="{'has-success': user.newPassword1 && (user.newPassword1==user.newPassword)}">
+					<label ng-model="user.newPassword1" class="col-md-4 col-sm-4 col text-right">重复新密码：</label>
+					<div class="col-md-4 col-sm-4 col">
+						<input ng-pattern="/^[\S]{6,}$/" ng-model="user.newPassword1" class="form-control input-sm" type="password" required placeholder="重复新密码">
+					</div>
+				</div>
+        	</div>
+        	<div class="modal-footer">
+            	<button class="btn btn-primary" ng-disabled="!checkSuccess" type="submit">确认修改</button>
+            	<button class="btn btn-warning" ng-click="cancel()" type="button">取消</button>
+        	</div>
+		</form>
+    </script>
+<div class="pane base-info">
+	<div class="pane-header">
+		全部用户
+		<div class="pull-right" ng-show="user.sys">
+			<a title="新增用户默认密码为111111" ng-show="adding == true" class="btn btn-success btn-sm" ng-disabled="newUserForm.$invalid" ng-click="addUser(newUser)" class="text-simple">
+			 	<i class="fa fa-user-plus fa-fw"></i>
+			 	确定添加
+			</a> 
+			<a ng-click="adding = false" ng-show="adding == true" class="text-simple">
+				<i class="fa fa-user-plus fa-fw"></i>
+				取消
+			</a>
+			
+			<!-- 添加用户 start -->
+			<div class="row-operator2">
+				<a ng-show="adding != true" class="text-simple operator-trigger" href="javascript:void(0);">
+					<i class="fa fa-user-plus fa-fw"></i>
+					添加用户
+				</a>
+				<ul ng-show="adding != true" class="list-unstyle list-inline operator-menu2">
+					<li><a ng-click="adding = true">添加未注册用户</a></li>
+					<li><a ng-click="addExistUser()">添加已注册用户</a></li>
+				</ul>
+			</div>
+			<!-- 添加用户 end -->
+			
+		</div>
+	</div>
+	<div class="pane-body">
+		<form name="newUserForm">
+			<table class="block table table-default table-striped"
+				ng-table="tableParams">
+				<thead>
+					<tr class="header">
+						<th width="90">UU</th>
+						<th width="120">姓名</th>
+						<th width="80">性别</th>
+						<th width="170">身份证号</th>
+						<th width="170">电话</th>
+						<th width="200">邮箱</th>
+						<th width="70">客户分配</th>
+						<th colspan="2">角色</th>
+					</tr>
+				</thead>
+				<tbody>
+					<tr ng-show="adding">
+						<td class="text-center">
+							<div style="line-height: 30px;">系统生成</div>
+						</td>
+						<td class="text-center"><input ng-model="newUser.userName"
+							class="form-control input-sm" required type="text"
+							placeholder="用户名"></td>
+						<td class="text-center"><select ng-model="newUser.userSex"
+							class="form-control input-sm" ng-init="newUser.userSex='M'">
+								<option value="F">女</option>
+								<option value="M">男</option>
+						</select></td>
+						<td class="text-center"><input ng-model="newUser.userIdcode"
+							class="form-control input-sm" type="text" placeholder="身份证号">
+						</td>
+						<td class="text-center"
+							ng-class="{'has-error': userTelError, 'has-success': userTelSuccess}">
+							<input ng-model="newUser.userTel"
+							ng-blur="telValid(newUser.userTel)" required name="newUserTel"
+							class="form-control input-sm" ng-pattern="/^1[3|4|5|7|8]\d{9}$/" type="text" placeholder="手机号">
+						</td>
+						<td class="text-center"
+							ng-class="{'has-error': userEmailError, 'has-success': userEmailSuccess}">
+							<input ng-model="newUser.userEmail" ng-pattern="/^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/"
+							ng-blur="emailValid(newUser.userEmail)" required
+							name="newUserEmail" class="form-control input-sm" type="text"
+							placeholder="邮箱">
+						</td>
+						<td colspan="2"></td>
+					</tr>
+				</tbody>
+				<tbody>
+					<tr ng-repeat="u in $data">
+						<td class="text-center" ng-bind="::u.userUU"></td>
+						<td class="text-center" ng-bind="::u.userName"></td>
+						<td class="text-center" ng-bind="::u.userSex == 'F' ? '女' : '男'"></td>
+						<td class="text-center" ng-bind="::u.userIdcode"></td>
+						<td class="text-center" ng-bind="::u.userTel"></td>
+						<td class="text-center" ng-bind="::u.userEmail"></td>
+						<td class="text-center row-operator2">
+							<a class="operator-trigger" href="javascript:void(0);" ng-click="addVendor(u,user.sys)" style="color: green;"><i class="fa fa-plus-circle fa-lg"></i></a>
+						<!--  	<ul class="list-unstyle list-inline operator-menu3" ng-show="user.sys">
+								<li><a ng-click="addVendor(u,true)"><i class="fa fa-fw fa-pencil-square-o"></i>添加</a></li>
+								<li><a ng-click="removeVendor(u)" ng-if="u.userUU != user.userUU"><i class="fa fa-fw fa-trash-o"></i>删除</a></li>
+							</ul>-->
+						</td>
+						<td class="user-role">
+							<div class="role-item" ng-repeat="role in u.roles"
+								title="{{role.desc}}">
+								<span class="icon"
+									ng-class="{'info':role.issys == 1,'danger':role.isdefault == 0}"
+									ng-bind="::role.desc | firstchar"></span>
+							</div>
+						</td>
+						<!-- 系统管理员无法被编辑限制，因为用户反馈注册用户都是业务员，需要权限来保护隐私，所以拿掉这个限制 -->
+						<!-- ng-show="user.sys && enterprise.enAdminuu != u.userUU" -->
+						<td class="row-operator">
+							<a class="operator-trigger" href="javascript:void(0);"><i class="fa fa-pencil fa-lg"></i></a>
+							<ul class="list-unstyle list-inline operator-menu">
+								<li><a ng-click="editUserRole(u)"><i class="fa fa-fw fa-pencil-square-o"></i>编辑</a></li>
+								<li><a ng-click="removeUser(u)" ng-if="u.userUU != user.userUU"><i class="fa fa-fw fa-trash-o"></i>删除</a></li>
+							</ul>
+						</td>
+					</tr>
+				</tbody>
+			</table>
+		</form>
+	</div>
+</div>

src/main/webapp/resources/tpl/index/approvalFlow/user_role.html

@@ -0,0 +1,25 @@
+<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="userrole-list">
+		<div class="item" ng-repeat="role in roles track by role.id" ng-click="select(role)" ng-class="{'checked': role.$checked}">
+			<div class="icon"> <i class="fa fa-user"
+				ng-class="{'fa-user-md': role.name=='ROLE_ADMIN','fa-male': role.name=='ROLE_SALE','fa-street-view': role.name=='ROLE_USER'}"></i>
+				<h5 ng-bind="role.desc"></h5>
+			</div>
+			<div class="desc">
+				<div class="text-muted" ng-bind="role.duty"></div>
+			</div>
+			<div class="checker"></div>
+		</div>
+	</div>
+</div>
+<div class="modal-footer">
+	<span class="pull-left text-muted"><i
+		class="fa fa-fw fa-warning"></i>点击角色选中或取消</span>
+	<button class="btn btn-primary" ng-disabled="!isChanged()" ng-click="close(true)">确认并保存</button>
+	<button class="btn btn-default" ng-click="close(false)" type="button">取消</button>
+</div>

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

@@ -4,11 +4,11 @@
 			<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.enterpriseList"
-						ng-class="{'btn-info':status=='enList'}" >企业列表（<em>5</em>）</a>
+						ng-class="{'btn-info':status=='enList'}" >企业列表</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=='send'}" >合作伙伴（<em>5</em>）</a>
+						ng-class="{'btn-info':status=='send'}" >合作伙伴<!-- （<em>5</em>） --></a>
 				</div>
 				<!-- <div class="btn-group btn-group-sm">
 					<a type="button" class="btn btn-default btn-line" ui-sref="baseInfo.myPartners"

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

@@ -238,7 +238,7 @@
 	font-size: 16px;
 	}
 </style>
-<div class="block">
+<div class="block" style="margin-left: -240px; width: 1100px;">
 <div class="loading in" ng-class="{'in': loading}">
 	<i></i>
 </div>
@@ -246,8 +246,8 @@
 <div class="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> 搜索"优软",为您找到结果:</span>
-				企业10家；器件10个
+				<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="search">
@@ -255,7 +255,7 @@
 						<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入企业名称、简称、管理员姓名进行搜索" />
 						<div id="searchContainer" class="dropdown-menu">
 						</div>
-						<a class="form-control-feedback text-simple">搜索</a>
+						<a class="btn input-group-addon" ng-click="onSearch()">搜索</a>
 					</div>
 				</div>
 			</div>
@@ -270,13 +270,14 @@
 	<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="::enterprise.name" class="text-center"></span>（<span ng-bind="::enterprise.shortName"></span>）<img src="resources/img/logo/youruanrenzheng.png" id="logo" ng-if="enterprise.status == 313"></td>
-			<td width="200" class="grey01">当前企业不是优软云用户</td>
+			<td width="200" class="grey01" ng-if="enterprise.status != 313">当前企业不是优软云用户</td>
+			<td width="200" class="grey01" ng-if="enterprise.status == 313">优软云用户</td>
 		</tr>
 		<tr class="enterprise-bd" ng-if="!enterprise.$collapsed ">
 			<td class="product" colspan="4">
 				<div class="">营业执照：<span ng-bind="::enterprise.businessCode" ></span></div>
 				<div class="">企业类型：<span class="text-muted" ng-bind="::enterprise.industry"></span></div>
-				<div class="">企业地址：<span class="text-muted" ng-bind="::enterprise.industry"></span></div>
+				<div class="">企业地址：<span class="text-muted" ng-bind="::enterprise.address"></span></div>
 				<div class="">
 					管理员：<span ng-bind="::enterprise.adminName"></span>
 					电话：<span ng-bind="::enterprise.adminTel"></span>

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

@@ -1,9 +1,3 @@
-<div class="left-nav left-home">
-	<div class="nav-home">
-		<a ui-sref="sale" class="text-default"><span
-			class="glyphicon glyphicon-home icon-left"></span>基础资料</a>
-	</div>
-</div>
 <div class="left-nav">
 	<div class="nav-label">
 		<i></i>企业列表
@@ -25,10 +19,4 @@
 		<li ui-sref-active="active"><a ui-sref="baseInfo.prodList">物料列表</a></li>
 		<li ui-sref-active="active"><a ui-sref="baseInfo.uploadByBatch">批量导入</a></li>
 	</ul>
-</div>
-<div class="left-nav">
-	<ul class="list-unstyled">
-		<li><a ng-click="showModal()">问题反馈<span class="pull-right"><i class="fa fa-bell-o icon-right"></i></span></a></li>
-		<li><a href="serve">客服中心<span class="pull-right"><i class="fa fa-headphones icon-right"></i></span></a></li>
-	</ul>
 </div>

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

@@ -250,30 +250,30 @@
 	padding-bottom: 10px;
 }
 </style>
-<div class="block">
+<div class="block" style="margin-left: -240px; width: 1100px;">
 <div class="loading in" ng-class="{'in': loading}">
 	<i></i>
 </div>
 <div ng-include src="'static/tpl/index/baseInfo/enMenu.html'"></div>
-<div class="group-container condition block">
+<div class="group-container condition block" >
 		<div class="row">
 			<div class="col-xs-4">
 				<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"
-							ng-class="{'btn-info':active=='all'}" ng-click="setActive('all')">全部（<em>10</em>）</button>
+							ng-class="{'btn-info':active=='all'}" ng-click="setActive('all')">全部</button>
 					</div>
 					<div class="btn-group btn-group-sm">
 						<button type="button" class="btn btn-default btn-line"
-							ng-class="{'btn-info':active=='todo'}" ng-click="setActive('todo')">待处理（<em>2</em>）</button>
+							ng-class="{'btn-info':active=='todo'}" ng-click="setActive('todo')">待处理</button>
 					</div>
 					<div class="btn-group btn-group-sm">
 						<button type="button" class="btn btn-default btn-line"
-							ng-class="{'btn-info':active=='done'}" ng-click="setActive('done')">已通过（<em>1</em>）</button>
+							ng-class="{'btn-info':active=='done'}" ng-click="setActive('done')">已通过</button>
 					</div>
 					<div class="btn-group btn-group-sm">
 						<button type="button" class="btn btn-default btn-line"
-							ng-class="{'btn-info':active=='end'}" ng-click="setActive('end')">未通过（<em>7</em>)</button>
+							ng-class="{'btn-info':active=='end'}" ng-click="setActive('end')">未通过</button>
 					</div>
 				</div>
 			</div>
@@ -282,14 +282,14 @@
 <div class="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> 搜索"优软",为您找到结果:</span>
-				企业10家；器件10个
+				<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="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="输入企业名称、简称或申请人搜索" />
-						<span class="form-control-feedback text-simple">搜索</span>
+						<a class="btn input-group-addon" ng-click="onSearch()">搜索</a>
 					</div>
 				</div>
 			</div>

src/main/webapp/resources/tpl/index/fa/left.html

@@ -1,9 +1,3 @@
-<div class="left-nav left-home">
-	<div class="nav-home">
-		<a ui-sref="sale" class="text-default"><span
-			class="glyphicon glyphicon-home icon-left"></span>对账</a>
-	</div>
-</div>
 <div class="left-nav">
 	<div class="nav-label">
 		<i></i>应收财务
@@ -20,30 +14,4 @@
 	<ul class="list-unstyled">
 		<li ui-sref-active="active"><a ui-sref="fa.arCheck">应付对账单</a></li>
 	</ul>
-</div>
-<div class="left-nav">
-	<div class="nav-label">
-		<i></i>增值服务
-	</div>
-	<ul class="list-unstyled">
-		<li><a href="{{userInfo.enterprise.enSaasUrl? 'http://' + userInfo.enterprise.enSaasUrl + '.saas.ubtob.com':'#/account/enterprise'}}">优企云服</a></li>
-		<li><a>优软商城</a></li>
-		<li><a>商机库</a></li>
-		<li><a>我的物流</a></li>
-	</ul>
-</div>
-<div class="left-nav">
-	<div class="nav-label">
-		<i></i>自定义菜单
-	</div>
-	<ul class="list-unstyled">
-		<li ng-class="{'active': active=='apbill'}"><a ui-sref="fa.apbill">客户应付发票</a></li>
-		<li><a>添加自定义菜单<span class="pull-right"><i class="fa fa-plus icon-right"></i></span></a></li>
-	</ul>
-</div>
-<div class="left-nav">
-	<ul class="list-unstyled">
-		<li><a href="serve">问题反馈<span class="pull-right"><i class="fa fa-bell-o icon-right"></i></span></a></li>
-		<li><a href="serve">客服中心<span class="pull-right"><i class="fa fa-headphones icon-right"></i></span></a></li>
-	</ul>
 </div>

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

@@ -20,7 +20,7 @@
 		<div class="border01 todo-content" ng-controller="TodoCtrl">
 			<div class="todo-content" id="saleTodo">
 				<div class="col-xs-2">
-					<li class="icon"><img  src="resources/img/home/sale.png" >销售</li>
+					<li class="icon"><img  src="resources/img/home/sale.png" ui-sref="sale.home"><a ui-sref="sale.home">销售</a></li>
 				</div>
 				<div class="col-xs-10">
 					<ul class="list-unstyled list-inline" >
@@ -75,7 +75,7 @@
 			</div>
 			<div class="todo-content" id="purcTodo">
 				<div class="col-xs-2">
-					<li class="icon"><img  src="resources/img/home/purc.png" >采购</li>
+					<li class="icon"><img  src="resources/img/home/purc.png" ui-sref="purc.home"><a ui-sref="purc.home">采购</a></li>
 				</div>
 				<div class="col-xs-10">
 					<ul class="list-unstyled list-inline">
@@ -107,7 +107,7 @@
 			</div>
 			<div class="todo-content" id="financeTodo">
 				<div class="col-xs-2">
-					<li class="icon"><img  src="resources/img/home/finance.png" >财务</li>
+					<li class="icon"><img  src="resources/img/home/finance.png" ui-sref="fa.home"><a ui-sref="fa.home">财务</a></li>
 				</div>
 				<div class="col-xs-10">
 					<ul class="list-unstyled list-inline">

src/main/webapp/resources/tpl/index/make/left.html

@@ -1,9 +1,3 @@
-<div class="left-nav left-home">
-	<div class="nav-home">
-		<a ui-sref="sale.home" class="text-default"><span
-			class="glyphicon glyphicon-home icon-left"></span>委外</a>
-	</div>
-</div>
 <div class="left-nav">
 	<div class="nav-label">
 		<i></i>委外管理
@@ -41,10 +35,4 @@
 	<ul class="list-unstyled">
 		<li><a>添加自定义菜单<span class="pull-right"><i class="fa fa-plus icon-right"></i></span></a></li>
 	</ul>
-</div>
-<div class="left-nav">
-	<ul class="list-unstyled">
-		<li><a href="serve">问题反馈<span class="pull-right"><i class="fa fa-bell-o icon-right"></i></span></a></li>
-		<li><a href="serve">客服中心<span class="pull-right"><i class="fa fa-headphones icon-right"></i></span></a></li>
-	</ul>
 </div>

src/main/webapp/resources/tpl/index/purc/addOrder.html

@@ -11,7 +11,7 @@
 <body>
 <div class="wrap">
 	<div class="content">
-		<div class="com_title">服务>采购模块>采购单<font>>采购单</font></div>
+		<div class="com_title">服务>采购模块>采购单<font>>新增采购单</font></div>
 		<div class="com_head"><span>新增采购单</span></div>
 		<!--B2B商务采购变更-添加-->
         <form class="oder-change clearfix" name="orderForm" id="orderForm">

src/main/webapp/resources/tpl/index/purc/left.html

@@ -1,21 +1,10 @@
-<div class="left-nav left-home">
-	<div class="nav-home">
-		<a ui-sref="sale.home" class="text-default"><span
-			class="glyphicon glyphicon-home icon-left"></span>采购</a>
-	</div>
-</div>
 <div class="left-nav">
 	<div class="nav-label">
-		<i></i>使用管理
+		<i></i>采购管理
 	</div>
 	<ul class="list-unstyled">
-		<li ui-sref-active="active"><a ui-sref="purc.introduce">使用说明</a></li>
+		<li ui-sref-active="active"><a ui-sref="purc.vendor">供应商资料</a></li>
 	</ul>
-</div>
-<div class="left-nav">
-	<div class="nav-label">
-		<i></i>采购管理
-	</div>
 	<ul class="list-unstyled">
 		<li ui-sref-active="active"><a ui-sref="purc.order">采购订单</a></li>
 	</ul>
@@ -34,9 +23,3 @@
 	</ul>
 
 </div>
-<div class="left-nav">
-	<ul class="list-unstyled">
-		<li><a ng-click="showModal()">问题反馈<span class="pull-right"><i class="fa fa-bell-o icon-right"></i></span></a></li>
-		<li><a href="serve">客服中心<span class="pull-right"><i class="fa fa-headphones icon-right"></i></span></a></li>
-	</ul>
-</div>

src/main/webapp/resources/tpl/index/sale/left.html

@@ -1,15 +1,12 @@
-<div class="left-nav left-home">
-	<div class="nav-home">
-		<a ui-sref="sale.home" class="text-default"><span
-			class="glyphicon glyphicon-home icon-left"></span>销售</a>
-	</div>
-</div>
 <div class="left-nav">
 	<div class="nav-label">
-		<i></i>客户管理
+		<i></i>基础资料
 	</div>
 	<ul class="list-unstyled">
-		<li ui-sref-active="active"><a ui-sref="sale.customer">客户资料管理</a></li>
+		<li ui-sref-active="active"><a ui-sref="sale.customer">客户资料</a></li>
+	</ul>
+	<ul class="list-unstyled">
+		<li ui-sref-active="active"><a ui-sref="sale.prodList">产品资料</a></li>
 	</ul>
 </div>
 <!-- <div class="left-nav">
@@ -24,35 +21,27 @@
 </div> -->
 <div class="left-nav">
 	<div class="nav-label">
-		<i></i>报价管理
+		<i></i>价格管理
 	</div>
 	<ul class="list-unstyled">
 		<li ui-sref-active="active"><a ui-sref="sale.inquiry">客户采购询价管理</a></li>
 		<li ui-sref-active="active"><a ui-sref="sale.inquirymould">客户模具询价管理</a></li>
 		<li ui-sref-active="active"><a ui-sref="sale.quotation.list">主动报价</a></li>
+		<li ui-sref-active="active"><a ui-sref="">客户招投标</a></li>
+		<li ui-sref-active="active"><a ui-sref="">平台公共招标</a></li>
 	</ul>
 </div>
 <div class="left-nav">
 	<div class="nav-label">
-		<i></i>销售管理
+		<i></i>订单管理
 	</div>
 	<ul class="list-unstyled">
 		<li ui-sref-active="active"><a ui-sref="sale.order">客户采购订单</a></li>
 		<li ui-sref-active="active"><a ui-sref="sale.change">客户采购变更单</a></li>
-		<li ui-sref-active="active"><a ui-sref="sale.forecast">客户采购预测单</a></li>
-		<li ui-sref-active="active"><a ui-sref="sale.tenderlist">客户指定招标</a></li>
-		<li ui-sref-active="active"><a ui-sref="sale.opentenderlist">平台公开招标</a></li>
-	</ul>
-</div>
-<div class="left-nav">
-	<div class="nav-label">
-		<i></i>出货管理
-	</div>
-	<ul class="list-unstyled">
-		<li ui-sref-active="active"><a ui-sref="sale.notice">发货提醒</a></li>
+		<li ui-sref-active="active"><a ui-sref="sale.maketodo.order">客户委外单</a></li>
+		<li ui-sref-active="active"><a ui-sref="sale.notice">客户发货提醒</a></li>
 		<li ui-sref-active="active"><a ui-sref="sale.send">发货单</a></li>
-		<li ui-sref-active="active"><a ui-sref="sale.accept">客户验收单</a></li>
-		<li ui-sref-active="active"><a ui-sref="sale.returns">客户退货单</a></li>
+		<li ui-sref-active="active"><a ui-sref="sale.makeoutorder">委外单</a></li>
 	</ul>
 </div>
 <div class="left-nav">
@@ -64,36 +53,17 @@
 		<li ui-sref-active="active"><a ui-sref="sale.approval">客户认定单</a></li>
 	</ul>
 </div>
-<!-- <div class="left-nav">
-	<div class="nav-label">
-		<i></i>委托加工管理
-	</div>
-	<ul class="list-unstyled">
-		<li><a href="#">受委托加工订单管理</a></li>
-	</ul>
-</div> -->
-<div class="left-nav">
-	<div class="nav-label">
-		<i></i>增值服务
-	</div>
-	<ul class="list-unstyled">
-		<li><a href="{{userInfo.enterprise.enSaasUrl? 'http://' + userInfo.enterprise.enSaasUrl + '.saas.ubtob.com':'#/account/enterprise'}}">优企云服</a></li>
-		<li><a>优软商城</a></li>
-		<li><a>商机库</a></li>
-		<li><a>我的物流</a></li>
-	</ul>
-</div>
 <div class="left-nav">
 	<div class="nav-label">
-		<i></i>自定义菜单
+		<i></i>客户出入库
 	</div>
 	<ul class="list-unstyled">
-		<li><a>添加自定义菜单<span class="pull-right"><i class="fa fa-plus icon-right"></i></span></a></li>
-	</ul>
-</div>
-<div class="left-nav">
-	<ul class="list-unstyled">
-		<li><a ng-click="showModal()">问题反馈<span class="pull-right"><i class="fa fa-bell-o icon-right"></i></span></a></li>
-		<li><a href="serve">客服中心<span class="pull-right"><i class="fa fa-headphones icon-right"></i></span></a></li>
+		<li ui-sref-active="active"><a ui-sref="sale.MRB">MRB单</a></li>
+		<li ui-sref-active="active"><a ui-sref="sale.badOut">不良品出库单</a></li>
+		<li ui-sref-active="active"><a ui-sref="sale.badIn">不良品入库单</a></li>
+		<li ui-sref-active="active"><a ui-sref="sale.accept">客户验收单</a></li>
+		<li ui-sref-active="active"><a ui-sref="sale.returns">客户验退单</a></li>
+		<li ui-sref-active="active"><a ui-sref="sale.makeaccept">客户委外验收单</a></li>
+		<li ui-sref-active="active"><a ui-sref="sale.makereturns">客户委外验退单</a></li>
 	</ul>
 </div>