1

app/cloudAjaxRouter.js

@@ -26,17 +26,21 @@ router.get('/cloud/curing/ajax/getCuringPage/:currentPage', function(req, res, n
 router.get('/cloud/curing/ajax/getCuringBySsoid', function(req, res, next) {
     cloudAjaxController.getCuringBySsoid(req, res);
 });
-
-
-
-
 /**
- * 用户检索--废弃
+ * 用户关联CLD客户
  */
-router.get('/cloud/curing/ajax/curingInfo/:mobile', function(req, res, next) {
-    cloudAjaxController.getCuringInfo(req, res);
+router.post('/cloud/curing/ajax/relevanceClientDo', function(req, res, next) {
+    cloudAjaxController.relevanceClientDo(req, res);
+});
+//������д��CLD��������������Ʒ
+router.post('/cloud/curing/ajax/upCuringDo', function(req, res, next) {
+    cloudAjaxController.upCuringDo(req, res);
 });
 
+//�����û��Ƴ�CLD�ͻ�
+router.post('/cloud/curing/ajax/relieveClientDo', function(req, res, next) {
+    cloudAjaxController.relieveClientDo(req, res);
+});
 
 
 
@@ -45,6 +49,12 @@ router.get('/cloud/curing/ajax/curingInfo/:mobile', function(req, res, next) {
 
 
 
+/**
+ * 用户检索--废弃
+ */
+router.get('/cloud/curing/ajax/curingInfo/:mobile', function(req, res, next) {
+    cloudAjaxController.getCuringInfo(req, res);
+});
 
 
 //废弃
@@ -58,18 +68,6 @@ router.get('/cloud/curing/ajax/checkMobile/:mobile', function(req, res, next) {
 router.get('/cloud/curing/ajax/getCuringById/:sso_id', function(req, res, next) {
     cloudAjaxController.getCuringById(req, res);
 });
-//������д��CLD��������������Ʒ
-router.post('/cloud/curing/ajax/upCuringDo', function(req, res, next) {
-    cloudAjaxController.upCuringDo(req, res);
-});
-//�����û�����CLD�ͻ�
-router.post('/cloud/curing/ajax/relevanceClientDo', function(req, res, next) {
-    cloudAjaxController.relevanceClientDo(req, res);
-});
-//�����û��Ƴ�CLD�ͻ�
-router.post('/cloud/curing/ajax/relieveClientDo', function(req, res, next) {
-    cloudAjaxController.relieveClientDo(req, res);
-});
 
 
 

app/controller/cloudEditionAjaxController.js

@@ -23,7 +23,7 @@ var cloudEditionAjaxController={
 
 		//------------用户详情页界面相关----------------
 		/**
-		 * 异步获得养护用户信息详情
+		 * 获得养护用户信息详情
 		 */
 		getCuringBySsoid: async function(req, res){
 		    var params = url.parse(req.url, true).query;
@@ -42,6 +42,32 @@ var cloudEditionAjaxController={
 		    }
 		},
 		
+		//养护绑定CLD客户
+		/**
+		 * 用户关联CLD客户
+		 */
+		relevanceClientDo: async function(req, res){
+		    //post数据获得
+		    var cidKey=req.body.cidKey;//客户ID
+		    var ssoid=req.body.ssoid;//养护用户ID
+
+		    if(hash.isExistence(cidKey)&&hash.isExistence(ssoid)) {
+		        var flag= await cloudService.relevanceClientDo(req.body);
+		        
+		        if(flag){
+		            //获得绑定的CLD客户信息
+		            var detail= await models.CLD_client.findById(cidKey);
+		            var operateLogList=await models.operate_log.findByCondition(1,hash.hashDecode(id));
+
+
+		            res.json({ 'status': 1,'detail':detail,'operateLogList':operateLogList,'msg':'绑定CLD客户成功' });
+		        }else{
+		            res.json({ 'status': 2,'msg':'绑定失败' });
+		        }
+		    }else{
+		        res.json({ 'status': 3,'msg':'参数不正确' });
+		    }
+		},
 		
 		
 		
@@ -124,28 +150,7 @@ upCuringDo: async function(req, res){
         res.json({ 'status': 3,'msg':'数据不正确' });
     }
 },
-//养护绑定CLD客户
-relevanceClientDo: async function(req, res){
-    //post数据获得
-    var cidKey=req.body.cidKey;//客户ID
-    var id=req.body.id;//养护用户ID
-
-    if(hash.isExistence(cidKey)&&hash.isExistence(id)) {
-        var flag= await cloudService.relevanceClientDo(req.body);
-        if(flag){
-            //获得绑定的CLD客户信息
-            var detail= await models.CLD_client.findById(cidKey);
-            var operateLogList=await models.operate_log.findByCondition(1,hash.hashDecode(id));
-
 
-            res.json({ 'status': 1,'detail':detail,'operateLogList':operateLogList,'msg':'绑定CLD客户成功' });
-        }else{
-            res.json({ 'status': 2,'msg':'绑定失败' });
-        }
-    }else{
-        res.json({ 'status': 3,'msg':'参数不正确' });
-    }
-},
 //养护移除CLD客户
 relieveClientDo: async function(req, res){
     //post数据获得

app/service/cloudEditionService.js

@@ -243,27 +243,12 @@ var cloudService={
         
         //最后使用          
         userData['userInfo']['latest_usedName']='';
-//        for(var ci=0;ci<compilationList.length;ci++){
-//        	if(compilationList[ci]._id==v.latest_used){
-//        		userData['userInfo']['latest_usedName']=compilationList[ci].name;
-//        		break;
-//        	}
-//        }
-        
-        
-        
+
+                
         //本地养护用户
         userData['curingInfo']=await models.cloud_curing.getCuringBySsoid(ssoid);
         client_id=userData['curingInfo']['client_id'];
 
-        /*userData['clientInfo']='';
-        if(!hash.isNotANumber(client_id)){
-            client_id=hash.hashDecode(client_id);
-            if(!hash.isNotANumber(client_id)){
-                userData['clientInfo']=[];
-            }
-        }*/
-
         var detail =[];
         if(hash.isExistence(client_id)){
                  detail = await models.CLD_client.findById(client_id);
@@ -286,63 +271,18 @@ var cloudService={
         });
         userData['userInfo']['ssoIdKey']=hash.hashEncode(userData['userInfo']['ssoId'].toString());
 
-
-
         //获得操作日志
         userData['operateLog']=[];
         if(hash.isExistence(userData['curingInfo'])){
             userData['operateLog']=await models.operate_log.findByCondition(1,hash.hashDecode(userData['curingInfo']['id']));
         }
 
-
-
         return userData;
     },
     
-    
-    
-    
-    
-    
-    
     /**
-     * 获得本地编办列表--废弃
+     * 用户升级专业版
      */
-    getCuringCompilationList:async function (){
-        var compilationList = await models.cloud_curing.getCuringCompilationList();
-        return compilationList;
-    },
-
-    
-
-    //获取本地养护数据--可能废弃
-    getBindCuringByMobile:async function (mobile){
-        var curingList = await models.cloud_curing.getCuringByMobile(mobile);
-        if (curingList!=null){
-            var cid=[curingList['client_id']];
-            var attributes= ['cid', 'clientname', 'companyid', 'companyname'];
-            var clientList = await models.CLD_client.findAllInCid(cid,attributes);
-            curingList.clientInfo={};
-            clientList.forEach(function(clientVal,clientI){
-                if(curingList.client_id==clientVal.cid){
-                    curingList.clientInfo=clientVal;
-
-                }
-            });
-            curingList.addtime=moment.unix(curingList.addtime).format('YYYY-MM-DD HH:mm');
-        }
-        return curingList;
-    },
-
-    //根据手机号码获得养护用户信息--可能废弃
-    getCuringByMobile: async function(mobile){
-        var url= curingUrl+'/getUsersAndCompilation?mobile='+ mobile;
-        var userData= await curlRequest(url);
-        return userData;
-    },
-
-    
-
     upCuringDo: async function(data){
         var url =  curingUrl+'/setUserUpgrade';
         var ssoid=hash.hashDecode(data.ssoid);
@@ -379,11 +319,11 @@ var cloudService={
                     mobile: data.mobile,
                     sso_id: data.ssoid,
                     compilation_id: data.compilationId,
-                    curingCompany: data.name,
+                    //curingCompany: data.name,
                     sid: sid,
                     cid: STAFF.cid,
                     status: 1,
-                    addtime: new Date().getTime(),
+                    //addtime: new Date().getTime(),
                     updateTotal: 1
                 };
                 var detail=await models.cloud_curing.create(obj);
@@ -400,16 +340,18 @@ var cloudService={
         }
     },
 
-    //养护用户绑定CLD客户
+    /**
+     * 用户关联CLD客户
+     */
     relevanceClientDo: async function(data){
 
         var cid=hash.hashDecode(data.cidKey);
-        var id=hash.hashDecode(data.id);
-        if(!hash.isNotANumber(cid)||!hash.isNotANumber(id)){
+        var ssoId=hash.hashDecode(data.ssoId);
+        if(!hash.isNotANumber(cid)||!hash.isNotANumber(ssoId)){
             return false;
         }
-
-        var curingDetail=await models.cloud_curing.getCuringById(id);
+//修改
+        var curingDetail=await models.cloud_curing.getCuringBySsoid(ssoId);
         if(hash.isExistence(curingDetail)) {
 
             var clientDetail=await models.CLD_client.findById(cid);
@@ -434,6 +376,49 @@ var cloudService={
             return false;
         }
     },
+    
+    
+    
+    
+    
+    /**
+     * 获得本地编办列表--废弃
+     */
+    getCuringCompilationList:async function (){
+        var compilationList = await models.cloud_curing.getCuringCompilationList();
+        return compilationList;
+    },
+
+    
+
+    //获取本地养护数据--可能废弃
+    getBindCuringByMobile:async function (mobile){
+        var curingList = await models.cloud_curing.getCuringByMobile(mobile);
+        if (curingList!=null){
+            var cid=[curingList['client_id']];
+            var attributes= ['cid', 'clientname', 'companyid', 'companyname'];
+            var clientList = await models.CLD_client.findAllInCid(cid,attributes);
+            curingList.clientInfo={};
+            clientList.forEach(function(clientVal,clientI){
+                if(curingList.client_id==clientVal.cid){
+                    curingList.clientInfo=clientVal;
+
+                }
+            });
+            curingList.addtime=moment.unix(curingList.addtime).format('YYYY-MM-DD HH:mm');
+        }
+        return curingList;
+    },
+
+    //根据手机号码获得养护用户信息--可能废弃
+    getCuringByMobile: async function(mobile){
+        var url= curingUrl+'/getUsersAndCompilation?mobile='+ mobile;
+        var userData= await curlRequest(url);
+        return userData;
+    },
+
+    
+    
     //移除关联CLD客户
     relieveClientDo: async function(data){
 

global/js/cloud/curing.js

@@ -170,7 +170,6 @@ $(function() {
     $('tbody[curingUser]').delegate( 'tr','click', function(){
         // 只获取第一个选中的值
         var ssoid = $(this).attr('data');
-        var id=$(this).attr('dataId');
         var client_id=$(this).attr('dataCid')
         $(this).attr('data-toggle',' ');
         
@@ -209,33 +208,35 @@ $(function() {
         }
     });
     
-    
-    
     /**
-     * 动态绑定 移除CLD客户事件
+     * 用户绑定CLD客户--用户详情页
      */
-    $('button[relieveClientDo]').on('click', function(e){
-    //$('div[curinginfo]').delegate( 'a[relieveClientDo]','click', function(){
+    $('div[relevanceClientDo]').delegate( 'span','click', function(){
         // 只获取第一个选中的值
-        var cid = $(this).attr('data');
-        var id=$('#id').val();
-        $('#unlinkcld').modal('hide');
+        var cidKey = $(this).attr('data');
+        var ssoId = $('#curingSsoid').val();
+        //var id=$('#id').val();
+
         $.ajax({
             cache :false,
             type: 'POST',
-            url: '/cloud/curing/ajax/relieveClientDo',
-            data: {cid: encodeURI(cid),id:encodeURI(id)},
+            url: '/cloud/curing/ajax/relevanceClientDo',
+            data: {cidKey: encodeURI(cidKey),ssoId:encodeURI(ssoId)},
             dataType: 'json',
             success: function(data){
                 if(data.status==1){
+                	
+                	refreshCuringPageDetail(ssoId,cidKey);
+                	
                     //设置CLD客户信息
-                    var clientHtml=relevanceClient();
-                    $('div[curingInfo] curingClient').html(clientHtml);
-
-                    //设置养护日志
-                    var operateLogHtml=buildCuringOperateLog(data.operateLogList);
-                    $('div[operateLog] curingOperate').html(operateLogHtml);
+//                    var clientHtml=relevanceClient(data.detail);
+//                    $('div[curingInfo] curingClient').html(clientHtml);
+//
+//                    //设置养护日志
+//                    var operateLogHtml=buildCuringOperateLog(data.operateLogList);
+//                    $('div[operateLog] curingOperate').html(operateLogHtml);
 
+                    $('#linkcld').modal('hide');
                 }else{
                     alert(data.msg);
                 }
@@ -246,30 +247,33 @@ $(function() {
         })
 
     });
-
-    //动态绑定养护用户列表 数据获得
-    $('div[relevanceClientDo]').delegate( 'span','click', function(){
+    
+    
+    /**
+     * 动态绑定 移除CLD客户事件
+     */
+    $('button[relieveClientDo]').on('click', function(e){
+    //$('div[curinginfo]').delegate( 'a[relieveClientDo]','click', function(){
         // 只获取第一个选中的值
-        var cidKey = $(this).attr('data');
+        var cid = $(this).attr('data');
         var id=$('#id').val();
-
+        $('#unlinkcld').modal('hide');
         $.ajax({
             cache :false,
             type: 'POST',
-            url: '/cloud/curing/ajax/relevanceClientDo',
-            data: {cidKey: encodeURI(cidKey),id:encodeURI(id)},
+            url: '/cloud/curing/ajax/relieveClientDo',
+            data: {cid: encodeURI(cid),id:encodeURI(id)},
             dataType: 'json',
             success: function(data){
                 if(data.status==1){
                     //设置CLD客户信息
-                    var clientHtml=relevanceClient(data.detail);
+                    var clientHtml=relevanceClient();
                     $('div[curingInfo] curingClient').html(clientHtml);
 
                     //设置养护日志
                     var operateLogHtml=buildCuringOperateLog(data.operateLogList);
                     $('div[operateLog] curingOperate').html(operateLogHtml);
 
-                    $('#linkcld').modal('hide');
                 }else{
                     alert(data.msg);
                 }
@@ -282,6 +286,8 @@ $(function() {
     });
 
     
+
+    
     
     
     //检索cld用户

global/js/cloud/curingFN.js

@@ -54,7 +54,7 @@ function refreshCuringPageDetail(ssoid,client_id){
                 $('div[curingInfo] curingClient').html('');
                 //设置CLD客户信息
                 if(data.detail.curingInfo.updateTotal!=0){
-                	 $("#id").val(id);
+                	 //$("#id").val(id);
                      var clientHtml=relevanceClient(data.detail.clientInfo);
                      $('div[curingInfo] curingClient').html(clientHtml);
                 }