Merge remote-tracking branch 'origin/master'

1 year ago · bf16493aca
37 changed files with 132 additions and 62 deletions
--- a/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js
+++ b/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js
@ -529,13 +529,13 @@ const codemenu = [
      {
        path: '/specialrebate/specialrebatecheck',
        component: () => import('@/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue'),
-        name: 'specialrebatetobechecked',
+        name: 'SpecialRebateToBeChecked',
        meta: { title: '专项返利核对', noCache: true }
      },
      {
        path: '/specialrebate/specialrebatedistribution',
        component: () => import('@/views/specialrebate/specialrebatedistribution/specialrebatetobeallocated.vue'),
-        name: 'specialrebatetobeallocated',
+        name: 'SpecialRebateToBeAllocated',
        meta: { title: '专项返利分配', noCache: true }
      }
    ]
@ -551,13 +551,13 @@ const codemenu = [
      {
        path: '/huikuanguanli/collectionrebatemanagement',
        component: () => import('@/views/manufacturerrebates/huikuanguanli/collectionrebatemanagement.vue'),
-        name: 'huikuanfanliguanli',
+        name: 'HuiKuanFanLiGuanLi',
        meta: { title: '厂家回款返利管理', noCache: true }
      },
      {
        path: '/huikuanyuti/collectionrebatewithholding',
        component: () => import('@/views/manufacturerrebates/huikuanyuti/collectionrebatewithholding.vue'),
-        name: 'huikuanfanliyutigaunli',
+        name: 'HuiKuanFanLiYuYiGuanLi',
        meta: { title: '厂家回款返利预提', noCache: true }
      },
      {
@ -1139,21 +1139,21 @@ const codemenu = [
    path: '/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiDaiBanInfo',
    component: () =>
      import('@/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiDaiBanInfo.vue'),
-    name: 'zhuanxiangfanliheduiDaiBanInfo'
+    name: 'ZhuanXiangFanLiHeDuiDaiBanInfo'
  },
  // 专项返利核对详情
  {
    path: '/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiYiBanInfo',
    component: () =>
      import('@/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiYiBanInfo.vue'),
-    name: 'zhuanxiangfanliheduiYiBanInfo'
+    name: 'ZhuanXiangFanLiHeDuiYiBanInfo'
  },
  // 专项返利核对办理
  {
    path: '/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiEdit',
    component: () =>
      import('@/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiEdit.vue'),
-    name: 'zhuanxiangfanliheduiEdit'
+    name: 'ZhuanXiangFanLiHeDuiEdit'
  },

  // 专项返利分配申请详情页面
@ -1161,21 +1161,21 @@ const codemenu = [
    path: '/zhuanxiangfanlifenpeiFlow/zhuanxiangfanlifenpeiDaiBanInfo',
    component: () =>
      import('@/views/workFlow/zhuanxiangfanlifenpeiFlow/zhuanxiangfanlifenpeiDaiBanInfo.vue'),
-    name: 'zhuanxiangfanlifenpeiDaiBanInfo'
+    name: 'ZhuanXiangFanLiFenPeiDaiBanInfo'
  },
  // 专项返利分配详情
  {
    path: '/zhuanxiangfanlifenpeiFlow/zhuanxiangfanlifenpeiYiBanInfo',
    component: () =>
      import('@/views/workFlow/zhuanxiangfanlifenpeiFlow/zhuanxiangfanlifenpeiYiBanInfo.vue'),
-    name: 'zhuanxiangfanlifenpeiYiBanInfo'
+    name: 'ZhuanXiangFanLiFenPeiYiBanInfo'
  },
  // 专项返利分配办理
  {
    path: '/zhuanxiangfanlifenpeiFlow/zhuanxiangfanlifenpeiEdit',
    component: () =>
      import('@/views/workFlow/zhuanxiangfanlifenpeiFlow/zhuanxiangfanlifenpeiEdit.vue'),
-    name: 'zhuanxiangfanlifenpeiEdit'
+    name: 'ZhuanXiangFanLiFenPeiEdit'
  },

  // 回款返利预提申请待办详情页面
@ -1183,21 +1183,21 @@ const codemenu = [
    path: '/huikuanfanliyutiFlow/huikuanfanliyutiDanBanInfo',
    component: () =>
      import('@/views/workFlow/huikuanfanliyutiFlow/huikuanfanliyutiDanBanInfo.vue'),
-    name: 'huikuanfanliyutiDanBanInfo'
+    name: 'HuiKuanFanLiYuTiDanBanInfo'
  },
  // 回款返利预提已办详情
  {
    path: '/huikuanfanliyutiFlow/huikuanfanliyutiYiBanInfo',
    component: () =>
      import('@/views/workFlow/huikuanfanliyutiFlow/huikuanfanliyutiYiBanInfo.vue'),
-    name: 'huikuanfanliyutiYiBanInfo'
+    name: 'HuiKuanFanLiYuTiYiBanInfo'
  },
  // 回款返利预提办理
  {
    path: '/huikuanfanliyutiFlow/huikuanfanliyutiEdit',
    component: () =>
      import('@/views/workFlow/huikuanfanliyutiFlow/huikuanfanliyutiEdit.vue'),
-    name: 'huikuanfanliyutiEdit'
+    name: 'HuiKuanFanLiYuTiEdit'
  },

  // 回款返利核对申请待办详情页面
--- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanguanli/collectionrebatemanagement.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanguanli/collectionrebatemanagement.vue
@ -137,7 +137,7 @@ import collectionrebatemanagementAdd from './collectionrebatemanagementAdd'
 import collectionrebatemanagementInfo from './collectionrebatemanagementInfo'

 export default {
-  name: 'huikuanfanliguanli',
+  name: 'HuiKuanFanLiGuanLi',
  components: {
    Pagination,
    pageye,
@ -176,6 +176,9 @@ export default {
          collectionStartDate: '',
          collectionEndDate: '',
          state: '',
+          orgPath: '',
+          userSid: '',
+          menuUrl: '',
          sidList: []
        },
        current: 1,
@ -242,6 +245,9 @@ export default {
    // 查询列表信息
    getList() {
      this.listLoading = true
+      this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
+      this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+      this.listQuery.params.menuUrl = this.$route.path
      req.listPage(this.listQuery).then((response) => {
        console.log('列表查询结果：', response)
        this.listLoading = false
@ -269,6 +275,9 @@ export default {
          collectionStartDate: '',
          collectionEndDate: '',
          state: '',
+          orgPath: '',
+          userSid: '',
+          menuUrl: '',
          sidList: []
        },
        current: 1,
--- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanguanli/collectionrebatemanagementAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanguanli/collectionrebatemanagementAdd.vue
@ -118,7 +118,7 @@ import req from '@/api/manufacturerrebates/collectionrebatemanagement'
 import { fetchBySid } from '@/api/cheliang/dictcommons'

 export default {
-  name: 'huikuanfanliguanliAdd',
+  name: 'HuiKuanFanLiGuanLiAdd',
  data() {
    return {
      viewTitle: '',
@ -151,6 +151,7 @@ export default {
        createOrgName: '',
        createOrgSid: '',
        withholdingDate: '',
+        orgPath: '',
        scmCollectionRebateVehs: []
      },
      rules: {},
@ -283,6 +284,7 @@ export default {
        createOrgName: '',
        createOrgSid: '',
        withholdingDate: '',
+        orgPath: '',
        scmCollectionRebateVehs: []
      }
      this.submitdisabled = false
--- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanguanli/collectionrebatemanagementInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanguanli/collectionrebatemanagementInfo.vue
@ -98,7 +98,7 @@
 import req from '@/api/manufacturerrebates/collectionrebatemanagement'

 export default {
-  name: 'huikuanfanliguanliInfo',
+  name: 'HuiKuanFanLiGuanLiInfo',
  data() {
    return {
      viewTitle: '',
--- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/collectionrebatewithholding.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/collectionrebatewithholding.vue
@ -115,7 +115,7 @@ import collectionrebatewithholdingInfo from './collectionrebatewithholdingInfo'
 import { getStorage } from '@/utils/auth'

 export default {
-  name: 'huikuanfanliyutigaunli',
+  name: 'HuiKuanFanLiYuYiGuanLi',
  components: {
    Pagination,
    pageye,
@ -168,7 +168,10 @@ export default {
          brandSid: '',
          collectionApply: '',
          createEndTime: '',
-          createStartTime: ''
+          createStartTime: '',
+          orgPath: '',
+          userSid: '',
+          menuUrl: ''
        },
        current: 1,
        size: 5,
@ -271,7 +274,9 @@ export default {
    // 查询列表信息
    getList() {
      this.listLoading = true
-      this.listQuery.params.createBySid = window.sessionStorage.getItem('userSid')
+      this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
+      this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+      this.listQuery.params.menuUrl = this.$route.path
      req.listPage(this.listQuery).then((response) => {
        console.log('列表查询结果：', response)
        this.listLoading = false
@ -296,7 +301,10 @@ export default {
          brandSid: '',
          collectionApply: '',
          createEndTime: '',
-          createStartTime: ''
+          createStartTime: '',
+          orgPath: '',
+          userSid: '',
+          menuUrl: ''
        },
        current: 1,
        size: 5,
--- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/collectionrebatewithholdingAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/collectionrebatewithholdingAdd.vue
@ -98,7 +98,7 @@ import huikuanfanliselect from './relation/huikuanfanliselect'
 import huikuanfanliAdd from './relation/huikuanfanliAdd'

 export default {
-  name: 'collectionrebatewithholdingAdd',
+  name: 'HuiKuanFanLiYuYiAdd',
  components: {
    huikuanfanliselect,
    huikuanfanliAdd
@ -127,6 +127,7 @@ export default {
        createBySid: '',
        instanceId: '', // 流程实例ID
        taskId: '', // 任务ID
+        orgPath: '',
        scmCollectionRebateWiths: []
      },
      rules: {},
@ -165,6 +166,7 @@ export default {
      this.formobj.createOrgSid = createOrgSid
      this.formobj.useOrgSid = createOrgSid
      this.formobj.createByName = window.sessionStorage.getItem('name')
+      this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath')
      this.viewTitle = '【新增】回款返利预提申请'
    },
    showEdit(row) {
@ -404,6 +406,7 @@ export default {
        createBySid: '',
        instanceId: '', // 流程实例ID
        taskId: '', // 任务ID
+        orgPath: '',
        scmCollectionRebateWiths: []
      }
      this.submitdisabled = false
--- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/collectionrebatewithholdingInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/collectionrebatewithholdingInfo.vue
@ -88,7 +88,7 @@ import req from '@/api/manufacturerrebates/collectionrebatewithholding'
 import huikuanfanliInfo from './relation/huikuanfanliInfo'

 export default {
-  name: 'collectionrebatewithholdingInfo',
+  name: 'HuiKuanFanLiYuYiInfo',
  components: {
    huikuanfanliInfo
  },
@ -114,6 +114,7 @@ export default {
        createBySid: '',
        instanceId: '', // 流程实例ID
        taskId: '', // 任务ID
+        orgPath: '',
        scmCollectionRebateWiths: []
      },
      rules: {},
@ -200,6 +201,7 @@ export default {
        createBySid: '',
        instanceId: '', // 流程实例ID
        taskId: '', // 任务ID
+        orgPath: '',
        scmCollectionRebateWiths: []
      }
      this.$refs['form_obj'].resetFields()
--- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/relation/huikuanfanliAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/relation/huikuanfanliAdd.vue
@ -77,7 +77,7 @@ import req from '@/api/manufacturerrebates/collectionrebatewithholding'
 import collectionrebatemanagementInfo from '../../../manufacturerrebates/huikuanguanli/collectionrebatemanagementInfo'

 export default {
-  name: 'huikuanfanliAdd',
+  name: 'HuiKuanFanLiAdd',
  components: {
    collectionrebatemanagementInfo
  },
--- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/relation/huikuanfanliInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/relation/huikuanfanliInfo.vue
@ -75,7 +75,7 @@ import req from '@/api/manufacturerrebates/collectionrebatewithholding'
 import collectionrebatemanagementInfo from '../../../manufacturerrebates/huikuanguanli/collectionrebatemanagementInfo'

 export default {
-  name: 'huikuanfanliInfo',
+  name: 'HuiKuanFanLiInfo',
  components: {
    collectionrebatemanagementInfo
  },
--- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/relation/huikuanfanliselect.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/relation/huikuanfanliselect.vue
@ -103,7 +103,7 @@ import { typeValues } from '@/api/cheliang/dictcommons'
 import collectionrebatemanagementInfo from '../../../manufacturerrebates/huikuanguanli/collectionrebatemanagementInfo'

 export default {
-  name: 'huikuanfanliselect',
+  name: 'HuiKuanFanLiSelect',
  components: {
    Pagination,
    ButtonBar,
--- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/relation/specialrebatetobecheckedAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/relation/specialrebatetobecheckedAdd.vue
@ -90,7 +90,7 @@
 import req from '@/api/specialrebate/specialrebatecheck'

 export default {
-  name: 'specialrebatetobecheckedAdd',
+  name: 'SpecialRebateToBeCheckedAdd',
  data() {
    return {
      viewTitle: '',
--- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/relation/specialrebatetobecheckedInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/relation/specialrebatetobecheckedInfo.vue
@ -88,7 +88,7 @@
 import req from '@/api/specialrebate/specialrebatecheck'

 export default {
-  name: 'sepcialrebatetobecheckedInfo',
+  name: 'SepcialRebateToBeCheckedInfo',
  data() {
    return {
      viewTitle: '',
--- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/relation/yiheduizhuanxiangfanli.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/relation/yiheduizhuanxiangfanli.vue
@ -122,7 +122,7 @@ import Pagination from '@/components/pagination'
 import ButtonBar from '@/components/ButtonBar'

 export default {
-  name: 'yiheduizhuanxiangfanli',
+  name: 'YiHeDuiZhuanXiangFanLi',
  components: {
    Pagination,
    ButtonBar
--- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheck.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheck.vue
@ -126,10 +126,10 @@ import ButtonBar from '@/components/ButtonBar'
 import { brandDown, getOrgSidByPath } from '@/api/cheliang/dictcommons'
 import specialrebatecheckAdd from './specialrebatecheckAdd'
 import specialrebatecheckInfo from './specialrebatecheckInfo'
-import {getStorage} from '@/utils/auth'
+import { getStorage } from '@/utils/auth'

 export default {
-  name: 'specialrebatecheck',
+  name: 'SpecialRebateCheck',
  components: {
    Pagination,
    pageye,
@ -175,7 +175,10 @@ export default {
          checkApply: '',
          createOrgSid: '',
          createEndTime: '',
-          createStartTime: ''
+          createStartTime: '',
+          orgPath: '',
+          userSid: '',
+          menuUrl: ''
        },
        current: 1,
        size: 5,
@ -271,6 +274,9 @@ export default {
    // 查询列表信息
    getList() {
      this.listLoading = true
+      this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
+      this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+      this.listQuery.params.menuUrl = this.$route.path
      req.pagelist(this.listQuery).then((response) => {
        console.log('列表查询结果：', response)
        this.listLoading = false
@ -295,7 +301,10 @@ export default {
          checkApply: '',
          createOrgSid: '',
          createEndTime: '',
-          createStartTime: ''
+          createStartTime: '',
+          orgPath: '',
+          userSid: '',
+          menuUrl: ''
        },
        current: 1,
        size: 5,
--- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckAdd.vue
@ -200,7 +200,7 @@ import yiheduizhuanxiangfanli from './relation/yiheduizhuanxiangfanli'
 import specialrebatetobecheckedAdd from './relation/specialrebatetobecheckedAdd'

 export default {
-  name: 'specialrebatecheckAdd',
+  name: 'SpecialRebateCheckAdd',
  components: {
    yiheduizhuanxiangfanli,
    specialrebatetobecheckedAdd
@ -233,6 +233,7 @@ export default {
        remarks: '',
        instanceId: '', // 流程实例ID
        taskId: '', // 任务ID
+        orgPath: '',
        scmWhenSpecialrebateCheckapplydetailDetails: [],
        scmLastSpecialrebateCheckapplydetailDetails: []
      },
@ -272,6 +273,7 @@ export default {
      this.formobj.useOrgSid = createOrgSid
      this.formobj.createByName = window.sessionStorage.getItem('name')
      this.formobj.createBySid = window.sessionStorage.getItem('userSid')
+      this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath')
      this.viewTitle = '【新增】专项返利核对审核申请'
    },
    showEdit(row) {
@ -531,6 +533,7 @@ export default {
        remarks: '',
        instanceId: '', // 流程实例ID
        taskId: '', // 任务ID
+        orgPath: '',
        scmWhenSpecialrebateCheckapplydetailDetails: [],
        scmLastSpecialrebateCheckapplydetailDetails: []
      }
--- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckInfo.vue
@ -146,7 +146,7 @@ import req from '@/api/specialrebate/specialrebatecheck'
 import specialrebatetobecheckedInfo from './relation/specialrebatetobecheckedInfo'

 export default {
-  name: 'specialrebatecheckInfo',
+  name: 'SpecialRebateCheckInfo',
  components: {
    specialrebatetobecheckedInfo
  },
--- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue
@ -249,7 +249,7 @@ import specialrebatecheckAdd from './specialrebatecheckAdd'
 import { brandDown, getOrgSidByPath, typeValues } from '@/api/cheliang/dictcommons'

 export default {
-  name: 'specialrebatetobechecked',
+  name: 'SpecialRebateToBeChecked',
  components: {
    Pagination,
    ButtonBar,
@ -330,7 +330,10 @@ export default {
          rebateName: '',
          state: '',
          createEndTime: '',
-          createStartTime: ''
+          createStartTime: '',
+          orgPath: '',
+          userSid: '',
+          menuUrl: ''
        },
        current: 1,
        size: 5,
@ -425,6 +428,9 @@ export default {
    // 查询列表信息
    getList() {
      this.listLoading = true
+      this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
+      this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+      this.listQuery.params.menuUrl = this.$route.path
      req.listPage(this.listQuery).then((response) => {
        console.log('列表查询结果：', response)
        this.listLoading = false
@ -451,7 +457,10 @@ export default {
          rebateName: '',
          state: '',
          createEndTime: '',
-          createStartTime: ''
+          createStartTime: '',
+          orgPath: '',
+          userSid: '',
+          menuUrl: ''
        },
        current: 1,
        size: 5,
--- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatedistribution.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatedistribution.vue
@ -114,7 +114,7 @@ import specialrebatedistributionInfo from './specialrebatedistributionInfo'
 import { getStorage } from '@/utils/auth'

 export default {
-  name: 'specialrebatedistribution',
+  name: 'SpecialRebateDistribution',
  components: {
    Pagination,
    pageye,
@ -160,7 +160,10 @@ export default {
          checkApply: '',
          createOrgSid: '',
          createEndTime: '',
-          createStartTime: ''
+          createStartTime: '',
+          orgPath: '',
+          userSid: '',
+          menuUrl: ''
        },
        current: 1,
        size: 5,
@ -256,6 +259,9 @@ export default {
    // 查询列表信息
    getList() {
      this.listLoading = true
+      this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
+      this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+      this.listQuery.params.menuUrl = this.$route.path
      req.listPage(this.listQuery).then((response) => {
        console.log('列表查询结果：', response)
        this.listLoading = false
@ -280,7 +286,10 @@ export default {
          checkApply: '',
          createOrgSid: '',
          createEndTime: '',
-          createStartTime: ''
+          createStartTime: '',
+          orgPath: '',
+          userSid: '',
+          menuUrl: ''
        },
        current: 1,
        size: 5,
--- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatedistributionAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatedistributionAdd.vue
@ -93,7 +93,7 @@ import daifeipeizhuanxiang from './relation/daifeipeizhuanxiang'
 import { fetchBySid, brandDown } from '@/api/cheliang/dictcommons'

 export default {
-  name: 'specialrebatedistributionAdd',
+  name: 'SpecialRebateDistributionAdd',
  components: {
    daifeipeizhuanxiang
  },
@ -122,6 +122,7 @@ export default {
        withRebate: '',
        taskId: '',
        instanceId: '',
+        orgPath: '',
        scmSpecialrebatedistributedetails: []
      },
      rules: {},
@ -161,6 +162,7 @@ export default {
      this.formobj.useOrgSid = createOrgSid
      this.formobj.createByName = window.sessionStorage.getItem('name')
      this.formobj.createBySid = window.sessionStorage.getItem('userSid')
+      this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath')
      this.viewTitle = '【新增】专项返利分配申请'
    },
    showEdit(row) {
@ -363,6 +365,7 @@ export default {
        withRebate: '',
        taskId: '',
        instanceId: '',
+        orgPath: '',
        scmSpecialrebatedistributedetails: []
      }
      this.$refs['form_obj'].resetFields()
--- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatedistributionInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatedistributionInfo.vue
@ -79,7 +79,7 @@
 import req from '@/api/specialrebate/specialrebatedistribution'

 export default {
-  name: 'specialrebatedistributionInfo',
+  name: 'SpecialRebateDistributionInfo',
  data() {
    return {
      viewTitle: '',
--- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatetobeallocated.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatetobeallocated.vue
@ -119,7 +119,7 @@ import specialrebatetobeallocatedByDisNum from './specialrebatetobeallocatedByDi
 import { brandDown, getOrgSidByPath, typeValues } from '@/api/cheliang/dictcommons'

 export default {
-  name: 'specialrebatetobeallocated',
+  name: 'SpecialRebateToBeAllocated',
  components: {
    Pagination,
    ButtonBar,
@ -170,7 +170,10 @@ export default {
          state: '',
          createEndTime: '',
          createStartTime: '',
-          sidList: []
+          sidList: [],
+          orgPath: '',
+          userSid: '',
+          menuUrl: ''
        },
        current: 1,
        size: 5,
@ -246,6 +249,9 @@ export default {
    // 查询列表信息
    getList() {
      this.listLoading = true
+      this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
+      this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+      this.listQuery.params.menuUrl = this.$route.path
      req.stayDisRebate(this.listQuery).then((response) => {
        console.log('列表查询结果：', response)
        this.listLoading = false
@ -274,7 +280,10 @@ export default {
          state: '',
          createEndTime: '',
          createStartTime: '',
-          sidList: []
+          sidList: [],
+          orgPath: '',
+          userSid: '',
+          menuUrl: ''
        },
        current: 1,
        size: 5,
--- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatetobeallocatedAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatetobeallocatedAdd.vue
@ -123,6 +123,7 @@ export default {
        setNumber: '',
        unitSetAllocationMoney: '',
        createOrgSid: '',
+        orgPath: '',
        specialRebateSids: [],
        scmSpecialrebateVehsVehSidAndVinNos: []
      },
@ -210,6 +211,7 @@ export default {
        setNumber: '',
        unitSetAllocationMoney: '',
        createOrgSid: '',
+        orgPath: '',
        specialRebateSids: [],
        scmSpecialrebateVehsVehSidAndVinNos: []
      }
--- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatetobeallocatedByDisNum.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatetobeallocatedByDisNum.vue
@ -57,7 +57,7 @@
 import req from '@/api/specialrebate/specialrebatedistribution'

 export default {
-  name: 'specialrebatetobeallocatedByDisNum',
+  name: 'SpecialRebateToBeAllocatedByDisNum',
  data() {
    return {
      index: 0,
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/huikuanfanliyutiDanBanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/huikuanfanliyutiDanBanInfo.vue
@ -111,7 +111,7 @@ import req from '@/api/manufacturerrebates/collectionrebatewithholding'
 import huikuanfanliInfo from './relation/huikuanfanliInfo'

 export default {
-  name: 'collectionrebatewithholdingDaiBanInfo',
+  name: 'HuiKuanFanLiYuTiDaiBanInfo',
  components: {
    huikuanfanliInfo
  },
@ -137,6 +137,7 @@ export default {
        createBySid: '',
        instanceId: '', // 流程实例ID
        taskId: '', // 任务ID
+        orgPath: '',
        scmCollectionRebateWiths: []
      },
      operation: '', // 点击操作按钮
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/huikuanfanliyutiEdit.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/huikuanfanliyutiEdit.vue
@ -97,7 +97,7 @@ import huikuanfanliselect from './relation/huikuanfanliselect'
 import huikuanfanliAdd from './relation/huikuanfanliAdd'

 export default {
-  name: 'collectionrebatewithholdingAdd',
+  name: 'HuiKuanFanLiYuTiEdit',
  components: {
    huikuanfanliselect,
    huikuanfanliAdd
@ -126,6 +126,7 @@ export default {
        createBySid: '',
        instanceId: '', // 流程实例ID
        taskId: '', // 任务ID
+        orgPath: '',
        scmCollectionRebateWiths: []
      },
      rules: {},
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/huikuanfanliyutiYiBanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/huikuanfanliyutiYiBanInfo.vue
@ -88,7 +88,7 @@ import req from '@/api/manufacturerrebates/collectionrebatewithholding'
 import huikuanfanliInfo from './relation/huikuanfanliInfo'

 export default {
-  name: 'collectionrebatewithholdingYiBanInfo',
+  name: 'HuiKuanFanLiYuTiYiBanInfo',
  components: {
    huikuanfanliInfo
  },
@ -114,6 +114,7 @@ export default {
        createBySid: '',
        instanceId: '', // 流程实例ID
        taskId: '', // 任务ID
+        orgPath: '',
        scmCollectionRebateWiths: []
      },
      rules: {},
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/relation/huikuanfanliselect.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/relation/huikuanfanliselect.vue
@ -103,7 +103,7 @@ import { typeValues } from '@/api/cheliang/dictcommons'
 import huikuanfanliguanliInfo from './huikuanfanliguanliInfo'

 export default {
-  name: 'huikuanfanliselect',
+  name: 'HuiKuanFanLiSelect',
  components: {
    Pagination,
    ButtonBar,
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanlifenpeiFlow/relation/daifeipeizhuanxiang.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanlifenpeiFlow/relation/daifeipeizhuanxiang.vue
@ -93,7 +93,7 @@ import ButtonBar from '@/components/ButtonBar'
 import { typeValues } from '@/api/cheliang/dictcommons'

 export default {
-  name: 'daifenpeizhuanxiang',
+  name: 'DaiFenPeiZhuanXiang',
  components: {
    Pagination,
    ButtonBar
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanlifenpeiFlow/zhuanxiangfanlifenpeiDaiBanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanlifenpeiFlow/zhuanxiangfanlifenpeiDaiBanInfo.vue
@ -102,7 +102,7 @@
 import req from '@/api/specialrebate/specialrebatedistribution'

 export default {
-  name: 'zhuanxiangfanlifenpeiDaiBanInfo',
+  name: 'ZhuanXiangFanLiFenPeiDaiBanInfo',
  data() {
    return {
      viewTitle: '',
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanlifenpeiFlow/zhuanxiangfanlifenpeiEdit.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanlifenpeiFlow/zhuanxiangfanlifenpeiEdit.vue
@ -89,10 +89,9 @@
 <script>
 import req from '@/api/specialrebate/specialrebatedistribution'
 import daifeipeizhuanxiang from './relation/daifeipeizhuanxiang'
-import { fetchBySid, brandDown } from '@/api/cheliang/dictcommons'

 export default {
-  name: 'zhuanxiangfanlifenpeiEdit',
+  name: 'ZhuanXiangFanLiFenPeiEdit',
  components: {
    daifeipeizhuanxiang
  },
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanlifenpeiFlow/zhuanxiangfanlifenpeiYiBanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanlifenpeiFlow/zhuanxiangfanlifenpeiYiBanInfo.vue
@ -79,7 +79,7 @@
 import req from '@/api/specialrebate/specialrebatedistribution'

 export default {
-  name: 'zhuanxiangfanlifenpeiYiBanInfo',
+  name: 'ZhuanXiangFanLiFenPeiYiBanInfo',
  data() {
    return {
      viewTitle: '',
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/relation/specialrebatetobecheckedAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/relation/specialrebatetobecheckedAdd.vue
@ -90,7 +90,7 @@
 import req from '@/api/specialrebate/specialrebatecheck'

 export default {
-  name: 'specialrebatetobecheckedAdd',
+  name: 'SpecialRebateToBeCheckedAdd',
  data() {
    return {
      viewTitle: '',
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/relation/specialrebatetobecheckedInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/relation/specialrebatetobecheckedInfo.vue
@ -88,7 +88,7 @@
 import req from '@/api/specialrebate/specialrebatecheck'

 export default {
-  name: 'sepcialrebatetobecheckedInfo',
+  name: 'SepcialRebateToBeCheckedInfo',
  data() {
    return {
      viewTitle: '',
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/relation/yiheduizhuanxiangfanli.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/relation/yiheduizhuanxiangfanli.vue
@ -122,7 +122,7 @@ import Pagination from '@/components/pagination'
 import ButtonBar from '@/components/ButtonBar'

 export default {
-  name: 'yiheduizhuanxiangfanli',
+  name: 'YiHeDuiZhuanXiangFanLi',
  components: {
    Pagination,
    ButtonBar
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiDaiBanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiDaiBanInfo.vue
@ -169,7 +169,7 @@ import req from '@/api/specialrebate/specialrebatecheck'
 import specialrebatetobecheckedInfo from './relation/specialrebatetobecheckedInfo'

 export default {
-  name: 'specialrebatecheckInfo',
+  name: 'ZhuanXiangFanLiHeDuiDaiBanInfo',
  components: {
    specialrebatetobecheckedInfo
  },
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiEdit.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiEdit.vue
@ -194,12 +194,11 @@

 <script>
 import req from '@/api/specialrebate/specialrebatecheck'
-import { fetchBySid, brandDown } from '@/api/cheliang/dictcommons'
 import yiheduizhuanxiangfanli from './relation/yiheduizhuanxiangfanli'
 import specialrebatetobecheckedAdd from './relation/specialrebatetobecheckedAdd'

 export default {
-  name: 'zhuanxiangfanliheduiEdit',
+  name: 'ZhuanXiangFanLiHeDuiEdit',
  components: {
    yiheduizhuanxiangfanli,
    specialrebatetobecheckedAdd
@ -232,6 +231,7 @@ export default {
        remarks: '',
        instanceId: '', // 流程实例ID
        taskId: '', // 任务ID
+        orgPath: '',
        scmWhenSpecialrebateCheckapplydetailDetails: [],
        scmLastSpecialrebateCheckapplydetailDetails: []
      },
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiYiBanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiYiBanInfo.vue
@ -146,7 +146,7 @@ import req from '@/api/specialrebate/specialrebatecheck'
 import specialrebatetobecheckedInfo from './relation/specialrebatetobecheckedInfo'

 export default {
-  name: 'zhuanxiangfanliheduiYiBanInfo',
+  name: 'ZhuanXiangFanLiHeDuiYiBanInfo',
  components: {
    specialrebatetobecheckedInfo
  },