服务增加财务模块、询价样式调整。

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

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

@@ -79,7 +79,7 @@
 								<a><em class="list02"></em>采购</a>
 							</li>
 							<li>
-								<a href="#/fa/apBill" class="href"><em class="list03"></em>财务</a>
+								<a><em class="list03"></em>财务</a>
 							</li>
 							<li>
 								<a><em class="list04"></em>企业圈</a>
@@ -148,7 +148,20 @@
 								<a href="" class="a11">采购验退</a>
 							</div>
 						</div>
-						<div class="tab tab04"></div>
+						<div class="tab tab04">
+							<div class="line01">
+								<a href="" class="a01">发货</a>
+								<a href="" class="a02">收货</a>
+							</div>
+							<div class="line02">
+								<a href="" class="a03">应收发票</a>
+								<a href="" class="a04">应付发票</a>
+							</div>
+							<div class="line03">
+								<a href="" class="a05">应收对账</a>
+								<a href="" class="a06">应付对账</a>
+							</div>
+						</div>
 						<div class="tab tab03">
 							<div class="line01">
 								<a href="https://account.ubtob.com/sso/register" class="a01">企业<br/>注册</a>

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

@@ -3858,4 +3858,71 @@ input[required]:invalid, input:focus:invalid, textarea[required]:invalid, textar
 }
 .tab-list .tab03 a.a04{
 	margin-top: 55px;
+}
+/*tab*/
+.tab-list .tab04{
+	width: 1170px;
+	height: 245px;
+	background: url("../img/icon/list-bg04.png") no-repeat left;
+	margin-top: 40px;
+	margin-bottom: 40px;
+}
+.tab-list .tab04 div{
+	float: left;
+}
+.tab-list .tab04 .line01{
+	width: 70px;
+	height: 245px;
+	margin-left: 44px;
+}
+.tab-list .tab04 .line01 a{
+	width: 70px;
+	height: 70px;
+	line-height: 70px;
+	border-radius: 100%;
+}
+.tab-list .tab04 a{
+	font-size: 14px;
+	color: #fff;
+	text-align: center;
+	display: inline-block;
+	border-radius: 5px;
+	/*background: #f47a86;*/
+}
+.tab-list .tab04 a:hover{
+	text-decoration: none;
+	background: #f47a86;
+}
+.tab-list .tab04 a.a01{
+	margin-top: 0;
+}
+.tab-list .tab04 a.a02{
+	margin-top: 104px;
+}
+.tab-list .tab04 .line02 a,.tab-list .tab04 .line03 a,.tab-list .tab04 .line04 a{
+	width: 98px;
+	height: 26px;
+	line-height: 26px;
+}
+.tab-list .tab04 .line02{
+	width: 98px;
+	height: 254px;
+	margin-left: 75px;
+}
+.tab-list .tab04 a.a03{
+	margin-top: 24px;
+}
+.tab-list .tab04 a.a04{
+	margin-top: 148px;
+}
+.tab-list .tab04 .line03{
+	width: 98px;
+	height: 254px;
+	margin-left: 72px;
+}
+.tab-list .tab04 a.a05{
+	margin-top: 24px;
+}
+.tab-list .tab04 a.a06{
+	margin-top: 148px;
 }

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

@@ -913,6 +913,19 @@ select.disabled {
 }
 .left-dropdown-menu .dropdown-menu{
     left: 700px !important;
+}
+    .info-line span,.info-line input{
+        float: left;
+        font-size: 14px;
+    }
+.info-line{
+    line-height: 34px;
+}
+.info-line span:last-child{
+    margin-left: 8px;
+}
+.left-dropdown-menu .dropdown-menu li span{
+    width: auto !important;
 }
 </style>
 <div class="ng-scope">
