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

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

@@ -52,6 +52,32 @@
 			<li class="nav-node"><a href="#trade/record_chart"><i
 					class="fa fa-th"></i><span> 交易记录表</span></a></li>
 
+			<li class="nav-header">财务结算中心</li>
+			<li class="nav-node"><a href="#check/check_vender"><i
+					class="fa fa-user"></i><span> 付款申请</span></a></li>
+			<li class="nav-node"><a href="#check/settlement"><i
+					class="fa fa-calculator"></i><span> 财务结算</span></a></li>
+			<li class="nav-node"><a href="#check/histTransfer"><i
+					class="fa fa-filter"></i><span> 历史转账查询</span></a></li>
+			<li class="nav-node"><a href="#check/accountQuery"><i
+					class="fa fa-fire"></i><span> 账户查询</span></a></li>
+			<li class="nav-node"><a href="#check/refund"><i
+					class="fa fa-fire"></i><span> 退款单管理</span></a></li>
+			<li class="nav-node"><a href="#order/bill/admin"><i
+					class="fa fa-fire"></i><span> 客户订单发票管理</span></a></li>
+			<li class="nav-node"><a href="#purchase/bill/admin"><i
+					class="fa fa-fire"></i><span> 平台采购单发票管理</span></a></li>
+			<li class="nav-node"><a href="#check/credit"><i
+					class="fa fa-fire"></i><span> 银行账户信息管理</span></a></li>
+			<li class="nav-node"><a href="#billInfo/admin"><i
+					class="fa fa-fire"></i><span> 平台发票信息管理</span></a></li>
+			<li class="nav-node"><a href="#pay/available"><i
+					class="fa fa-fire"></i><span> 买家付款有效时间</span></a></li>
+			<li class="nav-node"><a href="#pay/exchangerate"><i
+					class="fa fa-fire"></i><span> 汇率设置</span></a></li>
+			<li class="nav-node"><a href="#fa/loanApply"><i
+					class="fa fa-fire"></i><span> 贷款申请列表</span></a></li>
+
 			<li class="nav-header">售后服务管理</li>
 			<li class="nav-node"><a href="#trade/buyerExProcess"><i
 					class="fa fa-home"></i><span> 买家异常处理</span></a></li>
@@ -106,31 +132,6 @@
 			<li class="nav-node"><a href="#buyer/automaticReceiving"><i
 					class="fa fa-fire"></i><span>买家自动收货的时间</span></a></li>
 
-			<li class="nav-header">财务结算中心</li>
-			<li class="nav-node"><a href="#check/check_vender"><i
-					class="fa fa-user"></i><span> 付款申请</span></a></li>
-			<li class="nav-node"><a href="#check/settlement"><i
-					class="fa fa-calculator"></i><span> 财务结算</span></a></li>
-			<li class="nav-node"><a href="#check/histTransfer"><i
-					class="fa fa-filter"></i><span> 历史转账查询</span></a></li>
-			<li class="nav-node"><a href="#check/accountQuery"><i
-					class="fa fa-fire"></i><span> 账户查询</span></a></li>
-			<li class="nav-node"><a href="#check/refund"><i
-					class="fa fa-fire"></i><span> 退款单管理</span></a></li>
-			<li class="nav-node"><a href="#order/bill/admin"><i
-					class="fa fa-fire"></i><span> 客户订单发票管理</span></a></li>
-			<li class="nav-node"><a href="#purchase/bill/admin"><i
-					class="fa fa-fire"></i><span> 平台采购单发票管理</span></a></li>
-			<li class="nav-node"><a href="#check/credit"><i
-					class="fa fa-fire"></i><span> 银行账户信息管理</span></a></li>
-			<li class="nav-node"><a href="#billInfo/admin"><i
-					class="fa fa-fire"></i><span> 平台发票信息管理</span></a></li>
-			<li class="nav-node"><a href="#pay/available"><i
-					class="fa fa-fire"></i><span> 买家付款有效时间</span></a></li>
-			<li class="nav-node"><a href="#pay/exchangerate"><i
-					class="fa fa-fire"></i><span> 汇率设置</span></a></li>
-			<li class="nav-node"><a href="#fa/loanApply"><i
-					class="fa fa-fire"></i><span> 贷款申请列表</span></a></li>
 
 			<li class="nav-header">审批</li>
 			<li class="nav-node"><a href="#audit/brand"><i
@@ -246,6 +247,43 @@
 				<li><a class="muted">基础</a></li>
 				<li><a>快照</a></li>
 			</ul>
