Merge branch 'gsb-center-manage' of gitlab.gongsibao.com:jiangyong/zhichan into gsb-center-manage

center-manage/app/base/controller/impl/common/companyCtl.js

@@ -8,59 +8,64 @@ class CompanyCtl extends CtlBase {
   constructor() {
     super("common", CtlBase.getServiceName(CompanyCtl));
   }
-  async update(p,q,req){
-   let u= await super.update(p,q,req)
-   //缓存失效
-   await this.cacheManager["CompanyCache"].invalidate(p.companykey)
-   let company=await this.cacheManager["CompanyCache"].cache(p.companykey)
-   return system.getResult(company)
+  async update (p, q, req) {
+    let u = await super.update(p, q, req)
+    //缓存失效
+    await this.cacheManager["CompanyCache"].invalidate(p.companykey)
+    let company = await this.cacheManager["CompanyCache"].cache(p.companykey)
+    return system.getResult(company)
   }
-  async getMyApps(p,q,req){
+
+  async getMyApps (p, q, req) {
     let userfind = await this.cacheManager["UserCache"].cache(p.username)
-    let isSuper=userfind.isSuper
-    if(userfind.company.appids && userfind.company.appids!=""){
-      let appsarray=userfind.company.appids.split(",")
-      let appidsquery=appsarray.map(astr=>{
-         return astr.split("|")[0]
+    let isSuper = userfind.isSuper
+    if (userfind.company.appids && userfind.company.appids != "") {
+      let appsarray = userfind.company.appids.split(",")
+      let appidsquery = appsarray.map(astr => {
+        return astr.split("|")[0]
       })
-      let apps=await this.service.getMyApps(appidsquery,isSuper)
+      let apps = await this.service.getMyApps(appidsquery, isSuper)
       return system.getResult(apps)
-    }else{
+    } else {
       return []
     }
   }
-  async bindApps(p,q,req){
-     let appids=p.appids
-     let cmpid=p.postcmpid
-     let appids2=appids.map(item=>{
-       return item.appid+"|"+item.title
-     })
-     let appidstrs=appids2.join(",")
-     await this.service.bindApps(appidstrs,cmpid)
+  async bindApps (p, q, req) {
+    let appids = p.appids
+    let cmpid = p.postcmpid
+    let appids2 = appids.map(item => {
+      return item.appid + "|" + item.title
+    })
+    let appidstrs = appids2.join(",")
+    await this.service.bindApps(appidstrs, cmpid)
     return system.getResult(appids)
   }
-  async setOrgs(p,q,req){
+  async setOrgs (p, q, req) {
     //let companynew=await this.service.findById(p.company_id)
-    let orgs=await this.service.setOrgs(p)
+    let orgs = await this.service.setOrgs(p)
     return system.getResult(orgs)
-   }
-   async getOrgs(p,q,req){
+  }
+  async getOrgs (p, q, req) {
     //let companynew=await this.cacheManager["CompanyCache"].cache(req.xctx.fromcompanykey)
-    let companynew=await this.service.findById(p.company_id)
-    let orgjsonstr=companynew.orgJson
-    let rtnjson=null
-    if(orgjsonstr && orgjsonstr!=""){
-      rtnjson=JSON.parse(companynew.orgJson)
-    }else{
-      rtnjson=[]
+    let companynew = await this.service.findById(p.company_id)
+    let orgjsonstr = companynew.orgJson
+    let rtnjson = null
+    if (orgjsonstr && orgjsonstr != "") {
+      rtnjson = JSON.parse(companynew.orgJson)
+    } else {
+      rtnjson = []
     }
-    return system.getResult({orgJson:rtnjson})
-   }
+    return system.getResult({ orgJson: rtnjson })
+  }
+  async getWatchOrgNodes (p, q, req) {
+    let wns = await this.service.getWatchOrgNodes(p.company_id)
+    return wns
+  }
 
-   async refQuery(pobj, qobj, req) {
-    let rtn=await this.service.refQuery(pobj);
+  async refQuery (pobj, qobj, req) {
+    let rtn = await this.service.refQuery(pobj);
     return rtn
   }
-  
+
 }
 module.exports = CompanyCtl;

center-manage/app/base/service/impl/common/channelhandlers/aliCloud.js

@@ -269,7 +269,7 @@ class AliHandler {
           obj.clerkOpcode = deliveryInfo.opath;//交付员opcode
           obj.clerkId = deliveryInfo.userId;//交付员id
           // obj.costPrice = deliveryInfo.cost;//成本
-          obj.clerkName = deliveryInfo.userName;//交付员名称
+          obj.clerkName = deliveryInfo.nickName;//交付员名称
           // obj.clerkPhone = deliveryInfo.mobile;//交付人员电话
           // obj.servicerCode = deliveryInfo.compId;
         }
@@ -408,9 +408,12 @@ class AliHandler {
         obj.servicerName = data.servicer.name;
       }
     }
-    if (data.channelNeedNo) {
+    if (data.channelNeedNo) {//需求编号
       obj.businessMode = data.channelNeedNo;
     }
+    if (data.channelSolutionNo) {//方案编号
+      obj.schemeNumber = data.channelSolutionNo;
+    }
     if (data.needsolution.solution.Area) {//服务地区编码和服务地区
       obj.serviceCode = data.needsolution.solution.Area;
       obj.serviceName = data.needsolution.solution.Area;
@@ -418,6 +421,7 @@ class AliHandler {
     }
     if (data.needsolution.solution.CompanyName) {//公司名称
       obj.baseInfo.companyName = data.needsolution.solution.CompanyName;
+      obj.companyName = data.needsolution.solution.CompanyName;
     }
     if (data.needsolution.solution.CompanyAddress) {//公司地址
       obj.baseInfo.companyAddress = data.needsolution.solution.CompanyAddress;

center-manage/app/base/service/impl/common/companySve.js

@@ -31,6 +31,32 @@ class CompanyService extends ServiceBase {
       return appids
     })
   }
+  buildNoPositionNode (treejson, rtnArray) {
+    treejson.forEach((n) => {
+      if (n.children) {
+        this.buildNoPositionNode(n.children, rtnArray)
+      }
+      if (typeof n.isPosition == "undefined") {
+        rtnArray.push(n)
+      } else {
+        if (!n.isPosition) {
+          rtnArray.push(n)
+        }
+      }
+
+    })
+  }
+  async getWatchOrgNodes (cmid) {
+    let rtn = []
+    let companynew = await this.findById(cmid)
+    let orgjsonstr = companynew.orgJson
+    if (orgjsonstr && orgjsonstr != "") {
+      let treejson = JSON.parse(companynew.orgJson)
+      this.buildNoPositionNode(treejson, rtn)
+    }
+    return rtn
+  }
+
   async setOrgs (p, cmk) {
     var self = this
     let curNodeData = p.curdata

center-manage/app/front/entry/public/index.html

-<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/ccc.png><title></title><link href=/css/chunk-14b9857b.0dc416de.css rel=prefetch><link href=/css/chunk-175acaff.7a825095.css rel=prefetch><link href=/css/chunk-1b756945.9e7173ae.css rel=prefetch><link href=/css/chunk-21b5182a.6e6ae301.css rel=prefetch><link href=/css/chunk-2c359864.0dc416de.css rel=prefetch><link href=/css/chunk-3385141a.0dc416de.css rel=prefetch><link href=/css/chunk-34953cb0.71e3d438.css rel=prefetch><link href=/css/chunk-480215f6.84fd9662.css rel=prefetch><link href=/css/chunk-5ccefbbb.9e7173ae.css rel=prefetch><link href=/css/chunk-61b0b1e5.9e7173ae.css rel=prefetch><link href=/css/chunk-8e32057a.e8e9a917.css rel=prefetch><link href=/css/chunk-e7e51fa0.9e7173ae.css rel=prefetch><link href=/css/chunk-ff3eaeb0.9e7173ae.css rel=prefetch><link href=/js/chunk-0109d85c.d8a39ef0.js rel=prefetch><link href=/js/chunk-037694a5.a74514c3.js rel=prefetch><link href=/js/chunk-0aa2a834.9028f9e8.js rel=prefetch><link href=/js/chunk-137dcf78.d8fcc61f.js rel=prefetch><link href=/js/chunk-14b9857b.35e42781.js rel=prefetch><link href=/js/chunk-15d6294e.2c73d8ff.js rel=prefetch><link href=/js/chunk-175acaff.ca3f7e65.js rel=prefetch><link href=/js/chunk-1792c498.4841b7fc.js rel=prefetch><link href=/js/chunk-1a0615f2.370fcaf1.js rel=prefetch><link href=/js/chunk-1b756945.d840b734.js rel=prefetch><link href=/js/chunk-21b5182a.74708748.js rel=prefetch><link href=/js/chunk-22347577.2275ebec.js rel=prefetch><link href=/js/chunk-24a41303.88feac34.js rel=prefetch><link href=/js/chunk-25d9ab36.087a7b9f.js rel=prefetch><link href=/js/chunk-2aeda6fa.2bd11851.js rel=prefetch><link href=/js/chunk-2b3066fa.372380fb.js rel=prefetch><link href=/js/chunk-2c359864.90a950b1.js rel=prefetch><link href=/js/chunk-2d0d61ef.ca1865db.js rel=prefetch><link href=/js/chunk-2d0e68e0.1a313c84.js rel=prefetch><link href=/js/chunk-2d0efc5d.662e1339.js rel=prefetch><link href=/js/chunk-2d20828f.7627562b.js rel=prefetch><link href=/js/chunk-3385141a.a6e1a986.js rel=prefetch><link href=/js/chunk-34953cb0.2fc03dd6.js rel=prefetch><link href=/js/chunk-3a0bcea0.192dd1cf.js rel=prefetch><link href=/js/chunk-477a8e91.c522ef77.js rel=prefetch><link href=/js/chunk-480215f6.5b09744b.js rel=prefetch><link href=/js/chunk-4b58f216.e79a0ff7.js rel=prefetch><link href=/js/chunk-5ccefbbb.0f021a99.js rel=prefetch><link href=/js/chunk-5e7b929d.9e85be22.js rel=prefetch><link href=/js/chunk-61b0b1e5.322b588f.js rel=prefetch><link href=/js/chunk-65e97401.3b9c7780.js rel=prefetch><link href=/js/chunk-8e32057a.5b0635fd.js rel=prefetch><link href=/js/chunk-9947983a.dea0cc2e.js rel=prefetch><link href=/js/chunk-e7e51fa0.c45982a9.js rel=prefetch><link href=/js/chunk-ff3eaeb0.d3d1af72.js rel=prefetch><link href=/css/app.4189c8e8.css rel=preload as=style><link href=/css/chunk-vendors.1d90d08d.css rel=preload as=style><link href=/js/app.dbb5cf0d.js rel=preload as=script><link href=/js/chunk-vendors.9ae5f635.js rel=preload as=script><link href=/css/chunk-vendors.1d90d08d.css rel=stylesheet><link href=/css/app.4189c8e8.css rel=stylesheet></head><body><noscript><strong>We're sorry but iview-admin doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.9ae5f635.js></script><script src=/js/app.dbb5cf0d.js></script></body></html>
\ No newline at end of file
+<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/ccc.png><title></title><link href=/css/chunk-14b9857b.0dc416de.css rel=prefetch><link href=/css/chunk-175acaff.7a825095.css rel=prefetch><link href=/css/chunk-1b756945.9e7173ae.css rel=prefetch><link href=/css/chunk-21b5182a.6e6ae301.css rel=prefetch><link href=/css/chunk-2c359864.0dc416de.css rel=prefetch><link href=/css/chunk-3385141a.0dc416de.css rel=prefetch><link href=/css/chunk-34953cb0.71e3d438.css rel=prefetch><link href=/css/chunk-480215f6.84fd9662.css rel=prefetch><link href=/css/chunk-5ccefbbb.9e7173ae.css rel=prefetch><link href=/css/chunk-61b0b1e5.9e7173ae.css rel=prefetch><link href=/css/chunk-8e32057a.e8e9a917.css rel=prefetch><link href=/css/chunk-e7e51fa0.9e7173ae.css rel=prefetch><link href=/css/chunk-ff3eaeb0.9e7173ae.css rel=prefetch><link href=/js/chunk-0109d85c.d8a39ef0.js rel=prefetch><link href=/js/chunk-037694a5.a74514c3.js rel=prefetch><link href=/js/chunk-0aa2a834.9028f9e8.js rel=prefetch><link href=/js/chunk-137dcf78.d8fcc61f.js rel=prefetch><link href=/js/chunk-14b9857b.35e42781.js rel=prefetch><link href=/js/chunk-15d6294e.42eb4739.js rel=prefetch><link href=/js/chunk-175acaff.ca3f7e65.js rel=prefetch><link href=/js/chunk-1792c498.4841b7fc.js rel=prefetch><link href=/js/chunk-1a0615f2.370fcaf1.js rel=prefetch><link href=/js/chunk-1b756945.d840b734.js rel=prefetch><link href=/js/chunk-21b5182a.74708748.js rel=prefetch><link href=/js/chunk-22347577.2275ebec.js rel=prefetch><link href=/js/chunk-24a41303.88feac34.js rel=prefetch><link href=/js/chunk-25d9ab36.087a7b9f.js rel=prefetch><link href=/js/chunk-2aeda6fa.2bd11851.js rel=prefetch><link href=/js/chunk-2b3066fa.71705e35.js rel=prefetch><link href=/js/chunk-2c359864.90a950b1.js rel=prefetch><link href=/js/chunk-2d0d61ef.ca1865db.js rel=prefetch><link href=/js/chunk-2d0e68e0.1a313c84.js rel=prefetch><link href=/js/chunk-2d0efc5d.662e1339.js rel=prefetch><link href=/js/chunk-2d20828f.7627562b.js rel=prefetch><link href=/js/chunk-3385141a.a6e1a986.js rel=prefetch><link href=/js/chunk-34953cb0.2fc03dd6.js rel=prefetch><link href=/js/chunk-3a0bcea0.192dd1cf.js rel=prefetch><link href=/js/chunk-477a8e91.c522ef77.js rel=prefetch><link href=/js/chunk-480215f6.5b09744b.js rel=prefetch><link href=/js/chunk-4b58f216.e79a0ff7.js rel=prefetch><link href=/js/chunk-5ccefbbb.0f021a99.js rel=prefetch><link href=/js/chunk-5e7b929d.9e85be22.js rel=prefetch><link href=/js/chunk-61b0b1e5.322b588f.js rel=prefetch><link href=/js/chunk-65e97401.3b9c7780.js rel=prefetch><link href=/js/chunk-8e32057a.5b0635fd.js rel=prefetch><link href=/js/chunk-9947983a.dea0cc2e.js rel=prefetch><link href=/js/chunk-e7e51fa0.c45982a9.js rel=prefetch><link href=/js/chunk-ff3eaeb0.d3d1af72.js rel=prefetch><link href=/css/app.4189c8e8.css rel=preload as=style><link href=/css/chunk-vendors.1d90d08d.css rel=preload as=style><link href=/js/app.881c15ae.js rel=preload as=script><link href=/js/chunk-vendors.9ae5f635.js rel=preload as=script><link href=/css/chunk-vendors.1d90d08d.css rel=stylesheet><link href=/css/app.4189c8e8.css rel=stylesheet></head><body><noscript><strong>We're sorry but iview-admin doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.9ae5f635.js></script><script src=/js/app.881c15ae.js></script></body></html>
\ No newline at end of file