@@ -1112,26 +1125,27 @@ select.disabled {
                 <div class="row vend-info">
                     <div class="col-xs-12" style="" ng-repeat="vendor in vendors">
                         <div class="col-xs-1 control-label" style="width: 60px;">{{$index + 1}}</div>
-                        <div class="col-xs-2" style="width: 100px;">供应商</div>
-                        <div class="col-xs-3">
-                            <input class="tender-input01" ng-model="vendor.enName" type="text" readonly>
-                        </div>
+                        <div class="info-line col-xs-4"><span>供应商</span><span><input class="tender-input01" ng-model="vendor.enName" type="text" readonly></span></div>
                         <!-- <div class="col-xs-1" style="width: 60px; margin-left: 20px;">UU</div>
                         <div class="col-xs-3">
                             <input ng-model="vendor.enuu" type="text" style="width: 200px;" class="tender-input01" readonly>
                         </div> -->
-                        <div class="col-xs-1" style="width: 60px; margin-left: 20px;">币别</div>
-                        <div class="col-xs-1">
-                            <select ng-model="vendor.currency" ng-init="vendor.currency = 'RMB'" class="tender-input01">
+                        <div class="info-line col-xs-3">
+                            <span>币别</span>
+                            <span>
+                                <select ng-model="vendor.currency" ng-init="vendor.currency = 'RMB'" class="tender-input01" style="width: 140px;">
                             	<option value ="RMB">RMB</option>
                                 <option value ="USD">USD</option>
                                 <option value ="HKD">HKD</option>
                                 <option value ="EUR">EUR</option>
                             </select>
+                            </span>
                         </div>
-                        <div class="col-xs-1" style="width: 60px; margin-left: 20px;">税率</div>
-                        <div class="col-xs-1">
-                            <input ng-model="vendor.rate" type="text" class="tender-input01">
+                        <div class="info-line col-xs-3">
+                            <span>税率</span>
+                            <span>
+                                <input ng-model="vendor.rate" type="text" class="tender-input01" style="width: 140px;">
+                            </span>
                         </div>
                         <div class="col-xs-1">
                             <a class="remove-vendor" href="javascript:void(0)" ng-click="removeVendor($index)" title="删除"><i class="fa fa-trash-o"></i></a>

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

@@ -908,6 +908,16 @@ select.disabled {
 .left-dropdown-menu .dropdown-menu{
     left: 700px !important;
 }
+.info-line span,.info-line input{
+    float: left;
+    font-size: 14px;
+}
+.info-line{
+    line-height: 34px;
+}
+.info-line span:last-child{
+    margin-left: 8px;
+}
 </style>
 <div class="ng-scope">
     <form name="tenderForm">
@@ -1093,26 +1103,27 @@ select.disabled {
                 </div>
                 <div class="row vend-info">
                     <div class="col-xs-12">
-                        <div class="col-xs-2" style="width: 100px;">供应商</div>
-                        <div class="col-xs-3">
-                            <input class="tender-input01" ng-model="vendor.enName" type="text" readonly>
-                        </div>
+                        <div class="info-line col-xs-4"><span>供应商</span><span><input class="tender-input01" ng-model="vendor.enName" type="text" readonly></span></div>
                         <!-- <div class="col-xs-1" style="width: 60px; margin-left: 20px;">UU</div>
                         <div class="col-xs-3">
                             <input ng-model="vendor.uu" type="text" style="width: 200px;" class="tender-input01" readonly>
                         </div> -->
-                         <div class="col-xs-1" style="width: 60px; margin-left: 20px;">币别</div>
-                        <div class="col-xs-1">
-                            <select ng-model="vendor.currency" ng-init="vendor.currency = 'RMB'" class="tender-input01" style="width:100px">
-                            	<option value ="RMB">RMB</option>
-                                <option value ="USD">USD</option>
-                                <option value ="HKD">HKD</option>
-                                <option value ="EUR">EUR</option>
-                            </select>
+                        <div class="info-line col-xs-3">
+                            <span>币别</span>
+                            <span>
+                                 <select ng-model="vendor.currency" ng-init="vendor.currency = 'RMB'" class="tender-input01" style="width:100px">
+                                    <option value ="RMB">RMB</option>
+                                    <option value ="USD">USD</option>
+                                    <option value ="HKD">HKD</option>
+                                    <option value ="EUR">EUR</option>
+                                </select>
+                            </span>
                         </div>
-                        <div class="col-xs-1" style="width: 60px; margin-left: 20px;">税率</div>
-                        <div class="col-xs-1">
-                            <input ng-model="vendor.rate" type="text" class="tender-input01">
+                        <div class="info-line col-xs-3">
+                            <span>税率</span>
+                            <span>
+                                <input ng-model="vendor.rate" type="text" class="tender-input01" style="width: 140px;">
+                            </span>
                         </div>
                     </div>
                 </div>