Merge remote-tracking branch 'origin/master'

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 }
       }
     ]

anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanfenpei/collectionrebateallot.vue

@@ -29,7 +29,7 @@
           </div>
         </div>
         <div class="listtop">
-          <div class="tit">回款返利预提申请列表</div>
+          <div class="tit">回款返利分配申请列表</div>
           <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
         </div>
         <div class="">
@@ -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,

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

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

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: '',