+			<!--消息-->
+			<div class="msg" style="display: none;">
+				<span class="message">待处理 <i class="fa fa-angle-double-down angle-hover-up"></i><span class="red-dot">99</span></span>
+				<div class="msg-show">
+					<table>
+						<thead>
+						<tr>
+							<th width="250" class="choose-type">
+								<span class="all-type dropdown-toggle">全部类型 <i class="fa fa-angle-double-down angle-hover-up"></i></span>
+								<ul class="dropdown-menu">
+									<li><a>确认收款</a></li>
+									<li><a>付款申请</a></li>
+									<li><a>财务结算</a></li>
+								</ul>
+							</th>
+							<th width="500"><b></b>任务描述</th>
+							<th width="400"><b></b>发起人</th>
+							<th width="auto"><b></b>发起时间</th>
+						</tr>
+						</thead>
+						<tbody>
+						<tr>
+							<td><span>确认收款</span></td>
+							<td><span>订单 <a href="">SS2018070500000035</a> 买家已付款成功，请确认是否收款成功！</span></td>
+							<td><span>深圳市华商龙科技商龙科技商龙科技有限公司（采购商名称）</span></td>
+							<td><span>2018/07/01  08:32:57</span></td>
+						</tr>
+						<tr>
+							<td><span>确认收款</span></td>
+							<td><span>订单 <a href="">SS2018070500000035</a> 买家已付款成功，请确认是否收款成功！</span></td>
+							<td><span>深圳市华商龙科技商龙科技商龙科技有限公司深圳市华商龙科技商龙科技商龙科技有限公司深圳市华商龙科技商龙科技商龙科技有限公司（采购商名称）</span></td>
+							<td><span>2018/07/01  08:32:57</span></td>
+						</tr>
+						</tbody>
+					</table>
+				</div>
+			</div>
 			<div ui-view></div>
 		</div>
 	</div>

src/main/webapp/resources/css/admin.css

