From 3a6a0ac9effc7bdb2a2ada99787e4f47646bf6f3 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Tue, 6 Feb 2024 16:36:09 +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=E5=88=86=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../anrui-scm-ui/src/router/modules/codemenu.js | 2 +-
.../huikuanfenpei/collectionrebateallot.vue | 17 +++++++++++++----
.../huikuanfenpei/collectionrebateallotAdd.vue | 4 +++-
.../collectionrebateallotByVehicleAdd.vue | 2 +-
.../huikuanfenpei/collectionrebateallotInfo.vue | 2 +-
5 files changed, 19 insertions(+), 8 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 63ca27f836..1ef3f1f190 100644
--- a/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js
+++ b/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js
@@ -569,7 +569,7 @@ const codemenu = [
{
path: '/huikuanfenpei/collectionrebateallot',
component: () => import('@/views/manufacturerrebates/huikuanfenpei/collectionrebateallot.vue'),
- name: 'huikuanfanlidaifenpei',
+ name: 'HuiKuanFanliFenPei',
meta: { title: '厂家回款返利分配', noCache: true }
}
]
diff --git a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanfenpei/collectionrebateallot.vue b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanfenpei/collectionrebateallot.vue
index 2fc6414147..ac0cf5b167 100644
--- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanfenpei/collectionrebateallot.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanfenpei/collectionrebateallot.vue
@@ -29,7 +29,7 @@
-
回款返利预提申请列表
+
回款返利分配申请列表
@@ -115,7 +115,7 @@ import collectionrebateallotByVehicleAdd from './collectionrebateallotByVehicleA
import collectionrebateallotInfo from './collectionrebateallotInfo'
export default {
- name: 'huikuanfanlifenpei',
+ name: 'HuiKuanFanLiFenPei',
components: {
Pagination,
pageye,
@@ -150,7 +150,10 @@ export default {
createOrgSid: '',
createStartTime: '',
createEndTime: '',
- withholdingApply: ''
+ withholdingApply: '',
+ orgPath: '',
+ userSid: '',
+ menuUrl: ''
},
current: 1,
size: 5,
@@ -208,6 +211,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
@@ -232,7 +238,10 @@ export default {
createOrgSid: '',
createStartTime: '',
createEndTime: '',
- withholdingApply: ''
+ withholdingApply: '',
+ orgPath: '',
+ userSid: '',
+ menuUrl: ''
},
current: 1,
size: 5,
diff --git a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanfenpei/collectionrebateallotAdd.vue b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanfenpei/collectionrebateallotAdd.vue
index b37d9ef719..7340a9596c 100644
--- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanfenpei/collectionrebateallotAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanfenpei/collectionrebateallotAdd.vue
@@ -116,7 +116,7 @@
import req from '@/api/manufacturerrebates/collectionrebateallot'
export default {
- name: 'collectionrebateallotAdd',
+ name: 'HuiKuanFanLiFenPeiAdd',
data() {
return {
viewTitle: '',
@@ -141,6 +141,7 @@ export default {
createOrgName: '',
createOrgSid: '',
withholdingApply: '',
+ orgPath: '',
scmCollectionRebateDistributionVehs: []
},
rules: {},
@@ -237,6 +238,7 @@ export default {
useOrgSid: '',
createOrgName: '',
createOrgSid: '',
+ orgPath: '',
scmCollectionRebateDistributionVehs: []
}
this.submitdisabled = false
diff --git a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanfenpei/collectionrebateallotByVehicleAdd.vue b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanfenpei/collectionrebateallotByVehicleAdd.vue
index bfc5e085bc..3c7e7bde9b 100644
--- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanfenpei/collectionrebateallotByVehicleAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanfenpei/collectionrebateallotByVehicleAdd.vue
@@ -104,7 +104,7 @@ import collectionrebateallotSelectVehicle from './relation/collectionrebateallot
import collectionrebateallotAdd from './collectionrebateallotAdd'
export default {
- name: 'collectionrebateallotByVehicleAdd',
+ name: 'HuiKuanFanLiFenPeiByVehicleAdd',
components: {
collectionrebateallotSelectVehicle,
collectionrebateallotAdd
diff --git a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanfenpei/collectionrebateallotInfo.vue b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanfenpei/collectionrebateallotInfo.vue
index ea34f9cd33..33ca7c5c5c 100644
--- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanfenpei/collectionrebateallotInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanfenpei/collectionrebateallotInfo.vue
@@ -110,7 +110,7 @@
import req from '@/api/manufacturerrebates/collectionrebateallot'
export default {
- name: 'collectionrebateallotInfo',
+ name: 'HuiKuanFanLiFenPeiInfo',
data() {
return {
viewTitle: '',