Merge remote-tracking branch 'origin/dev-mysql' into dev-mysql

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

@@ -10576,6 +10576,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                     + "|" + ($scope.condition.factory == null ? "" : $scope.condition.factory)
                     + "|" + ($scope.condition.prodtitle == null ? "" : $scope.condition.prodtitle)
                     + "|" + ($scope.condition.prodspec == null ? "" : $scope.condition.prodspec));//保存当前取值的关键词
+                $scope.exportKeywordXls = encodeURIComponent($scope.keywordXls);
                 $scope.fromDateXls = angular.copy($scope.condition.dateFrom ? $scope.condition.dateFrom.getTime() : null);//保存当前取值的起始日期
                 $scope.endDateXls = angular.copy($scope.condition.dateTo ? $scope.condition.dateTo.getTime() : null);//保存当前取值的截止日期
                 if (!$scope.suuorname) {
@@ -10832,7 +10833,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             if ($scope.sameCust && $scope.validQty) {
                 $scope.saveApCheck();
             }
-
         }
     }]);
 
@@ -16927,7 +16927,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             getPayMethod($scope.deOrder.deputyuu, 'paymentmethod');
         });
 
-
         var getPayMethod = function(enuu, key) {
             // 获取我方付款支付方式默认值
             DekeyValue.getValue({enuu: enuu, key: key}, function(data) {

src/main/webapp/resources/tpl/index/fa/apCheckList.html

@@ -140,16 +140,9 @@
 						class="fa fa-fw"
 						ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i></a>
 					<div class="btn-group btn-group-sm">
-						<a class="btn btn-default" ng-click="searchOrder()"><i
-							class="fa fa-search fa-fw btn-icon-left"></i>筛选</a> <a
-							class="btn btn-default" ng-click="createApCheck(check.$selected)"
-							ng-disabled="!data || data.length==0"><i
-							class="fa fa-check-circle-o fa-fw btn-icon-left"></i>对账</a> <a
-							class="btn btn-default"
-							href="sale/apCheck/xls?keyword={{keywordXls}}&fromDate={{fromDateXls}}&endDate={{endDateXls}}"
-							target="_self" title="导出Excel"
-							ng-disabled="!data || data.length==0"><i
-							class="fa fa-file-excel-o fa-fw btn-icon-left"></i>导出</a>
+						<a class="btn btn-default" ng-click="searchOrder()" title="筛选"><i class="fa fa-search fa-fw btn-icon-left"></i>筛选</a>
+						<a class="btn btn-default" ng-click="createApCheck(check.$selected)" ng-disabled="!data || data.length==0"><i class="fa fa-check-circle-o fa-fw btn-icon-left"></i>对账</a>
+						<a class="btn btn-default" href="sale/apCheck/xls?keyword={{exportKeywordXls}}&fromDate={{fromDateXls}}&endDate={{endDateXls}}" title="导出Excel" ng-disabled="!data || data.length==0"><i class="fa fa-file-excel-o fa-fw btn-icon-left"></i>导出</a>
 					</div>
 				</div>
 			</div>

src/main/webapp/resources/tpl/index/purc/deputyOrder_detail.html

@@ -266,19 +266,10 @@
                             <div class="fr">
                                 <em><b>*</b>我方付款方式：</em>
                                 <span>
-                                	<select name="" ng-model="deOrder.paymentmethod" class="select" ng-required="true">
-                                        <option value="">请先选择支付方式</option>
-                                        <option value="预付20%履约保证金，尾款提货前付清。">预付20%履约保证金，尾款提货前付清。</option>
-                                        <option value="预付10%履约保证金，尾款提货前付清。">预付10%履约保证金，尾款提货前付清。</option>
-                                        <option value="预付15%履约保证金，尾款提货前付清。">预付15%履约保证金，尾款提货前付清。</option>
-                                        <option value="预付25%履约保证金，尾款提货前付清。">预付25%履约保证金，尾款提货前付清。</option>
-                                        <option value="预付30%履约保证金，尾款提货前付清。">预付30%履约保证金，尾款提货前付清。</option>
-                                        <option value="预付30%履约保证金，尾款提货前付清。">预付35%履约保证金，尾款提货前付清。</option>
-                                        <option value="提货前TT全款。">提货前TT全款。</option>
-                                    </select>
-                                    <!--<select ng-if="methods.length != 0" ng-model="deOrder.paymentmethod" class="select" ng-required="true" ng-options="me.value for me in methods | orderBy:'-weight'">
-                                        <option value="">请先选择支付方式</option>
-                                    </select>-->
+                                	<input  ng-model="deOrder.paymentmethod" list="paymentmethod" class="select" style="width: 200px">
+	                                    <datalist id="paymentmethod">
+	                                    	 <option ng-repeat="me in methods | orderBy:'-weightid'" value="{{me.value}}">{{me.value}}</option>
+	                                    </datalist>
                                 </span>
                             </div>
                         </li>

src/main/webapp/resources/tpl/index/purc/deputyOrder_new.html

@@ -267,28 +267,10 @@
                             <div class="fr">
                                 <em><b>*</b>我方付款方式：</em>
                                 <span>
-                                    <!--<input  ng-model="deOrder.paymentmethod" list="paymentmethod" class="select" ng-required="true">-->
-                                    <!--<datalist id="paymentmethod" ng-if="methods.length == 0">-->
-                                        <!--<option value="">请先选择支付方式</option>-->
-                                        <!--<option value="T/T支付;预付20%履约保定金，尾款提货前付清。">T/T支付;预付20%履约保定金，尾款提货前付清。</option>-->
-                                        <!--<option value="T/T支付;预付15%履约保定金，尾款提货前付清。">T/T支付;预付15%履约保定金，尾款提货前付清。</option>-->
-                                        <!--<option value="T/T支付;预付25%履约保定金，尾款提货前付清。">T/T支付;预付25%履约保定金，尾款提货前付清。</option>-->
-                                        <!--<option value="T/T支付;预付30%履约保定金，尾款提货前付清。">T/T支付;预付30%履约保定金，尾款提货前付清。</option>-->
-                                    <!--</datalist>-->
-                                    <!--<datalist id="paymentmethod" ng-if="methods.length != 0">-->
-                                        <!--<option ng-repeat="me in methods | orderBy:'-weightid'" value="{{me.value}}">{{me.value}}</option>-->
-                                    <!--</datalist>-->
-                                    <select ng-model="deOrder.paymentmethod" class="select" ng-required="true" ng-if="methods.length == 0">
-                                        <option value="">请先选择支付方式</option>
-                                        <option value="T/T支付;预付20%履约保定金，尾款提货前付清。">T/T支付;预付20%履约保定金，尾款提货前付清。</option>
-                                        <option value="T/T支付;预付15%履约保定金，尾款提货前付清。">T/T支付;预付15%履约保定金，尾款提货前付清。</option>
-                                        <option value="T/T支付;预付25%履约保定金，尾款提货前付清。">T/T支付;预付25%履约保定金，尾款提货前付清。</option>
-                                        <option value="T/T支付;预付30%履约保定金，尾款提货前付清。">T/T支付;预付30%履约保定金，尾款提货前付清。</option>
-                                    </select>
-                                    <select ng-if="methods.length != 0" ng-model="deOrder.paymentmethod" class="select" ng-required="true">
-                                        <option value="">请先选择支付方式</option>
-                                        <option ng-repeat="me in methods | orderBy:'-weightid'" value="{{me.value}}">{{me.value}}</option>
-                                    </select>
+                                    <input  ng-model="deOrder.paymentmethod" list="paymentmethod" class="select" style="width: 200px">
+	                                    <datalist id="paymentmethod">
+	                                    	 <option ng-repeat="me in methods | orderBy:'-weightid'" value="{{me.value}}">{{me.value}}</option>
+	                                    </datalist>
                                 </span>
                             </div>
                         </li>
@@ -354,13 +336,6 @@
                             <span><a ng-click="add($index)" style="color: #1f4fb2">添加</a><a ng-click="del($index)" style="color: #d32526"> 删除</a></span>
                         </dd>
                     </dl>
-                 <!--    <div class="page fl">
-                        <ul>
-                            <li><a href="#">上一页</a> </li>
-                            <li>第<input type="text" placeholder="3">页&nbsp;共6页</li>
-                            <li><a href="#">下一页</a> </li>
-                        </ul>
-                    </div> -->
                 </div>
                 <!--采购订单-->
                 <div class="com_title01"><span>采购订单</span></div>