Merge remote-tracking branch 'origin/master'

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<BaseInternal
     public ResultBean complete(BusinessVariables bv) {
         ResultBean rb = ResultBean.fireFail();
         BaseInternalPurchase baseInternalPurchase = fetchBySid(bv.getBusinessSid());
-        bv.setOrgSidPath(baseInternalPurchase.getOrgSidPath());
         Map<String, Object> formVariables = bv.getFormVariables();
         if (formVariables != null) {
             if (baseInternalPurchase.getShuntingTypeValue().equals("调入")) {
@@ -581,10 +580,9 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
         }
     }
 
-    public ResultBean InitiatorToAnswer(BusinessVariables bv,String id) {
+    public ResultBean InitiatorToAnswer(BusinessVariables bv, String id) {
         ResultBean rb = ResultBean.fireFail();
         BaseInternalPurchase baseInternalPurchase = fetchBySid(bv.getBusinessSid());
-        bv.setOrgSidPath(baseInternalPurchase.getOrgSidPath());
         String shuntingTypeValue = baseInternalPurchase.getShuntingTypeValue();
         if (shuntingTypeValue.equals("调入")) {
             String callOutOrgSid = baseInternalPurchase.getSellerOrgSid();
@@ -616,20 +614,23 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
             List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
             List<String> candidateGroups = voList.get(0).getCandidateGroups();
             UserRoleQuery userRoleQuery = new UserRoleQuery();
-            if (StringUtils.isNotBlank(id)){
+            if (StringUtils.isNotBlank(id)) {
-                if (id.equals("Activity_08r04ow")){
+                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);
             }

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',
+      //   path: '/huikuanhedui/collectionrebatetobechecked',
-        component: () => import('@/views/manufacturerrebates/huikuanhedui/collectionrebatetobechecked.vue'),
+      //   component: () => import('@/views/manufacturerrebates/huikuanhedui/collectionrebatetobechecked.vue'),
-        name: 'huikuanfanlidaihedui',
+      //   name: 'huikuanfanlidaihedui',
-        meta: { title: '厂家回款返利核对', noCache: true }
+      //   meta: { title: '厂家回款返利核对', noCache: true }
-      },
+      // },
       {
         path: '/huikuanfenpei/collectionrebateallot',
         component: () => import('@/views/manufacturerrebates/huikuanfenpei/collectionrebateallot.vue'),

anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/vehicle.vue

@@ -12,7 +12,7 @@
         <div class="searchcon">
           <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
           <div v-show="isSearchShow" class="search">
-            <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="120px" class="tab-header">
+            <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
               <el-form-item label="品牌">
                 <el-select v-model="listQuery.params.brandSid" disabled class="addinputw" placeholder="请选择" filterable>
                   <el-option v-for="item in carbrand_list" :key="item.sid" :label="item.brandName" :value="item.sid"/>
@@ -74,7 +74,7 @@
                 <span>{{ scope.row.location }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="厂家结算价" align="center">
+            <el-table-column label="厂家结算价(元)" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.guidedPrice }}</span>
               </template>

anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/vehicle.vue

@@ -12,7 +12,7 @@
         <div class="searchcon">
           <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
           <div v-show="isSearchShow" class="search">
-            <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="120px" class="tab-header">
+            <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
               <el-form-item label="品牌">
                 <el-select v-model="listQuery.params.brandSid" disabled class="addinputw" placeholder="请选择" filterable>
                   <el-option v-for="item in carbrand_list" :key="item.sid" :label="item.brandName" :value="item.sid"/>
@@ -74,7 +74,7 @@
                 <span>{{ scope.row.location }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="厂家结算价" align="center">
+            <el-table-column label="厂家结算价(元)" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.guidedPrice }}</span>
               </template>