Merge remote-tracking branch 'origin/feature-201830-wangcz' into feature-201830-wangcz

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

@@ -6,10 +6,10 @@ define(['app/app'], function(app) {
 		document.title = '订单详情-优软商城';
 		// 保存订单编号信息
 		$scope.orderId = $stateParams.orderid;
-		$scope.acceptGoods = false; // 是否是 收货入库进来
+		$scope.acceptGoods = true; // 是否是 收货入库进来
 		$scope.CheckId = 'autoMonth0'; // 当前发货点选择按钮
     	$scope.ChooseItem = '';// 当前选择发货单
-		$scope.orderStatus = true
+		$scope.orderStatus = false
 
     // 获取当前收货单所对应的物品信息
     function getReceiveInfo() {
@@ -20,7 +20,9 @@ define(['app/app'], function(app) {
           {id: $scope.order.id, invoiceid: $scope.ChooseItem}, {},
           function (data) {
             var params = {};
-          	if (data.data.status === 404) {
+              // $scope.orderStatus = true
+
+          	if (data.data.status === 404 || data.data.signReceive) {
               $scope.orderStatus = true
 	          } else {
               $scope.orderStatus = false
@@ -251,7 +253,7 @@ define(['app/app'], function(app) {
 				if ($scope.order.inIds) {
           $scope.sendGoodsList = $scope.order.inIds.split(',')
         }
-        $scope.acceptGoods = $scope.order.signReceive
+        // $scope.acceptGoods = $scope.order.signReceive
         $scope.ChooseItem = $scope.sendGoodsList.length > 0 ? $scope.sendGoodsList[0] : ''
 				// if ($scope.acceptGoods) {
           getReceiveInfo()

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

@@ -215,11 +215,12 @@
         background: #e8e8e8;
     }
     .seek-purchase .seek-purchase-content >table >tbody tr.expand-row table tbody tr td.input-number span:first-child {
-        top: 12px;
+        top: 23px;
+        left: -6px;
     }
     .seek-purchase .seek-purchase-content >table >tbody tr.expand-row table tbody tr td.input-number span:last-child {
-        top: 12px;
-        right: 10px;
+        top: 23px;
+        right: -7px;
     }
     .seek-purchase .seek-purchase-content >table >tbody tr.expand-row table tbody tr td.operate > a {
         color: #5078cb;
@@ -810,10 +811,10 @@
                                 <thead>
                                 <tr>
                                     <!-- <th width="68">全选</th>-->
-                                    <th width="214">卖家</th>
+                                    <th width="350">卖家</th>
                                     <th width="83">交期(天)</th>
                                     <th width="104">单价</th>
-                                    <th width="137">生产日期</th>
+                                    <!--<th width="137">生产日期</th>-->
                                     <th width="111">库存</th>
                                     <th width="142">购买数量</th>
                                     <th width="186">操作</th>
@@ -830,10 +831,10 @@
                                                 <label for="{{$index + 2}}"></label>
                                             </label>
                                         </td>-->
-                                        <td width="214" title="{{go.enterpriseName}}" ng-bind="go.enterpriseName">哈哈哈</td>
+                                        <td width="350" title="{{go.enterpriseName}}" ng-bind="go.enterpriseName">哈哈哈</td>
                                         <td width="83" class="red-text" ng-bind="go.minDelivery+'-'+go.maxDelivery">4-6{{fragments[i].price}}</td>
                                         <td width="104" class="red-text">{{go.currencyName + fragments[$index].price | currencyStr}}</td>
-                                        <td width="137" ng-bind="go.produceDate">2012-12-12</td>
+                                        <!--<td width="137" ng-bind="go.produceDate">2012-12-12</td>-->
                                         <td width="111" ng-bind="go.reserve">21412</td>
                                         <td width="142" class="input-number">
                                             <div>

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

@@ -59,13 +59,13 @@
 	/*订单详情修改*/
 	.logistics_list01{
 		background: #fff;
+		padding-bottom:10px;
 	}
 	.oder_xq_list dl dt{
 		border: #f1f6ff 1px solid;
 		height: 40px;
 		border-bottom: #769be9 2px solid;
 		background: #f6f9ff;
-		margin-top: 10px;
 	}
 	.oder_xq_list dl .oder_l {
 		background: #f6f9ff;
@@ -290,24 +290,23 @@
 		font-size: 14px;
 		color: #fff;
 	}
+	.oder_detail .logistics {
+		width: 100%;
+		margin: 0 auto;
+		height: 206px;
+		background: #fff;
+		border: #e8e8e8 1px solid;
+	}
+	.log_menu {
+		width: 100%;
+		margin: 5px auto;
+		background: #fff;
+	}
 </style>
 <div class="user_right fr">
 	<!--叮当详情-->
 	<div class="oder_detail" id="oder-detail" >
-		<div class="log_menu" ng-if="!acceptGoods">
-			<div class="sendGoodsList" >
-				<li ng-repeat="item in sendGoodsList">
-					<label class="com-check-radio"   ng-click="ChooseSendGoodsItem(item, $index, $event)">
-						<input type="radio" name="autoMonth" name="date" ng-checked="CheckId === 'autoMonth'+$index">
-						<label style="vertical-align: top"  name="autoMonth" ></label>
-						<div class="clearfix">
-							<div style="color: #666">发货单：</div><div style="color: #333">{{item}}</div>
-						</div>
-					</label>
-				</li>
-			</div>
-		</div>
-		<div ng-if="!acceptGoods">
+		<div>
 			<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) }">
@@ -364,48 +363,48 @@
 		<!--</div>-->
 
 		<!-- 收入入库抬头 -->
-		<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">
-				订单信息 <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">
+		<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>-->
+				<!--&lt;!&ndash;<a href="javascript:void(0)" class="contact_btn" title="联系卖家" ng-click="contactSeller()">联系卖家</a>&ndash;&gt;-->
+							<!--<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>
 				订单信息 <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">
@@ -449,6 +448,7 @@
 					<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">
@@ -483,7 +483,7 @@
 			<div class="log_menu" ng-if="acceptGoods">
 				<span>订单明细</span>
 			</div>
-			<div class="oder_xq_list" style="padding-top: 0;">
+			<div class="oder_xq_list" style="padding-top: 0;padding-bottom:0px;">
 				<dl class="clearfix">
 					<dt>
 						<span class="wd02">产品信息</span>
@@ -650,7 +650,7 @@
 					</dd>
 				</dl>
 			</div>
-			<div class="oder_xq clearfix" ng-if="address && !acceptGoods" style="background: #f8f8f8">
+			<div class="oder_xq clearfix" ng-if="address" style="background: #f8f8f8">
 				<p>
 					<b>收货人：</b>
 					<span ng-bind="address.name">王子鑫</span>
@@ -716,7 +716,7 @@
 		<!--</div>-->
 		<!--</div>-->
 		<!--发票信息-->
-		<div class="logistics_list01" ng-if="!acceptGoods">
+		<div class="logistics_list01">
 			<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>

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

@@ -1274,10 +1274,10 @@
                                 <thead>
                                 <tr>
                                     <!-- <th width="68">全选</th>-->
-                                    <th width="214">卖家</th>
+                                    <th width="350">卖家</th>
                                     <th width="83">交期(天)</th>
                                     <th width="104">单价</th>
-                                    <th width="137">生产日期</th>
+                                    <!--<th width="137">生产日期</th>-->
                                     <th width="111">库存</th>
                                     <th width="142">购买数量</th>
                                     <th width="186">操作</th>
@@ -1294,10 +1294,10 @@
                                                 <label for="{{$index + 2}}"></label>
                                             </label>
                                         </td>-->
-                                        <td width="214" title="{{go.enterpriseName}}" ng-bind="go.enterpriseName">哈哈哈</td>
+                                        <td width="350" title="{{go.enterpriseName}}" ng-bind="go.enterpriseName">哈哈哈</td>
                                         <td width="83" class="red-text" ng-bind="go.minDelivery+'-'+go.maxDelivery">4-6{{fragments[i].price}}</td>
                                         <td width="104" class="red-text">{{go.currencyName + fragments[$index].price | currencyStr}}</td>
-                                        <td width="137" ng-bind="go.produceDate">2012-12-12</td>
+                                        <!--<td width="137" ng-bind="go.produceDate">2012-12-12</td>-->
                                         <td width="111" ng-bind="go.reserve">21412</td>
                                         <td width="142" class="input-number">
                                             <div>

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

@@ -1055,7 +1055,7 @@
 					<div class="operate-btn" ng-click="sendGoodsCome()"><span>入库</span></div>
 					<div class="operate-btn" ng-click="sendGoodsOut()"><span>出库</span></div>
 					<div class="operate-btn" ng-click="download($event)"><span>导出选中</span></div>
-					<!--<div class="operate-btn" ng-click="modifyBatch($event)"><span>批量修改</span></div>-->
+					<div class="operate-btn" ng-click="modifyBatch($event)"><span>批量修改</span></div>
 					<!--<div class="operate-btn" ng-show="standard_tab == 'unstandard'" ng-click="matchAll()"><span ng-show="standard_tab == 'unstandard'">匹配</span></div>-->
 					<div class="operate-btn" ng-click="deleteBatch($event)"><span>删除选中</span></div>
 					<span class="check-btn" ng-show="isBatch">

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

@@ -1464,7 +1464,7 @@
                             <table class="wanted-sub-tab table" ng-if="storage_tab === 'outBound'">
                                 <tr ng-repeat="list in item.purchaseDetails">
                                     <td width="60" ng-bind="$index + 1"></td>
-                                    <td width="150"><span ng-bind="list.batchCode || '-'" title="{{list.batchCode}}"></span></td>
+                                    <td width="150"><span ng-bind="list.cmpCode || '-'" title="{{list.batchCode}}"></span></td>
                                     <td width="110"><span ng-bind="list.brName || '-'" title="{{list.brName}}"></span></td>
                                     <td><span ng-bind="list.kiName || '-'" title="{{list.kiName}}"></span></td>
                                     <td width="180"><span ng-bind="list.spec || '-'" title="{{list.spec}}"></span></td>