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

src/main/java/com/uas/platform/b2c/common/account/service/impl/UserServiceImpl.java

@@ -610,12 +610,13 @@ public class UserServiceImpl implements UserService {
 
 	@Override
 	public User switchEnterprise(Long enUU) {
-		User user = SystemSession.getUser();
+		User user = userDao.findUserByUserUU(SystemSession.getUser().getUserUU()).get(0);
 		if ( enUU == 0L) {
 			user.setEnterprise(null);
 		} else {
 			user.setCurrentEnterprise(enUU);
 		}
+		SystemSession.setUser(user);
 		return user;
 	}
 

src/main/webapp/resources/js/admin/controllers/checkMoney/SettlementCtrl.js

@@ -136,7 +136,7 @@ define(['app/app'], function(app) {
 			bankInfoService.getAdminEnterAccount('', function(data) {
 				$scope.b2cAccountInfos = resolveData(data);
 				angular.forEach($scope.b2cAccountInfos, function(b2cAccountInfos) {
-					b2cAccountInfos.filterAccount = hideBankFilter(b2cAccountInfos.number);
+					b2cAccountInfos.filterAccount = b2cAccountInfos.number;
 				});
 				$scope.b2cAccount = getOriginalData($scope.b2cAccountInfos);
 			}, function(res) {
@@ -150,7 +150,7 @@ define(['app/app'], function(app) {
 			bankInfoService.getVenderBank({venduu:venduu},null, function(data) {
 				$scope.venderAccountInfos = resolveData(data);
 				angular.forEach($scope.venderAccountInfos, function(venderAccountInfos) {
-					venderAccountInfos.filterAccount = hideBankFilter(venderAccountInfos.number);
+					venderAccountInfos.filterAccount = venderAccountInfos.number;
 				});
 				$scope.venderAccount = getOriginalData($scope.venderAccountInfos);
 			}, function(res) {

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

@@ -23,7 +23,8 @@ define([ 'app/app' ], function(app) {
 			'release/product/release/excel',
 			'release/product/release/excel/pcb',
 			'release/product/batchRelease/pcb',
-			'release/product/batchRelease'
+			'release/product/batchRelease',
+      'release/product/batchRelease/person'
 		]
 		return {
 			request: function(cfg){

src/main/webapp/resources/js/sso/controllers/staffManagementCtrl.js

@@ -103,7 +103,14 @@ define(['app/app'], function (app) {
                 $scope.totalPages = 0;
                 toaster.pop('error', '数据获取失败，请重新刷新页面！');
             });
-        }
+        };
+
+        $scope.keyUpApply = function () {
+            var keycode = window.event ? event.keyCode : event.which;
+            if (keycode == 13) {
+                $scope.searchApply();
+            }
+        };
 
         $scope.searchApply = function () {
             applyToEnterpriseTableParams();
@@ -210,7 +217,7 @@ define(['app/app'], function (app) {
             if (event && event.keyCode == 13) {
                 $scope.onSearch(keyword, filterRole);
             }
-        }
+        };
 
         $scope.newUser = {};
 

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

@@ -31,8 +31,9 @@ define(['app/app'], function(app) {
 			Bill.getListPersonal(null, function(data) {
 				$scope.bill = {};
 				$scope.bills = data;
-				$scope.bill.kind = '1207';
-				$scope.order.invoicetype = '1207';
+				$scope.bill.kind = '1205';
+				$scope.order.invoicetype = '1205';
+        $scope.order.paytype = '1102'
 				// angular.forEach($scope.bills, function(item) {
 				//     if(item.kind == '1205') {
 				//         $scope.bill = item;

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

@@ -298,12 +298,12 @@ define([ 'app/app' ], function(app) {
         } else {
             toaster.pop('success', '提示', '上传完成');
         }
+        $scope.showCanvas = false
 				$scope.relTableParams.page(1);
 				$scope.relTableParams.reload();
         if ($rootScope.$$productOn.tab === 'bathOnPerson') {
             publicPersonProduct();
         }
-        $scope.showCanvas = false
         }).error(function(response) {
             $scope.result = {};
             $scope.result.total = 0;
@@ -401,7 +401,20 @@ define([ 'app/app' ], function(app) {
     };
 
     function publicPersonProduct() {
+        speed = 1
+        $scope.showCanvas = true
+        $scope.AnimationCanvas = setInterval(function () {
+          if (speed > 100) clearInterval($scope.AnimationCanvas)
+          if (speed >= 98) clearInterval($scope.AnimationCanvas)
+          else {
+            speed += RandomNumber();
+            drawFrame(speed)
+          }
+        }, 30)
         ReleaseProductByBatch.batchReleasePerson({batch : $scope.result.batch}, null, function(data) {
+          speed = 100
+          clearInterval($scope.AnimationCanvas)
+          $scope.showCanvas = false
             if ($scope.needShowTip) {
                 $scope.relTableParams.page(1);
                 $scope.relTableParams.reload();

src/main/webapp/resources/view/sso/staffManagement.html

@@ -1058,7 +1058,7 @@
         <!-- 申请绑定 -->
         <div class="clearfix bind-en" ng-if="tab=='bind'">
             <div class="rt_menu">
-                <span class="pull-right"><input type="text" ng-model="searchParams.keyword" ng-keyup="keyUpApply($e)" class="form-control" placeholder="用户名/UU账号/手机号"/><button class="btn" ng-click="searchApply()">搜索</button> </span></span>
+                <span class="pull-right"><input type="text" ng-model="searchParams.keyword" ng-keyup="keyUpApply()" class="form-control" placeholder="用户名/UU账号/手机号"/><button class="btn" ng-click="searchApply()">搜索</button> </span></span>
             </div>
             <table class="bind-enter-tab" ng-table="applyToEnterpriseTableParams">
                 <thead>

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

@@ -890,14 +890,14 @@
 			<div class="pay_com">
 				<span>发票信息详情
 					<!--<a ng-click="modifyInvoice(bill)" ng-if="order.invoicetype!='1207'&&order.status == 501"><i class="fa fa-plus-square" aria-hidden="true"></i>&nbsp;<em ng-if="!bill.name">新增发票</em><em ng-if="bill.name">修改发票</em></a>-->
-					<span ng-click="modifyInvoice(bill)" ng-if="order.invoicetype!='1207'&&order.status == 501"><i class="fa fa-plus-square" aria-hidden="true"></i>&nbsp;<button ng-if="!bill.name">新增发票</button><button ng-if="bill.name">修改发票</button></span>
+					<span ng-click="modifyInvoice(bill)" ng-if="order.invoicetype!='1207'&&(order.status == 501 || order.status == 503 || order.status == 504)"><i class="fa fa-plus-square" aria-hidden="true"></i>&nbsp;<button ng-if="!bill.name">新增发票</button><button ng-if="bill.name">修改发票</button></span>
 				</span>
 			</div>
-			<p class="bill-radio" ng-if="order.status == '501'">
-				<span  ng-click="selectBill('1207')">
-					<input type="radio"  name="bill" ng-checked="order.invoicetype == '1207'"/>
-					<label></label><em>暂不开票</em>
-				</span>
+			<p class="bill-radio" ng-if="order.status == '501' || order.status == 503 || order.status == 504">
+				<!--<span  ng-click="selectBill('1207')">-->
+					<!--<input type="radio"  name="bill" ng-checked="order.invoicetype == '1207'"/>-->
+					<!--<label></label><em>暂不开票</em>-->
+				<!--</span>-->
 				<span  ng-click="selectBill('1206')" ng-hide="storeArray.length == 1 && hideNormal">
 					<input type="radio"  name="bill" ng-checked="order.invoicetype == '1206'"/>
 					<label></label><em>增值税普通发票</em>
@@ -906,10 +906,10 @@
 					<input type="radio"  name="bill" ng-checked="order.invoicetype == '1205'"/>
 					<label></label><em>增值税专用发票</em>
 				</span>
-				<b ng-if="order.invoicetype == '1206' && hideNormal">因存在部分寄售产品，寄售产品默认仅提供增值税专票</b>
+				<b ng-if="order.invoicetype == '1205' && hideNormal">因存在部分寄售产品，寄售产品默认仅提供增值税专票</b>
 			</p>
-			<div class="pay_oder_xq_list no-need-bill f14" ng-if="order.invoicetype=='1207'">
-			</div>
+			<!--<div class="pay_oder_xq_list no-need-bill f14" ng-if="order.invoicetype=='1207'">-->
+			<!--</div>-->
 			<div class="pay_oder_xq_list no-need-bill notice" ng-if="order.invoicetype!='1207' && !bill.name">
 				还没有对应的发票信息，请新增相应的发票信息
 			</div>
@@ -961,12 +961,20 @@
 							<input type="hidden" name="timestamp" value={{ysepayRequest.timestamp}}>
 							<input type="hidden" name="sign" value={{ysepayRequest.sign}}>
 						</form>
-						<p>
-									<span class="style01" style="width: 220px; margin-left: 610px;">付款方式:
-										<select class="select" ng-model="order.paytype">
-											<option value="1102">在线支付</option>
-											<option value="1103">线下支付</option>
-										</select>
+						<p class="payment">
+									<span class="style01 " style="width: 268px; margin-left: 590px;">付款方式:
+										<span  ng-click="order.paytype = 1102" class="bill-radio" style="width: 80px;float:none;margin-left:5px;padding: 0">
+											<input type="radio"  name="payfor" ng-checked="order.paytype == '1102'"/>
+											<label></label><em>在线支付</em>
+										</span>
+										<span ng-click="order.paytype = 1103" class="bill-radio" style="width: 80px;float:none;margin-left:5px;padding: 0">
+											<input type="radio"  name="payfor" ng-checked="order.paytype == '1103'"/>
+											<label></label><em>线下支付</em>
+										</span>
+										<!--<select class="select" ng-model="order.paytype">-->
+											<!--<option value="1102">在线支付</option>-->
+											<!--<option value="1103">线下支付</option>-->
+										<!--</select>-->
 									</span>
 							<a ng-click="confirmPay()">提交订单</a></p>
 						<p class="bulb-remind"><img src="static/img/user/bulb.png" alt="">若价格变动，请在订单提交后联系卖家改价</p>

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

@@ -596,11 +596,11 @@
                                 <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="repeatImport" value="1" ng-click="switchImport(1)">-->
+                                <!--<label for="forImport"></label>-->
+                                <!--<span>作为新产品继续导入</span>-->
+                            <!--</label>-->
                         </div>
                         <div><span ng-if="$$productOn.tab == 'bathOn'">3、</span>请上传已经编辑好的库存表格，选择好上传的文件之后，点击确认上传</div>
                         <div class="upload">
@@ -626,7 +626,7 @@
                             </div>-->
                         </div>
                         <div class="txt-info" ng-if="result && result.total != 0 && !hadImport && $$productOn.tab != 'bathOnPerson'">成功导入 <span ng-bind="result.success + result.failure">600</span> 个产品（其中标准产品 <span ng-bind="result.success">200</span> 个，非标产品 <span ng-bind="result.failure">400</span> 个）<b class="success-hidden" ng-if="result.filter != 0">，下载 <a ng-click="downloadExcel()">导入失败产品</a></b></div>
-                        <div ng-if="$$productOn.tab == 'bathOn'">
+                        <div ng-show="$$productOn.tab == 'bathOn'">
                             <table ng-table="relTableParams" class="public-tab table">
                                 <thead>
                                 <tr>