From 2101f7e18279d1c34c1cb01cbe13b920e1e131db Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Mon, 5 Feb 2024 15:57:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8D=95=E8=BD=A6=E8=BF=94?= =?UTF-8?q?=E5=88=A9=E6=A0=B8=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/router/modules/codemenu.js | 18 +++++++++--------- .../bicyclerebatecheck/bicyclerebatecheck.vue | 15 ++++++++++++--- .../bicyclerebatecheckAdd.vue | 5 ++++- .../bicyclerebatecheckInfo.vue | 2 +- .../bicyclerebatetobechecked.vue | 15 ++++++++++++--- .../relation/bicyclerebatetobecheckedAdd.vue | 3 +-- .../relation/bicyclerebatetobecheckedInfo.vue | 2 +- .../relation/yiheduidanchefanli.vue | 2 +- .../danchefanliheduiDaiBanInfo.vue | 2 +- .../danchefanliheduiEdit.vue | 3 ++- .../danchefanliheduiYiBanInfo.vue | 2 +- .../relation/bicyclerebatetobecheckedAdd.vue | 3 +-- .../relation/bicyclerebatetobecheckedInfo.vue | 2 +- .../relation/yiheduidanchefanli.vue | 2 +- 14 files changed, 48 insertions(+), 28 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 ce6437ecee..7f82684515 100644 --- a/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js +++ b/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js @@ -489,19 +489,19 @@ const codemenu = [ { path: '/bikerebate/bikerebatemanagement', component: () => import('@/views/bikerebate/bikerebatemanagement/bicyclerebatemanagement.vue'), - name: 'bicyclerebatemanagement', + name: 'BicycleRebateManagement', meta: { title: '单车返利管理', noCache: true } }, { path: '/bikerebate/bicyclerebatewithholding', component: () => import('@/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholding.vue'), - name: 'bicyclerebatewithholding', + name: 'BicycleRebateWithholding', meta: { title: '单车返利预提', noCache: true } }, { path: '/bikerebate/bicyclerebatecheck', component: () => import('@/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue'), - name: 'bicyclerebatetobechecked', + name: 'BicycleRebateToBeChecked', meta: { title: '单车返利核对', noCache: true } } ] @@ -1076,42 +1076,42 @@ const codemenu = [ path: '/danchefanliyutiFlow/danchefanliyutiDaiBanInfo', component: () => import('@/views/workFlow/danchefanliyutiFlow/danchefanliyutiDaiBanInfo.vue'), - name: 'danchefanliyutiDaiBanInfo' + name: 'DanCheFanLiYuTiDaiBanInfo' }, // 单车返利预提办理页面 { path: '/danchefanliyutiFlow/danchefanliyutiYiBanInfo', component: () => import('@/views/workFlow/danchefanliyutiFlow/danchefanliyutiYiBanInfo.vue'), - name: 'danchefanliyutiYiBanInfo' + name: 'DanCheFanLiYuTiYiBanInfo' }, // 单车返利预提 { path: '/danchefanliyutiFlow/danchefanliyutiEdit', component: () => import('@/views/workFlow/danchefanliyutiFlow/danchefanliyutiEdit.vue'), - name: 'danchefanliyutiEdit' + name: 'DanCheFanLiYuTiEdit' }, // 单车返利核对申请详情页面 { path: '/danchefanliheduiFlow/danchefanliheduiDaiBanInfo', component: () => import('@/views/workFlow/danchefanliheduiFlow/danchefanliheduiDaiBanInfo.vue'), - name: 'danchefanliheduiDaiBanInfo' + name: 'DanCheFanLiHeDuiDaiBanInfo' }, // 单车返利核对办理页面 { path: '/danchefanliheduiFlow/danchefanliheduiYiBanInfo', component: () => import('@/views/workFlow/danchefanliheduiFlow/danchefanliheduiYiBanInfo.vue'), - name: 'danchefanliheduiYiBanInfo' + name: 'DanCheFanLiHeDuiYiBanInfo' }, // 单车返利核对 { path: '/danchefanliheduiFlow/danchefanliheduiEdit', component: () => import('@/views/workFlow/danchefanliheduiFlow/danchefanliheduiEdit.vue'), - name: 'danchefanliheduiEdit' + name: 'DanCheFanLiHeDuiEdit' }, // 专项返利预提申请详情页面 { diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheck.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheck.vue index a87446ca67..38505012c7 100644 --- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheck.vue +++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheck.vue @@ -129,7 +129,7 @@ import bicyclerebatecheckInfo from './bicyclerebatecheckInfo' import {getStorage} from "@/utils/auth"; export default { - name: 'bicyclerebatecheck', + name: 'BicycleRebateCheck', components: { Pagination, pageye, @@ -175,7 +175,10 @@ export default { checkApply: '', createOrgSid: '', createEndTime: '', - createStartTime: '' + createStartTime: '', + orgPath: '', + userSid: '', + menuUrl: '' }, current: 1, size: 5, @@ -275,6 +278,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 @@ -299,7 +305,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/bikerebate/bicyclerebatecheck/bicyclerebatecheckAdd.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckAdd.vue index cfdc68c29f..5eaeee703f 100644 --- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckAdd.vue @@ -200,7 +200,7 @@ import yiheduidanchefanli from './relation/yiheduidanchefanli' import bicyclerebatetobecheckedAdd from './relation/bicyclerebatetobecheckedAdd' export default { - name: 'bicyclerebatecheckAdd', + name: 'BicycleRebateCheckAdd', components: { yiheduidanchefanli, bicyclerebatetobecheckedAdd @@ -233,6 +233,7 @@ export default { remarks: '', instanceId: '', // 流程实例ID taskId: '', // 任务ID + orgPath: '', scmWhenVehrebateCheckapplydetailDetails: [], scmLastVehrebateCheckapplydetailDetails: [] }, @@ -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: '', scmWhenVehrebateCheckapplydetailDetails: [], scmLastVehrebateCheckapplydetailDetails: [] } diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckInfo.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckInfo.vue index b218ad9d85..28db0e2aab 100644 --- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckInfo.vue @@ -146,7 +146,7 @@ import req from '@/api/bikerebate/bicyclerebatecheck' import bicyclerebatetobecheckedInfo from './relation/bicyclerebatetobecheckedInfo' export default { - name: 'bicyclerebatecheckInfo', + name: 'BicycleRebateCheckInfo', components: { bicyclerebatetobecheckedInfo }, diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue index 51baec0cd1..5f3cad6d38 100644 --- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue +++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue @@ -277,7 +277,7 @@ import bicyclerebatecheckAdd from './bicyclerebatecheckAdd' import { brandDown, getOrgSidByPath, typeValues } from '@/api/cheliang/dictcommons' export default { - name: 'bicyclerebatetobechecked', + name: 'BicycleRebateToBeChecked', components: { Pagination, ButtonBar, @@ -351,7 +351,10 @@ export default { rebateName: '', state: '', createEndTime: '', - createStartTime: '' + createStartTime: '', + orgPath: '', + userSid: '', + menuUrl: '' }, current: 1, size: 5, @@ -446,6 +449,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 @@ -473,7 +479,10 @@ export default { rebateName: '', state: '', createEndTime: '', - createStartTime: '' + createStartTime: '', + orgPath: '', + userSid: '', + menuUrl: '' }, current: 1, size: 5, diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/relation/bicyclerebatetobecheckedAdd.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/relation/bicyclerebatetobecheckedAdd.vue index a2d8a7c508..2c159659b1 100644 --- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/relation/bicyclerebatetobecheckedAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/relation/bicyclerebatetobecheckedAdd.vue @@ -113,10 +113,9 @@