@@ -57,8 +57,116 @@ select {
 
 .main-container {
 	min-width: 720px;
+	overflow: hidden;
 }
 
+.main-container .msg{
+	position: relative;
+}
+.main-container .message{
+	position: absolute;
+	top: -46px;
+	right: 45px;
+	width: 78px;
+	height: 26px;
+	line-height: 26px;
+	text-align: center;
+	font-size: 12px;
+	color: #fff;
+	background-color: #31a5e7;
+	border-radius: 4px;
+	cursor: pointer;
+}
+.main-container .message .red-dot {
+	position: absolute;
+	top: -2px;
+	right: -8px;
+	width: 18px;
+	height: 18px;
+	line-height: 18px;
+	font-size: 12px;
+	color: #fff;
+	border-radius: 50%;
+	background: #f00;
+}
+.main-container .message:hover .angle-hover-up{
+	-webkit-transform: rotateZ(180deg);
+	-moz-transform: rotateZ(180deg);
+	-o-transform: rotateZ(180deg);
+	-ms-transform: rotateZ(180deg);
+	transform: rotateZ(180deg);
+}
+.main-container .msg-show{
+	position: absolute;
+	top: -20px;
+	right: 42px;
+	z-index: 1000;
+	background-color: #ffffff;
+	border-radius: 4px;
+	border: solid 1px #31a5e7;
+}
+.main-container .msg-show table{
+	width: 1350px;
+	table-layout: fixed;
+}
+.main-container .msg-show table thead{
+	width: 100%;
+	height: 45px;
+	background-color: rgba(49, 165, 231, 0.1);
+	border-radius: 4px;
+}
+.main-container .msg-show table tr th{
+	height: 45px;
+}
+.main-container .msg-show table tr th,.main-container .msg-show table tr td{
+	vertical-align: middle;
+	font-weight: normal;
+	position:relative;
+	text-align: center;
+}
+.main-container .msg-show table tr th b{
+	position: absolute;
+	top: 13px;
+	left: 0;
+	width: 1px;
+	height: 20px;
+	border: solid 1px #bfbfbf;
+}
+.main-container .msg-show table tr th.choose-type .all-type {
+	cursor: pointer;
+}
+.main-container .msg-show table tr th.choose-type .dropdown-menu{
+	position: absolute;
+	top: 30px;
+	left: 45px;
+	z-index: 1000;
+	display: none;
+	float: left;
+	font-size: 14px;
+	border-radius: 4px;
+	-webkit-box-shadow: 0 6px 12px rgba(0,0,0,0.175);
+	box-shadow: 0 6px 12px rgba(0,0,0,0.175);
+	-webkit-background-clip: padding-box;
+	background-clip: padding-box;
+	width: 100px;
+	height: 78px;
+	background-color: #ffffff;
+	border: solid 1px #d2d2d2;
+}
+.main-container .msg-show table tr th.choose-type .dropdown-menu li{
+	width: 100%;
+	height: 25px;
+	line-height: 25px;
+	text-align: center;
+	font-size: 14px;
+	color: #333;
+}
+.main-container .msg-show table tbody tr{
+	border-bottom: 1px solid #dcdcdc;
+}
+.main-container .msg-show table tbody tr td{
+	padding: 10px 0;
+}
 .top-block {
 	font-size: 14px;
 	font-family: "Microsoft YaHei";

src/main/webapp/resources/js/admin/controllers/StoreApplicationCtrl.js

@@ -46,6 +46,14 @@ define([ 'app/app' ], function(app) {
 		// 保存查询店铺类型的状态
 		$scope.type = 'ALL_TYPE';
 
+		// 保存店铺搜索类型
+		$scope.search = 'STORE_NAME';
+
+		// 保存店铺搜索类型所传参数
+        $scope.searchParams = 'authPage';
+
+        $scope.showSearch = false
+
 		/**
 		 * 切换Tab
 		 *
@@ -66,6 +74,29 @@ define([ 'app/app' ], function(app) {
 		};
 
 
+        $scope.isShowSearch = function (flag) {
+            $scope.showSearch = flag
+		};
+        /**
+         * 切换搜索类型
+         *
+         * @param type	店铺类型
+		 *
+         */
+        $scope.placeValue = $scope.search === 'STORE_NAME' ? '请输入公司名称' : '请输入审核人姓名';
+
+        $scope.switchSearch = function (type, flag) {
+			if (type === 'STORE_NAME') {
+                $scope.search = 'STORE_NAME';
+                $scope.searchParams = 'authPage';
+			}
+            if (type === 'AUDITOR') {
+                $scope.search = 'AUDITOR';
+                $scope.searchParams = 'authorPage';
+            }
+            $scope.showSearch = flag
+            $scope.placeValue = $scope.search === 'STORE_NAME' ? '请输入公司名称' : '请输入审核人姓名';
+        };
 
 		$scope.applicationTableParams = new ngTableParams($scope.ngPageInfo, {
 			total : 0,
@@ -76,6 +107,7 @@ define([ 'app/app' ], function(app) {
 				param.status = $scope.status === 'ALL' ? null : $scope.status;
 				param.type = $scope.type === 'ALL_TYPE' ? null : $scope.type;
 				param.keyword = $scope.keyword && $scope.keyword !== '' ? $scope.keyword : null;
+				param.operate = $scope.searchParams;
 				StoreInfo.pageStoreApplications(param, function (data) {
 					console.log(data);
 					params.total(data.totalElements);

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

@@ -21,7 +21,7 @@ define([ 'app/app' ], function(app) {
 				if(lgtid){
 					getLogistics();
 				}
-				
+
 				//控制流程状态样式
 				var scheduleStyle = function(){ 
 					var statusAttr =['501', '503', '504', '406', '403', '407', '408', '404', '405'];
@@ -182,5 +182,21 @@ define([ 'app/app' ], function(app) {
 			};
 		};
 		loadData();
+        //确认付款
+        $scope.ensurePay = function(order){
+            Order.ensurePay({orderid: order.orderid}, {}, function(data){
+                toaster.pop('success', '处理成功', '【' + data.orderid + '】' + '确认付款');
+                loadData()
+            }, function(response){
+                toaster.pop('error', '确认付款失败', response.data);
+            })
+        };
+        /**
+         * 当用户点击审核不通过时，弹出模态框
+         * @param order
+         */
+        $scope.showAuditFailureModal = function (order) {
+            order.dislayModal = true;
+        }
 	}]);
 });

src/main/webapp/resources/js/common/query/storeInfo.js

@@ -55,14 +55,11 @@ define([ 'ngResource' ], function() {
 			 * @param params		分页参数
 			 * @param status		店铺审核状态
 			 * @param type			店铺类型
-			 * @param keyword		搜索关键字，主要是公司名称
+			 * @param keyword		搜索关键字，主要是公司名称  或 审核人
 			 */
 			pageStoreApplications: {
             	url: 'store-service/applications',
-				method: 'GET',
-				params: {
-            		operate: 'authPage'
-				}
+				method: 'GET'
 			},
 			/**
 			 * 保存店铺申请信息

src/main/webapp/resources/view/admin/store_application_maintenance.html

@@ -44,7 +44,7 @@
 		background: #229ee6;
 		margin: 0;
 		line-height: 40px;
-		overflow: hidden;
+		/*overflow: hidden;*/
 	}
 	.menu02{
 		width: 100%;
@@ -97,6 +97,45 @@
 		width: 270px;
 		height: 40px;
 	}
+	.menu .sreach-input .options{
+		position: absolute;
+		left: -58px;
+		top: 1px;
+		width: 60px;
+		height: 28px;
+		line-height: 28px;
+		text-align: center;
+		color: #666;
+		font-size: 14px;
+		background: #fff;
+		border-top-left-radius: 5px;
+		border-bottom-left-radius: 5px;
+		cursor: pointer;
+	}
+	.menu .sreach-input .options b{
+		position: absolute;
+		top: 6px;
+		right: -5px;
+		width: 2px;
+		height: 18px;
+		background: #dcdcdc;
+	}
+	.menu .sreach-input .options ul {
+		position: absolute;
+		top: 28px;
+		left: 0;
+		width: 60px;
+	}
+	.menu .sreach-input .options ul li{
+		width: 60px;
+		height: 30px;
+		line-height: 30px;
+		border-radius: 5px;
+		background: #666;
+		color: rgba(255, 255, 255, 0.89);
+		text-align: center;
+		font-size: 12px;
+	}
 	.menu .sreach-input .form-control{
 		height: 30px;
 		float: left;
@@ -176,7 +215,14 @@
 		</div>
 		<div class="col-sm-3">
 			<div class="sreach-input">
-				<input type="search" class="form-control" placeholder="请输入公司名称" ng-model="keyword" ng-search="refreshTableData()"/>
+				<div class="options">
+					<span ng-click="isShowSearch(true)">{{search === 'STORE_NAME' ? '店铺名' : '审核人'}} <i class="fa fa-angle-down"></i><b></b></span>
+					<ul ng-show="showSearch">
+						<li ng-hide="search === 'STORE_NAME'" ng-click="switchSearch('STORE_NAME', false)">店铺名</li>
+						<li ng-hide="search === 'AUDITOR'" ng-click="switchSearch('AUDITOR', false)">审核人</li>
+					</ul>
+				</div>
+				<input type="search" class="form-control" placeholder="{{placeValue}}" ng-model="keyword" ng-search="refreshTableData()"/>
 				<button ng-click="refreshTableData()">搜索</button>
 			</div>
 		</div>

src/main/webapp/resources/view/admin/trade/trade_buyer_order.html

@@ -233,7 +233,7 @@
 						<th class="th-normal" width="70">总数量</th>
 						<th class="th-normal" width="100">销售<br/>总金额</th>
 						<th class="th-normal" width="50">币种</th>
-						<th class="th-normal" width="50">税率</th>
+						<!--<th class="th-normal" width="50">税率</th>-->
 					</tr>
 				</thead>
 				<tbody>
@@ -310,7 +310,7 @@
 						<!-- 币别 -->
 						<td>{{order.currency}}</td>
 						<!-- 税率 -->
-						<td><span ng-if="order.taxRate">{{order.taxRate * 100}}%</span></td>
+						<!--<td><span ng-if="order.taxRate">{{order.taxRate * 100}}%</span></td>-->
 					</tr>
 					<tr ng-if="page.totalPages == 0">
 						<td colspan="18">
@@ -365,7 +365,7 @@
 						<th class="th-normal" width="70">订单<br/>总数量</th>
 						<th class="th-normal" width="100">订单<br/>总金额</th>
 						<th class="th-normal" width="50">币种</th>
-						<th class="th-normal" width="50">税率</th>
+						<!--<th class="th-normal" width="50">税率</th>-->
 					</tr>
 				</thead>
 				<tbody>
@@ -404,7 +404,7 @@
 						<!-- 币种 -->
 						<td>{{order.currency}}</td>
 						<!-- 税率 -->
-						<td><span ng-if="order.taxRate != null">{{order.taxRate * 100}}%</span></td>
+						<!--<td><span ng-if="order.taxRate != null">{{order.taxRate * 100}}%</span></td>-->
 					</tr>
 					<tr ng-if="page.totalPages == 0">
 						<td colspan="16">

src/main/webapp/resources/view/admin/trade/trade_order_detail.html

@@ -31,6 +31,14 @@
 	.orderid {
 		border: 1px solid #ddd;
 		padding: 5px;
+		overflow: hidden;
+	}
+	.orderid h3{
+		float: left;
+	}
+	.orderid .handle-btn {
+		float: right;
+		padding-top: 15px;
 	}
 	
 	.flow {
@@ -61,8 +69,84 @@
 	.row {
 		line-height: 30px;
 	}
+	/*审核不通过弹框*/
+	.audit-failure-modal {
+		display: block !important;
+		position: fixed;
+		background-color: white;
+		opacity: 1;
+		width: 300px;
+		height: 140px;
+		top: 250px;
+		left: 554px;
+		font-family: "microsoft yahei";
+		border: 1px solid #d9d5ce;
+		z-index: 10;
+	}
+
+	.audit-failure-modal .title {
+		line-height: 31px;
+		height: 31px;
+		font-size: 14px;
+		background-color: #3a76e4;
+		color: white;
+		text-align: left;
+		font-family: microsoft yahei;
+		padding-left: 15px;
+	}
+
+	.audit-failure-modal .content input {
+		width: 80%;
+		height: 31px;
+		line-height: 31px;
+		border-radius: 4px;
+		margin-top: 10px;
+		margin-left: 28px;
+		margin-bottom: 15px;
+	}
+
+	.audit-failure-modal  .footer{
+		margin: 0 auto;
+		text-align: center;
+	}
+
+	.audit-failure-modal  .footer .confirm {
+		width: 90px;
+		padding: 5px 10px;
+		background-color: #3A76E4;
+		border: none;
+		color: white;
+		font-size: 14px;
+	}
+
+	.audit-failure-modal .footer .cancle-button {
+		width: 90px;
+		padding: 5px 10px;
+		background-color: #D9D5CE;
+		border: none;
+		color: #333333;
+		font-size: 14px;
+	}
 </style>
-<div class="orderid"><h3>订单号：<span class="content" ng-bind="orderDetailInfo.orderid"></span></h3></div>
+<div class="orderid">
+	<h3>订单号：<span class="content" ng-bind="orderDetailInfo.orderid"></span></h3>
+	<div class="handle-btn">
+		<a ng-if="orderDetailInfo.status==504 || orderDetailInfo.status==503" style="position: relative;">
+			<button type="button" ng-if="(orderDetailInfo.status==504 && !orderDetailInfo.installmentId) || (orderDetailInfo.status==504 && orderDetailInfo.installmentId && orderDetailInfo.installment.status==503)" class="btn btn-default btn-sm" ng-click="ensurePay(orderDetailInfo)">确认收款</button>
+			<button ng-if="orderDetailInfo.status==504" type="button" class="btn btn-default btn-sm" ng-click="showAuditFailureModal(orderDetailInfo)">审核不通过</button>
+			<div class="audit-failure-modal" ng-if="orderDetailInfo.dislayModal">
+				<div class="title">审核不通过的原因</div>
+				<div class="content">
+					<input class="form-control" ng-model="orderDetailInfo.auditFailureReason" placeholder="请输入审核不通过的原因"/>
+				</div>
+				<div class="footer">
+					<button class="confirm" ng-click="auditFailure(orderDetailInfo)">确认</button>
+					<button class="cancle-button" ng-click="orderDetailInfo.dislayModal = false">取消</button>
+				</div>
+			</div>
+		</a>
+	</div>
+</div>
 <div class="row col-md-12">
 	<div class="col-md-1 {{styl0}}"><span>待确认</span></div>
 	<div class="col-md-1 {{styl1}}"><span>待付款</span></div>

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

@@ -1505,7 +1505,7 @@
 						</div>
 						<div class="content">
 							<p>您还未填写<a target="_blank" ng-click="goToSettle(purchase)">收款账户信息&nbsp;</a>，请进行完善,<br/>否则在交易完成后，商城无法给您打款。</p>
-							<p>前往卖家<a target="_blank" ng-click="goToSettle(purchase)">结算中心&nbsp;<i class="fa fa-arrow-right"></i></a></p>
+							<p>前往卖家<a target="_blank" ng-click="goToSettle(purchase)">财务对账&nbsp;<i class="fa fa-arrow-right"></i></a></p>
 						</div>
 					</div>
 				</div>