fix ui

src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientComplianceCompanyMapper.xml

@@ -4,5 +4,13 @@
     <select id="listClientCompliances" resultType="com.alibaba.fastjson.JSONObject">
         SELECT c.client_moniker,c.short_name,c.create_time,c.bd_user_name,c.approve_result,c.approve_time,c.open_status,
         c.source as client_source,a.* FROM client_authfile_compliance a INNER JOIN sys_clients c on c.client_id = a.client_id
+        <where>
+            <if test="client_moniker!=null">
+                and c.client_moniker = #{client_moniker}
+            </if>
+            <if test="status!=null">
+                and a.status = #{status}
+            </if>
+        </where>
     </select>
 </mapper>

src/main/ui/static/payment/partner/partner.js

@@ -1034,7 +1034,6 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload','uiBoot
     app.controller('aggregateFileCtrl', ['$scope', '$http', '$rootScope', 'commonDialog', '$state', 'Upload', function ($scope, $http, $rootScope, commonDialog, $state, Upload) {
         $scope.aggregateFile = function () {
             $http.get('/client/partner_info/aggregateFile/client_info').then(function (resp) {
-                debugger;
                 $scope.aggregateFileInfo = resp.data;
             }, function (resp) {
                 commonDialog.alert({title: '生成合同失败', content:"错误原因:"+resp.data.message+",请联系bd或客服", type: 'error'});

src/main/ui/static/payment/partner/partner_compliance.js

@@ -48,6 +48,11 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS
                 });
             };
             $scope.loadClientCompliance(1);
+            $scope.statusSelected = function (arr) {
+                return $scope.params.status != null && $scope.params.status.filter(function (status) {
+                    return arr.indexOf(status) >= 0
+                }).length > 0
+            };
         }]);
 
     app.controller('partnerComplianceCompanyDetail', ['$rootScope', '$scope', '$http', '$state', '$uibModal', 'commonDialog', 'file', function ($rootScope, $scope, $http, $state, $uibModal, commonDialog, file) {

src/main/ui/static/payment/partner/templates/contract_for_compliance.html

@@ -35,8 +35,8 @@
 
 </style>
 
-<script type="text/javascript" src="static/lib/mSign_signMark_app.js"></script>
+<script src="static/lib/mSign_signMark_app.js"></script>
-<script type="text/javascript" src="static/lib/mSign_signMark_signature_pad.js"></script>
+<script src="static/lib/mSign_signMark_signature_pad.js"></script>
 
 
 <script>

src/main/ui/static/sys/templates/partner_compliance_for_client.html

@@ -7,26 +7,39 @@
         <li class="active">商户合规文件审核</li>
     </ol>
 </section>
-<!--<ul class="nav nav-tabs">
+
-    <li ui-sref-active-eq="active" class="active">
+<div class="box box-warning" style="margin-top: 30px;">
-        <a ui-sref="contract">Contract</a>
+    <div class="box-header">
-    </li>
+        <div class="row">
-    <li ui-sref-active-eq="active" class="active">
+            <div class="col-sm-12">
-        <a ui-sref="manual_settle">Manual Settle</a>
+                <div class="form-horizontal">
-    </li>
+                    <div class="form-group col-xs-12">
-</ul>
+                        <label class="col-xs-4 col-sm-2 control-label">Partner Code</label>
-<br>-->
+                        <div class="col-sm-5 col-xs-8">
-<div class="box box-danger">
+                            <input class="form-control" placeholder="" ng-click="loadClientCompliance(1)"
-    <div class="modal-body">
+                                   ng-model="params.client_moniker">
-        <div class="form-inline">
-            <div class="form-group">
-                <label class="control-label" for="title-search">Partner Code</label>
-                <input class="form-control" id="title-search" ng-model="params.client_moniker">
                         </div>
+                    </div>
+                    <div class="form-group col-xs-12">
+                        <label class="control-label col-xs-4 col-sm-2">审核状态：</label>
+                        <div class="col-sm-10 col-xs-8">
+                        <p class="form-control-static">
+                            <a role="button" ng-class="{'bg-primary':params.status==null}"
+                               ng-click="params.status=null;loadClientCompliance(1)">All</a> |
 
-            <div class="form-group">
+                            <a role="button" ng-class="{'bg-primary':statusSelected([0])}"
-                <button class="btn btn-primary" type="button" ng-click="loadClientCompliance(1)"><i
+                               ng-click="params.status=[0];loadClientCompliance(1)">待审核</a>|
-                        class="fa fa-search"></i></button>
+                            <a role="button" ng-class="{'bg-primary':statusSelected([1])}"
+                               ng-click="params.status=[1];loadClientCompliance(1)">通过</a>|
+                            <a role="button" ng-class="{'bg-primary':statusSelected([2])}"
+                               ng-click="params.status=[2];loadClientCompliance(1)">打回</a>
+                        </p>
+                        </div>
+                    </div>
+                    <button class="btn btn-success" type="button" ng-click="loadTradeLogs()">
+                        <i class="fa fa-search"></i> Search
+                    </button>
+                </div>
             </div>
         </div>
     </div>
@@ -60,12 +73,16 @@
                         <span ng-if="!compliance_company.open_status && compliance_company.approve_result==2 && compliance_company.approve_time">自助开通试用中({{compliance_company.approve_time}}~{{compliance_company.expiry_time}})</span>
                         <span ng-if="compliance_company.approve_result==0 && compliance_company.approve_time">不通过({{compliance_company.approve_time}})</span>
                         <span ng-if="compliance_company.approve_result==5 && compliance_company.approve_time && compliance_company.refuse_remark">申请打回({{compliance_company.refuse_remark|limitTo:15}})</span>
-                        <span ng-if="(compliance_company.open_status==1||compliance_company.open_status==4) && compliance_company.approve_result!=3"><i ng-if="compliance_company.refuse_remark.length>0" class="fa fa-reply" aria-hidden="true" title="被打回重新提交"></i>等待合规</span>
+                        <span ng-if="(compliance_company.open_status==1||compliance_company.open_status==4) && compliance_company.approve_result!=3"><i
+                                ng-if="compliance_company.refuse_remark.length>0" class="fa fa-reply" aria-hidden="true"
+                                title="被打回重新提交"></i>等待合规</span>
                         <span ng-if="compliance_company.approve_result==3 && (!compliance_company.open_status || compliance_company.open_status==4)">自助开通（等待合规）</span>
                         <span ng-if="compliance_company.open_status==2">合同制作完成</span>
                         <span ng-if="compliance_company.open_status==3 && compliance_company.approve_result!=5">等待BD上传材料审核</span>
                         <span ng-if="compliance_company.open_status==10">绿色通道申请中</span>
-                        <span ng-if="compliance_company.approve_result==4 && !compliance_company.open_status"><i ng-if="compliance_company.refuse_remark.length>0" class="fa fa-reply" aria-hidden="true" title="被打回重新提交"></i>等待合规</span>
+                        <span ng-if="compliance_company.approve_result==4 && !compliance_company.open_status"><i
+                                ng-if="compliance_company.refuse_remark.length>0" class="fa fa-reply" aria-hidden="true"
+                                title="被打回重新提交"></i>等待合规</span>
                     </td>
                     <td ng-bind="compliance_company.create_time|date:'dd/MMM/yyyy'"></td>
                     <td ng-bind="compliance_company.bd_user_name"></td>