Merge remote-tracking branch 'origin/feature-yc-201813' into feature-yc-201813

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/ReleaseProductByBatchServiceImpl.java

@@ -190,7 +190,7 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
 			if (colNum != UploadConstant.TOTAL_COLUMN_PERSON && colNum != UploadConstant.MAX_TOTAL_COLUMN_PERSON) {
 				throw new IllegalOperatorException("表格模板不正确！请重新下载最新模板");
 			}
-		} else if ((isPcb && colNum != UploadConstant.TOTAL_COLUMN_PCB && colNum != UploadConstant.MAX_TOTAL_COLUMN_PCB) || (colNum != UploadConstant.TOTAL_COLUMN && colNum != UploadConstant.MAX_TOTAL_COLUMN)) {
+		} else if ((isPcb && colNum != UploadConstant.TOTAL_COLUMN_PCB && colNum != UploadConstant.MAX_TOTAL_COLUMN_PCB) || (!isPcb && colNum != UploadConstant.TOTAL_COLUMN && colNum != UploadConstant.MAX_TOTAL_COLUMN)) {
 				throw new IllegalOperatorException("表格模板不正确！请重新下载最新模板");
 			}
 		int rowNum = SheetUtil.getSheetLastNum(sheet, isPcb ? UploadConstant.MAX_TOTAL_COLUMN_PCB : UploadConstant.MAX_TOTAL_COLUMN);

src/main/webapp/resources/js/common/controllers/commonCtrls.js

@@ -1846,9 +1846,10 @@ define([ 'app/app' ], function(app) {
 				$scope.openHomeCenterModel();
 			}*/
 		// };
-		$q.all[$rootScope.pcbPromise].then(function (res) {
-			$rootScope.isPcbStore = res == 1;
-		})
+		// $q.all[$rootScope.pcbPromise].then(function (res) {
+		// 	$rootScope.isPcbStore = res == 1;
+		// })
+        // console.log($scope.pcbPromise);
 	}]);
 
     function checkNullStr (str) {

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

@@ -677,14 +677,7 @@ define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'commo
 		});
 		var applyPromise = deferred1.promise;
 
-		// 是否pcb
-		var deferred2 = $q.defer();
-		StoreInfo.isPcb({enuu: $rootScope.userInfo.enterprise.uu}, function (result) {
-			deferred1.resolve(result);
-		}, function (error) {
-			deferred1.reject(error);
-		});
-		$rootScope.pcbPromise = deferred2.promise;
+        // console.log($rootScope.userInfo);
 
 		// 合并多个Promise对象
 		$q.all([storePromise, applyPromise]).then(function (result) {
@@ -710,9 +703,11 @@ define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'commo
 						$state.go('vendor_store_maintain');
 					}
 				}
-				$q.all[$rootScope.pcbPromise].then(function (res) {
-					$rootScope.isPcbStore = res == 1;
-				})
+                // 是否pcb
+                StoreInfo.isPcb({enuu: $rootScope.userInfo.enterprise.uu}, function (res) {
+                    $rootScope.isPcbStore = res.data == 1;
+                }, function (error) {
+                });
 			}).error(function (error) {
 				toaster.pop('error', '获取登录信息失败');
 			})

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_upload_ctrl.js

