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 947c544394..56210caaa6 100644 --- a/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js +++ b/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js @@ -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 } }, { @@ -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' }, // 回款返利核对申请待办详情页面 diff --git a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/collectionrebatewithholding.vue b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/collectionrebatewithholding.vue index 10b49fc59c..83f69359ae 100644 --- 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, diff --git a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/collectionrebatewithholdingAdd.vue b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/collectionrebatewithholdingAdd.vue index 84e8016cc6..317ecdc5e9 100644 --- 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 diff --git a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/collectionrebatewithholdingInfo.vue b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/collectionrebatewithholdingInfo.vue index afbc5410b1..d96a789a6b 100644 --- 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() diff --git 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 index 5d138ba4f5..aabbebde32 100644 --- 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 }, diff --git 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 index 78aa3a463c..140d584f0b 100644 --- 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 }, diff --git 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 index 37a02a47d0..e95bf296c2 100644 --- 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, diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/huikuanfanliyutiDanBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/huikuanfanliyutiDanBanInfo.vue index 876c84855f..146190c469 100644 --- 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: '', // 点击操作按钮 diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/huikuanfanliyutiEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/huikuanfanliyutiEdit.vue index f197899995..7949bd7288 100644 --- 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: {}, diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/huikuanfanliyutiYiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliyutiFlow/huikuanfanliyutiYiBanInfo.vue index deac0ce005..b36a4894cd 100644 --- 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: {}, diff --git 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 index b80423d709..74ecaa9a2b 100644 --- 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,