Browse Source

计费认证功能恢复

seimin 3 years ago
parent
commit
6885f096c4

+ 12 - 2
assets/js/controllers/customform/customformCtrl.js

@@ -7601,12 +7601,22 @@ appFormly.config(
7601 7601
                 }
7602 7602
             },
7603 7603
             controller: ['$scope', '$rootScope', '$modal', 'SweetAlert', 'api_bpm_data', 'api_solution', '$aside', 'api_zsk', 'api_bpm_domain', function ($scope, $rootScope, $modal, SweetAlert, api_bpm_data, api_solution, $aside, api_zsk, api_bpm_domain) {
7604
-
7604
+                console.log($scope)
7605 7605
                 $scope.selection = {
7606 7606
                     id: ''
7607 7607
                 };
7608
+                //认证计费数据获取
7609
+                $scope.sumInfo = {};
7610
+                function getSumInfo() {
7611
+                    api_bpm_data.sumInfo($scope.model.incident.account).then(function (data) {
7612
+                        console.log(data)
7613
+                        if (data) {
7614
+                            $scope.sumInfo = data.data||{};
7615
+                        }
7616
+                    })
7617
+                }
7618
+                getSumInfo();
7608 7619
                 // 收起重复事件侧滑框
7609
-
7610 7620
                 function reashdata(item) {
7611 7621
                     var fildata = {
7612 7622
                         idx: 0,

+ 4 - 0
assets/js/main.js

@@ -803,6 +803,10 @@ app.factory('api_bpm_data', ['BpmRestangular', function (BpmRestangular) {
803 803
         notAcceptData: function (data) {
804 804
             return dataService.customPOST(data, 'updData/alarmIncident');
805 805
         },
806
+        // 获取认证计费数据
807
+        sumInfo: function (account) {
808
+            return dataService.customPOST({}, 'sumInfo/'+account);
809
+        },
806 810
         impFileData: function () {
807 811
             return dataService.one('/impFileData/bpm_scheduleorder');
808 812
         },

+ 1 - 0
assets/views/customform/tpl/ui-repeatIncidentbtn.html

@@ -1,3 +1,4 @@
1 1
 <!-- start: SETTINGS -->
2 2
 <span></span>
3
+<div data-ng-include=" 'assets/views/partials/off-right.html' " toggleable class="charging panel panel-default hidden-xs hidden-sm" id="charging"></div>
3 4
 <div ng-if="true" data-ng-include=" 'assets/views/customform/tpl/ui-repeatIncident.html' " toggleable default=notactive class="repeatIncident panel panel-default hidden-xs hidden-sm " id="repeatIncident"></div>

+ 26 - 24
assets/views/partials/off-right.html

@@ -12,48 +12,57 @@
12 12
 <div class="panel-body ng-scope">
13 13
     <!-- start: FIXED HEADER -->
14 14
     <tabset class="heighttab">
15
-        <tab heading="人员信息" style="min-width:50%;">
15
+        <tab heading="人员信息" style="min-width:100%;">
16 16
             <div class="category">
17 17
                 <div>
18 18
                     <div>
19 19
                         <div class="col-md-6 padding-top-5">
20
-                            用户名:<span class="recentin">{{information.userId}}</span>
20
+                            账号:<span class="recentin">{{sumInfo.user_name}}</span>
21 21
                         </div>
22 22
                         <div class=" col-md-6 padding-top-5">
23
-                            用户姓名:<span class="recentin"> {{information.userName}}</span>
23
+                            人员名称:<span class="recentin"> {{sumInfo.user_real_name}}</span>
24 24
                         </div>
25 25
                         <div class=" col-md-6 padding-top-5">
26
-                            套餐: <span class="recentin">{{information.packageName}}</span>
26
+                            账号创建时间: <span class="recentin">{{sumInfo.user_create_time}}</span>
27 27
                         </div>
28 28
                         <div class=" col-md-6 padding-top-5">
29
-                            计费策略: <span class="recentin">{{information.policyId}}</span>
29
+                            账号更新时间: <span class="recentin">{{sumInfo.user_update_time}}</span>
30 30
                         </div>
31 31
                         <div class=" col-md-6 padding-top-5">
32
-                            账户余额: <span class="recentin">{{information.accountFee}}元</span>
32
+                            账号过期时间: <span class="recentin">{{sumInfo.user_expire_time}}</span>
33 33
                         </div>
34 34
                         <div class="col-md-6 padding-top-5">
35
-                            模版名: <span class="recentin">{{information.atName}}</span>
35
+                            是否欠费: <span class="recentin">{{sumInfo.user_status}}</span>
36 36
                         </div>
37 37
                         <div class=" col-md-6 padding-top-5">
38
-                            自动销户时间: <span class="recentin">{{information.autologicDestroyTime}}</span>
38
+                            余额: <span class="recentin">{{sumInfo.balance}}元</span>
39 39
                         </div>
40 40
                         <div class=" col-md-6 padding-top-5">
41
-                            移动电话: <span class="recentin">{{information.mobile}}</span>
41
+                            账号状态: <span class="recentin">{{sumInfo.user_available}}</span>
42 42
                         </div>
43 43
                         <div class=" col-md-6 padding-top-5">
44
-                            电话号码: <span class="recentin">{{information.tel}}</span>
44
+                            否允许修改密码: <span class="recentin">{{sumInfo.user_allow_chgpass}}</span>
45 45
                         </div>
46 46
                         <div class=" col-md-6 padding-top-5">
47
-                            住址: <span class="recentin">{{information.address}}</span>
47
+                            账号开始时间: <span class="recentin">{{sumInfo.user_start_time}}</span>
48 48
                         </div>
49 49
                         <div class=" col-md-6 padding-top-5">
50
-                            本周期起始: <span class="recentin">{{information.periodStartTime}}</span>
50
+                            账号停用时间: <span class="recentin">{{sumInfo.user_stop_time}}</span>
51 51
                         </div>
52 52
                         <div class=" col-md-6 padding-top-5">
53
-                            下次记账时刻:<span class="recentin"> {{information.nextBillingTime}}</span>
53
+                            创建此用户的管理员:<span class="recentin"> {{sumInfo.mgr_name_create}}</span>
54 54
                         </div>
55 55
                         <div class=" col-md-6 padding-top-5">
56
-                            是否是黑名单: <span class="recentin">{{information.blacklist}}</span>
56
+                            最后操作的管理员: <span class="recentin">{{sumInfo.mgr_name_update}}</span>
57
+                        </div>
58
+                        <div class=" col-md-6 padding-top-5">
59
+                            卡号: <span class="recentin">{{sumInfo.cert_num}}</span>
60
+                        </div>
61
+                        <div class=" col-md-6 padding-top-5">
62
+                            联系电话: <span class="recentin">{{sumInfo.phone}}</span>
63
+                        </div>
64
+                        <div class=" col-md-6 padding-top-5">
65
+                            邮箱: <span class="recentin">{{sumInfo.email}}</span>
57 66
                         </div>
58 67
                     </div>
59 68
                 </div>
@@ -61,14 +70,10 @@
61 70
             </div>
62 71
 
63 72
         </tab>
64
-        <tab heading="报修人上网登录信息 " style="min-width:50% ">
73
+        
74
+        <!-- <tab heading="报修人上网登录信息 " style="min-width:50% ">
65 75
             <div class="changechar active">
66
-                <!-- <div class="showright active"> -->
67
-                <!-- <div class="grid"> -->
68
-                <!--<div class="grid__item" ng-repeat="item in [1,2,3,4,5,6,7,8,9,10,11,12]">-->
69 76
                 <div>
70
-                    <!-- <a ng-click="showpage(item)"> -->
71
-                    <!-- <div class="title--preview">{{item.userip}}</div> -->
72 77
                     <div ng-repeat="item in logininform">
73 78
                         <div class="col-sm-12 ">
74 79
                             <span class="category pull-left ">用户IPv4:<span class="recentin">{{item.userIpv4}}</span></span>
@@ -97,12 +102,9 @@
97 102
                             <hr style="margin-top: 0px;margin-bottom: 0px;margin-left:-15px;width:500px; height:1px;border:none;border-top:1px double #185598;" />
98 103
                         </div>
99 104
                     </div>
100
-                    <!-- </a> -->
101 105
                 </div>
102
-                <!-- </div> -->
103
-                <!-- </div> -->
104 106
             </div>
105
-        </tab>
107
+        </tab> -->
106 108
     </tabset>
107 109
     <!-- end: FIXED HEADER -->
108 110
 </div>