认证计费接口修改

assets/js/controllers/customform/customformCtrl.js

@@ -9121,36 +9121,36 @@ appFormly.config(function config(formlyConfigProvider) {
           $scope.isHk = true;
           if($rootScope.isHk){
             //用户信息
-            api_webservice1.fetchDataList("queryUser", { "userId": $scope.model.incident.account }).then(function(response) {
+            api_bpm_data.sumInfo($scope.model.incident.account).then(function(response) {
                 // if (response.status == 200) {
                 if (response && response.data) {
-                    angular.extend($scope.sumInfo, response.data[0]);
+                    angular.extend($scope.sumInfo, response.data);
                     // $scope.sumInfo = response.data[0];
-                    $scope.sumInfo.autologicDestroyTime = moment(response.data[0].autologicDestroyTime).format('YYYY-MM-DD');
-                    $scope.sumInfo.periodStartTime = moment(response.data[0].periodStartTime).format('YYYY-MM-DD');
-                    $scope.sumInfo.nextBillingTime = moment(response.data[0].nextBillingTime).format('YYYY-MM-DD');
+                    // $scope.sumInfo.autologicDestroyTime = moment(response.data[0].autologicDestroyTime).format('YYYY-MM-DD');
+                    // $scope.sumInfo.periodStartTime = moment(response.data[0].periodStartTime).format('YYYY-MM-DD');
+                    // $scope.sumInfo.nextBillingTime = moment(response.data[0].nextBillingTime).format('YYYY-MM-DD');
                 } else if (response.err) {
                     SweetAlert.swal("系统错误!", "用户信息未取到，请刷新重试", "error");
                 }
                 // }
             })
             //上网明细
-            api_webservice1.fetchDataList("queryOnlineDetail", { "userId": $scope.model.incident.account, "limit": "10", "fromLoginTime": moment(new Date().getTime() - 86400000 * 6).format('YYYY-MM-DD HH:mm:ss'), "toLogoutTime": moment(new Date().getTime()).format('YYYY-MM-DD HH:mm:ss') }).then(function(response) {
-                // if (response.status == 200) {
-                if (response && response.data) {
-                    angular.forEach(response.data, function(item, index) {
-                        if (item.logoutTime) {
-                            response.data[index].logoutTime = moment(item.logoutTime).format('YYYY-MM-DD HH:mm:ss');
-                        }
-                        if (item.loginTime) {
-                            response.data[index].loginTime = moment(item.loginTime).format('YYYY-MM-DD HH:mm:ss');
-                        }
-                    })
-                    $scope.logininform_sumInfo = response.data;
-                } else if (response.err) {
-                    SweetAlert.swal("上网明细未取到", "该用户暂无上网明细", "error");
-                }
-            })
+            // api_webservice1.fetchDataList("queryOnlineDetail", { "userId": $scope.model.incident.account, "limit": "10", "fromLoginTime": moment(new Date().getTime() - 86400000 * 6).format('YYYY-MM-DD HH:mm:ss'), "toLogoutTime": moment(new Date().getTime()).format('YYYY-MM-DD HH:mm:ss') }).then(function(response) {
+            //     // if (response.status == 200) {
+            //     if (response && response.data) {
+            //         angular.forEach(response.data, function(item, index) {
+            //             if (item.logoutTime) {
+            //                 response.data[index].logoutTime = moment(item.logoutTime).format('YYYY-MM-DD HH:mm:ss');
+            //             }
+            //             if (item.loginTime) {
+            //                 response.data[index].loginTime = moment(item.loginTime).format('YYYY-MM-DD HH:mm:ss');
+            //             }
+            //         })
+            //         $scope.logininform_sumInfo = response.data;
+            //     } else if (response.err) {
+            //         SweetAlert.swal("上网明细未取到", "该用户暂无上网明细", "error");
+            //     }
+            // })
             //黑名单
             // $scope.sumInfo.blacklist = "否"
             api_webservice1.fetchDataList("queryInhibit", { "userId": $scope.model.incident.account }).then(function(response) {
@@ -11296,7 +11296,7 @@ appFormly.config(function config(formlyConfigProvider) {
                 $scope.$parent.$parent.$parent.model.incident.account = paramsModel.model.incident.requester.account;
               }
             }
-            
+
             //处理人根据事件分类自动带入baba
             if ($scope.options.templateOptions.onlyKey == "c_handlerUser") {
               console.log($scope.options.templateOptions.pkey);
@@ -13230,7 +13230,7 @@ appFormly.config(function config(formlyConfigProvider) {
                 '<div class="ui-grid-cell-contents">{{row.entity.endTime?grid.appScope.transferTime(row.entity.endTime):""}}</div>' +
                 '</div>'
         },
-        
+
         // {
         //   name: "batchNo",
         //   displayName: "批次号",
@@ -14220,7 +14220,7 @@ appFormly.config(function config(formlyConfigProvider) {
                           if (options.model.area) {
                             options.model.area.id = "";
                           }
-  
+
                           options.model.contacts = selectedItem.name;
                           if (
                             selectedItem.mphone &&
@@ -14341,7 +14341,7 @@ appFormly.config(function config(formlyConfigProvider) {
                             });
                           }
                         });
-  
+
                         // }
                         // $scope.$parent.$parent.$parent.model.incident.requester = selectedItem
                         // 选择重复事件侧滑框
@@ -22193,7 +22193,7 @@ appFormly.controller("CustomformCtrl", [
                     currentUserRoles = $rootScope.user.role ? $rootScope.user.role.map(v=>String(v.id)) : [];
                     intersection = integralRoles.filter(function (val) { return currentUserRoles.indexOf(val) > -1 });
                   }
-                  
+
                   if(resetDuty === "false" && vm.model.start_code == "close"&&((integralMechanism == 1 && (intersection.length || integralRoles.length === 0)) || (integralMechanism == 2 && $rootScope.user.userType.value == 2))){
                     $modal.open({
                       templateUrl: 'assets/views/incident/tpl/toIntegralMechanism.tpl.html',
@@ -22242,7 +22242,7 @@ appFormly.controller("CustomformCtrl", [
                           $scope.auditors = [];
                           $scope.onChangehandling();
                           $scope.onChangeComplexity = function(item){
-                            
+
                           }
                           $scope.ok = function () {
                               if (!$scope.complexityConfirm.complexity){
@@ -22357,7 +22357,7 @@ appFormly.controller("CustomformCtrl", [
                         if(resetDuty === "false" && vm.model.start_code == "close"&&((integralMechanism == 1 && (intersection.length || integralRoles.length === 0)) || (integralMechanism == 2 && $rootScope.user.userType.value == 2))){
                           api_wechatfile.getDictionary({"key":"incident_integral_state","type":"list"}).then(function(res){
                             var auditState = res.find(v=>v.value == 0);
-                            var postData = { 
+                            var postData = {
                               incidentIntegral: {
                                 incidentId:resData.bussId,
                                 auditState:auditState,
@@ -22424,7 +22424,7 @@ appFormly.controller("CustomformCtrl", [
                             }
                           );
                         }
-                        
+
                       } else {
                         SweetAlert.swal({
                           title: "系统错误",
@@ -22544,7 +22544,7 @@ appFormly.controller("CustomformCtrl", [
                                 api_wechatfile.getDictionary({"key":"incident_integral_state","type":"list"}).then(function(res){
                                   // var auditState = $scope.complexityConfirm.complexity.value == $scope.complexity?res.find(v=>v.value == 1):res.find(v=>v.value == 0);
                                   var auditState = $scope.complexityConfirm.complexity.value != $scope.complexity ? res.find(v=>v.value == 0) : res.find(v=>v.value == 1);
-                                  var postData = { 
+                                  var postData = {
                                     incidentIntegral: {
                                       incidentId:incidentData.id,
                                       auditState:auditState,
@@ -22605,7 +22605,7 @@ appFormly.controller("CustomformCtrl", [
                   }else{
                     handlerLogFn();
                   }
-                  
+
                   function handlerLogFn(){
                     //沟通记录
                     // 沟通记录不为空并且事件是处理中状态

assets/views/partials/off-right-hk.html

@@ -17,43 +17,47 @@
                 <div>
                     <div>
                         <div class="col-md-6 padding-top-5 pull-left">
-                            用户名:<span class="recentin">{{sumInfo.userId}}</span>
+                            名称: <span class="recentin">{{sumInfo.user_name}}</span>
                         </div>
                         <div class=" col-md-6 padding-top-5 pull-left">
-                            用户姓名:<span class="recentin"> {{sumInfo.userName}}</span>
+                            账号名称: <span class="recentin"> {{sumInfo.user_real_name}}</span>
                         </div>
                         <div class=" col-md-6 padding-top-5 pull-left">
-                            套餐: <span class="recentin">{{sumInfo.packageName}}</span>
+                            到期时间: <span class="recentin">{{sumInfo.user_expire_time}}</span>
                         </div>
                         <div class=" col-md-6 padding-top-5 pull-left">
-                            计费策略: <span class="recentin">{{sumInfo.policyId}}</span>
+                            余额(分): <span class="recentin">{{sumInfo.balance}}</span>
                         </div>
                         <div class=" col-md-6 padding-top-5 pull-left">
-                            账户余额: <span class="recentin">{{sumInfo.accountFee}}元</span>
+                            状态: <span class="recentin">{{sumInfo.user_status}}</span>
                         </div>
+                    </div>
+                </div>
+
+            </div>
+
+        </tab>
+        <tab heading="套餐信息" style="min-width:50%;">
+            <div class="category">
+                <div>
+                    <div>
                         <div class="col-md-6 padding-top-5 pull-left">
-                            模版名: <span class="recentin">{{sumInfo.atName}}</span>
+                            套餐名称: <span class="recentin">{{(sumInfo.packageInfos && sumInfo.packageInfos[0]) ? sumInfo.packageInfos[0].package_name : ''}}</span>
                         </div>
                         <div class=" col-md-6 padding-top-5 pull-left">
-                            自动销户时间: <span class="recentin">{{sumInfo.autologicDestroyTime}}</span>
+                            套餐描述: <span class="recentin"> {{(sumInfo.packageInfos && sumInfo.packageInfos[0]) ? sumInfo.packageInfos[0].description : ''}}</span>
                         </div>
                         <div class=" col-md-6 padding-top-5 pull-left">
-                            移动电话: <span class="recentin">{{sumInfo.mobile}}</span>
+                            总流量(kb): <span class="recentin">{{(sumInfo.packageInfos && sumInfo.packageInfos[0]) ? sumInfo.packageInfos[0].package_remain_bytes : ''}}</span>
                         </div>
                         <div class=" col-md-6 padding-top-5 pull-left">
-                            电话号码: <span class="recentin">{{sumInfo.tel}}</span>
+                            总时长(分钟): <span class="recentin">{{(sumInfo.packageInfos && sumInfo.packageInfos[0]) ? sumInfo.packageInfos[0].package_remain_seconds : ''}}</span>
                         </div>
                         <div class=" col-md-6 padding-top-5 pull-left">
-                            住址: <span class="recentin">{{sumInfo.address}}</span>
+                            套餐金额: <span class="recentin">{{(sumInfo.packageInfos && sumInfo.packageInfos[0]) ? sumInfo.packageInfos[0].checkout_amount : ''}}</span>
                         </div>
-                        <div class=" col-md-6 padding-top-5 pull-left">
-                            本周期起始: <span class="recentin">{{sumInfo.periodStartTime}}</span>
-                        </div>
-                        <div class=" col-md-6 padding-top-5 pull-left">
-                            下次记账时刻:<span class="recentin"> {{sumInfo.nextBillingTime}}</span>
-                        </div>
-                        <div class=" col-md-6 padding-top-5 pull-left">
-                            是否是黑名单: <span class="recentin">{{sumInfo.blacklist}}</span>
+                        <div class="col-md-6 padding-top-5 pull-left">
+                            有效起始日期: <span class="recentin">{{(sumInfo.packageInfos && sumInfo.packageInfos[0]) ? sumInfo.packageInfos[0].checkout_date : ''}}</span>
                         </div>
                     </div>
                 </div>
@@ -61,14 +65,9 @@
             </div>
 
         </tab>
-        <tab heading="报修人上网登录信息 " style="min-width:50% ">
+        <!-- <tab heading="报修人上网登录信息 " style="min-width:50% ">
             <div class="changechar active">
-                <!-- <div class="showright active"> -->
-                <!-- <div class="grid"> -->
-                <!--<div class="grid__item" ng-repeat="item in [1,2,3,4,5,6,7,8,9,10,11,12]">-->
                 <div>
-                    <!-- <a ng-click="showpage(item)"> -->
-                    <!-- <div class="title--preview">{{item.userip}}</div> -->
                     <div ng-repeat="item in logininform_sumInfo">
                         <div class="col-sm-12 ">
                             <span class="category pull-left ">用户IPv4:<span class="recentin">{{item.userIpv4}}</span></span>
@@ -97,12 +96,9 @@
                             <hr style="margin-top: 0px;margin-bottom: 0px;margin-left:-15px;width:500px; height:1px;border:none;border-top:1px double #185598;" />
                         </div>
                     </div>
-                    <!-- </a> -->
                 </div>
-                <!-- </div> -->
-                <!-- </div> -->
             </div>
-        </tab>
+        </tab> -->
     </tabset>
     <!-- end: FIXED HEADER -->
 </div>
@@ -115,12 +111,12 @@
         overflow-x: hidden;
         font-size: 12px;
     }
-    
+
     .tab-content>.active {
         /* display: none; */
         padding: 0px;
     }
-    
+
     .nav-tabs>li>a {
         border: 0 none;
         border-radius: 5;
@@ -129,7 +125,7 @@
         font-size: 12px;
         padding: 10px 5px;
     }
-    
+
     .loaderinform {
         height: 1px;
         width: 100%;