From eb8197dd6422096d512347fff62b87112b70897d Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Tue, 6 Feb 2024 13:47:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8E=82=E5=AE=B6=E5=9B=9E?= =?UTF-8?q?=E6=AC=BE=E8=BF=94=E5=88=A9=E6=A0=B8=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui-scm-ui/src/router/modules/codemenu.js | 8 ++++---- .../huikuanhedui/collectionrebatechecked.vue | 17 +++++++++++++---- .../huikuanhedui/collectionrebatecheckedAdd.vue | 5 ++++- .../collectionrebatecheckedInfo.vue | 2 +- .../collectionrebatetobechecked.vue | 11 ++++++++++- .../collectionrebatetobecheckedAdd.vue | 2 +- .../collectionrebatetobecheckedInfo.vue | 2 +- .../huikuanhedui/relation/heduishenpiAdd.vue | 2 +- .../huikuanhedui/relation/heduishenpiInfo.vue | 2 +- .../relation/yiheduihiukuanfanli.vue | 2 +- .../huikuanfanliheduiDanBanInfo.vue | 2 +- .../huikuanfanliheduiEdit.vue | 3 ++- .../huikuanfanliheduiYiBanInfo.vue | 2 +- .../relation/heduishenpiAdd.vue | 2 +- .../relation/heduishenpiInfo.vue | 2 +- .../relation/yiheduihiukuanfanli.vue | 2 +- 16 files changed, 44 insertions(+), 22 deletions(-) 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 56210caaa6..63ca27f836 100644 --- a/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js +++ b/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js @@ -563,7 +563,7 @@ const codemenu = [ { path: '/huikuanhedui/collectionrebatetobechecked', component: () => import('@/views/manufacturerrebates/huikuanhedui/collectionrebatetobechecked.vue'), - name: 'huikuanfanlidaihedui', + name: 'HuiKuanFanLiDaiHeDui', meta: { title: '厂家回款返利核对', noCache: true } }, { @@ -1205,21 +1205,21 @@ const codemenu = [ path: '/huikuanfanliheduiFlow/huikuanfanliheduiDanBanInfo', component: () => import('@/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiDanBanInfo.vue'), - name: 'huikuanfanliheduiDanBanInfo' + name: 'HuiKuanFanLiHeDuiDanBanInfo' }, // 回款返利核对已办详情 { path: '/huikuanfanliheduiYiBanInfo/huikuanfanliheduiYiBanInfo', component: () => import('@/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiYiBanInfo.vue'), - name: 'huikuanfanliheduiYiBanInfo' + name: 'HuiKuanFanLiHeDuiYiBanInfo' }, // 回款返利核对办理 { path: '/huikuanfanliheduiYiBanInfo/huikuanfanliheduiEdit', component: () => import('@/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiEdit.vue'), - name: 'huikuanfanliheduiEdit' + name: 'HuiKuanFanLiHeDuiEdit' }, // 挂车出库申请待办详情页面 diff --git a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatechecked.vue b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatechecked.vue index f147b5ef37..9a5b08afd2 100644 --- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatechecked.vue +++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatechecked.vue @@ -121,10 +121,10 @@ import ButtonBar from '@/components/ButtonBar' import { brandDown, getOrgSidByPath } from '@/api/cheliang/dictcommons' import collectionrebatecheckedAdd from './collectionrebatecheckedAdd' import collectionrebatecheckedInfo from './collectionrebatecheckedInfo' -import {getStorage} from '@/utils/auth' +import { getStorage } from '@/utils/auth' export default { - name: 'huikuanfanlihedui', + name: 'HuiKuanFanLiHeDui', components: { Pagination, pageye, @@ -170,7 +170,10 @@ export default { checkApply: '', createOrgSid: '', createEndTime: '', - createStartTime: '' + createStartTime: '', + orgPath: '', + userSid: '', + menuUrl: '' }, current: 1, size: 5, @@ -270,6 +273,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 @@ -294,7 +300,10 @@ export default { checkApply: '', createOrgSid: '', createEndTime: '', - createStartTime: '' + createStartTime: '', + orgPath: '', + userSid: '', + menuUrl: '' }, current: 1, size: 5, diff --git a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatecheckedAdd.vue b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatecheckedAdd.vue index de6b77453e..85b5157fa6 100644 --- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatecheckedAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatecheckedAdd.vue @@ -126,7 +126,7 @@ import yiheduihiukuanfanli from './relation/yiheduihiukuanfanli' import heduishenpiAdd from './relation/heduishenpiAdd' export default { - name: 'collectionrebatecheckAdd', + name: 'HuiKuanFanLiHeDuiAdd', components: { yiheduihiukuanfanli, heduishenpiAdd @@ -155,6 +155,7 @@ export default { remarks: '', instanceId: '', // 流程实例ID taskId: '', // 任务ID + orgPath: '', scmWhenCollectionrebateCheckapplydetailDetails: [], scmLastCollectionrebateCheckapplydetailDetails: [] }, @@ -194,6 +195,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) { @@ -428,6 +430,7 @@ export default { remarks: '', instanceId: '', // 流程实例ID taskId: '', // 任务ID + orgPath: '', scmWhenCollectionrebateCheckapplydetailDetails: [], scmLastCollectionrebateCheckapplydetailDetails: [] } diff --git a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatecheckedInfo.vue b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatecheckedInfo.vue index b032a98541..b022f45521 100644 --- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatecheckedInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatecheckedInfo.vue @@ -114,7 +114,7 @@ import req from '@/api/manufacturerrebates/collectionrebatecheck' import heduishenpiInfo from './relation/heduishenpiInfo' export default { - name: 'collectionrebatecheckInfo', + name: 'HuiKuanFanLiHeDuiInfo', components: { heduishenpiInfo }, diff --git a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobechecked.vue b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobechecked.vue index 64c0d9893e..00c222bb09 100644 --- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobechecked.vue +++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobechecked.vue @@ -149,7 +149,7 @@ import collectionrebatetobecheckedInfo from './collectionrebatetobecheckedInfo' import { getOrgSidByPath, typeValues } from '@/api/cheliang/dictcommons' export default { - name: 'huikuanfanlidaihedui', + name: 'HuiKuanFanLiDaiHeDui', components: { Pagination, ButtonBar, @@ -205,6 +205,9 @@ export default { collectionTypeKey: '', createOrgSid: '', state: '', + orgPath: '', + userSid: '', + menuUrl: '', sidList: [] }, current: 1, @@ -282,6 +285,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 @@ -310,6 +316,9 @@ export default { collectionTypeKey: '', createOrgSid: '', state: '', + orgPath: '', + userSid: '', + menuUrl: '', sidList: [] }, current: 1, diff --git a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobecheckedAdd.vue b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobecheckedAdd.vue index 43473415b1..0c6c4c251c 100644 --- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobecheckedAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobecheckedAdd.vue @@ -129,7 +129,7 @@ import req from '@/api/manufacturerrebates/collectionrebatemanagement' export default { - name: 'huikuanfanlidaiheduiAdd', + name: 'HuiKuanFanLiDaiHeDuiAdd', data() { return { viewTitle: '', diff --git a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobecheckedInfo.vue b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobecheckedInfo.vue index ba4eecea1c..2f876302b0 100644 --- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobecheckedInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobecheckedInfo.vue @@ -118,7 +118,7 @@ import req from '@/api/manufacturerrebates/collectionrebatemanagement' export default { - name: 'huikuanfanlidaiheduiInfo', + name: 'HuiKuanFanLiDaiHeDuiInfo', data() { return { viewTitle: '', diff --git a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/relation/heduishenpiAdd.vue b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/relation/heduishenpiAdd.vue index dcb962a08a..10b4208223 100644 --- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/relation/heduishenpiAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/relation/heduishenpiAdd.vue @@ -90,7 +90,7 @@ import req from '@/api/manufacturerrebates/collectionrebatecheck' export default { - name: 'heduishenpiAdd', + name: 'HeDuiShenPiAdd', data() { return { viewTitle: '', diff --git a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/relation/heduishenpiInfo.vue b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/relation/heduishenpiInfo.vue index 0bd5b94753..fb5f02eff1 100644 --- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/relation/heduishenpiInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/relation/heduishenpiInfo.vue @@ -88,7 +88,7 @@ import req from '@/api/manufacturerrebates/collectionrebatecheck' export default { - name: 'heduishenpiInfo', + name: 'HeDuiShenPiInfo', data() { return { viewTitle: '', diff --git a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/relation/yiheduihiukuanfanli.vue b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/relation/yiheduihiukuanfanli.vue index 5306be5aaf..f97e5d3eb9 100644 --- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/relation/yiheduihiukuanfanli.vue +++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/relation/yiheduihiukuanfanli.vue @@ -88,7 +88,7 @@ import Pagination from '@/components/pagination' import ButtonBar from '@/components/ButtonBar' export default { - name: 'yiheduihuikuanfanli', + name: 'YiHeDuiHuiKuanFanLi', components: { Pagination, ButtonBar diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiDanBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiDanBanInfo.vue index dcf5f6d02d..a2d74acc0b 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiDanBanInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiDanBanInfo.vue @@ -136,7 +136,7 @@ import req from '@/api/manufacturerrebates/collectionrebatecheck' import heduishenpiInfo from './relation/heduishenpiInfo' export default { - name: 'collectionrebatecheckInfo', + name: 'HuiKuanFanLiHeDuiDaiBanInfo', components: { heduishenpiInfo }, diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiEdit.vue index a67ad805f2..6cef83964a 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiEdit.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiEdit.vue @@ -125,7 +125,7 @@ import yiheduihiukuanfanli from './relation/yiheduihiukuanfanli' import heduishenpiAdd from './relation/heduishenpiAdd' export default { - name: 'collectionrebatecheckAdd', + name: 'HuiKuanFanLiHeDuiEdit', components: { yiheduihiukuanfanli, heduishenpiAdd @@ -154,6 +154,7 @@ export default { remarks: '', instanceId: '', // 流程实例ID taskId: '', // 任务ID + orgPath: '', scmWhenCollectionrebateCheckapplydetailDetails: [], scmLastCollectionrebateCheckapplydetailDetails: [] }, diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiYiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiYiBanInfo.vue index c17b6c597a..049deafd5e 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiYiBanInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiYiBanInfo.vue @@ -114,7 +114,7 @@ import req from '@/api/manufacturerrebates/collectionrebatecheck' import heduishenpiInfo from './relation/heduishenpiInfo' export default { - name: 'huikuanfanliheduiDaiBanInfo', + name: 'HuiKuanFanLiHeDuiYiBanInfo', components: { heduishenpiInfo }, diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/relation/heduishenpiAdd.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/relation/heduishenpiAdd.vue index dcb962a08a..10b4208223 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/relation/heduishenpiAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/relation/heduishenpiAdd.vue @@ -90,7 +90,7 @@ import req from '@/api/manufacturerrebates/collectionrebatecheck' export default { - name: 'heduishenpiAdd', + name: 'HeDuiShenPiAdd', data() { return { viewTitle: '', diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/relation/heduishenpiInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/relation/heduishenpiInfo.vue index 0bd5b94753..fb5f02eff1 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/relation/heduishenpiInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/relation/heduishenpiInfo.vue @@ -88,7 +88,7 @@ import req from '@/api/manufacturerrebates/collectionrebatecheck' export default { - name: 'heduishenpiInfo', + name: 'HeDuiShenPiInfo', data() { return { viewTitle: '', diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/relation/yiheduihiukuanfanli.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/relation/yiheduihiukuanfanli.vue index 5306be5aaf..f97e5d3eb9 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/relation/yiheduihiukuanfanli.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/relation/yiheduihiukuanfanli.vue @@ -88,7 +88,7 @@ import Pagination from '@/components/pagination' import ButtonBar from '@/components/ButtonBar' export default { - name: 'yiheduihuikuanfanli', + name: 'YiHeDuiHuiKuanFanLi', components: { Pagination, ButtonBar