消息列表、新增联系人等修改

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

src/main/webapp/resources/css/add.css

@@ -1049,7 +1049,7 @@ input:focus, select:focus {
 }
 
 .bomb-box .box04 ul li div em {
-    color: #d2272d;
+    color: #f00;
 }
 
 .bomb-box .box04 ul li.line01 div.fl span.fr input, .bomb-box .box04 ul li.line01 div.fr span.fr input {

src/main/webapp/resources/css/index.css

@@ -203,7 +203,7 @@ a.none:hover {
 }
 
 .input-xs, .input-group-xs>.form-control, .input-group-xs>.input-group-addon, .input-group-xs>.input-group-btn>.btn {
-	border-color: #3399CC;
+	border-color: #327ebe;
 }
 
 .form-group-sm .form-control-feedback {
@@ -2751,6 +2751,9 @@ input:-webkit-autofill { box-shadow: 0 0 0 1000px white inset !important;}
 	height: 50px;
 	padding-top: 11px;
 }
+.com_title01,.title-div{
+	border-bottom: 1px dashed #327ebe !important;
+}
 #order-detail-list{
 	font-size: 14px;
 }

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

@@ -574,11 +574,11 @@
         <ul>
             <li class="line01">
                 <div class="fl">
-                    <span class="fl">收货人<em>*</em>：</span>
+                    <span class="fl"><em>*</em>收货人：</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="fl"><em>*</em>手机：</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>
@@ -593,7 +593,7 @@
                 </div>
             </li>
             <li class="line02 margin-top40">
-                <div class="fl">所在地址<em>*</em>：</div>
+                <div class="fl"><em>*</em>所在地址：</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="area-select" ng-model="ship.province" ng-options="key as key for (key,value) in provinces"
@@ -610,7 +610,7 @@
 				</div>
             </li>
             <li class="line02">
-                <div class="fl">详细地址<em>*</em>：</div>
+                <div class="fl"><em>*</em>详细地址：</div>
                 <div class="fr"><input type="text" ng-model="ship.addressdet" required="true"/></div>
             </li>
             <li class="line02">

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

@@ -9,6 +9,9 @@
     margin: auto;
     box-shadow: 0 0 3px #888;
 }
+.bomb-box .box04{
+    height: 415px;
+}
 </style>
 <div class="bomb-box" id="paycompany">
     <form class="box04 box" name="payCompany" id="payCompany">
@@ -17,11 +20,11 @@
         <ul>
             <li class="line01">
                 <div class="fl">
-                    <span class="fl">企业名称<em>*</em>：</span>
+                    <span class="fl"><em>*</em>企业名称：</span>
                     <span class="fr"><input type="text" placeholder="填写企业名称" ng-model="pay.enname" required="true"/></span>
                 </div>
                 <div class="fr">
-                    <span class="fl">联系人<em>*</em>：</span>
+                    <span class="fl"><em>*</em>联系人：</span>
                     <span class="fr"><input type="text" ng-model="pay.user" required="true"/></span>
                 </div>
             </li>
@@ -32,7 +35,7 @@
                 </div>
             </li>
             <li class="line02 margin-top40">
-                <div class="fl">所在地址<em>*</em>：</div>
+                <div class="fl"><em>*</em>所在地址：</div>
 				 <div class="select fr">
                     <select required="" class="area-select" ng-model="pay.province" ng-options="key as key for (key,value) in provinces"
                             ng-change="pay.city='';pay.district='';" required="true">  
@@ -48,7 +51,7 @@
 				</div>
             </li>
             <li class="line02">
-                <div class="fl">详细地址<em>*</em>：</div>
+                <div class="fl"><em>*</em>详细地址：</div>
                 <div class="fr"><input type="text" ng-model="pay.addressdet" required="true"/></div>
             </li>
         </ul>

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

@@ -106,13 +106,13 @@
 					</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')">未对账</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=='done'}"
-							ng-click="setActive('done')">已确认</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"

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

@@ -174,7 +174,7 @@
                 <th width="40" ng-hide="active == 'done'"></th>
                 <th width="150">推送时间</th>
                 <th width="500">信息详情</th>
-                <th width="150">发起时间</th>
+                <th width="150" ng-hide="active == 'todo'">发起时间</th>
             </tr>
         </thead>
         <tbody>
