diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java index ca862d4f91..75a2290330 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java @@ -437,7 +437,6 @@ public class BaseInternalPurchaseService extends MybatisBaseService formVariables = bv.getFormVariables(); if (formVariables != null) { if (baseInternalPurchase.getShuntingTypeValue().equals("调入")) { @@ -581,10 +580,9 @@ public class BaseInternalPurchaseService extends MybatisBaseService voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); List candidateGroups = voList.get(0).getCandidateGroups(); UserRoleQuery userRoleQuery = new UserRoleQuery(); - if (StringUtils.isNotBlank(id)){ - if (id.equals("Activity_08r04ow")){ + if (StringUtils.isNotBlank(id)) { + if (id.equals("Activity_08r04ow")) {//事业部副总经理审批(管辖调出方) String sellerOrgSid = baseInternalPurchase.getSellerOrgSid(); userRoleQuery.setRoleSid(candidateGroups.get(0)); userRoleQuery.setOrgSid(sellerOrgSid); - }else if (id.equals("Activity_02xqz9n")){ + SysOrganizationVo data = sysOrganizationFeign.fetchBySid(callInOrgSid).getData(); + String orgSidPath = data.getOrgSidPath(); + bv.setOrgSidPath(orgSidPath); + } else if (id.equals("Activity_02xqz9n")) {//事业部副总经理审批(管辖调入方) String buyerOrgSid = baseInternalPurchase.getBuyerOrgSid(); userRoleQuery.setRoleSid(candidateGroups.get(0)); userRoleQuery.setOrgSid(buyerOrgSid); - }else { + } else { userRoleQuery.setRoleSid(candidateGroups.get(0)); userRoleQuery.setOrgSid(callInOrgSid); } - }else { + } else { userRoleQuery.setRoleSid(candidateGroups.get(0)); userRoleQuery.setOrgSid(callInOrgSid); } diff --git a/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js b/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js index eb0c7975e4..8b20f4642c 100644 --- a/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js +++ b/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js @@ -533,12 +533,12 @@ const codemenu = [ name: 'huikuanfanliyutigaunli', meta: { title: '厂家回款返利预提', noCache: true } }, - { - path: '/huikuanhedui/collectionrebatetobechecked', - component: () => import('@/views/manufacturerrebates/huikuanhedui/collectionrebatetobechecked.vue'), - name: 'huikuanfanlidaihedui', - meta: { title: '厂家回款返利核对', noCache: true } - }, + // { + // path: '/huikuanhedui/collectionrebatetobechecked', + // component: () => import('@/views/manufacturerrebates/huikuanhedui/collectionrebatetobechecked.vue'), + // name: 'huikuanfanlidaihedui', + // meta: { title: '厂家回款返利核对', noCache: true } + // }, { path: '/huikuanfenpei/collectionrebateallot', component: () => import('@/views/manufacturerrebates/huikuanfenpei/collectionrebateallot.vue'), diff --git a/anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/vehicle.vue b/anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/vehicle.vue index b236b0ab40..3d28f6e0f8 100644 --- a/anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/vehicle.vue +++ b/anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/vehicle.vue @@ -12,7 +12,7 @@
{{ searchxianshitit }}