1、优化收入库管理

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

@@ -1,13 +1,16 @@
 
 define(['app/app'], function(app) {
 	"use strict";
-	app.register.controller('orderDetailCtrl', ['$scope', 'Order', 'Logistics', 'ComponentActive', 'toaster', '$stateParams', 'KdnLogistics', '$state', 'StoreInfo', 'NumberService', function($scope, Order, Logistics, ComponentActive, toaster, $stateParams, KdnLogistics, $state, StoreInfo, NumberService) {
+	app.register.controller('orderDetailCtrl', ['$scope', 'Order', 'Logistics', 'ComponentActive', 'toaster', '$stateParams', 'KdnLogistics', '$state', 'StoreInfo', 'NumberService', '$location', function($scope, Order, Logistics, ComponentActive, toaster, $stateParams, KdnLogistics, $state, StoreInfo, NumberService, $location) {
 
 		document.title = '订单详情-优软商城';
 		// 保存订单编号信息
 		$scope.orderId = $stateParams.orderid;
-
-		// 记录状态激活信息
+		$scope.acceptGoods = $location.search().fromPage || false // 是否是 收货入库进来
+		$scope.CheckId = 'autoMonth0' // 当前发货点选择按钮
+    $scope.ChooseItem = {} // 当前选择发货单
+		$scope.sendGoodsList = [{},{},{}]
+    // 记录状态激活信息
 		$scope.steps = {
 			step1 : false,
 			step2 : false,
@@ -242,6 +245,29 @@ define(['app/app'], function(app) {
 			});
 		}
 
+		// 设置当前选择的发货单
+		$scope.ChooseSendGoodsItem = function(item, ind) {
+      $scope.CheckId = `autoMonth${ind}`
+			$scope.ChooseItem = item
+		}
+
+    // 确认收货
+    $scope.ensureAccept = function() {
+      // var orderids = Object.getOwnPropertyNames($scope.store);
+      var ids = $scope.order.id
+      OrderSimpleInfo.ensureAccept({ids: ids},{},function(data){
+        toaster.pop('success', '成功' ,'确认收货成功');
+        $scope.goBack()
+      }, function(res){
+        toaster.pop('error', '失败！' + res.data);
+      });
+    };
+
+		// 取消收货
+		$scope.goBack = function() {
+      $state.go('buyer_order');
+		}
+
 	}]);
 
 	app.register.filter('noLogisticFilter', function () {

src/main/webapp/resources/view/usercenter/forstore/buyer_order.html

@@ -1021,7 +1021,7 @@
                               </a>
                                 <div ng-if="order.status == 404">
 																	<!--ng-click="ensureAccept(order)"-->
-                                    <a href="user#/order/detail/{{order.orderid | EncryptionFilter}}" class="operate-height"  style="display: block;">
+                                    <a href="user#/order/detail/{{order.orderid | EncryptionFilter}}?fromPage=true" class="operate-height"  style="display: block;">
                                         <em class="order-operation">收货入库</em>
                                     </a>
                                     <div class="clock-mind">

src/main/webapp/resources/view/usercenter/forstore/order_detail.html

@@ -209,24 +209,25 @@
 		padding-left: 15px;
 		margin-left: 10px;
 	}
-	.text-area{
+	.text-area {
 		width: 120px;
-		height: 60px;
-		background: #fff;
-		margin-top: 15px;
-		overflow-y: auto;
-		text-align: left;
+		height: 24px;
+		margin-top: 34px;
+		text-align: center;
+		font-size: 16px;
 		padding: 0 3px;
 		margin-left: 5px;
 	}
-	.text-area i{
+
+	.text-area i {
 		text-align: left;
 		position: relative;
 		top: 4px;
-		font-size: 12px;
+		font-size: 16px;
 		color: #666;
 		word-break: break-all;
 	}
+
 	.oder_xq_list dl span.user-address{
 		width: 100% !important;
 		line-height: 30px;
@@ -292,8 +293,9 @@
 </style>
 <div class="user_right fr">
 	<!--叮当详情-->
-	<div class="oder_detail" id="oder-detail">
-		<div class="logistics" ng-if="order.status != 602 && order.status != 603 && order.status != 604 && order.status != 605 && order.status != 606 && order.status != 315" ng-cloak>
+	<div class="oder_detail" id="oder-detail" >
+		<div ng-if="!acceptGoods">
+			<div class="logistics" ng-if="order.status != 602 && order.status != 603 && order.status != 604 && order.status != 605 && order.status != 606 && order.status != 315" ng-cloak>
 			<ul>
 				<li ng-class="{ 'active' : (steps.step2 || steps.step3 || steps.step4 || steps.step5) }">
 					<p>拍下产品</p>
@@ -322,6 +324,7 @@
 				</li>
 			</ul>
 		</div>
+		</div>
 		<!--<div class="logistics_list01">-->
 		<!--<div class="log_menu">-->
 		<!--<span>收发货地址</span>-->
@@ -346,12 +349,116 @@
 		<!--</ul>-->
 		<!--</div>-->
 		<!--</div>-->
+
+		<!-- 收入入库抬头 -->
+		<div class="log_menu">
+			<span ng-if="order.status != 602 && order.status != 603 && order.status != 604 && order.status != 605 && order.status != 606 && order.status != 315">
+				订单信息 <a style="margin: 0 5px"></a>卖家：
+				<span style="white-space: nowrap;text-align: left;line-height: 24px;position: relative;border-bottom: 0px;height: 24px;width: 480px;margin-left: 0px;padding-left: 0px;">
+               <i style="min-width: 300px; display: inline-block">
+								&nbsp;&nbsp;<img src="static/img/user/images/shop_home.png"/>
+								<a ng-href="store/{{order.orderDetails[0].storeid}}" ng-bind="order.storeName" class="hover-color" target="_blank"></a>
+							</i>
+							<img src="static/img/common/songguo.png" style="margin-right:0; ">
+							<div style="display: inline-block" ng-controller="ChatContactCtrl as chat">
+								<a href="javascript:void(0)" class="contact_btn" title="联系卖家" ng-click="chat.contactWithOther(null, order.buyerenuu, chat.UserType.STORE)">联系卖家</a>
+								<div class="com-mall-del-box link-saler-box" ng-if="showLinkBox">
+									<div class="title">
+									  <i ng-click="setShowLinkBox(false)"></i>
+									</div>
+									<div class="content">
+									  <p><i class="fa fa-exclamation-circle"></i>抱歉，暂时无法与卖家在线沟通！</p>
+									  <p>卖家联系电话：<span ng-bind="phone"></span></p>
+									  <div>
+										<a ng-click="setShowLinkBox(false)">我知道了</a>
+									  </div>
+									</div>
+								  </div>
+							</div>
+				<!--<a href="javascript:void(0)" class="contact_btn" title="联系卖家" ng-click="contactSeller()">联系卖家</a>-->
+							<div class="contact-box" ng-if="contactBNox">
+								<div class="title"><i class="fa fa-close fa-lg" ng-click="closeBox()"></i></div>
+								<div class="content">
+									<div class="company-title" ng-bind="::order.sellername">深圳市优软科技</div>
+									<div class="list">
+										<em>手机：<em ng-bind="::order.sellPhone || '暂无联系电话'">45413413131313</em></em>
+										<em style="margin-left: 60px;">邮箱：<em ng-bind="::order.sellEmail || '暂无电子邮箱'">45413413131313</em></em>
+									</div>
+									<div class="list">地址：
+										<em ng-bind="order.sellCompanyAddress || order.sellCompanyArea || '暂无地址信息'">1212314531455</em>
+									</div>
+								</div>
+							</div>
+						</span>
+				<b>订单号：{{order.orderid}}<em><font style="color: #333;">订单状态：</font>{{order.status | orderStatus}}</em></b>
+			</span>
+			<span ng-if="order.status == 602 || order.status == 603 || order.status == 604 || order.status == 605 || order.status == 606 || order.status == 315">
+				订单信息 <a style="margin: 0 5px"></a>卖家：
+				<span style="white-space: nowrap;text-align: left;line-height: 24px;position: relative;border-bottom: 0px;height: 24px;width: 480px;margin-left: 0px;padding-left: 0px;">
+               <i style="min-width: 300px; display: inline-block">
+								&nbsp;&nbsp;<img src="static/img/user/images/shop_home.png"/>
+								<a ng-href="store/{{order.orderDetails[0].storeid}}" ng-bind="order.storeName" class="hover-color" target="_blank"></a>
+							</i>
+							<img src="static/img/common/songguo.png" style="margin-right:0; ">
+							<div style="display: inline-block" ng-controller="ChatContactCtrl as chat">
+								<a href="javascript:void(0)" class="contact_btn" title="联系卖家" ng-click="chat.contactWithOther(null, order.buyerenuu, chat.UserType.STORE)">联系卖家</a>
+								<div class="com-mall-del-box link-saler-box" ng-if="showLinkBox">
+									<div class="title">
+									  <i ng-click="setShowLinkBox(false)"></i>
+									</div>
+									<div class="content">
+									  <p><i class="fa fa-exclamation-circle"></i>抱歉，暂时无法与卖家在线沟通！</p>
+									  <p>卖家联系电话：<span ng-bind="phone"></span></p>
+									  <div>
+										<a ng-click="setShowLinkBox(false)">我知道了</a>
+									  </div>
+									</div>
+								  </div>
+							</div>
+					<!--<a href="javascript:void(0)" class="contact_btn" title="联系卖家" ng-click="contactSeller()">联系卖家</a>-->
+							<div class="contact-box" ng-if="contactBNox">
+								<div class="title"><i class="fa fa-close fa-lg" ng-click="closeBox()"></i></div>
+								<div class="content">
+									<div class="company-title" ng-bind="::order.sellername">深圳市优软科技</div>
+									<div class="list">
+										<em>手机：<em ng-bind="::order.sellPhone || '暂无联系电话'">45413413131313</em></em>
+										<em style="margin-left: 60px;">邮箱：<em ng-bind="::order.sellEmail || '暂无电子邮箱'">45413413131313</em></em>
+									</div>
+									<div class="list">地址：
+										<em ng-bind="order.sellCompanyAddress || order.sellCompanyArea || '暂无地址信息'">1212314531455</em>
+									</div>
+								</div>
+							</div>
+						</span>
+				<b>
+					订单号：{{order.orderid}}
+					<em style="margin-right: 0;" ng-if="order.status != 603"><font class="color999">取消原因：</font>{{order.unavailableReason.reason}}</em>
+					<em style="margin-right: 0;" ng-if="order.status == 603"><font class="color999">取消原因：</font>超时未付款自动取消</em>
+					<em><font class="color999">订单状态：</font>{{order.status | orderStatus}}</em>
+				</b>
+			</span>
+
+			<div class="sendGoodsList">
+				<li ng-repeat="item in sendGoodsList">
+					<label class="com-check-radio" >
+						<input type="radio" id="autoMonth0" name="date" ng-click="ChooseSendGoodsItem(item, $index)" ng-checked="CheckId === 'autoMonth'+$index">
+						<label style="vertical-align: top" for="autoMonth0"></label>
+						<div class="clearfix">
+							<div style="color: #666">发货单：</div><div style="color: #333">FH001001002003004 (2018-08-11 11:20:20)</div>
+						</div>
+					</label>
+				</li>
+			</div>
+
+		</div>
+		<!-- /end 收入入库抬头 -->
+
 		<!--订单信息-->
 		<div class="logistics_list01" ng-class="{'status': order.status == 602 || order.status == 603 || order.status == 604 || order.status == 605 || order.status == 606 || order.status == 315}">
-			<div class="log_menu">
+			<div class="log_menu" ng-if="!acceptGoods">
 				<span ng-if="order.status != 602 && order.status != 603 && order.status != 604 && order.status != 605 && order.status != 606 && order.status != 315">订单信息<b>订单号：{{order.orderid}}<em><font style="color: #333;">订单状态：</font>{{order.status | orderStatus}}</em></b></span>
 				<span ng-if="order.status == 602 || order.status == 603 || order.status == 604 || order.status == 605 || order.status == 606 || order.status == 315">
-					<i class="f14">订单号：{{order.orderid}}</i>
+					<i class="f14" ng-if="!acceptGoods">订单号：{{order.orderid}}</i>
 					<b>
 						<em style="margin-right: 0;" ng-if="order.status != 603"><font class="color999">取消原因：</font>{{order.unavailableReason.reason}}</em>
 						<em style="margin-right: 0;" ng-if="order.status == 603"><font class="color999">取消原因：</font>超时未付款自动取消</em>
@@ -359,7 +466,10 @@
 					</b>
 				</span>
 			</div>
-			<div class="oder_xq clearfix" ng-if="address" style="background: #f8f8f8">
+			<div class="log_menu">
+				<span>订单明细</span>
+			</div>
+			<div class="oder_xq clearfix" ng-if="address && !acceptGoods" style="background: #f8f8f8">
 				<p>
 					<b>收货人：</b>
 					<span ng-bind="address.name">王子鑫</span>
@@ -384,15 +494,15 @@
 						<span class="wd01">已收货PCS</span>
 						<span class="wd01">本次收货PCS</span>
 					</dt>
-					<dd class="order-company">
+					<dd class="order-company" ng-if="!acceptGoods">
 						<span style="white-space: nowrap; width: 100%; text-align: left; line-height: 50px; position: relative;">
-                            <i style="min-width: 300px; display: inline-block">
+               <i style="min-width: 300px; display: inline-block">
 								&nbsp;&nbsp;<img src="static/img/user/images/shop_home.png"/>
 								<a ng-href="store/{{order.orderDetails[0].storeid}}" ng-bind="order.storeName" class="hover-color" target="_blank"></a>
 							</i>
 							<img src="static/img/common/songguo.png" style="margin-right:0; ">
-                            <div style="display: inline-block" ng-controller="ChatContactCtrl as chat">
-							    <a href="javascript:void(0)" class="contact_btn" title="联系卖家" ng-click="chat.contactWithOther(null, order.buyerenuu, chat.UserType.STORE)">联系卖家</a>
+							<div style="display: inline-block" ng-controller="ChatContactCtrl as chat">
+								<a href="javascript:void(0)" class="contact_btn" title="联系卖家" ng-click="chat.contactWithOther(null, order.buyerenuu, chat.UserType.STORE)">联系卖家</a>
 								<div class="com-mall-del-box link-saler-box" ng-if="showLinkBox">
 									<div class="title">
 									  <i ng-click="setShowLinkBox(false)"></i>
@@ -529,13 +639,22 @@
 							<i class="fl">地址：<i ng-bind="takeSelf.area"></i>  <i ng-bind="takeSelf.detailAddress">科技园英唐大厦6楼 优软商城科技园英唐大厦6楼 优软商城</i></i>
 						</span>
 					</dd>
-					<!--<dd class="price">-->
-					<!--<span style="width: 100%;">总计：<i  ng-bind="order.price | formateNumber : 2 | currencySysmbol : order.currency">￥820.00</i></span>-->
-					<!--</dd>-->
+					<dd ng-if="acceptGoods">
+						<span class="user-address" style="padding-left: 40px;">
+							<i class="fl">物流公司：{{logistics.companyName.companyName || logistics.companyName || '空'}}</i><br>
+							<i class="fl" style="margin-top: 5px">物流单号：{{logistics.number || '空'}}</i>
+						</span>
+					</dd>
 				</dl>
 			</div>
+			<div class="order_btn" ng-if="acceptGoods">
+				<div ng-click="goBack()">取消</div>
+				<div ng-click="ensureAccept()">确认收货</div>
+			</div>
+			<div style="clear: both"></div>
 		</div>
 		<!--物流信息-->
+		<div ng-if="!acceptGoods">
 		<div class="logistics_list01" ng-if="order.status != 602 && order.status != 603 && order.status != 604 && order.status != 605 && order.status != 606 && order.status != 315">
 			<div class="log_menu">
 				<span>物流信息<em style="color: #666;" ng-if="!logistics.companyName&& noLogisticInfoArray[order.status]">（暂无物流信息）</em>
@@ -554,6 +673,7 @@
 				<!--<div ng-if="!canShowInfo" style="text-align:center;padding-top:20px;font-size: 14px;">系统无法提供此物流信息</div>-->
 			</div>
 		</div>
+		</div>
 		<!--<div class="logistics_list01">-->
 		<!--<div class="log_menu">-->
 		<!--<span>收发货地址</span>-->
@@ -579,7 +699,7 @@
 		<!--</div>-->
 		<!--</div>-->
 		<!--发票信息-->
-		<div class="logistics_list01">
+		<div class="logistics_list01" ng-if="!acceptGoods">
 			<div class="log_menu"><span>发票信息<em style="color: #666;" ng-if="order.invoicetype == 1207">（暂不开票）</em></span></div>
 			<div class="oder_xq clearfix" style="padding-bottom: 20px;" ng-if="order.invoicetype == 1206 || order.invoicetype == 1205">
 				<p>
@@ -627,3 +747,71 @@
 		</div>
 	</div>
 </div>
+
+<style>
+	label {
+		margin-bottom: 0px;
+	}
+	.com-check-radio input[type='radio'] + label {
+		top: 14px !important;
+	}
+	.sendGoodsList {
+		padding: 0 25px;
+	}
+	.sendGoodsList:after {
+		clear: both;
+		content: ' ';
+		zoom: 1;
+		display: block;
+		visibility: hidden;
+	}
+	.sendGoodsList li {
+		float: left;
+		width: 50%;
+	}
+	.sendGoodsList li .clearfix {
+		display: inline-block;
+		line-height: 40px;
+	}
+	.sendGoodsList li .clearfix:after {
+		clear: both;
+		content: ' ';
+		zoom: 1;
+		display: block;
+		visibility: hidden;
+	}
+	.sendGoodsList li .clearfix div {
+		float: left;
+		font-size: 14px;
+	}
+	.order_btn {
+		float: right;
+		padding-bottom: 40px;
+	}
+	.order_btn:after {
+		clear: both;
+		content: ' ';
+		zoom: 1;
+		display: block;
+		visibility: hidden;
+	}
+	.order_btn div {
+		width: 120px;
+		height: 34px;
+		line-height: 34px;
+		color: #fff;
+		font-size: 16px;
+		border-radius: 4px;
+		text-align: center;
+		float: left;
+		cursor: pointer;
+	}
+	.order_btn div:last-child {
+		background: #aaaaaa;
+		margin-left: 30px;
+		margin-right: 16px;
+	}
+	.order_btn div:first-child {
+		background: #5078cb;
+	}
+</style>

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

@@ -775,7 +775,7 @@
                 <!--<input type="text" ng-model="mockModal" ng-blur="Change" />-->
                 <!--<em ng-if="!detail.goodsnumber">&nbsp;</em>-->
                 <div class="text-area">
-                  <i >{{detail.shipQty}}</i>
+                  <i >{{detail.shipQty > 0 ? detail.shipQty : '-'}}</i>
                 </div>
               </span>
               <span class="wd01" style="line-height: 18px;">
@@ -784,7 +784,10 @@
                 <!--<div class="text-area" ng-if="detail.remark">-->
                   <!--<i ng-bind="detail.remark">金石为开取数据五块钱叫稍微亲上加亲</i>-->
                 <!--</div>-->
-                <input class="sendInput" type="text" ng-model="detail.sendCount" ng-blur="ChangeSendCount(detail, detail.sendCount, $index)" />
+                <div class="text-area" ng-if="detail.shipQty === detail.number">
+                  <i>-</i>
+                </div>
+                <input ng-if="detail.shipQty < detail.number" class="sendInput" type="text" ng-model="detail.sendCount" ng-blur="ChangeSendCount(detail, detail.sendCount, $index)" />
               </span>
             </dd>
           </div>