d

bigdata/app/base/controller/impl/common/companyCtl.js

@@ -37,6 +37,12 @@ class CompanyCtl extends CtlBase {
      req.session.tocompany=cmpfind;
      return system.getResult(cmpfind.apps);
   }
+  async giveupApp(p,q,req){
+    var comid=p.compid;
+    var appid=p.appid;
+    await this.service.giveupApp(comid,appid);
+    return system.getResult({});
+  }
   //设置当前用户选择的公司为当前公司
   async settocompany(p,q,req){
      p.isCurrent=true;

bigdata/app/base/db/impl/common/appDao.js

@@ -77,7 +77,10 @@ class AppDao extends Dao {
   async findAndCountAll(qobj, t) {
     if(qobj.codepath.indexOf("comapps")>=0){
       var rtn={};
-      var cas=await this.db.models.companyapp.findAndCountAll({where:{company_id:qobj.tocompanyid}});
+      var comp=await this.db.models.company.findById(qobj.search.company_id);
+      var apps=await comp.getApps();
+      rtn.results={rows:apps,count:apps.length};
+      rtn.aggresult={};
       return rtn;
     }else{
       return super.findAndCountAll(qobj, t);

bigdata/app/base/service/impl/common/companySve.js

@@ -34,6 +34,13 @@ class CompanyService extends ServiceBase {
        return rtn;
     });
   }
+  async giveupApp(comid,appid){
+    return this.db.transaction(async function (t){
+      //检查当前company_id下面是否有
+      await  this.db.models.companyapp.destroy({where:{company_id:comid,app_id:appid}});
+      return {};
+    });
+  }
   async buyApp(p,cmid,user){
     var self=this;
     var appid=p.id;

bigdata/app/front/vues/pages/apps/apps.js

@@ -16,6 +16,7 @@
             return callback();
         };
         return {
+          selCompanyid:'',
           bizCode:'',
           currow:null,
           adminExist:false,
@@ -46,7 +47,9 @@
         }
     },
     mounted:function(){
-       
+      var cmpid=this.$router.history.current.query.compid;
+      this.selCompanyid=cmpid;
+      this.$refs.cgrid.linkInInitQuery("company_id",cmpid);
     },
     created:function(){
       if(this.codePath.indexOf("myapps")>=0){
@@ -56,7 +59,8 @@
         this.bizCode="allapps";
       }
       if(this.codePath.indexOf("comapps")>=0){
-        this.bizCode="allapps";
+        this.bizCode="comapps";
+        
       }
     },
     methods:{
@@ -153,6 +157,10 @@
                path:"/appconfig"
              });
           }
+          if(key=="giveup"){
+            var d=  await this.$root.postReq("/web/common/companyCtl/giveupApp", {compid: this.selCompanyid,appid:row.id});
+            this.$refs.cgrid.linkInInitQuery("company_id",this.selCompanyid);
+          }
           this.currow=row;
        }
 

bigdata/app/front/vues/pages/companyinfo/companyinfo.js

@@ -42,7 +42,7 @@
           }
         }
         if(key="comapps"){
-             this.$router.push("/comapps");
+             this.$router.push({path:"/comapps",query:{"compid":row.id}});
         }
       },
       onColFormater(row,column,cellvalue,index){