Merge remote-tracking branch 'origin/release-201827-wangcz' into release-201827-wangcz

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

@@ -15,6 +15,7 @@
 <link rel="stylesheet" href="static/lib/iconfont/css/iconfont.css" />
 <link rel="stylesheet" href="static/lib/jquery/themes/uploadify/uploadify.css" />
 <link rel="stylesheet" href="static/lib/angular/toaster.css" />
+	<link rel="stylesheet" href="static/css/vendor/sell.css" />
 <link rel="stylesheet" href="static/css/common.css" />
 <!--<link rel="stylesheet" href="static/css/usercenter.css" />-->
 <link rel="stylesheet" href="static/css/user/base.css" />

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

@@ -234,7 +234,7 @@ define([ 'app/app' ], function(app) {
 				order.logistics = {};
 				// console.log($scope.logistics.companyName);
 				// $scope.logisitcsDetail = angular.fromJson($scope.logistics.companyName);
-				order.logistics.companyName = $scope.logistics.companyName;
+				 order.logistics.companyName = $scope.logistics.companyName;
 				//order.logistics.companyId = $scope.logisitcsDetail.id;
 				order.logistics.weight = $scope.logistics.weight;
 				order.logistics.number = $scope.logistics.number;

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

@@ -1,7 +1,7 @@
 
-define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'common/services', 'common/directives','common/query/kind', 'common/query/brand', 'common/query/component', 'common/query/order', 'common/query/cart', 'common/query/goods', 'common/query/return' ,'angular-toaster', 'common/query/urlencryption', 'ui-jquery', 'common/query/bankTransfer', 'common/query/bankInfo', 'common/query/change', 'common/query/rate', 'common/query/logistics', 'common/query/address' ,'angular-toaster','common/query/collection', 'common/query/proofing', 'common/query/bill', 'common/query/user','file-upload', 'file-upload-shim', 'common/query/bankInfo' , 'common/query/responseLogistics', 'common/query/payment', 'common/query/afterSale', 'common/query/messageBoard', 'common/query/importDeclaration', 'common/query/enterprise', 'common/query/invoice', 'common/query/refund', 'common/query/recommendation', 'common/query/logisticsPort', 'common/query/storeInfo', 'common/query/tradeMessageNotice', 'common/query/tradeBasicProperties', 'common/query/browsingHistory', 'common/query/internalMessage', 'common/module/chat_web_module', 'angular-filter', 'common/query/vendor','common/query/seekPurchase', 'common/query/search', 'angular-sanitize', 'common/query/authority'], function(angularAMD) {
+define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'common/services', 'common/directives','common/query/kind', 'common/query/brand', 'common/query/component', 'common/query/order', 'common/query/cart', 'common/query/goods', 'common/query/return' ,'angular-toaster', 'common/query/urlencryption', 'ui-jquery', 'common/query/bankTransfer', 'common/query/bankInfo', 'common/query/change', 'common/query/rate', 'common/query/logistics', 'common/query/address' ,'angular-toaster','common/query/collection', 'common/query/proofing', 'common/query/bill', 'common/query/user','file-upload', 'file-upload-shim', 'common/query/bankInfo' , 'common/query/responseLogistics', 'common/query/payment', 'common/query/afterSale', 'common/query/messageBoard', 'common/query/importDeclaration', 'common/query/enterprise', 'common/query/invoice', 'common/query/refund', 'common/query/recommendation', 'common/query/logisticsPort', 'common/query/storeInfo', 'common/query/tradeMessageNotice', 'common/query/tradeBasicProperties', 'common/query/browsingHistory', 'common/query/internalMessage', 'common/module/chat_web_module', 'angular-filter', 'common/query/vendor','common/query/seekPurchase', 'common/query/search', 'angular-sanitize', 'common/query/authority', 'common/query/releaseProInfo', 'common/query/logisticsPort'], function(angularAMD) {
 	'use strict';
-	var app = angular.module('myApp', [ 'ui.router', 'ui.bootstrap', 'ng.local', 'ngTable', 'common.services', 'common.directives', 'tool.directives', 'common.query.kind', 'brandServices', 'componentServices', 'orderServices', 'cartServices', 'goodsServices', 'returnServices' , 'toaster', 'urlencryptionServices', 'ui.jquery', 'bankTransfer', 'bankInfo', 'changeServices','rateServices', 'logisticsServices', 'addressServices', 'toaster','collection','proofingServices', 'billServices', 'common.query.user', 'angularFileUpload', 'bankInfo', 'responseLogisticsService', 'PaymentService', 'afterSaleService', 'messageBoardServices', 'table.directives', 'importDeclaration', 'common.query.enterprise', 'invoiceServices', 'refundModule', 'recommendation','logisticsPortService', 'storeInfoServices', 'tradeMessageNoticeModule', 'tradeBasicPropertiesServices', 'BrowsingHistory', 'internalMessageServices', 'WebChatModule', 'angular.filter', 'vendorServices','seekPurchaseServices', 'searchService', 'ngSanitize', 'authorityServices']);
+	var app = angular.module('myApp', [ 'ui.router', 'ui.bootstrap', 'ng.local', 'ngTable', 'common.services', 'common.directives', 'tool.directives', 'common.query.kind', 'brandServices', 'componentServices', 'orderServices', 'cartServices', 'goodsServices', 'returnServices' , 'toaster', 'urlencryptionServices', 'ui.jquery', 'bankTransfer', 'bankInfo', 'changeServices','rateServices', 'logisticsServices', 'addressServices', 'toaster','collection','proofingServices', 'billServices', 'common.query.user', 'angularFileUpload', 'bankInfo', 'responseLogisticsService', 'PaymentService', 'afterSaleService', 'messageBoardServices', 'table.directives', 'importDeclaration', 'common.query.enterprise', 'invoiceServices', 'refundModule', 'recommendation','logisticsPortService', 'storeInfoServices', 'tradeMessageNoticeModule', 'tradeBasicPropertiesServices', 'BrowsingHistory', 'internalMessageServices', 'WebChatModule', 'angular.filter', 'vendorServices','seekPurchaseServices', 'searchService', 'ngSanitize', 'authorityServices', 'ReleaseProductByBatchService', 'logisticsPortService']);
 	app.init = function() {
 		angularAMD.bootstrap(app);
 	};
@@ -441,6 +441,12 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'commo
 			templateUrl: 'static/view/usercenter/forstore/bomListDetail.html',
 			controller: 'bomListDetailCtrl',
 			controllerUrl: 'app/controllers/forstore/bomListDetailCtrl'
+        })).state('vendor_upload', angularAMD.route({
+            title : '产品导入',
+            url : '/vendor_upload',
+            templateUrl : 'static/view/vendor/forstore/vendor_upload.html',
+            controllerUrl : "js/vendor/controllers/forstore/vendor_upload_ctrl",
+            controller : 'vendorUploadCtrl'
 		}));
 	}]);
 

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

