From 05b882b5f17447b3f912b33cc2110fb69e5718f1 Mon Sep 17 00:00:00 2001 From: luoyang Date: Thu, 12 Dec 2019 14:00:35 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E4=BD=8D=E7=BD=AE=E8=BF=81=E7=A7=BB,?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=90=88=E8=A7=84=E5=AE=A1=E6=A0=B8=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kyc/templates/compliance_audit.html | 37 +++++ .../templates/compliance_audit_authfile.html | 119 +++++++++++++++ .../kyc/templates/compliance_audit_kyc.html | 119 +++++++++++++++ .../payment/partner/partner_compliance.js | 27 ++-- .../partner_compliance_for_client.html | 138 ----------------- .../sys/templates/partner_kyc_flies_auth.html | 140 ------------------ 6 files changed, 293 insertions(+), 287 deletions(-) create mode 100644 src/main/ui/static/payment/kyc/templates/compliance_audit.html create mode 100644 src/main/ui/static/payment/kyc/templates/compliance_audit_authfile.html create mode 100644 src/main/ui/static/payment/kyc/templates/compliance_audit_kyc.html delete mode 100644 src/main/ui/static/sys/templates/partner_compliance_for_client.html delete mode 100644 src/main/ui/static/sys/templates/partner_kyc_flies_auth.html diff --git a/src/main/ui/static/payment/kyc/templates/compliance_audit.html b/src/main/ui/static/payment/kyc/templates/compliance_audit.html new file mode 100644 index 000000000..ccd7b0b44 --- /dev/null +++ b/src/main/ui/static/payment/kyc/templates/compliance_audit.html @@ -0,0 +1,37 @@ +
+

商户合规文件审核

+
    +
  1. + Compliance Management +
    2. +
  2. 商户合规文件审核
    3. +
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+ + + + + diff --git a/src/main/ui/static/payment/kyc/templates/compliance_audit_authfile.html b/src/main/ui/static/payment/kyc/templates/compliance_audit_authfile.html new file mode 100644 index 000000000..2c7f9968f --- /dev/null +++ b/src/main/ui/static/payment/kyc/templates/compliance_audit_authfile.html @@ -0,0 +1,119 @@ +
+
+
+
+
+
+
+
+ +
+ +
+
+
+ +
+

+ All | + + 待审核| + 通过| + 打回 +

+
+
+ +
+
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Client MonikerShort NameCompliance StatusRegister TimeBDAuthFile StatusSubmit TimeSourceOperation
+ 通过({{compliance_company.approve_time}}) + 资料完善中 + (自助开通)资料完善中 + 自助开通试用中({{compliance_company.approve_time}}~{{compliance_company.expiry_time}}) + 不通过({{compliance_company.approve_time}}) + 申请打回({{compliance_company.refuse_remark|limitTo:15}}) + 等待合规 + 自助开通（等待合规） + 合同制作完成 + 等待BD上传材料审核 + 绿色通道申请中 + 等待合规 + + 待审核 + 通过 + 打回 + + App + Web + + Detail + +
+
+
+ +
Total Records:{{pagination.totalCount}};Total Pages:{{pagination.totalPages}}
+
+
+
+
+
+
+
diff --git a/src/main/ui/static/payment/kyc/templates/compliance_audit_kyc.html b/src/main/ui/static/payment/kyc/templates/compliance_audit_kyc.html new file mode 100644 index 000000000..2c7f9968f --- /dev/null +++ b/src/main/ui/static/payment/kyc/templates/compliance_audit_kyc.html @@ -0,0 +1,119 @@ +
+
+
+
+
+
+
+
+ +
+ +
+
+
+ +
+

+ All | + + 待审核| + 通过| + 打回 +

