调整UI，新增收货地址和新增供应商联系人时增加判断，为空的话不能进行提交操作

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

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

@@ -195,7 +195,7 @@
 					</p>
 				</div>
 				<div class="col-sm-2" style="float: right;">
-					<a href="www.ubtob.com" class="back-home">返回优软云</a>
+					<a href="http://www.ubtob.com" class="back-home">返回优软云</a>
 				</div>
 			</div>
 		</div>

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

@@ -25,36 +25,50 @@
 					<ul class="list-unstyled list-inline" >
 						<li class="start">
 							<ul class="list-unstyled">
-								<li><a ui-sref="sale.todo.inquiry">询价单(<span
+								<li><a ui-sref="sale.todo.inquiry">待报价询价单(<span
 										ng-class="{'text-inverse': todo.inquiry>0}">{{todo.inquiry
 											|| 0}}</span>)
 								</a></li>
-								<li><a ui-sref="sale.todo.order">待回复(<span
+								<li><a ui-sref="sale.todo.inquirymould">待报价模具询价单(<span
+										ng-class="{'text-inverse': todo.inquiry>0}">{{todo.inquiry
+											|| 0}}</span>)
+								</a></li>
+								<li><a ui-sref="sale.quotation.list">待确认主动报价单(<span
+										ng-class="{'text-inverse': todo.inquiry>0}">{{todo.inquiry
+											|| 0}}</span>)
+								</a></li>
+								<li><a ui-sref="sale.todo.order">待回复客户采购单(<span
 										ng-class="{'text-inverse': todo.order>0}">{{todo.order ||
 											0}}</span>)
 								</a></li>
-								<li><a>招标单</a></li>
-								<li><a ui-sref="sale.todo.notice">待发货(<span
+								<li><a>待投标招标单</a></li>
+								<li><a>待发货的送样单</a></li>
+								<li><a ui-sref="sale.todo.notice">待发货的送货提醒(<span
 										ng-class="{'text-inverse': todo.notice>0}">{{todo.notice
 											|| 0}}</span>)
 								</a></li>
-								<li><a ui-sref="sale.todo.change">变更中(<span
+								<li><a ui-sref="sale.todo.change">待确认客户采购变更单(<span
+										ng-class="{'text-inverse': todo.orderChange>0}">{{todo.orderChange
+											|| 0}}</span>)
+								</a></li>
+								<li><a ui-sref="make.todo.order">待回复的客户委外单(<span
 										ng-class="{'text-inverse': todo.orderChange>0}">{{todo.orderChange
 											|| 0}}</span>)
 								</a></li>
-								<li><a ui-sref="sale.send">发货单</a></li>
+							<!-- 	<li><a ui-sref="sale.send">发货单</a></li>
 								<li><a ui-sref="sale.accept">买家验收</a></li>
 								<li><a ui-sref="sale.returns">买家退货</a></li>
 								<li><a ui-sref="baseInfo.prodList">物料列表</a></li>
-								<li><a ui-sref="sale.accept">买家验收</a></li>
+								<li><a ui-sref="sale.accept">买家验收</a></li> -->
 							</ul>
 						</li>
 					</ul>
 					<div id="operateTips" ng-controller="VendCountCtrl">
 						<a class="col-xs-4" href="#/sale/customer"> 我的客户（<span ng-class="{'text-inverse': count.customer>0}">{{count.customer || 0}}</span>）</a>
 						<a class="col-xs-4" style="color: #327ebe" href="#/baseInfo/myRquest"><i class="fa fa-plus"></i> 添加客户</a>
-						<a class="col-xs-4" style="color: #327ebe" ui-sref="baseInfo.newProdInfo"><i class="fa fa-plus"></i> 新增物料</a>
-						<a class="col-xs-4" style="color: #327ebe" ui-sref="baseInfo.uploadByBatch"><i class="fa fa-plus"></i> 导入物料</a>
+						<a class="col-xs-4" style="color: #327ebe" ui-sref="baseInfo.newProdInfo"><i class="fa fa-plus"></i> 新增产品信息</a>
+						<a class="col-xs-4" style="color: #327ebe" ui-sref="baseInfo.uploadByBatch"><i class="fa fa-plus"></i> 导入产品信息</a>
+						<a class="col-xs-4" style="color: #327ebe" ui-sref="baseInfo.prodList">产品信息</a>
 					</div>
 				</div>
 			</div>
@@ -66,7 +80,7 @@
 					<ul class="list-unstyled list-inline">
 						<li class="start">
 							<ul class="list-unstyled">
-								<li><a ui-sref="purc.order">采购单(<span
+								<li><a ui-sref="purc.order">待回复采购单(<span
 										ng-class="{'text-inverse': todo.purcTodo>0}">{{todo.purcTodo
 											|| 0}}</span>)
 								</a></li>
@@ -74,10 +88,9 @@
 										ng-class="{'text-inverse': todo.cartTodo>0}">{{todo.cartTodo ||
 											0}}</span>)
 								</a></li>
+								<li><a>未交货采购单</a></li>
 								<li><a>待回复采购单</a></li>
-								<li><a>待回复询价单</a></li>
-								<li><a>待回复采购单</a></li>
-								<li><a>待回复询价单</a></li>
+								<li><a>进行中的招标单</a></li>
 							</ul>
 						</li>
 					</ul>
@@ -87,6 +100,7 @@
 						<a class="col-xs-4" style="color: #327ebe" href="#/purc/addOrder"><i class="fa fa-plus"></i> 新增采购单</a>
 						<a class="col-xs-4" style="color: #327ebe" href="#/sale/quotation/new"><i class="fa fa-plus"></i> 新增报价单</a>
 						<a class="col-xs-4" style="color: #327ebe" href="#/purc/deputy/add"><i class="fa fa-plus"></i> 新增代采订单</a>
+						<a class="col-xs-4" style="color: #327ebe" href=""><i class="fa fa-plus"></i> 发布招标</a>
 					</div>
 				</div>
 			</div>
@@ -98,22 +112,23 @@
 					<ul class="list-unstyled list-inline">
 						<li class="start">
 							<ul class="list-unstyled">
-								<li><a ui-sref="fa.apBill">客户应付发票（<span
+								<!-- <li><a ui-sref="fa.apBill">客户应付发票（<span
 										ng-class="{'text-inverse': todo.apBillAll>0}">{{todo.apBillAll || 0}}</span>）
-								</a></li>
-								<li><a ui-sref="fa.apCheck">应收对账单（<span
+								</a></li> -->
+								<li><a ui-sref="fa.apCheck">待我确认应付对账单（<span
 										ng-class="{'text-inverse': todo.acceptAll>0}">{{todo.acceptAll ||
 											0}}</span>）
-								</a></li>
-								<li><a ui-sref="#">招标单</a></li>
+									</a></li>
+								<li><a>我发出的待确认对账单</a></li>
+								<!-- <li><a ui-sref="#">招标单</a></li>
 								<li><a ui-sref="fa.arCheck">应付对账单（<span
 										ng-class="{'text-inverse': todo.arCheckToConfirm>0}">{{todo.arCheckToConfirm || 0}}</span>）
-								</a></li>
+								</a></li> -->
 							</ul>
 						</li>
 					</ul>
 					<div id="operateTips">
-						<a class="col-xs-4" style="color: #327ebe" href="#/fa/apCheckList"><i class="fa fa-plus"></i> 新增对账单</a>
+						<a class="col-xs-4" style="color: #327ebe" href="#/fa/apCheckList"><i class="fa fa-plus"></i> 新增应收对账单</a>
 					</div>
 				</div>
 			</div>

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

@@ -201,37 +201,50 @@
 </div>
 <!--设置-企业设置-收货地址编辑-->
 <div class="bomb-box" style="display: none">
-    <div class="box04 box">
+    <form class="box04 box" name="shipAddress" id="shipAddress">
         <i class="off"><img src="resources/img/purc/close.png" alt="" /></i>
         <p>个人资料</p>
         <ul>
             <li class="line01">
                 <div class="fl">
                     <span class="fl">收货人<em>*</em>：</span>
-                    <span class="fr"><input type="text" placeholder="填写收货人" ng-model="ship.receiver"/></span>
+                    <span class="fr"><input type="text" placeholder="填写收货人" ng-model="ship.receiver" required="true"/></span>
                 </div>
                 <div class="fr">
                     <span class="fl">手机<em>*</em>：</span>
-                    <span class="fr"><input type="text" ng-model="ship.usertel"/></span>
+                    <span class="fr"><input type="text" ng-model="ship.usertel" required="true" ng-pattern="/^1(3|4|5|7|8)\d{9}$/"/></span>
                 </div>
             </li>
             <li class="line01">
                 <div class="fl">
-                    <span class="fl">固定电话<em>*</em>：</span>
+                    <span class="fl">固定电话<em></em>：</span>
                     <span class="fr"><input type="text" ng-model="ship.phone"/></span>
                 </div>
                 <div class="fr">
                     <span class="fl">邮箱：</span>
-                    <span class="fr emaill"><input type="text" ng-model="ship.email"/><i>用于接收订单提醒邮件，便于您及时了解订单状态</i></span>
+                    <span class="fr emaill"><input type="text" ng-model="ship.email" ng-pattern="/^(\w-*\.*)+@(\w-?)+(\.\w{2,})+$/"/><i>用于接收订单提醒邮件，便于您及时了解订单状态</i></span>
                 </div>
             </li>
             <li class="line02 margin-top40">
                 <div class="fl">所在地址<em>*</em>：</div>
-                <div class="select fr"><input type="text" placeholder="请选择" ng-model="ship.address"/><i class="fa fa-angle-down"></i></div>
+                <div class="select fr"><input type="text" placeholder="请选择" ng-model="ship.address" required="true"/><i class="fa fa-angle-down"></i></div>
+				<!-- <div class="select fr">
+                    <select required="" class="" ng-model="address.province" ng-options="key as key for (key,value) in provinces"  
+                            ng-change="address.city='';address.district='';">  
+                        <option value="">省</option>  
+                    </select>
+                    <select class="" ng-model="address.city" ng-options="key as key for (key,value) in provinces[address.province]"  
+                            ng-change="address.district='';">  
+                        <option value="">市</option>  
+                    </select>
+                    <select class="" ng-model="address.district" ng-options="value as value for value in provinces[address.province][address.city]">  
+                        <option value="">区</option>  
+                    </select>  
+				</div> -->
             </li>
             <li class="line02">
                 <div class="fl">详细地址<em>*</em>：</div>
-                <div class="fr"><input type="text" ng-model="ship.addressdet"/></div>
+                <div class="fr"><input type="text" ng-model="ship.addressdet" required="true"/></div>
             </li>
             <li class="line02">
                 <div class="fl">地址别名：</div>
@@ -239,9 +252,9 @@
             </li>
         </ul>
         <div class="many-file-btn">
-            <a class="btn01" ng-click="saveShipAddress(ship)">保存</a><a href="#" class="btn02">取消</a>
+            <button class="btn01" ng-click="saveShipAddress(ship)" ng-disabled="shipAddress.$invalid">保存</button><a href="#" class="btn02">取消</a>
         </div>
-    </div>
+    </form>
 </div>
 <script src="static/lib/jquery/jquery.min.js"></script>
 <script>

src/main/webapp/resources/tpl/index/purc/modal/contact_person_modal.html

@@ -11,11 +11,11 @@
 <body>
 <!--B2B商务账号设置-个人信息-->
 <div class="bomb-box">
-	<div class="box01 box">
+	<div class="box01 box" >
 		<p>供应商联系人信息</p>
-		<div class="per-data">
+		<form class="per-data" name="contactInfo" id="contactInfo">
 			<ul>
-				<li><em>姓名</em><input type="text" placeholder="姓名" ng-model="contact.venduser"><span>联系人姓名</span></li>
+				<li><em>姓名</em><input type="text" placeholder="姓名" ng-model="contact.venduser" required="true"><span>联系人姓名</span></li>
 				<li>
 					<em>性别</em>
 					<select name="" id="" ng-model="contact.sex" ng-init="contact.sex = 'M'">
@@ -24,12 +24,12 @@
 					</select>
 				</li>
 				<li><em>职位</em><input type="text" placeholder="职位"  ng-model="contact.position"></li>
-				<li><em>手机</em><input type="text" placeholder="手机" ng-model="contact.tel"><span>联系人手机号</span></li>
+				<li><em>手机</em><input type="text" placeholder="手机" ng-model="contact.tel" required="true" ng-pattern="/^1(3|4|5|7|8)\d{9}$/"><span>联系人手机号</span></li>
 				<li><em>电话</em><input type="text" placeholder="电话" ng-model="contact.phone"><span>联系人电话号码</span></li>
-				<li><em>邮箱</em><input type="email" placeholder="邮箱" ng-model="contact.email"><span>联系人邮箱</span></li>
-				<li class="per-btn"><a ng-click="save(contact)" class="save">保存</a><a ng-click="cancel()" class="mod-psd">取消</a></li>
+				<li><em>邮箱</em><input type="email" placeholder="邮箱" ng-model="contact.email" ng-pattern="/^(\w-*\.*)+@(\w-?)+(\.\w{2,})+$/"/><span>联系人邮箱</span></li>
+				<li class="per-btn"><button ng-click="save(contact)" class="save"  ng-disabled="contactInfo.$invalid">保存</button><a ng-click="cancel()" class="mod-psd">取消</a></li>
 			</ul>
-		</div>
+		</form>
 	</div>
 </div>
 </body>

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

@@ -22,8 +22,8 @@
 	<div class="content">
 		<div class="com_title">服务>销售模块<font>>供应商</font>
 			<div class="search fr">
-				<input type="text" placeholder="输入相关信息">
-				<a class="seek" href="###">搜索</a>
+				<input type="text" placeholder="输入相关信息" ng-model="keyword" ng-search="onSearch(keyword)">
+				<a class="seek" ng-click="onSearch(keyword)">搜索</a>
 			</div>
 		</div>
 		<!--供应商列表-->