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 7f82684515..c43f5449e8 100644 --- a/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js +++ b/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js @@ -1118,21 +1118,21 @@ const codemenu = [ path: '/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiDaiBanInfo', component: () => import('@/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiDaiBanInfo.vue'), - name: 'zhuanxiangfanliyutiDaiBanInfo' + name: 'ZhuanXiangFanLiYuTiDaiBanInfo' }, // 专项返利预提详情 { path: '/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiYiBanInfo', component: () => import('@/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiYiBanInfo.vue'), - name: 'zhuanxiangfanliyutiYiBanInfo' + name: 'ZhuanXiangFanLiYuTiYiBanInfo' }, // 专项返利预提办理 { path: '/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiEdit', component: () => import('@/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiEdit.vue'), - name: 'zhuanxiangfanliyutiEdit' + name: 'ZhuanXiangFanLiYuTiEdit' }, // 专项返利核对申请详情页面 { diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagement.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagement.vue index 1d78e7e526..170b639efb 100644 --- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagement.vue +++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagement.vue @@ -222,7 +222,10 @@ export default { rebateName: '', rebateTypeKey: '', state: '', - brandSid: '' + brandSid: '', + orgPath: '', + userSid: '', + menuUrl: '' }, current: 1, size: 5, @@ -302,6 +305,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 @@ -328,7 +334,10 @@ export default { rebateName: '', rebateTypeKey: '', state: '', - brandSid: '' + brandSid: '', + orgPath: '', + userSid: '', + menuUrl: '' }, current: 1, size: 5, diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagementAdd.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagementAdd.vue index 407e6a2ece..110c0a0502 100644 --- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagementAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagementAdd.vue @@ -98,7 +98,8 @@ export default { createOrgName: '', useOrgSid: '', useOrgName: '', - estimateRebate: '' + estimateRebate: '', + orgPath: '' }, rules: {}, submitdisabled: false @@ -144,6 +145,7 @@ export default { }) this.formobj.createOrgSid = createOrgSid this.formobj.useOrgSid = createOrgSid + this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath') this.viewTitle = '【新增】回款返利' }, showEdit(row) { @@ -220,7 +222,8 @@ export default { createOrgName: '', useOrgSid: '', useOrgName: '', - estimateRebate: '' + estimateRebate: '', + orgPath: '' } this.$refs['form_obj'].resetFields() this.$emit('doback') diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/relation/zhuanxiangfanliAdd.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/relation/zhuanxiangfanliAdd.vue index 548d87558d..451576d024 100644 --- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/relation/zhuanxiangfanliAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/relation/zhuanxiangfanliAdd.vue @@ -55,7 +55,7 @@ import req from '@/api/specialrebate/specialrebatewithholding' export default { - name: 'zhuanxiangfanliAdd', + name: 'ZhuanXiangFanLiAdd', data() { return { viewTitle: '', diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/relation/zhuanxiangfanliInfo.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/relation/zhuanxiangfanliInfo.vue index 832de7e6e7..103bbb70e7 100644 --- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/relation/zhuanxiangfanliInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/relation/zhuanxiangfanliInfo.vue @@ -53,7 +53,7 @@ import req from '@/api/specialrebate/specialrebatewithholding' export default { - name: 'zhuanxiangfanliInfo', + name: 'ZhuanXiangFanLiInfo', data() { return { viewTitle: '', diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/relation/zhuanxiangfanliselect.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/relation/zhuanxiangfanliselect.vue index 36493d8626..f937e71ca1 100644 --- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/relation/zhuanxiangfanliselect.vue +++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/relation/zhuanxiangfanliselect.vue @@ -84,7 +84,7 @@ import ButtonBar from '@/components/ButtonBar' import { brandDown, typeValues } from '@/api/cheliang/dictcommons' export default { - name: 'zhuanxiangfanliSelect', + name: 'ZhuanXiangFanLiSelect', components: { Pagination, ButtonBar diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/specialrebatewithholding.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/specialrebatewithholding.vue index 717be35004..2023269fbf 100644 --- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/specialrebatewithholding.vue +++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/specialrebatewithholding.vue @@ -154,11 +154,14 @@ export default { brand_list: [], listQuery: { params: { - createBySid: '', + createOrgSid: '', createEndTime: '', createStartTime: '', withApply: '', - brandSid: '' + brandSid: '', + orgPath: '', + userSid: '', + menuUrl: '' }, current: 1, size: 5, @@ -261,7 +264,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 @@ -282,9 +287,14 @@ export default { handleReset() { this.listQuery = { params: { - createBySid: '', + createOrgSid: '', createEndTime: '', - createStartTime: '' + createStartTime: '', + withApply: '', + brandSid: '', + orgPath: '', + userSid: '', + menuUrl: '' }, current: 1, size: 5, diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/specialrebatewithholdingAdd.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/specialrebatewithholdingAdd.vue index 528a53324f..71005fa6bb 100644 --- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/specialrebatewithholdingAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/specialrebatewithholdingAdd.vue @@ -122,6 +122,7 @@ export default { createBySid: '', instanceId: '', // 流程实例ID taskId: '', // 任务ID + orgPath: '', scmSpecialRebateWiths: [] }, rules: {}, @@ -160,6 +161,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) { @@ -395,6 +397,7 @@ export default { createBySid: '', instanceId: '', // 流程实例ID taskId: '', // 任务ID + orgPath: '', scmSpecialRebateWiths: [] } this.$refs['form_obj'].resetFields() diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/relation/zhuanxiangfanliyutiAdd.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/relation/zhuanxiangfanliyutiAdd.vue index b9d5a9caad..16c52211c5 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/relation/zhuanxiangfanliyutiAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/relation/zhuanxiangfanliyutiAdd.vue @@ -55,7 +55,7 @@ import req from '@/api/specialrebate/specialrebatewithholding' export default { - name: 'zhuanxiangfanliyutiAdd', + name: 'ZhuanXiangFanLiYuTiAdd', data() { return { viewTitle: '', diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/relation/zhuanxiangfanliyutiInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/relation/zhuanxiangfanliyutiInfo.vue index ceffec36b1..98fe1dc072 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/relation/zhuanxiangfanliyutiInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/relation/zhuanxiangfanliyutiInfo.vue @@ -53,7 +53,7 @@ import req from '@/api/specialrebate/specialrebatewithholding' export default { - name: 'zhuanxiangfanliyutiInfo', + name: 'ZhuanXiangFanLiYuTiInfo', data() { return { viewTitle: '', diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/relation/zhuanxiangfanliyutichoose.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/relation/zhuanxiangfanliyutichoose.vue index c86bad84af..ae0cbbb9d6 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/relation/zhuanxiangfanliyutichoose.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/relation/zhuanxiangfanliyutichoose.vue @@ -84,7 +84,7 @@ import ButtonBar from '@/components/ButtonBar' import { brandDown, typeValues } from '@/api/cheliang/dictcommons' export default { - name: 'zhuanxiangfanliyutichoose', + name: 'ZhuanXiangFanLiYuTiChoose', components: { Pagination, ButtonBar diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiDaiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiDaiBanInfo.vue index 57fb8e9a5f..5b3df0b054 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiDaiBanInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiDaiBanInfo.vue @@ -104,7 +104,7 @@ import req from '@/api/specialrebate/specialrebatewithholding' import zhuanxiangfanliyutiInfo from './relation/zhuanxiangfanliyutiInfo' export default { - name: 'zhuanxiangfanliyutiDaiBanInfo', + name: 'ZhuanXiangFanLiYuTiDaiBanInfo', components: { zhuanxiangfanliyutiInfo }, diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiEdit.vue index bed4fea82a..2a2f99752e 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiEdit.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiEdit.vue @@ -92,7 +92,7 @@ import zhuanxiangfanliyutichoose from './relation/zhuanxiangfanliyutichoose' import zhuanxiangfanliyutiAdd from './relation/zhuanxiangfanliyutiAdd' export default { - name: 'zhuanxiangfanliyutiEdit', + name: 'ZhuanXiangFanLiYuTiEdit', components: { zhuanxiangfanliyutichoose, zhuanxiangfanliyutiAdd @@ -121,6 +121,7 @@ export default { createBySid: '', instanceId: '', // 流程实例ID taskId: '', // 任务ID + orgPath: '', scmSpecialRebateWiths: [] }, rules: {}, diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiYiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiYiBanInfo.vue index 9ee057ba55..366b809560 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiYiBanInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiYiBanInfo.vue @@ -81,7 +81,7 @@ import req from '@/api/specialrebate/specialrebatewithholding' import zhuanxiangfanliyutiInfo from './relation/zhuanxiangfanliyutiInfo' export default { - name: 'zhuanxiangfanliyutiYiBanInfo', + name: 'ZhuanXiangFanLiYuTiYiBanInfo', components: { zhuanxiangfanliyutiInfo },