@@ -21,12 +21,13 @@ define(['app/app'], function(app) {
 	          } else {
               $scope.orderStatus = false
 	          }
-            var _data = data.data.invoiceFPurchaseDetails
+            var _data = data.data.invoiceDetails
             var _details = $scope.order.orderDetails
+	          $scope.order.logistics = data.data.logistics
             for (var j = 0; j < _data.length; j++) {
               for (var k = 0; k < _details.length; k++) {
-                if (_data[j].ordetailid === _details[k].id) {
-                  _details[k].receiveCount = _data[j].number
+                if (_data[j].orderDetailId === _details[k].id) {
+                  _details[k].receiveCount = _data[j].qty
                 }
               }
             }

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

@@ -748,6 +748,10 @@ define(['app/app'], function(app) {
         // $scope.isSendCount = 0
         // todo 已发货信息到时候需要根据当前对象获取信息
         $scope.ChangeSendCount = function(details, val, ind) {
+            if (val.indexOf('.')) {
+              toaster.pop('warning', '提示', '发货数量不能输入小数点')
+                return
+            }
             if (val > details.number - details.shipQty) {
                 toaster.pop('warning', '提示', '本次发货数量不能大于已剩数量')
                 val = details.number - details.shipQty

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

@@ -2584,6 +2584,11 @@ define(['app/app', 'jquery-uploadify'], function(app) {
       if (!prices || !prices[index] || !price) {
         return;
       }
+      if (index === 0) {
+        if (Number(prices[index].rMBPrice) > 0) {
+          $scope.productUpOff.goods.autoPublish = true
+        }
+      }
       if (isNaN(price)) {
         prices[index].priceInvalid = true;
         toaster.pop('warning', '提示', '单价必须是大于0的数字');
@@ -3689,6 +3694,7 @@ define(['app/app', 'jquery-uploadify'], function(app) {
       $scope.Regul.RegulImg = ChooseItem.cmpImg || 'static/img/vendor/images/upload.png' // 物料图片
       $scope.Regul.packaging = ChooseItem.packaging || '其他' // 包装信息
       $scope.Regul.minPackQty = ChooseItem.minPackQty >= 0 ?  ChooseItem.minPackQty : ChooseItem.goods.minBuyQty // 最小包装数
+      $scope.Regul.minPackQty = $scope.Regul.minPackQty > 0 ? $scope.Regul.minPackQty : 1
     }
     // 编辑物料保存
     $scope.RegulSave = function() {
@@ -3755,17 +3761,25 @@ define(['app/app', 'jquery-uploadify'], function(app) {
       $scope.productUpOff = _deepCopy(commodity)
       if (!$scope.productUpOff.goods) {
         $scope.productUpOff.goods = {
-          prices: [],
+          prices: [{'start': $scope.productUpOff.minPackQty, rMBPrice: ''}],
           selfSale: 1,
           breakUp: false,
           autoPublish: false,
-          productid: $scope.productUpOff.id
+          productid: $scope.productUpOff.id,
+          minDelivery: 1,
+          maxDelivery: 10,
+          minBuyQty: $scope.productUpOff.minPackQty,
+
         }
-        $scope.productAddFragment($scope.productUpOff.goods.prices)
+        // $scope.productAddFragment($scope.productUpOff.goods.prices)
       }
       $scope.productUpOff.goods.selfSale = ($scope.storeInfo.uuid != 'undefind' && $scope.productUpOff.goods.storeid == $scope.storeInfo.uuid && $scope.storeInfo.storeName.indexOf('优软测试二') < 0 && $scope.storeInfo.storeName.indexOf('优软商城') < 0) ? 1: 0
       // $scope.productUpOff.dateArea = $scope.productUpOff.goods.selfSale === 1 ? 'formMe' : 'autoMonth' // 自营还是销售
       commodity.dateArea = $scope.productUpOff.goods.selfSale === 1 ? 'formMe' : 'autoMonth' // 自营还是销售
+      if (!$scope.productUpOff.goods.storeid) {
+        $scope.productUpOff.goods.selfSale = 1
+        commodity.dateArea = 'formMe'
+      }
     }
 
     // 最小起订量修改 梯度1的值等于最小起订量
@@ -3775,6 +3789,10 @@ define(['app/app', 'jquery-uploadify'], function(app) {
     // 最小起订量失去焦点
     $scope.ProductblurMinBuyQty = function(MinBuyQty) {
       if (!MinBuyQty) return
+      if (!$scope.productUpOff.minPackQty || $scope.productUpOff.minPackQty === '') {
+        toaster.pop('warning', '提示', '最小包装数未编辑导致无法上架');
+        return
+      }
       if (!$scope.productUpOff.goods.breakUp && $scope.productUpOff.goods.minBuyQty !== $scope.productUpOff.minPackQty) {
         $scope.productUpOff.goods.minBuyQty = $scope.productUpOff.minPackQty
         toaster.pop('warning', '提示', '不可拆卖时，起订量必须是包装数量的倍数');
@@ -3830,7 +3848,7 @@ define(['app/app', 'jquery-uploadify'], function(app) {
           flag = false
           break;
         }
-        else if ($scope.productUpOff.goods.prices[i + 1] && $scope.productUpOff.goods.prices[i].start < $scope.productUpOff.goods.prices[i + 1].start) {
+        else if ($scope.productUpOff.goods.prices[i + 1] && Number($scope.productUpOff.goods.prices[i].start) < Number($scope.productUpOff.goods.prices[i + 1].start)) {
           toaster.pop('warning','提示','输入值会导致梯度重叠，请重新修改')
           flag = false
           break;
@@ -3935,12 +3953,20 @@ define(['app/app', 'jquery-uploadify'], function(app) {
     $scope.sendGoodsCome= function() {
       $scope.getChoosedInfo()
       var ids = $scope.choosedIds.join('-')
+      if (ids.length <= 0) {
+        toaster.pop('warning', '提示', '请先选择要入库的物料');
+        return
+      }
       window.open('vendor#/vendor_storage?storage_tab=inBound&ids=' + ids, '_top')
     }
-    //  出 库
+    //  出库
     $scope.sendGoodsOut= function() {
       $scope.getChoosedInfo()
       var ids = $scope.choosedIds.join('-')
+      if (ids.length <= 0) {
+        toaster.pop('warning', '提示', '请先选择要出库的物料');
+        return
+      }
       window.open('vendor#/vendor_storage?storage_tab=outBound&ids=' + ids, '_top')
     }
   }

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

@@ -1,6 +1,7 @@
 define([ 'app/app' ], function(app) {
 	'use strict';
 	app.register.controller('vendorUploadCtrl', ['$scope', '$rootScope', 'ngTableParams', '$upload', '$q', 'AuthenticationService', 'BaseService', 'StoreInfo', 'SessionService', '$modal', 'toaster', 'ReleaseProductByBatch', 'Loading', 'Enterprise', 'DistributionRule', '$state', '$location', function ($scope, $rootScope, ngTableParams, $upload, $q, AuthenticationService, BaseService, StoreInfo, SessionService, $modal, toaster, ReleaseProductByBatch, Loading, Enterprise, DistributionRule, $state, $location) {
+        $scope.ignoreImport = 1;
 	    if (!$rootScope.$$productOn) {
             $rootScope.$$productOn = {};
             $rootScope.$$productOn.leadIn = 'bathOn';
@@ -51,9 +52,9 @@ define([ 'app/app' ], function(app) {
         $scope.batch.sellType = null;
 
 
-        $scope.repeatImport = 0;
+        $scope.ignorelmport = 0;
 		$scope.switchImport = function (type) {
-			$scope.repeatImport = type;
+			$scope.ignorelmport = type;
 		};
 
         //翻页的信息
@@ -249,7 +250,7 @@ define([ 'app/app' ], function(app) {
 			if ($rootScope.$$productOn.tab === 'bathOnPerson') {
 				var param = {selfSale : $scope.batch.sellType == 'self', currency : $scope.batch.currency, isPerson : 1};
 			} else {
-                var param = {selfSale : $scope.batch.sellType == 'self', currency : $scope.batch.currency, repeatImport : $scope.repeatImport};
+                var param = {selfSale : $scope.batch.sellType == 'self', currency : $scope.batch.currency, ignoreImport : $scope.ignoreImport};
 			}
 
 			var uploadUrl = $rootScope.isPcbStore ? 'release/product/release/excel/pcb' : 'release/product/release/excel';

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

@@ -643,8 +643,8 @@
 					</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>
+							<i class="fl">物流公司：{{logistics.companyName.companyName || logistics.companyName || order.logistics.companyName || '空'}}</i><br>
+							<i class="fl" style="margin-top: 5px">物流单号：{{logistics.number || order.logistics.number || '空'}}</i>
 						</span>
 					</dd>
 				</dl>

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

@@ -631,7 +631,7 @@
 						<span class="wd01">单价</span>
 						<span class="wd01">数量</span>
 						<span style="width: 10%">小计</span>
-						<span>物料编码</span>
+						<!--<span>物料编码</span>-->
 						<span>备注</span>
 					</dt>
 					<div ng-repeat="(key, details) in $$orderDetailsMap track by $index">
@@ -738,14 +738,14 @@
 									</table>
 								</p>
 							</span>
-							<span style="line-height: 18px;">
-                            	<textarea ng-if="order.status==501" placeholder="可填写物料编码" maxlength="20" ng-model="detail.goodsnumber"></textarea>
-                        		<div class="text-area" ng-if="order.status!=501 && detail.goodsnumber">
-									<i ng-bind="detail.goodsnumber">金石为开取数据五块钱叫稍微亲上加亲</i>
-								</div>
-								<em ng-if="order.status!=501 && !detail.goodsnumber">&nbsp;</em>
-								<!--<em ng-if="order.status!=501" ng-bind="detail.goodsnumber" style="color: #333; line-height: 20px; display: inline-block; padding-top: 10px;"></em>-->
-							</span>
+							<!--<span style="line-height: 18px;">-->
+                            	<!--<textarea ng-if="order.status==501" placeholder="可填写物料编码" maxlength="20" ng-model="detail.goodsnumber"></textarea>-->
+                        		<!--<div class="text-area" ng-if="order.status!=501 && detail.goodsnumber">-->
+									<!--<i ng-bind="detail.goodsnumber">金石为开取数据五块钱叫稍微亲上加亲</i>-->
+								<!--</div>-->
+								<!--<em ng-if="order.status!=501 && !detail.goodsnumber">&nbsp;</em>-->
+								<!--&lt;!&ndash;<em ng-if="order.status!=501" ng-bind="detail.goodsnumber" style="color: #333; line-height: 20px; display: inline-block; padding-top: 10px;"></em>&ndash;&gt;-->
+							<!--</span>-->
 							<span style="line-height: 18px;">
                             	<textarea ng-if="order.status==501" placeholder="可填写产品备注" ng-model="detail.remark" maxlength="200"></textarea>
 								<div class="text-area" ng-if="order.status!=501 && detail.remark">

src/main/webapp/resources/view/usercenter/left_nav.html

@@ -41,6 +41,7 @@
                     <li ng-class="{'active' : active == 'buyer_order'}"><a  ui-sref="buyer_order">采购订单</a></li>
                     <li ng-class="{'active' : active == 'buyer_pay_center'}"><a  ui-sref="pay_center">应付对账</a></li>
                     <li ng-class="{'active' : active == 'buyer_invoice'}"><a  ui-sref="buyer_no_invoice">发票管理</a></li>
+                    <li ng-class="{'active' : active == 'vendor_productOn'}"><a  ui-sref="vendor_upload">产品导入</a></li>
                 </div>
                 <!--<div ng-hide="!(userInfo.pwdEnable && userInfo.haveUserQuestion &&  userInfo.emailValidCode && userInfo.emailValidCode == 2)">-->
                     <!--<li ng-class="{'active' : active == 'buyer_order'}"><a  ui-sref="buyer_order">订单中心</a></li>-->

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

@@ -1128,7 +1128,7 @@
 									<div class="overHidden" ng-if="material.pbranden" title="{{material.pbranden}}">品牌：{{material.pbranden}}</div>
 									<div class="overHidden" ng-if="!material.pbranden" title="{{material.pbrand}}">品牌：{{material.pbrand}}</div>
 									<div class="overHidden" ng-if="material.kind" title="{{material.kind}}">物料名称：{{material.kind}}</div>
-									<div class="overHidden" ng-if="!material.kind" title="{{material.kinden}}">>物料名称：{{material.kinden}}</div>
+									<div class="overHidden" ng-if="!material.kind" title="{{material.kinden}}">物料名称：{{material.kinden}}</div>
 									<div class="overHidden" ng-if="material.cmpUuId" title="{{material.pcmpcode}}">型号：<a ng-href="product/component/{{material.cmpUuId}}/">{{material.pcmpcode}}</a></div>
 									<div class="overHidden" ng-if="!material.cmpUuId" title="{{material.pcmpcode}}">型号：{{material.pcmpcode}}</div>
 									<div class="overHidden" title="{{material.spec || '-'}}">规格：{{material.spec || '-'}}</div>
@@ -1156,10 +1156,10 @@
 									</div>
 								</td>
 								<td style="text-align: left">
-									<div class="overHidden">成本单价：{{material.price}}</div>
-									<div class="overHidden">库存数量：{{material.erpReserve}}</div>
+									<div class="overHidden">成本单价：{{material.price || '-'}}</div>
+									<div class="overHidden">库存数量：{{material.erpReserve || '-'}}</div>
 									<div class="overHidden">最小起订量：{{material.goods.minBuyQty || '-'}}</div>
-									<div class="overHidden" ng-if="material.goods.b2cMinDelivery === material.goods.b2cMaxDelivery">交期(天)：{{material.goods.b2cMinDelivery}}</div>
+									<div class="overHidden" ng-if="material.goods.b2cMinDelivery === material.goods.b2cMaxDelivery">交期(天)：{{material.goods.b2cMinDelivery || '-'}}</div>
 									<div class="overHidden" ng-if="material.goods.b2cMinDelivery !== material.goods.b2cMaxDelivery">交期(天)：{{material.goods.b2cMinDelivery}} - {{material.goods.b2cMaxDelivery}}</div>
 								</td>
 								<td>
@@ -1171,15 +1171,14 @@
 										</li>
 										<li style="font-size: 14px;color: #333;background: #fff;" class='priceInfoList' ng-repeat="price in material.goods.prices">
 											<span class="fl w50" style="width: 50%;border-right:1px solid #dcdcdc">{{price.start}}+</span>
-											<span class="fl w50" style="width: 50%">¥{{price.rMBPrice}}</span>
+											<span class="fl w50" style="width: 50%;overflow: hidden" title="{{price.rMBPrice}}">¥{{price.rMBPrice}}</span>
 											<div class="clearfix"></div>
 										</li>
 									</ul>
 								</td>
 								<td>
-									<div ng-bind="(storeInfo.uuid != 'undefind' && material.goods.storeid == storeInfo.uuid && storeInfo.storeName.indexOf('优软测试二') < 0 && storeInfo.storeName.indexOf('优软商城') < 0) ? '自营': '寄售'">
-
-										自营</div>
+									<div ng-if="!material.goods">自营</div>
+									<div ng-bind="(storeInfo.uuid != 'undefind' && material.goods.storeid == storeInfo.uuid && storeInfo.storeName.indexOf('优软测试二') < 0 && storeInfo.storeName.indexOf('优软商城') < 0) ? '自营': '寄售'">自营</div>
 									<div>{{material.goods.breakUp ? '可拆卖' : '不可拆卖'}}</div>
 									<div>{{material.goods.autoPublish ? '已上架' : '已下架' }}</div>
 								</td>
@@ -1455,10 +1454,10 @@
 														</div>
 														<div class="plusBtn" style="font-size: 14px;color: #333;background: #fff;border-top: 1px solid #dcdcdc;position:relative" ng-repeat="price in productUpOff.goods.prices">
 															<span class="fl w50" style="width: 50%;border-right:1px solid #dcdcdc">
-																<input text="text" style="width: 100%;outline: 0;border: 0;text-align: center;height: 30px" ng-disabled="$index === 0" ng-readonly="$index === 0" ng-model="price.start" ng-blur="productPriceInfoBlur($index, price.start)" />
+																<input text="text" style="width: 100%;outline: 0;border: 0;text-align: center;height: 30px" maxlength="8" ng-disabled="$index === 0" ng-readonly="$index === 0" ng-model="price.start" ng-blur="productPriceInfoBlur($index, price.start)" />
 															</span>
 															<span class="fl w50" style="width: 50%">
-																<input text="text" style="width: 100%;outline: 0;border: 0;text-align: center;height: 30px" ng-model="price.rMBPrice" />
+																<input text="text" autocomplete="off" validata-price ng-blur="changePrices(productUpOff.goods.prices, price.rMBPrice, $index)" oninput="if(value.length>11)value=value.slice(0,11)" style="width: 100%;outline: 0;border: 0;text-align: center;height: 30px" ng-model="price.rMBPrice" />
 															</span>
 															<div class="clearfix"></div>
 															<div class="input-list ng-scope" style="height: 24px;line-height: 24px;position: absolute;right: -38px;top: 3px">

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

@@ -531,8 +531,9 @@
     <div class="pro_management device">
         <div class="com_tab">
             <ul class="fl" style="width: 100%" ng-if="!isPcbStore">
-                <li ng-class="{'active': $$productOn.tab == 'bathOn'}" ng-click="toggleActive('bathOn')"><a href="">导入产品并上架</a></li>
-                <li ng-class="{'active': $$productOn.tab == 'bathOnPerson'}" ng-click="toggleActive('bathOnPerson')"><a href="">导入产品</a></li>
+                <li ng-class="{'active': $$productOn.tab == 'bathOn'}"><a>导入产品</a></li>
+                <!--<li ng-class="{'active': $$productOn.tab == 'bathOn'}" ng-click="toggleActive('bathOn')"><a href="">导入产品并上架</a></li>-->
+                <!--<li ng-class="{'active': $$productOn.tab == 'bathOnPerson'}" ng-click="toggleActive('bathOnPerson')"><a href="">导入产品</a></li>-->
             </ul>
             <ul class="fl" style="width: 100%" ng-if="isPcbStore">
                 <li><a ui-sref="vendor_material">公司产品库</a></li>
@@ -593,15 +594,15 @@
                         <div ng-if="$$productOn.tab == 'bathOn'">2、若存在属性完全相同但价格不一致的产品：</div>
                         <div class="sale-label" style="margin-top: -10px;" ng-if="$$productOn.tab == 'bathOn'">
                             <label class="sellType">
-                                <input type="radio" name="import" id="forIgnore" ng-model="repeatImport" value="0" ng-click="switchImport(0)">
+                                <input type="radio" name="import" id="forIgnore" ng-model="ignoreImport" value="1" ng-click="switchImport(1)">
                                 <label for="forIgnore"></label>
                                 <span>忽略不导入</span>
                             </label>
-                            <!--<label class="sellType">-->
-                                <!--<input type="radio" name="import" id="forImport" ng-model="repeatImport" value="1" ng-click="switchImport(1)">-->
-                                <!--<label for="forImport"></label>-->
-                                <!--<span>作为新产品继续导入</span>-->
-                            <!--</label>-->
+                            <label class="sellType">
+                                <input type="radio" name="import" id="forImport" ng-model="ignoreImport" value="0" ng-click="switchImport(0)">
+                                <label for="forImport"></label>
+                                <span>导入并覆盖</span>
+                            </label>
                         </div>
                         <div><span ng-if="$$productOn.tab == 'bathOn'">3、</span>请上传已经编辑好的库存表格，选择好上传的文件之后，点击确认上传</div>
                         <div class="upload">