Browse Source

完善厂家回款返利核对

zhanglei
yunuo970428 1 year ago
parent
commit
eb8197dd64
  1. 8
      anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js
  2. 17
      anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatechecked.vue
  3. 5
      anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatecheckedAdd.vue
  4. 2
      anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatecheckedInfo.vue
  5. 11
      anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobechecked.vue
  6. 2
      anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobecheckedAdd.vue
  7. 2
      anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobecheckedInfo.vue
  8. 2
      anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/relation/heduishenpiAdd.vue
  9. 2
      anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/relation/heduishenpiInfo.vue
  10. 2
      anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/relation/yiheduihiukuanfanli.vue
  11. 2
      anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiDanBanInfo.vue
  12. 3
      anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiEdit.vue
  13. 2
      anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiYiBanInfo.vue
  14. 2
      anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/relation/heduishenpiAdd.vue
  15. 2
      anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/relation/heduishenpiInfo.vue
  16. 2
      anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/relation/yiheduihiukuanfanli.vue

8
anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js

@ -563,7 +563,7 @@ const codemenu = [
{ {
path: '/huikuanhedui/collectionrebatetobechecked', path: '/huikuanhedui/collectionrebatetobechecked',
component: () => import('@/views/manufacturerrebates/huikuanhedui/collectionrebatetobechecked.vue'), component: () => import('@/views/manufacturerrebates/huikuanhedui/collectionrebatetobechecked.vue'),
name: 'huikuanfanlidaihedui', name: 'HuiKuanFanLiDaiHeDui',
meta: { title: '厂家回款返利核对', noCache: true } meta: { title: '厂家回款返利核对', noCache: true }
}, },
{ {
@ -1205,21 +1205,21 @@ const codemenu = [
path: '/huikuanfanliheduiFlow/huikuanfanliheduiDanBanInfo', path: '/huikuanfanliheduiFlow/huikuanfanliheduiDanBanInfo',
component: () => component: () =>
import('@/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiDanBanInfo.vue'), import('@/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiDanBanInfo.vue'),
name: 'huikuanfanliheduiDanBanInfo' name: 'HuiKuanFanLiHeDuiDanBanInfo'
}, },
// 回款返利核对已办详情 // 回款返利核对已办详情
{ {
path: '/huikuanfanliheduiYiBanInfo/huikuanfanliheduiYiBanInfo', path: '/huikuanfanliheduiYiBanInfo/huikuanfanliheduiYiBanInfo',
component: () => component: () =>
import('@/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiYiBanInfo.vue'), import('@/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiYiBanInfo.vue'),
name: 'huikuanfanliheduiYiBanInfo' name: 'HuiKuanFanLiHeDuiYiBanInfo'
}, },
// 回款返利核对办理 // 回款返利核对办理
{ {
path: '/huikuanfanliheduiYiBanInfo/huikuanfanliheduiEdit', path: '/huikuanfanliheduiYiBanInfo/huikuanfanliheduiEdit',
component: () => component: () =>
import('@/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiEdit.vue'), import('@/views/workFlow/huikuanfanliheduiFlow/huikuanfanliheduiEdit.vue'),
name: 'huikuanfanliheduiEdit' name: 'HuiKuanFanLiHeDuiEdit'
}, },
// 挂车出库申请待办详情页面 // 挂车出库申请待办详情页面

17
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 { brandDown, getOrgSidByPath } from '@/api/cheliang/dictcommons'
import collectionrebatecheckedAdd from './collectionrebatecheckedAdd' import collectionrebatecheckedAdd from './collectionrebatecheckedAdd'
import collectionrebatecheckedInfo from './collectionrebatecheckedInfo' import collectionrebatecheckedInfo from './collectionrebatecheckedInfo'
import {getStorage} from '@/utils/auth' import { getStorage } from '@/utils/auth'
export default { export default {
name: 'huikuanfanlihedui', name: 'HuiKuanFanLiHeDui',
components: { components: {
Pagination, Pagination,
pageye, pageye,
@ -170,7 +170,10 @@ export default {
checkApply: '', checkApply: '',
createOrgSid: '', createOrgSid: '',
createEndTime: '', createEndTime: '',
createStartTime: '' createStartTime: '',
orgPath: '',
userSid: '',
menuUrl: ''
}, },
current: 1, current: 1,
size: 5, size: 5,
@ -270,6 +273,9 @@ export default {
// //
getList() { getList() {
this.listLoading = true 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) => { req.pagelist(this.listQuery).then((response) => {
console.log('列表查询结果:', response) console.log('列表查询结果:', response)
this.listLoading = false this.listLoading = false
@ -294,7 +300,10 @@ export default {
checkApply: '', checkApply: '',
createOrgSid: '', createOrgSid: '',
createEndTime: '', createEndTime: '',
createStartTime: '' createStartTime: '',
orgPath: '',
userSid: '',
menuUrl: ''
}, },
current: 1, current: 1,
size: 5, size: 5,

5
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' import heduishenpiAdd from './relation/heduishenpiAdd'
export default { export default {
name: 'collectionrebatecheckAdd', name: 'HuiKuanFanLiHeDuiAdd',
components: { components: {
yiheduihiukuanfanli, yiheduihiukuanfanli,
heduishenpiAdd heduishenpiAdd
@ -155,6 +155,7 @@ export default {
remarks: '', remarks: '',
instanceId: '', // ID instanceId: '', // ID
taskId: '', // ID taskId: '', // ID
orgPath: '',
scmWhenCollectionrebateCheckapplydetailDetails: [], scmWhenCollectionrebateCheckapplydetailDetails: [],
scmLastCollectionrebateCheckapplydetailDetails: [] scmLastCollectionrebateCheckapplydetailDetails: []
}, },
@ -194,6 +195,7 @@ export default {
this.formobj.useOrgSid = createOrgSid this.formobj.useOrgSid = createOrgSid
this.formobj.createByName = window.sessionStorage.getItem('name') this.formobj.createByName = window.sessionStorage.getItem('name')
this.formobj.createBySid = window.sessionStorage.getItem('userSid') this.formobj.createBySid = window.sessionStorage.getItem('userSid')
this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.viewTitle = '【新增】回款返利核对审核申请' this.viewTitle = '【新增】回款返利核对审核申请'
}, },
showEdit(row) { showEdit(row) {
@ -428,6 +430,7 @@ export default {
remarks: '', remarks: '',
instanceId: '', // ID instanceId: '', // ID
taskId: '', // ID taskId: '', // ID
orgPath: '',
scmWhenCollectionrebateCheckapplydetailDetails: [], scmWhenCollectionrebateCheckapplydetailDetails: [],
scmLastCollectionrebateCheckapplydetailDetails: [] scmLastCollectionrebateCheckapplydetailDetails: []
} }

2
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' import heduishenpiInfo from './relation/heduishenpiInfo'
export default { export default {
name: 'collectionrebatecheckInfo', name: 'HuiKuanFanLiHeDuiInfo',
components: { components: {
heduishenpiInfo heduishenpiInfo
}, },

11
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' import { getOrgSidByPath, typeValues } from '@/api/cheliang/dictcommons'
export default { export default {
name: 'huikuanfanlidaihedui', name: 'HuiKuanFanLiDaiHeDui',
components: { components: {
Pagination, Pagination,
ButtonBar, ButtonBar,
@ -205,6 +205,9 @@ export default {
collectionTypeKey: '', collectionTypeKey: '',
createOrgSid: '', createOrgSid: '',
state: '', state: '',
orgPath: '',
userSid: '',
menuUrl: '',
sidList: [] sidList: []
}, },
current: 1, current: 1,
@ -282,6 +285,9 @@ export default {
// //
getList() { getList() {
this.listLoading = true 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) => { req.listPage(this.listQuery).then((response) => {
console.log('列表查询结果:', response) console.log('列表查询结果:', response)
this.listLoading = false this.listLoading = false
@ -310,6 +316,9 @@ export default {
collectionTypeKey: '', collectionTypeKey: '',
createOrgSid: '', createOrgSid: '',
state: '', state: '',
orgPath: '',
userSid: '',
menuUrl: '',
sidList: [] sidList: []
}, },
current: 1, current: 1,

2
anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobecheckedAdd.vue

@ -129,7 +129,7 @@
import req from '@/api/manufacturerrebates/collectionrebatemanagement' import req from '@/api/manufacturerrebates/collectionrebatemanagement'
export default { export default {
name: 'huikuanfanlidaiheduiAdd', name: 'HuiKuanFanLiDaiHeDuiAdd',
data() { data() {
return { return {
viewTitle: '', viewTitle: '',

2
anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobecheckedInfo.vue

@ -118,7 +118,7 @@
import req from '@/api/manufacturerrebates/collectionrebatemanagement' import req from '@/api/manufacturerrebates/collectionrebatemanagement'
export default { export default {
name: 'huikuanfanlidaiheduiInfo', name: 'HuiKuanFanLiDaiHeDuiInfo',
data() { data() {
return { return {
viewTitle: '', viewTitle: '',

2
anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/relation/heduishenpiAdd.vue

@ -90,7 +90,7 @@
import req from '@/api/manufacturerrebates/collectionrebatecheck' import req from '@/api/manufacturerrebates/collectionrebatecheck'
export default { export default {
name: 'heduishenpiAdd', name: 'HeDuiShenPiAdd',
data() { data() {
return { return {
viewTitle: '', viewTitle: '',

2
anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/relation/heduishenpiInfo.vue

@ -88,7 +88,7 @@
import req from '@/api/manufacturerrebates/collectionrebatecheck' import req from '@/api/manufacturerrebates/collectionrebatecheck'
export default { export default {
name: 'heduishenpiInfo', name: 'HeDuiShenPiInfo',
data() { data() {
return { return {
viewTitle: '', viewTitle: '',

2
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' import ButtonBar from '@/components/ButtonBar'
export default { export default {
name: 'yiheduihuikuanfanli', name: 'YiHeDuiHuiKuanFanLi',
components: { components: {
Pagination, Pagination,
ButtonBar ButtonBar

2
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' import heduishenpiInfo from './relation/heduishenpiInfo'
export default { export default {
name: 'collectionrebatecheckInfo', name: 'HuiKuanFanLiHeDuiDaiBanInfo',
components: { components: {
heduishenpiInfo heduishenpiInfo
}, },

3
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' import heduishenpiAdd from './relation/heduishenpiAdd'
export default { export default {
name: 'collectionrebatecheckAdd', name: 'HuiKuanFanLiHeDuiEdit',
components: { components: {
yiheduihiukuanfanli, yiheduihiukuanfanli,
heduishenpiAdd heduishenpiAdd
@ -154,6 +154,7 @@ export default {
remarks: '', remarks: '',
instanceId: '', // ID instanceId: '', // ID
taskId: '', // ID taskId: '', // ID
orgPath: '',
scmWhenCollectionrebateCheckapplydetailDetails: [], scmWhenCollectionrebateCheckapplydetailDetails: [],
scmLastCollectionrebateCheckapplydetailDetails: [] scmLastCollectionrebateCheckapplydetailDetails: []
}, },

2
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' import heduishenpiInfo from './relation/heduishenpiInfo'
export default { export default {
name: 'huikuanfanliheduiDaiBanInfo', name: 'HuiKuanFanLiHeDuiYiBanInfo',
components: { components: {
heduishenpiInfo heduishenpiInfo
}, },

2
anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/relation/heduishenpiAdd.vue

@ -90,7 +90,7 @@
import req from '@/api/manufacturerrebates/collectionrebatecheck' import req from '@/api/manufacturerrebates/collectionrebatecheck'
export default { export default {
name: 'heduishenpiAdd', name: 'HeDuiShenPiAdd',
data() { data() {
return { return {
viewTitle: '', viewTitle: '',

2
anrui-scm/anrui-scm-ui/src/views/workFlow/huikuanfanliheduiFlow/relation/heduishenpiInfo.vue

@ -88,7 +88,7 @@
import req from '@/api/manufacturerrebates/collectionrebatecheck' import req from '@/api/manufacturerrebates/collectionrebatecheck'
export default { export default {
name: 'heduishenpiInfo', name: 'HeDuiShenPiInfo',
data() { data() {
return { return {
viewTitle: '', viewTitle: '',

2
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' import ButtonBar from '@/components/ButtonBar'
export default { export default {
name: 'yiheduihuikuanfanli', name: 'YiHeDuiHuiKuanFanLi',
components: { components: {
Pagination, Pagination,
ButtonBar ButtonBar

Loading…
Cancel
Save