@@ -189,7 +189,7 @@
             <td>
                 <div style="text-align: left;">{{releaseDetail.pagingRelease.context}}</div>
             </td>
-            <td>
+            <td ng-hide="active == 'todo'">
                 <div>{{releaseDetail.readDate | date:'yyyy-MM-dd HH:mm'}}</div>
             </td>
         </tr>

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

@@ -318,13 +318,13 @@
 			<ul>
 				<li class="line01">
 					<div class="fl">
-						<span class="fl">收货人<em>*</em>：
+						<span class="fl"><em>*</em>收货人：
 						</span> <span class="fr"><input type="text" placeholder="填写收货人"
 							ng-model="ship.receiver" required="true"
 							ng-pattern="/^[\u4e00-\u9fa5]{1,6}$|^[\dA-Za-z]{1,12}$/" /></span>
 					</div>
 					<div class="fr">
-						<span class="fl">手机<em>*</em>：
+						<span class="fl"><em>*</em>手机：
 						</span> <span class="fr"><input type="text"
 							ng-model="ship.usertel" required="true"
 							ng-pattern="/^1(3|4|5|7|8)\d{9}$/" /></span>
@@ -344,7 +344,7 @@
 				</li>
 				<li class="line02 margin-top40">
 					<div class="fl">
-						所在地址<em>*</em>：
+						<em>*</em>所在地址：
 					</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="area-select" ng-model="ship.province"
@@ -364,7 +364,7 @@
 				</li>
 				<li class="line02">
 					<div class="fl">
-						详细地址<em>*</em>：
+						<em>*</em>详细地址：
 					</div>
 					<div class="fr">
 						<input type="text" ng-model="ship.addressdet" required="true" />

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