@@ -247,7 +247,7 @@ define([ 'app/app' ], function(app) {
 			} else {
                 var param = {selfSale : $scope.batch.sellType == 'self', currency : $scope.batch.currency, repeatImport : $scope.repeatImport};
 			}
-			var uploadUrl = $rootScope.isPcbStore ? '/release/product/batchRelease/pcb' : 'release/product/release/excel';
+			var uploadUrl = $rootScope.isPcbStore ? '/release/product/release/excel/pcb' : 'release/product/release/excel';
 			$upload.upload({
 				url: uploadUrl,
 				file: file,

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

@@ -142,6 +142,9 @@
 		border-bottom: #e8e8e8 1px solid;
 		text-align: center;
 	}
+	.public-tab.table>thead>tr>th:first-child{
+		text-align:right;
+	}
 	.public-tab.table>tbody>tr>td{
 		border-top: none;
 		border-bottom: #e8e8e8 1px solid;
@@ -178,7 +181,7 @@
 		color: #5078cb;
 	}
 	.public-tab.table>tbody>tr>td.edit span span{
-		padding: 0 8px;
+		padding: 0 5px;
 		display: inline-block;
 		/*width: 50px;*/
 		height: 24px;
@@ -193,7 +196,7 @@
 	}
 	/*展开收起按钮同一位置显示*/
 	.public-tab.table>tbody>tr>td.edit span.packUp{
-		margin-left: 112px;
+		margin-left: 100px;
 	}
 		/*已上架*/
 	.public-tab.table>tbody>tr>td span.has-on{
@@ -1101,7 +1104,7 @@
 	.edit-contents td .bg{
 		background: #fff;
 		width: 100%;
-		height: 132px;
+		height: 100px;
 	}
 	.edit-contents .content{
 		text-align: left;
@@ -2004,37 +2007,37 @@
 				<table class="public-tab standard-tab table">
 					<thead>
 					<tr>
-						<th width="80">
+						<th width="65">
 							<label class="check-active">
 								<input ng-disabled="currenctMaterial.length == 0" type="checkbox"  ng-click="chooseAllItem()" ng-checked="chooseAll || chooseAllPage" id="AllChoose"/>
 								<label for="AllChoose"></label>
 								<span>全选</span>
 							</label>
 						</th>
-						<th width="50">序号</th>
+						<th width="40">序号</th>
 						<th width="120">品牌</th>
 						<th width="140">类目(产品名称)</th>
-						<th width="170">产品型号</th>
-
-						<th width="100">单位</th>
+						<th width="170">型号</th>
+						<th width="100">规格</th>
+						<th width="80">单位</th>
 						<!--<th width="80">封装</th>-->
-						<th width="310">操作</th>
+						<th width="280">操作</th>
 					</tr>
 					</thead>
 					<tbody class="bg-show">
 					<!--<tr style="height: 14px;" ng-show="!isBatch && standard_tab == 'standard'">-->
 					<tr style="height: 14px;">
-						<td colspan="7" class="hei18"></td>
+						<td colspan="8" class="hei18"></td>
 					</tr>
 					</tbody>
 					<tbody>
 						<tr style="height: 14px;" ng-show="currenctMaterial.length > 0 && standard_tab == 'unstandard' && showTip">
-							<td colspan="7" class="hei17">
+							<td colspan="8" class="hei17">
 								<span>*匹配成为标准产品方可通过器件选型、参数搜索展示</span><a ng-click="cancelTip()">&times;</a>
 							</td>
 						</tr>
 						<tr class="no-hover batch-tr" ng-if="(chooseAll || chooseAllPage) && currenctMaterial.length != 0">
-							<td colspan="7">
+							<td colspan="8">
 								<div class="batch-line" ng-if="chooseAll && !chooseAllPage">
 									已选中当前页
 									<em class="red" ng-bind="materialAll.numberOfElements"></em>个产品，
@@ -2071,7 +2074,9 @@
                             <a class="brand-type" ng-if="material.cmpUuId" ng-href="product/component/{{material.cmpUuId}}/" ng-bind="material.pcmpcode" title="{{material.pcmpcode}}" target="_blank"></a>
                             <span class="brand-type" ng-if="!material.cmpUuId" ng-bind="material.pcmpcode" title="{{material.pcmpcode}}"></span>
 						</td>
-
+						<td>
+							<span ng-bind="material.spec || '-'" title="{{material.spec || '-'}}"></span>
+						</td>
 						<td ng-bind="material.unit || 'PCS'" title="{{material.unit  || 'PCS'}}"></td>
 						<!--<td>-->
 							<!--<span ng-bind="material.encapsulation || '-'" title="{{material.encapsulation || '-'}}"></span>-->
@@ -2092,7 +2097,7 @@
 					</tr>
 					<!--展开内容-->
 					<tr ng-show="material.addGoodsOper  || (material.exPandOper && material.goodsArr.length > 0)">
-						<td colspan="7" style="padding: 0;">
+						<td colspan="8" style="padding: 0;">
 							<div class="show-content">
 								<div class="content-body">
 									<table class="public-tab table">
@@ -2156,9 +2161,9 @@
                                                         <div class="input-list">
 										                    <span class="tit" style="width: 84px">最小包装数：</span><input type="number" maxlength="6" oninput="if(value.length>6)value=value.slice(0,6)" class="wid70 form-control" name="minPackQty" title="最小包装数" placeholder="数量" ng-model="goods.editMinPackQty" ng-blur="setPriceMinPackAmount(goods)" ng-class="{'error' : goods.editMinPackQtyInValid}" style="width: 70px;"/>
                                                         </div>
-																											<div class="input-list">
-																												<span class="tit" style="width: 84px">规格：</span><input maxlength="40" class="wid70 form-control" name="minPackQty" title="规格" placeholder="规格" ng-model="goods.spec"  style="width: 70px;"/>
-																											</div>
+														<!--<div class="input-list">-->
+															<!--<span class="tit" style="width: 84px">规格：</span><input maxlength="40" class="wid70 form-control" name="minPackQty" title="规格" placeholder="规格" ng-model="goods.spec"  style="width: 70px;"/>-->
+														<!--</div>-->
                                                     </div>
                                                     <div class="content">
                                                         <p class="title height24">梯度/pcs</p>
@@ -2258,7 +2263,7 @@
 														<p class="title"><span style="width:84px">库存：</span><span ng-bind="goods.reserve">9023492</span></p>
 														<p class="title"><span style="width:84px">最小起订量：</span><span ng-bind="goods.minBuyQty">90492</span></p>
 														<p class="title"><span style="width:84px">最小包装数：</span><span ng-bind="goods.minPackQty">980</span></p>
-														<p class="title"><span style="width:84px">规格：</span><span ng-bind="goods.spec || '-'" title="{{goods.spec}}">980</span></p>
+														<!--<p class="title"><span style="width:84px">规格：</span><span ng-bind="goods.spec || '-'" title="{{goods.spec}}">980</span></p>-->
 													</div>
 													<div class="content width150">
 														<div class="title-price">
@@ -2363,11 +2368,11 @@
 																								 ng-class="{'error' : goods.editMinPackQtyInValid}"
 																								 style="width: 70px;"/>
 														</div>
-														<div class="input-list">
-															<span class="tit"  style="width: 84px">规格：</span><input class="width70 form-control" name="spec" title="规格"  placeholder="规格" ng-model="goods.spec"
-																																		maxlength="50"
-																																		style="width: 70px;"/>
-														</div>
+														<!--<div class="input-list">-->
+															<!--<span class="tit"  style="width: 84px">规格：</span><input class="width70 form-control" name="spec" title="规格"  placeholder="规格" ng-model="goods.spec"-->
+																																		<!--maxlength="50"-->
+																																		<!--style="width: 70px;"/>-->
+														<!--</div>-->
 													</div>
 													<div class="content">
 														<p class="title height24">梯度/pcs</p>

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

@@ -1201,11 +1201,12 @@
                                         <p>品牌: <em ng-bind="commodity.brandNameEn" title="{{commodity.brandNameEn}}">NXP</em></p>
                                         <p>类目(产品名称): <em ng-bind="commodity.kindNameCn || '-'" title="{{commodity.kindNameCn}}"></em></p>
                                         <p>型号: <em ng-bind="commodity.code" title="{{commodity.code}}">LPC1112</em></p>
-                                        <p>
-                                            <span style="width: 32px;">规格: </span>
-                                            <span><input style="width:90px" type="text"
-                                                         placeholder="请输入规格" maxlength="50" ng-model="commodity.spec" class="wid48 form-control"/></span>
-                                        </p>
+                                        <p>规格: <em ng-bind="commodity.spec || '-'" title="{{commodity.spec}}">LPC1112</em></p>
+                                        <!--<p>-->
+                                            <!--<span style="width: 32px;">规格: </span>-->
+                                            <!--<span><input style="width:90px" type="text"-->
+                                                         <!--placeholder="请输入规格" maxlength="50" ng-model="commodity.spec" class="wid48 form-control"/></span>-->
+                                        <!--</p>-->
                                     </div>
                                 </div>
                                 <div class="content-show width120">