From ac7836da815ab76ec110bcde331af67363989770 Mon Sep 17 00:00:00 2001 From: yangkai Date: Mon, 22 Oct 2018 18:09:12 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=A4=B4=E9=83=A8=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/ui/manage.html | 4 +- src/main/ui/static/analysis/clearing-log.js | 12 +- .../analysis/templates/bd_sale_analysis.html | 6 +- .../analysis/templates/clearing_logs.html | 4 +- .../analysis/templates/client_rates.html | 4 +- .../templates/merchant_amount_analysis.html | 2 +- .../analysis/templates/org_sale_analysis.html | 18 +- .../templates/settle_date_config.html | 36 +- .../templates/settle_estimate_analysis.html | 163 ++++----- .../analysis/templates/settle_warnings.html | 3 - .../ui/static/cms/templates/cms_root.html | 5 +- .../bdprize/templates/bd_prize_root.html | 2 +- .../devtools/templates/wx_settlements.html | 2 +- .../config/managers/templates/managers.html | 2 +- .../config/notice/templates/notice.html | 2 +- .../config/organizations/templates/orgs.html | 2 +- .../templates/permission_config.html | 2 +- .../sysconfigs/templates/servants_config.html | 2 +- .../payment/invoice/templates/invoice.html | 2 +- .../static/payment/partner/partner-manage.js | 75 ++++ .../partner/templates/partner_compliance.html | 335 ++++++++++++++++++ .../payment/product/templates/product.html | 9 + .../tradelog/templates/trans_report.html | 2 +- .../risk/templates/attention_merchants.html | 2 +- src/main/ui/static/risk/templates/risk.html | 2 +- .../static/sys/templates/contract_sign.html | 8 +- .../static/sys/templates/manual_settle.html | 13 +- 27 files changed, 575 insertions(+), 144 deletions(-) create mode 100644 src/main/ui/static/payment/partner/templates/partner_compliance.html diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html index 6d507b05d..3a5c3f54b 100644 --- a/src/main/ui/manage.html +++ b/src/main/ui/manage.html @@ -371,8 +371,8 @@ margin-bottom: 10%;"/>
  • 合规管理|Compliance Management
    • -
  • - +
  • + 商户合规
    • diff --git a/src/main/ui/static/analysis/clearing-log.js b/src/main/ui/static/analysis/clearing-log.js index e610c6ee9..5117625f4 100644 --- a/src/main/ui/static/analysis/clearing-log.js +++ b/src/main/ui/static/analysis/clearing-log.js @@ -20,19 +20,17 @@ define(['angular', 'decimal', 'uiBootstrap', 'uiRouter', 'angularEcharts'], func controller: ['$state', function ($state) { $state.go('^') }] - }).state('clearingLogs.date_setting', { + }).state('date_setting', { url: '/date_setting', - template: '
    ', - onEnter: ['$uibModal', function ($uibModal) { + templateUrl: '/static/analysis/templates/settle_date_config.html', +/* onEnter: ['$uibModal', function ($uibModal) { $uibModal.open({ templateUrl: '/static/analysis/templates/settle_date_config.html', controller: 'settleDateConfigCtrl', size: 'lg' }) - }], - controller: ['$state', function ($state) { - $state.go('^') - }] + }],*/ + controller: 'settleDateConfigCtrl', }).state('clearingLogs.settlementDetail', { url: '/settles/{date}', templateUrl: '/static/analysis/templates/settlement_detail.html', diff --git a/src/main/ui/static/analysis/templates/bd_sale_analysis.html b/src/main/ui/static/analysis/templates/bd_sale_analysis.html index a071dd659..f2e5b96fe 100644 --- a/src/main/ui/static/analysis/templates/bd_sale_analysis.html +++ b/src/main/ui/static/analysis/templates/bd_sale_analysis.html @@ -7,15 +7,15 @@ text-align: center; } - +
    diff --git a/src/main/ui/static/analysis/templates/clearing_logs.html b/src/main/ui/static/analysis/templates/clearing_logs.html index 9f0224898..5e071c521 100644 --- a/src/main/ui/static/analysis/templates/clearing_logs.html +++ b/src/main/ui/static/analysis/templates/clearing_logs.html @@ -18,7 +18,7 @@
    -
    +
    Settlement Dates
    diff --git a/src/main/ui/static/analysis/templates/client_rates.html b/src/main/ui/static/analysis/templates/client_rates.html index 744833752..412b2d5bd 100644 --- a/src/main/ui/static/analysis/templates/client_rates.html +++ b/src/main/ui/static/analysis/templates/client_rates.html @@ -1,10 +1,10 @@
    -

    New Partner

    +

    Partner Active Rate

    1. Partner Manage
      2. -
    2. New Partner
      3. +
    3. Partner Active Rate
    diff --git a/src/main/ui/static/analysis/templates/merchant_amount_analysis.html b/src/main/ui/static/analysis/templates/merchant_amount_analysis.html index 42ebcc8b7..0535d2d78 100644 --- a/src/main/ui/static/analysis/templates/merchant_amount_analysis.html +++ b/src/main/ui/static/analysis/templates/merchant_amount_analysis.html @@ -46,7 +46,7 @@

    Transaction Amount Analysis

    1. - Payment + Partner Manage
    2. Transaction Amount Analysis
    diff --git a/src/main/ui/static/analysis/templates/org_sale_analysis.html b/src/main/ui/static/analysis/templates/org_sale_analysis.html index 55d0920cc..191815499 100644 --- a/src/main/ui/static/analysis/templates/org_sale_analysis.html +++ b/src/main/ui/static/analysis/templates/org_sale_analysis.html @@ -7,15 +7,15 @@ text-align: center; } - - - - - - - - - +
    +

    + City Partner Sale +

    +
      +
    1. Analysis
      2. +
    2. City Partner Sale
      3. +
    +
    diff --git a/src/main/ui/static/analysis/templates/settle_date_config.html b/src/main/ui/static/analysis/templates/settle_date_config.html index d2e0e6902..9c3967965 100644 --- a/src/main/ui/static/analysis/templates/settle_date_config.html +++ b/src/main/ui/static/analysis/templates/settle_date_config.html @@ -1,17 +1,27 @@ -

    Clearing Plans

    -
    -
    -
    -
    -
    - +
    +

    Clearing Plans

    +
      +
    1. Settlement
      2. +
    2. Clearing Plans
      3. +
    +
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    + +
    +
    + +
    - -
    -
    - - -
    \ No newline at end of file +
    \ No newline at end of file diff --git a/src/main/ui/static/analysis/templates/settle_estimate_analysis.html b/src/main/ui/static/analysis/templates/settle_estimate_analysis.html index 5a1d877be..b1307193d 100644 --- a/src/main/ui/static/analysis/templates/settle_estimate_analysis.html +++ b/src/main/ui/static/analysis/templates/settle_estimate_analysis.html @@ -17,96 +17,99 @@
    -
    -
    +
    -
    + -
    -
    -
    -
    -
    -
    -
    -
    - 清算金额: -
    -  T+1: - -
    -
    -  T+2: - -
    -
    -  T+3: - -
    +
    +
    +
    +
    +
    +
    +
    +
    - Total: - + 清算金额: +
    +  T+1: + +
    +
    +  T+2: + +
    +
    +  T+3: + +
    +
    + Total: + +
    +
    + 到账金额详情: +
    +
    +

    (1307485301)到账金额:

    +

    (1431999902)到账金额:

    +

    (1487387142)到账金额:

    +

    + Alipay 到账金额: +

    +

    AliPayOnline 到账金额(AlipayOnline): +

    +

    Hf 到账金额: +

    +

    RoyalPay + 总到账金额:

    +
    +
    -
    - 到账金额详情: -
    -
    -

    (1307485301)到账金额:

    -

    (1431999902)到账金额:

    -

    (1487387142)到账金额:

    -

    - Alipay 到账金额: -

    -

    AliPayOnline 到账金额(AlipayOnline): -

    -

    Hf 到账金额: -

    -

    RoyalPay - 总到账金额:

    -
    - +
    -
    -
    -
    +
    +
    +
    +
    @@ -208,6 +211,6 @@
    -
    -
    -
    \ No newline at end of file + + + \ No newline at end of file diff --git a/src/main/ui/static/analysis/templates/settle_warnings.html b/src/main/ui/static/analysis/templates/settle_warnings.html index 028b2688f..ef69f3d89 100644 --- a/src/main/ui/static/analysis/templates/settle_warnings.html +++ b/src/main/ui/static/analysis/templates/settle_warnings.html @@ -78,7 +78,4 @@
    -
    -
    -
    \ No newline at end of file diff --git a/src/main/ui/static/cms/templates/cms_root.html b/src/main/ui/static/cms/templates/cms_root.html index 0040caa6b..006648e7a 100644 --- a/src/main/ui/static/cms/templates/cms_root.html +++ b/src/main/ui/static/cms/templates/cms_root.html @@ -2,7 +2,10 @@

    网站管理

      -
    1. 网站管理
      2. +
    2. + Content Management +
      3. +
    3. 网站管理
    diff --git a/src/main/ui/static/config/bdprize/templates/bd_prize_root.html b/src/main/ui/static/config/bdprize/templates/bd_prize_root.html index ef9ffeae6..7657024b0 100644 --- a/src/main/ui/static/config/bdprize/templates/bd_prize_root.html +++ b/src/main/ui/static/config/bdprize/templates/bd_prize_root.html @@ -2,7 +2,7 @@

    BD Commissions

      -
    1. Financial
      2. +
    2. Performance
    3. BD Commissions
    diff --git a/src/main/ui/static/config/devtools/templates/wx_settlements.html b/src/main/ui/static/config/devtools/templates/wx_settlements.html index dca317662..cbb5c67ac 100644 --- a/src/main/ui/static/config/devtools/templates/wx_settlements.html +++ b/src/main/ui/static/config/devtools/templates/wx_settlements.html @@ -2,7 +2,7 @@

    Wechat Settlements

    1. - Financial + Financial
    2. Wechat Settlements
    diff --git a/src/main/ui/static/config/managers/templates/managers.html b/src/main/ui/static/config/managers/templates/managers.html index e46db3e3d..4acfb3305 100644 --- a/src/main/ui/static/config/managers/templates/managers.html +++ b/src/main/ui/static/config/managers/templates/managers.html @@ -2,7 +2,7 @@

    Manager Accounts

    1. - Basic Config + Framework
    2. Manager Accounts
    diff --git a/src/main/ui/static/config/notice/templates/notice.html b/src/main/ui/static/config/notice/templates/notice.html index 5979a33c2..b336ba0e1 100644 --- a/src/main/ui/static/config/notice/templates/notice.html +++ b/src/main/ui/static/config/notice/templates/notice.html @@ -3,7 +3,7 @@

    Notice Manage

    1. - Basic Config + Content Management
    2. Notice Manage
    diff --git a/src/main/ui/static/config/organizations/templates/orgs.html b/src/main/ui/static/config/organizations/templates/orgs.html index ba15ad749..02662ec4e 100644 --- a/src/main/ui/static/config/organizations/templates/orgs.html +++ b/src/main/ui/static/config/organizations/templates/orgs.html @@ -27,7 +27,7 @@

    Organizations

    1. - Basic Config + Framework
    2. Organizations
    diff --git a/src/main/ui/static/config/sysconfigs/templates/permission_config.html b/src/main/ui/static/config/sysconfigs/templates/permission_config.html index 9442c787c..274afa648 100644 --- a/src/main/ui/static/config/sysconfigs/templates/permission_config.html +++ b/src/main/ui/static/config/sysconfigs/templates/permission_config.html @@ -2,7 +2,7 @@

    Permission Config

    1. - System Config + Framework
    2. Permission Config
    diff --git a/src/main/ui/static/config/sysconfigs/templates/servants_config.html b/src/main/ui/static/config/sysconfigs/templates/servants_config.html index 1faef465a..133cfce47 100644 --- a/src/main/ui/static/config/sysconfigs/templates/servants_config.html +++ b/src/main/ui/static/config/sysconfigs/templates/servants_config.html @@ -2,7 +2,7 @@

    Servants Config

    1. - System Config + Framework
    2. Servants Config
    diff --git a/src/main/ui/static/payment/invoice/templates/invoice.html b/src/main/ui/static/payment/invoice/templates/invoice.html index f96b8ca1e..d6664ff3b 100644 --- a/src/main/ui/static/payment/invoice/templates/invoice.html +++ b/src/main/ui/static/payment/invoice/templates/invoice.html @@ -33,7 +33,7 @@

    Partner Invoice

    1. - Financial + Financial
    2. Partner Invoice
    diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js index ef733f8e5..922eeafdb 100644 --- a/src/main/ui/static/payment/partner/partner-manage.js +++ b/src/main/ui/static/payment/partner/partner-manage.js @@ -91,6 +91,10 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter url: '/partners/new', templateUrl: '/static/payment/partner/templates/add_partner.html', controller: 'addPartnerCtrl' + }).state('businessCompliance', { + url: '/partners/compliance', + templateUrl: '/static/payment/partner/templates/partner_compliance.html', + controller: 'compliancePartnerCtrl' }).state('partners.detail', { url: '/{clientMoniker}/detail', templateUrl: '/static/payment/partner/templates/partner_detail.html', @@ -277,6 +281,77 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter } $scope.toogleMerchantSelect();*/ }]); + app.controller('compliancePartnerCtrl', ['$scope', '$sce', '$http', '$filter', '$uibModal', 'businessStructuresMap', 'industryMap', 'stateMap', 'sectorMap', 'countryMap', + function ($scope, $sce, $http, $filter, $uibModal, businessStructuresMap, industryMap, stateMap, sectorMap, countryMap) { + + $scope.analysisClients = function () { + $http.get('/sys/partners/analysis').then(function (resp) { + $scope.analysis = resp.data; + }) + }; + if ($scope.currentUser.org_id == 1 || $scope.currentUser.org_id == null) { + $scope.analysisClients(); + } + $scope.pagination = {}; + $scope.industries = industryMap.configs(); + $scope.states = stateMap.configs(); + $scope.countries = countryMap.configs(); + $scope.sectors = sectorMap.configs(); + $scope.business_structures = businessStructuresMap.configs(); + $scope.clean_days = angular.copy(clean_days_map); + $scope.bd_citys = angular.copy(bd_city_map); + $scope.params = {textType: 'all', org_name: 'ALL'}; + + $scope.loadPartners = function (page) { + var params = angular.copy($scope.params); + params.page = page || $scope.pagination.page || 1; + $http.get('/sys/partners', {params: params}).then(function (resp) { + $scope.partners = resp.data.data; + $scope.pagination = resp.data.pagination; + }); + }; + + $scope.today = new Date(); + + $scope.listBDUsers = function () { + $http.get('/sys/manager_accounts/roles/bd_user').then(function (resp) { + $scope.bdUserSource = resp.data; + }) + }; + $scope.listBDUsers(); + + if (($scope.currentUser.role & parseInt('1000011', 2)) > 0 && !$scope.currentUser.org_id) { + $scope.showOrg = 'Organization'; + $http.get('/sys/orgs/list_all_Org', {params: {}}).then(function (resp) { + $scope.orgs = resp.data; + }); + } + + $scope.loadOrgs = function () { + var params = angular.copy($scope.params); + $http.get('/sys/orgs/orgChild', {params: params}).then(function (resp) { + $scope.orgs_child = resp.data; + }) + }; + $scope.loadOrgs(); + + $scope.loadPartners(1); + + + $scope.openClientBoard = function (client) { + $uibModal.open({ + templateUrl: '/static/analysis/templates/partner_card.html', + controller: 'partnerCardCtrl', + resolve: { + clientMoniker: function () { + return client.client_moniker + } + }, + size: 'lg' + }) + + }; + }]); app.controller('addPartnerCtrl', ['$rootScope', '$scope', '$http', '$state', 'Upload', 'commonDialog', 'timezone', function ($rootScope, $scope, $http, $state, Upload, commonDialog, timezone) { if ($scope.partner_application) { $scope.partner = angular.copy($scope.partner_application); diff --git a/src/main/ui/static/payment/partner/templates/partner_compliance.html b/src/main/ui/static/payment/partner/templates/partner_compliance.html new file mode 100644 index 000000000..534daecf6 --- /dev/null +++ b/src/main/ui/static/payment/partner/templates/partner_compliance.html @@ -0,0 +1,335 @@ + +
    +
    +

    Business compliance

    +
      +
    1. + Compliance Management +
      2. +
    2. Business compliance
      3. +
    +
    + +
    +
    +
    +
    + +
    + Waiting Compliance + {{analysis.wp}} + 其中自助开通:{{analysis.a_wp}} +
    +
    +
    +
    +
    + +
    + Pass + {{analysis.pass}} + 其中自助开通:{{analysis.z_pass+analysis.a_pass}} +
    +
    +
    +
    +
    + +
    + Temp SubMerchantID + +
    +
    +
    +
    +
    + +
    + 自助开通 + {{analysis.quick_pass}} + waiting compliance:{{analysis.a_wp}} +
    +
    +
    +
    +
    +
    +
    + +
    +
    + +
    +
    +
    + + + + +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + + +
    + +
    + +
    +
    + +
    + + +
    + +
    +
    + +
    + +
    + +
    +
    +
    + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    +
    +
    + 禁用 +   超期提醒   +   等待合规   +   绿色通道   +   通过   +
    + + + + + + + + + + + + + + + + + + + + + + + + + +
    Partner CodePartner NameSub Mch IDRegister TimeCompliance StatusOrganizationBDOperation +
    + + + + (已禁用) + + + + + 通过({{partner.approve_time}}) + 资料完善中 + (自助开通)资料完善中 + 自助开通试用中({{partner.approve_time}}~{{partner.expiry_time}}) + 不通过({{partner.approve_time}}) + 申请打回({{partner.refuse_remark|limitTo:15}}) + 等待合规 + 自助开通（等待合规） + 合同制作完成 + 等待BD上传材料审核 + 绿色通道申请中 + 等待合规 + + + Detail + +
    + +
    +
    + +
    +
    Total Records:{{pagination.totalCount}};Total + Pages:{{pagination.totalPages}} +
    +
    +
    +
    + + +
    +
    +
    +
    +
    diff --git a/src/main/ui/static/payment/product/templates/product.html b/src/main/ui/static/payment/product/templates/product.html index 196f2321e..c3aaaaa18 100644 --- a/src/main/ui/static/payment/product/templates/product.html +++ b/src/main/ui/static/payment/product/templates/product.html @@ -1,3 +1,12 @@ +
    +

    Products

    +
      +
    1. + Framework +
      2. +
    2. Products
      3. +
    +
    diff --git a/src/main/ui/static/payment/tradelog/templates/trans_report.html b/src/main/ui/static/payment/tradelog/templates/trans_report.html index ec22314e5..e8ef4c38c 100644 --- a/src/main/ui/static/payment/tradelog/templates/trans_report.html +++ b/src/main/ui/static/payment/tradelog/templates/trans_report.html @@ -11,7 +11,7 @@

    AusTrac Report

    1. - Financial + Financial
    2. AusTrac Report
    diff --git a/src/main/ui/static/risk/templates/attention_merchants.html b/src/main/ui/static/risk/templates/attention_merchants.html index a3da05e12..88aeee434 100644 --- a/src/main/ui/static/risk/templates/attention_merchants.html +++ b/src/main/ui/static/risk/templates/attention_merchants.html @@ -2,7 +2,7 @@

    Blacklist

      -
    1. Risk Manager
      2. +
    2. Risk Manager
    3. Blacklist
    diff --git a/src/main/ui/static/risk/templates/risk.html b/src/main/ui/static/risk/templates/risk.html index ce0415615..435911e83 100644 --- a/src/main/ui/static/risk/templates/risk.html +++ b/src/main/ui/static/risk/templates/risk.html @@ -2,7 +2,7 @@

    Risk Records

      -
    1. Risk Manager
      2. +
    2. Risk Manager
    3. Risk Records
    diff --git a/src/main/ui/static/sys/templates/contract_sign.html b/src/main/ui/static/sys/templates/contract_sign.html index 41f712886..06dc9b700 100644 --- a/src/main/ui/static/sys/templates/contract_sign.html +++ b/src/main/ui/static/sys/templates/contract_sign.html @@ -1,21 +1,17 @@
    -

    Business compliance

    +

    Contract Award

    1. Compliance Management
      2. -
    2. Business compliance
      3. +
    3. contract award
    -
    Contract
    • Contract
      • -
    • - Rate Warings -
    • Manual Settle
      • diff --git a/src/main/ui/static/sys/templates/manual_settle.html b/src/main/ui/static/sys/templates/manual_settle.html index dc67edcb0..f3378a7a5 100644 --- a/src/main/ui/static/sys/templates/manual_settle.html +++ b/src/main/ui/static/sys/templates/manual_settle.html @@ -1,12 +1,17 @@ -
      Contract
      +
      +

      Manual Settle

      +
        +
      1. + Compliance Management +
        2. +
      2. Manual Settle
        3. +
      +