1

app/service/cloudEditionService.js

@@ -195,8 +195,9 @@ var cloudService={
             //已升级专业版
             curingCloudList[i].upgradeListName='';
             for(var gi=1;gi<v.upgrade_list.length;gi++){
+            	console.log(v.upgrade_list);
             	for(var ci=0;ci<compilationList.length;ci++){
-            		if( compilationList[ci]._id == v.upgrade_list[gi].compilationID) {
+            		if( compilationList[ci]._id == v.upgrade_list[gi].compilationID&&v.upgrade_list[gi].isUpgrade) {
             			curingCloudList[i].upgradeListName+='<span class="badge badge-primary"><%= compilation.name %></span>';
             			break;
             		}
@@ -209,41 +210,31 @@ var cloudService={
         //分页计算
         var pageData = await getPage('','',page,limit,parameter,curingCloudData.pageData.total);
         
-//console.log(curingCloudList);
+console.log(compilationList);
         
         
         
         return {curingList:curingCloudList,pageData:pageData,sortList:[sortField,sort]};
     },
 
-    //获得本地编办列表
-    getCuringCompilationList:async function (){
-        var compilationList = await models.cloud_curing.getCuringCompilationList();
-        return compilationList;
-        /*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.clientname='';
-            curingList.companyname='';
-            clientList.forEach(function(clientVal,clientI){
-                if(curingList.client_id==clientVal.cid){
-                    curingList.clientname=clientVal.clientname;
-                    curingList.companyname=clientVal.companyname;
-                }
-            });
-            curingList.addtime=moment.unix(curingList.addtime).format('YYYY-MM-DD HH:mm');
-        }
-        */
-    },
-
-    //获得养护编办
+    /**
+     * 获得养护编办--接口拉取
+     */
     getCompilationList:async function (){
         var url= curingUrl+'/getCompilationList';
         var data= await curlRequest(url);
         return data;
     },
+    
+    /**
+     * 获得本地编办列表--废弃
+     */
+    getCuringCompilationList:async function (){
+        var compilationList = await models.cloud_curing.getCuringCompilationList();
+        return compilationList;
+    },
+
+    
 
     //获取本地养护数据
     getBindCuringByMobile:async function (mobile){