+
+
+ +
+
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Client MonikerShort NameCompliance StatusRegister TimeBDAuthFile StatusSubmit TimeSourceOperation
+ 通过({{compliance_company.approve_time}}) + 资料完善中 + (自助开通)资料完善中 + 自助开通试用中({{compliance_company.approve_time}}~{{compliance_company.expiry_time}}) + 不通过({{compliance_company.approve_time}}) + 申请打回({{compliance_company.refuse_remark|limitTo:15}}) + 等待合规 + 自助开通（等待合规） + 合同制作完成 + 等待BD上传材料审核 + 绿色通道申请中 + 等待合规 + + 待审核 + 通过 + 打回 + + App + Web + + Detail + +
+
+
+ +
Total Records:{{pagination.totalCount}};Total Pages:{{pagination.totalPages}}
+
+
+
+
+
+
+
diff --git a/src/main/ui/static/payment/partner/partner_compliance.js b/src/main/ui/static/payment/partner/partner_compliance.js index f03c14d31..b67db4565 100644 --- a/src/main/ui/static/payment/partner/partner_compliance.js +++ b/src/main/ui/static/payment/partner/partner_compliance.js @@ -4,7 +4,7 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS app.config(['$stateProvider', function ($stateProvider) { $stateProvider.state('partner_compliance_auth', { url: '/partners/complianceForClient', - templateUrl: 'static/sys/templates/partner_compliance_for_client.html', + templateUrl: 'static/payment/kyc/templates/compliance_audit.html', controller: 'compliancePartnerForClientCtrl' }).state('compliance_detail', { url: '/{client_moniker}/compliance_detail', @@ -28,11 +28,14 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS url: '/partner/complianceForAudit', templateUrl: '/static/payment/partner/templates/compliance_auth.html', controller: 'partnerComplianceAuditCtrl' - - }).state('partner_kyc_files_auth', { - url: '/partners/KycFilesAuth', - templateUrl: 'static/sys/templates/partner_kyc_flies_auth.html', + }).state('partner_compliance_auth.partner_kyc_files_auth', { + url: '/partners/KycFiles', + templateUrl: 'static/payment/kyc/templates/compliance_audit_kyc.html', controller: 'kycFilesAuthForClientCtrl' + }).state('partner_compliance_auth.partner_authfile', { + url: '/partners/authfile', + templateUrl: 'static/payment/kyc/templates/compliance_audit_authfile.html', + controller: 'authFileForClientCtrl' }).state('kyc_files_detail', { url: '/{client_moniker}/kyc_files_detail', templateUrl: '/static/payment/partner/templates/client_kyc_files_to_auth.html', @@ -45,13 +48,19 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS }) }]); - app.controller('compliancePartnerForClientCtrl', ['$scope', '$sce', '$http', '$filter', '$uibModal', 'businessStructuresMap', 'industryMap', 'stateMap', 'sectorMap', 'countryMap', + app.controller('compliancePartnerForClientCtrl', ['$rootScope','$state', function ($rootScope,$state) { + if ($state.is('partner_compliance_auth')){ + $state.go('.partner_authfile'); + } + }]); + + app.controller('kycFilesAuthForClientCtrl', ['$scope', '$sce', '$http', '$filter', '$uibModal', 'businessStructuresMap', 'industryMap', 'stateMap', 'sectorMap', 'countryMap', function ($scope, $sce, $http, $filter, $uibModal, businessStructuresMap, industryMap, stateMap, sectorMap, countryMap) { $scope.pagination = {}; $scope.industries = industryMap.configs(); $scope.states = stateMap.configs(); $scope.countries = countryMap.configs(); - $scope.params = {}; + $scope.params = {type:'2'}; $scope.loadClientCompliance = function (page) { var params = angular.copy($scope.params); params.page = page || $scope.pagination.page || 1; @@ -68,13 +77,13 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS }; }]); - app.controller('kycFilesAuthForClientCtrl', ['$scope', '$sce', '$http', '$filter', '$uibModal', 'businessStructuresMap', 'industryMap', 'stateMap', 'sectorMap', 'countryMap', + app.controller('authFileForClientCtrl', ['$scope', '$sce', '$http', '$filter', '$uibModal', 'businessStructuresMap', 'industryMap', 'stateMap', 'sectorMap', 'countryMap', function ($scope, $sce, $http, $filter, $uibModal, businessStructuresMap, industryMap, stateMap, sectorMap, countryMap) { $scope.pagination = {}; $scope.industries = industryMap.configs(); $scope.states = stateMap.configs(); $scope.countries = countryMap.configs(); - $scope.params = {type:'2'}; + $scope.params = {}; $scope.loadClientCompliance = function (page) { var params = angular.copy($scope.params); params.page = page || $scope.pagination.page || 1; diff --git a/src/main/ui/static/sys/templates/partner_compliance_for_client.html b/src/main/ui/static/sys/templates/partner_compliance_for_client.html deleted file mode 100644 index 0bf44744f..000000000 --- a/src/main/ui/static/sys/templates/partner_compliance_for_client.html +++ /dev/null @@ -1,138 +0,0 @@ -
-

商户合规文件审核

-
    -
  1. - Compliance Management -
    2. -
  2. 商户合规文件审核
    3. -
-
- -
-
-
- -
-
-
-
-
- -
- -
-
-
- -
-

- All | - - 待审核| - 通过| - 打回 -

-
-
- -
-
-
-
-
- -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Client MonikerShort NameCompliance StatusRegister TimeBDAuthFile StatusSubmit TimeSourceOperation
- 通过({{compliance_company.approve_time}}) - 资料完善中 - (自助开通)资料完善中 - 自助开通试用中({{compliance_company.approve_time}}~{{compliance_company.expiry_time}}) - 不通过({{compliance_company.approve_time}}) - 申请打回({{compliance_company.refuse_remark|limitTo:15}}) - 等待合规 - 自助开通（等待合规） - 合同制作完成 - 等待BD上传材料审核 - 绿色通道申请中 - 等待合规 - - 待审核 - 通过 - 打回 - - App - Web - - Detail - -
-
- -
- -
Total Records:{{pagination.totalCount}};Total Pages:{{pagination.totalPages}}
-
- -
- -
diff --git a/src/main/ui/static/sys/templates/partner_kyc_flies_auth.html b/src/main/ui/static/sys/templates/partner_kyc_flies_auth.html deleted file mode 100644 index 9eda08968..000000000 --- a/src/main/ui/static/sys/templates/partner_kyc_flies_auth.html +++ /dev/null @@ -1,140 +0,0 @@ -
-

商户合规文件审核

-
    -
  1. - Compliance Management -
    2. -
  2. 商户合规文件审核
    3. -
-
- - -
-
-
- -
- -
-
-
-
- -
- -
-
-
- -
-

- All | - - 待审核| - 通过| - 打回 -

-
-
- -
-
-
-
-
- -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Client MonikerShort NameCompliance StatusRegister TimeBDKYCFile StatusSubmit TimeSourceOperation
- 通过({{compliance_company.approve_time}}) - 资料完善中 - (自助开通)资料完善中 - 自助开通试用中({{compliance_company.approve_time}}~{{compliance_company.expiry_time}}) - 不通过({{compliance_company.approve_time}}) - 申请打回({{compliance_company.refuse_remark|limitTo:15}}) - 等待合规 - 自助开通（等待合规） - 合同制作完成 - 等待BD上传材料审核 - 绿色通道申请中 - 等待合规 - - 待审核 - 通过 - 打回 - - App - Web - - Detail - -
-
- -
- -
Total Records:{{pagination.totalCount}};Total Pages:{{pagination.totalPages}}
-
- -
- -