@@ -984,11 +984,11 @@ select.disabled {
                     </div>
                     <div class="col-xs-12" id="isOpenChoice">
 	                    <div class="tender-desc">询价类型：</div>
-	                     <div class="input-select col-xs-4">
+	                     <div class="input-select col-xs-1">
 	                        <input  class="tender-input" name="inquirytype" type="radio" value="询价" ng-model="inquiry.inquirytype"/>
 	                        <span>询价</span>
 	                    </div>
-	                    <div class="input-select col-xs-4">
+	                    <div class="input-select col-xs-1">
 	                        <input class="tender-input" name="inquirytype" type="radio" value="求购" ng-model="inquiry.inquirytype"/>
 	                        <span>求购</span>
 	                    </div>

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

@@ -17,7 +17,7 @@
 		height: 425px;
 	}
 	.per-data ul li span{
-		width: 120px;
+		width: 30px;
 		line-height: 34px;
 	}
 	.modal-content{
@@ -35,13 +35,19 @@
 	.per-data ul{
 		padding-top: 3px;
 	}
+	.red{
+		color: #f00 !important;
+	}
+	.per-data ul li input, .per-data ul li select{
+		width: 340px;
+	}
 </style>
 <div class="bomb-box">
 	<div class="box01 box" >
 		<p>供应商联系人信息</p>
 		<form class="per-data" name="contactInfo" id="contactInfo">
 			<ul>
-				<li><em>姓名</em><input type="text" placeholder="姓名" ng-model="contact.venduser" required="true" ng-pattern="/^[\u4e00-\u9fa5]{1,6}$|^[\dA-Za-z]{1,12}$/"><span>联系人姓名（必填）</span></li>
+				<li><em>姓名</em><input type="text" placeholder="姓名" ng-model="contact.venduser" required="true" ng-pattern="/^[\u4e00-\u9fa5]{1,6}$|^[\dA-Za-z]{1,12}$/"><span class="red">*必填</span></li>
 				<li>
 					<em>性别</em>
 					<select name="" id="" ng-model="contact.sex" ng-init="contact.sex = 'M'">
@@ -50,9 +56,9 @@
 					</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" 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" ng-pattern="/([0-9]{3,4}-)?[0-9]{7,8}/"><span>联系人电话号码</span></li>
-				<li><em>邮箱</em><input type="email" placeholder="邮箱" ng-model="contact.email" ng-pattern="/^(\w-*\.*)+@(\w-?)+(\.\w{2,})+$/"/><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 class="red">*必填</span></li>
+				<li><em>电话</em><input type="text" placeholder="电话" ng-model="contact.phone" ng-pattern="/([0-9]{3,4}-)?[0-9]{7,8}/"><span></span></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>
 		</form>

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

@@ -1113,11 +1113,11 @@ input[type="radio"], input[type="checkbox"] {
         <ul>
             <li class="line01">
                 <div class="fl">
-                    <span class="fl">收货人<em>*</em>：</span>
+                    <span class="fl"><em>*</em>收货人：</span>
                     <span class="fr"><input type="text" placeholder="填写收货人" ng-model="ship.receiver" required="true" ng-pattern="/^[\u4e00-\u9fa5]{1,6}$|^[\dA-Za-z]{1,12}$/"/></span>
                 </div>
                 <div class="fr">
-                    <span class="fl">手机<em>*</em>：</span>
+                    <span class="fl"><em>*</em>手机：</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>
@@ -1132,7 +1132,7 @@ input[type="radio"], input[type="checkbox"] {
                 </div>
             </li>
             <li class="line02 margin-top40">
-                <div class="fl">所在地址<em>*</em>：</div>
+                <div class="fl"><em>*</em>所在地址：</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="area-select" ng-model="ship.province" ng-options="key as key for (key,value) in provinces"
@@ -1149,7 +1149,7 @@ input[type="radio"], input[type="checkbox"] {
                 </div>
             </li>
             <li class="line02">
-                <div class="fl">详细地址<em>*</em>：</div>
+                <div class="fl"><em>*</em>详细地址：</div>
                 <div class="fr"><input type="text" ng-model="ship.addressdet" required="true"/></div>
             </li>
             <li class="line02">

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

@@ -17,7 +17,7 @@
 		height: 425px;
 	}
 	.per-data ul li span{
-		width: 120px;
+		width: 30px;
 		line-height: 34px;
 	}
 	.modal-content{
@@ -35,13 +35,19 @@
 	.per-data ul{
 		padding-top: 3px;
 	}
+	.red{
+		color: #f00 !important;
+	}
+	.per-data ul li input, .per-data ul li select{
+		width: 340px;
+	}
 </style>
 <div class="bomb-box">
 	<div class="box01 box" >
 		<p>客户联系人信息</p>
 		<form class="per-data" name="contactInfo" id="contactInfo">
 			<ul>
-				<li><em>姓名</em><input type="text" placeholder="姓名" ng-model="contact.venduser" required="true" ng-pattern="/^[\u4e00-\u9fa5]{1,6}$|^[\dA-Za-z]{1,12}$/"><span>联系人姓名（必填）</span></li>
+				<li><em>姓名</em><input type="text" placeholder="姓名" ng-model="contact.venduser" required="true" ng-pattern="/^[\u4e00-\u9fa5]{1,6}$|^[\dA-Za-z]{1,12}$/"><span class="red">*必填</span></li>
 				<li>
 					<em>性别</em>
 					<select name="" id="" ng-model="contact.sex" ng-init="contact.sex = 'M'">
@@ -50,9 +56,9 @@
 					</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" 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" ng-pattern="/([0-9]{3,4}-)?[0-9]{7,8}/"><span>联系人电话号码</span></li>
-				<li><em>邮箱</em><input type="email" placeholder="邮箱" ng-model="contact.email" ng-pattern="/^(\w-*\.*)+@(\w-?)+(\.\w{2,})+$/"/><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 class="red">*必填</span></li>
+				<li><em>电话</em><input type="text" placeholder="电话" ng-model="contact.phone" ng-pattern="/([0-9]{3,4}-)?[0-9]{7,8}/"><span></span></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>
 		</form>

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

@@ -195,7 +195,7 @@
     .tender-list dl{width: 100%;margin:0 auto;}
     .tender-list dl dt{width: 100%;margin:0 auto;height: 40px;}
     .tender-list dl dt span{height: 40px;line-height: 48px;display: inline-block;color: #999;}
-    .tender-list dl dd{width: 100%;margin:0 auto;height: 100px;border-bottom: #ccc 1px dashed;overflow: hidden;}
+    .tender-list dl dd{width: 100%;margin:0 auto;min-height: 100px;border-bottom: #ccc 1px dashed;overflow: hidden;}
     .tender-list dl dd:hover{border: #d32526 1px solid;}
     .tender-list dl dd span{height: 100px;line-height: 50px;display: inline-block;}
     .tender-list dl span{width:10.2%;font-size: 14px;float: left;text-align: center;}