平台UI调整

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

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

@@ -111,7 +111,7 @@
 								<li><a href="#/purc/vendor" title="采购询价">供应商资料</a></li>
 								<li><a href="#/purc/tender" title="采购招标">采购招标</a></li>
 								<li><a href="#/purc/order" title="采购订单">采购订单</a></li>
-								<li><a href="" title="采购询价">采购询价</a></li>
+								<li><a ui-sref="purc.inquiry" title="采购询价">采购询价</a></li>
 								<li><a href="#/purc/deputy" title="采购询价">代采订单</a></li>
 								<li><a href="#/purc/makeoutorder" title="委外单">委外单</a></li>
 							</ul>

src/main/webapp/resources/js/index/app.js

@@ -1627,7 +1627,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 	app.controller('PurcOrderCtrl', ['$scope', '$filter', 'PurcOrderItem', 'PurcOrder', 'ngTableParams', 'toaster', 'ReportService', 'BaseService',
   	   function($scope, $filter, PurcOrderItem, PurcOrder, ngTableParams, toaster, ReportService, BaseService){
 		BaseService.scrollBackToTop();
-		$scope.active = 'todo';
+		$scope.active = 'all';
   		$scope.dateZoneText = '不限';
   		$scope.deliveryZoneText = '不限';
   		$scope.condition = {dateZone: -1, deliveryZone: -1};
@@ -2612,11 +2612,13 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 				$scope.loading = true;
 				var pageParams = params.url();
 				pageParams.keyword = $scope.keyword;
+				$scope.tip = $scope.keyword;
 				pageParams.searchFilter = $scope.searchFilter;
 				getService()[getState($scope.active)].call(null, BaseService.parseParams(pageParams), function(page){
 					$scope.loading = false;
 					if(page) {
 						params.total(page.totalElement);
+						$scope.total = page.totalElement;
 						$defer.resolve(page.content);
 					}
 				}, function(response) {
@@ -2627,7 +2629,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 		});
 
 		// 搜索框回车
-		$scope.onSearch = function() {
+		$scope.onSearch = function(keyword) {
 			$scope.tableParams.page(1);
 			$scope.tableParams.reload();
 		};
@@ -8639,6 +8641,8 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 	 */
 	app.controller('PurcNewOrderCtrl',['$scope', '$modal', 'toaster', '$filter', 'addtoCart', '$rootScope', 'VendorInfo', 'ngTableParams', 'BaseService', 'Product', 'newPurcOrder', 'cartOperation', 'ShipAddress', 'Vendor', '$http', function($scope, $modal, toaster, $filter, addtoCart, $rootScope, VendorInfo, ngTableParams, BaseService, Product, newPurcOrder, cartOperation, ShipAddress, Vendor, $http) {
 		BaseService.scrollBackToTop();
+		// 每次进入时先清除掉rootScope下的venuu
+		$rootScope.venduu = null;
 		// 获取收货地址列表
 		ShipAddress.shipAddList({}, function(data) {
 			$scope.ships = data;
@@ -8689,6 +8693,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 				$scope.order.cust.enName = data.vendorEnterprise.enName;
 				$scope.order.cust.enAddress = data.vendorEnterprise.enAddress;
 				$scope.order.cust.uu = data.vendorEnterprise.uu;
+				$rootScope.venduu = data.vendorEnterprise.uu;
 				Vendor.contacts({venduu: $scope.order.cust.uu}, {}, function(data) {
 					$scope.contacts = data;
 					$scope.order.vendor = $scope.contacts[0];
@@ -8859,7 +8864,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 			$scope.loading = true;
 			$scope.order.vendusertel =  order.vendor.tel;
 			$scope.order.venduser = order.vendor.venduser;
-			$scope.order.shipaddress = order.shipadd.addressdet + '' + order.shipadd.receiver + '' + order.shipadd.usertel;
+			$scope.order.shipaddress = order.shipadd.address + order.shipadd.addressdet + '' + order.shipadd.receiver + '' + order.shipadd.usertel;
 			$scope.order.custUU = $scope.order.cust.uu;
 			$scope.order.custUserUU = $scope.order.custUser.userUU;
 			if($scope.order.date instanceof Date) {
@@ -8888,7 +8893,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 			$scope.loading = true;
             $scope.order.vendusertel =  order.vendor.tel;
 			$scope.order.venduser = order.vendor.venduser + '' + order.vendor.tel;
-			$scope.order.shipaddress = order.shipadd.addressdet + '' + order.shipadd.receiver + '' + order.shipadd.usertel;
+			$scope.order.shipaddress = order.shipadd.address + order.shipadd.addressdet + '' + order.shipadd.receiver + '' + order.shipadd.usertel;
 			$scope.order.custUU = $scope.order.cust.uu;
 			$scope.order.custUserUU = $scope.order.custUser.userUU;
 			if($scope.order.date instanceof Date) {
@@ -9002,9 +9007,9 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
   		
   		$scope.ensure = false;
   		$scope.check = function(vendor) { // 需要进行判断的选择
+  			console.log(vendor);
   			$scope.vendorInfo = vendor;
   			$scope.ensure = true;
-
   		};
   		
   		$scope.checkVendor = function(vendor) { // 直接选择

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

@@ -1,15 +1,15 @@
 <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="fa.apBill">客户应付发票</a></li>
+		<li ui-sref-active="active"><a ui-sref="fa.apBill">发票</a></li>
 		<li ui-sref-active="active"><a ui-sref="fa.apCheck">应收对账单</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="fa.arCheck">应付对账单</a></li>

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

@@ -139,7 +139,7 @@
 			<ul class="list-unstyled detail">
 				<li ng-repeat="msg in message | orderBy : - inid">
 					<!--<span ng-show="tender.isNew"><img src="static/img/home/newTender.png"></span>-->
-					<a ui-sref="sale.inquiry_detail({id:msg.inid})"class="text-light"><em style="color: #d32526;font-style: normal;">{{msg.pordName}}</em>的询价</a>
+					<a ui-sref="sale.inquiry_detail({id:msg.inid})"class="text-light"><em style="color: #d32526;font-style: normal;">{{msg.pordName}}</em></a>
 				</li>
 				<li class="pull-right"><a href="#/sale/inquiry" class="text-light">更多>></a></li>
 				<li ng-show="message == null || message == ''" class="grey">

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

@@ -93,7 +93,7 @@
                 <li class="beizhu">
                     <div class="fl">
                         <em>备注：</em>
-                        <span><input type="text" ng-model="order.remark" class="bor01" placeholder="请填写备注" style="cursor: pointer; width: 568px;" ng-required="true"/></span>
+                        <span><input type="text" ng-model="order.remark" class="bor01" placeholder="请填写备注" style="cursor: pointer; width: 568px;"/></span>
                     </div>
                 </li>
             </ul>
@@ -108,7 +108,7 @@
                     <b>单位</b>
                     <b>单价</b>
                     <b>数量</b>
-                    <b>税率</b>
+                    <b>税率(%)</b>
                     <b>交货日期</b>
                     <b>备注</b>
                     <b class="wid02">&nbsp;</b>
@@ -155,8 +155,8 @@
 			<table class="block table table-default table-striped" ng-table="tableParams">
 				<thead>
 					<tr class="header">
-						<th width="160px">编号</th>
 						<th width="120px">名称</th>
+						<th width="160px">编号</th>
 						<th>规格</th>
 						<th width="120px">单位</th>
 						<th width="80px">选择</th>
@@ -176,8 +176,8 @@
 				</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" ng-bind="::product.code"></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)" ng-click="check(product)" style="text-decoration: none; color: #327ebe;" id="click" class="add01">添加</a>

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

@@ -8,9 +8,6 @@
 	<ul class="list-unstyled">
 		<li ui-sref-active="active"><a ui-sref="purc.order">采购订单</a></li>
 	</ul>
-	<ul class="list-unstyled">
-		<li ui-sref-active="active"><a ui-sref="purc.cart">购物车</a></li>
-	</ul>
 	<ul class="list-unstyled">
 		<li ui-sref-active="active"><a ui-sref="purc.deputy">代采订单</a></li>
 	</ul>
@@ -24,4 +21,7 @@
 	<ul class="list-unstyled">
 		<li ui-sref-active="active"><a ui-sref="purc.inquiry">询价单</a></li>
 	</ul>
+	<ul class="list-unstyled">
+		<li ui-sref-active="active"><a ui-sref="purc.cart">购物车</a></li>
+	</ul>
 </div>

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

@@ -46,9 +46,21 @@
 		</thead>
 		<tbody>
 			<tr ng-repeat="vendor in $data">
-				<td class="text-center" ng-bind="::vendor.vendorEnterprise.uu"></td>
-				<td class="text-center" ng-bind="::vendor.vendorEnterprise.enName"></td>
-				<td class="text-center" ng-bind="::vendor.vendorEnterprise.enAddress"></td>
+				<td class="text-center" >
+					<a ng-bind="::vendor.vendorEnterprise.uu" ng-click="checkVendor(vendor)" ng-if="!prod && vendor.vendorEnterprise.uu!=venduu"></a>
+					<a ng-bind="::vendor.vendorEnterprise.uu" ng-click="check(vendor)" ng-if="prod && vendor.vendorEnterprise.uu!=venduu"></a>
+					<a ng-bind="::vendor.vendorEnterprise.uu" ng-if="vendor.vendorEnterprise.uu==venduu"></a>
+				</td>
+				<td class="text-center" >
+					<a ng-bind="::vendor.vendorEnterprise.enName" ng-click="checkVendor(vendor)" ng-if="!prod && vendor.vendorEnterprise.uu!=venduu"></a>
+					<a ng-bind="::vendor.vendorEnterprise.enName" ng-click="check(vendor)" ng-if="prod && vendor.vendorEnterprise.uu!=venduu"></a>
+					<a ng-bind="::vendor.vendorEnterprise.enName" ng-if="vendor.vendorEnterprise.uu==venduu"></a>
+				</td>
+				<td class="text-center" >
+					<a ng-bind="::vendor.vendorEnterprise.enAddress" ng-click="checkVendor(vendor)" ng-if="!prod && vendor.vendorEnterprise.uu!=venduu"></a>
+					<a ng-bind="::vendor.vendorEnterprise.enAddress" ng-click="check(vendor)" ng-if="prod && vendor.vendorEnterprise.uu!=venduu"></a>
+					<a ng-bind="::vendor.vendorEnterprise.enAddress" ng-if="vendor.vendorEnterprise.uu==venduu"></a>
+				</td>
 				<td class="text-center" ng-if="prod && vendor.vendorEnterprise.uu!=venduu"><a title="选择" href="javascript:void(0)" ng-click="check(vendor)" style="text-decoration: none;">选择</a></td>
 				<td class="text-center" ng-if="vendor.vendorEnterprise.uu==venduu"><a style="text-decoration: none;">已选择</a></td>
 				<td class="text-center" ng-if="!prod && vendor.vendorEnterprise.uu!=venduu"><a title="选择" href="javascript:void(0)" ng-click="checkVendor(vendor)" style="text-decoration: none;">选择</a></td>

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

@@ -256,7 +256,8 @@
 	<thead>
 		<tr class="header">
 			<th>商品</th>
-			<th width="80">单价</th>
+			<th width="80">含税单价</th>
+			<th width="80">税率（%）</th>
 			<th width="100">数量</th>
 			<th width="120">交货日期</th>
 			<th width="180">单据状态</th>
@@ -318,7 +319,7 @@
 	</tbody>
 	<tbody ng-repeat="order in $data track by order.id">
 		<tr class="order-hd" ng-dblclick="order.$collapsed=!order.$collapsed" ng-class="{'text-bold': order.display>0}">
-			<td class="first">
+			<td class="first" colspan="3">
 				<div class="order-main">
 					<span> <input type="checkbox" class="selector"
 						ng-model="order.$selected" ng-click="checkOne(order)">
@@ -328,12 +329,12 @@
 						class="text-num" ng-bind="::order.code" ui-sref="purc.order_detail({id:order.id})" target="_self"></a></span>
 				</div>
 			</td>
-			<td colspan="3"><a ng-bind="::order.enterprise.enName"></a></td>
 			<td colspan="1" class="order-sum">{{::order.currency}}： <span
 				ng-bind="getOrderTotal(order.orderItems) | number : 2"
 				class="text-num text-bold"></span>
 			</td>
-			<td colspan="1" class="text-center">
+			<td colspan="3" class="text-center">
+				{{::order.receiveName}}
 			</td>
 		</tr>
 		<tr class="order-bd" ng-repeat="item in order.orderItems track by item.id"
@@ -353,8 +354,8 @@
 			</td>
 			<td class="text-center">
 				<div class="text-num" ng-bind="::item.price | number:6"></div>
-				<div class="text-muted">税率：{{::item.taxrate || 0}}%</div>
 			</td>
+			<td class="text-center"><div class="text-muted">{{::item.taxrate || 0}}</div></td>
 			<td class="text-center">
 				<div class="text-num" ng-bind="::item.qty"></div>
 				<div class="text-muted" ng-bind="::item.product.unit"></div>