Merge branch 'dev' into release-20170915

src/main/webapp/resources/js/admin/controllers/trade/InvoicefromPurcDetailCtrl.js

@@ -14,15 +14,14 @@ define([ 'app/app' ], function(app) {
 					$scope.logistics = angular.fromJson($scope.invoiceFPur.logistics);
 					console.log($scope.logistics);
 					//查看物流详情
-					$scope.listLogistics = function(data){
-						var lgtid = $scope.logistics.id;
+					$scope.listLogistics = function(){
 						var modalInstance = $modal.open({
 							animation: true,
 							templateUrl: 'static/view/admin/modal/listLogistics_modal.html',
 							controller: 'listLogisticsCtrl',
 							resolve: {
-								lgtid: function() {
-									return lgtid;
+								logistics : function () {
+									return $scope.logistics
 								}
 							}
 						});
@@ -94,22 +93,25 @@ define([ 'app/app' ], function(app) {
 	
 
 				// 物流信息
-			app.register.controller('listLogisticsCtrl', [
-					'$scope',
-					'$modal',
-					'ResponseLogistics',
-					'$modalInstance',
-					'lgtid',
-					function($scope, $modal, ResponseLogistics, $modalInstance,
-							lgtid) {
+			app.register.controller('listLogisticsCtrl', ['$scope', '$modal', 'ResponseLogistics', '$modalInstance', 'logistics', 'KdnLogistics', function($scope, $modal, ResponseLogistics, $modalInstance, logistics, KdnLogistics) {
 						$scope.Info = [];
 						$scope.getlogistics = function() {
-							ResponseLogistics.get({
-								id : lgtid
-							}, {}, function(data) {
-								$scope.Info = data;
-								console.log(data);
+							var params = {};
+							params.companyName = logistics.companyName;
+							params.logisticsCode = logistics.number;
+							KdnLogistics.kdnQuery(params, {}, function(response){
+								if(!response.errorInfo) {
+									$scope.Info = eval ("(" + response.traces + ")");
+									// statusOfLogistics($scope.logisticsInfo[$scope.logisticsInfo.length - 1].AcceptStation);
+								}
+							}, function(){
+								$scope.logisticsInfo = [];
+								toaster.pop('info', '查询物流信息失败,请核对物流公司和运单号');
 							});
+							// ResponseLogistics.get({id : lgtid}, {}, function(data) {
+							// 	$scope.Info = data;
+							// 	console.log(data);
+							// });
 						};
 						$scope.getlogistics();
 						$scope.cancel = function() {

src/main/webapp/resources/js/admin/controllers/trade/TradePurchaseDetailCtrl.js

@@ -26,8 +26,8 @@ define([ 'app/app' ], function(app) {
 						templateUrl: 'static/view/admin/modal/listLogistics_modal.html',
 						controller: 'listLogisticsCtrl',
 						resolve: {
-							lgtid: function() {
-								return lgtid;
+							logistics : function () {
+								return $scope.logistics
 							}
 						}
 					});
@@ -106,13 +106,25 @@ define([ 'app/app' ], function(app) {
 		loadData();
 	}]);
 	
-	app.register.controller('listLogisticsCtrl', [ '$scope', '$modal', 'ResponseLogistics', '$modalInstance', 'lgtid', function($scope, $modal, ResponseLogistics, $modalInstance, lgtid){
+	app.register.controller('listLogisticsCtrl', [ '$scope', '$modal', 'ResponseLogistics', '$modalInstance', 'logistics', 'KdnLogistics', function($scope, $modal, ResponseLogistics, $modalInstance, logistics, KdnLogistics){
 		$scope.Info = [];
 		$scope.getlogistics = function() {
-			ResponseLogistics.get({id: lgtid}, {}, function(data) {
-				$scope.Info = data;
-				console.log(data);
+			var params = {};
+			params.companyName = logistics.companyName;
+			params.logisticsCode = logistics.number;
+			KdnLogistics.kdnQuery(params, {}, function(response){
+				if(!response.errorInfo) {
+					$scope.Info = eval ("(" + response.traces + ")");
+					// statusOfLogistics($scope.logisticsInfo[$scope.logisticsInfo.length - 1].AcceptStation);
+				}
+			}, function(){
+				$scope.logisticsInfo = [];
+				toaster.pop('info', '查询物流信息失败,请核对物流公司和运单号');
 			});
+			// ResponseLogistics.get({id : lgtid}, {}, function(data) {
+			// 	$scope.Info = data;
+			// 	console.log(data);
+			// });
 		};
 		$scope.getlogistics();
 		$scope.cancel = function() {

src/main/webapp/resources/js/usercenter/controllers/forstore/query_logistics_ctrl.js

@@ -58,7 +58,7 @@ define(['app/app', 'calendar'], function(app) {
                 str.indexOf("发出")!=-1||str.indexOf("收入")!=-1||str.indexOf("扫描")!=-1||str.indexOf("到达")!=-1){
                 $scope.status = "transit";
             }
-            if(str.indexOf("派送")!=-1){
+            if(str.indexOf("派送")!=-1 || str.indexOf("派件")!=-1){
                 $scope.status = "send";
             }
             if(str.indexOf("签收")!=-1){

src/main/webapp/resources/view/admin/modal/listLogistics_modal.html

@@ -42,12 +42,12 @@
 				<div class="col-md-5">处理时间</div>
 				<div class="col-md-7">进度监控记录</div>
 			</div>
-			<div class="row" ng-model="Info" ng-repeat="details in Info.data">
+			<div class="row" ng-model="Info" ng-repeat="details in Info">
 				<div class="col-md-5">
-					<span ng-bind="details.time"></span>
+					<span ng-bind="details.AcceptTime"></span>
 				</div>
 				<div class="col-md-7">
-					<span ng-bind="details.context"></span>
+					<span ng-bind="details.AcceptStation"></span>
 				</div>
 			</div>
 		</div>

src/main/webapp/resources/view/admin/trade/trade_invoicefrompurc_detail.html

@@ -102,7 +102,7 @@
 				<span>快递单号：</span>
 				<span ng-bind="logistics.number"></span>
 			</div>
-			<a  ng-click="listLogistics(logistics)" style="text-decoration : none ">点击查看物流详情</a>
+			<a  ng-click="listLogistics()" style="text-decoration : none ">点击查看物流详情</a>
 		</div>
 <!-- 
 		<div class="row-fluid">
@@ -121,11 +121,11 @@
 	</div>	
 	<div class="part">	
 		<div class="row">
-			<div class="col-xs-2"><h4>来源采购单信息:</h4></div>
+			<div class="col-xs-2"><h4>来源订单信息:</h4></div>
 			<div class="col-xs-4" style="line-height: 40px;">
-				<span>采购单号：</span>
+				<span>订单单号：</span>
 				<a target="_blank" ng-href="admin#/trade/purchase/{{invoiceFPur.sourceid | EncryptionFilter}}">
-					<span ng-bind="invoiceFPur.sourceid"></span>
+					<span ng-bind="invoiceFPur.orid"></span>
 				</a>
 				<!--|
 				<span ng-bind="purc.status | statusAndTypeFilter"></span>-->

src/main/webapp/resources/view/vendor/forstore/purchase_detail.html

@@ -327,8 +327,8 @@
 		opacity: 1;
 		background-color: white;
 		width: 600px;
-		top: 40px;
-		left: 200px;
+		top: 50px;
+		left: 100px;
 		border: 1px solid #E7E5E2;
 		-webkit-box-shadow: 0 5px 15px rgba(0,0,0,.5);
 		box-shadow: 0 5px 15px rgba(0,0,0,.5);
@@ -453,7 +453,7 @@
 					<!--<span style="width: 100%; text-align: left; padding-left: 20px;" class="ng-binding"><img src="static/img/user/images/shop_home01.png">{{purchase.buyentername}}</span>-->
 					<!--</dd>-->
 					<dd class="order-company">
-						<span style="white-space: nowrap; width: 100%; text-align: left; line-height: 50px;">
+						<span style="white-space: nowrap; width: 100%; text-align: left; line-height: 50px; position:relative;">
 							<i style="min-width: 315px; display: inline-block">
 								<i ng-bind="purchase.buyername" style="color: #333; margin-left: 20px;"></i>
                                 <i style="color: #999; margin: 0 5px;" ng-if="purchase.buyentername">|</i>