Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagement.vue

@@ -208,7 +208,7 @@ import req from '@/api/bikerebate/bicyclerebatemanagement'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
 import ButtonBar from '@/components/ButtonBar'
-import { typeValues } from '@/api/cheliang/dictcommons'
+import { getTypeValueList } from '@/api/cheliang/dictcommons'
 import bicyclerebatemanagementAdd from './bicyclerebatemanagementAdd'
 import bicyclerebatemanagementEdit from './bicyclerebatemanagementEdit'
 import bicyclerebatemanagementInfo from './bicyclerebatemanagementInfo'
@@ -369,7 +369,7 @@ export default {
   },
   methods: {
     init() {
-      typeValues({ type: 'rebateType' }).then((res) => {
+      getTypeValueList({ type: 'rebateType', groupNum: 'DC' }).then((res) => {
         if (res.success) {
           this.rebateType_list = res.data
         }

anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagement.vue

@@ -185,7 +185,7 @@ import req from '@/api/specialrebate/specialrebatemanagement'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
 import ButtonBar from '@/components/ButtonBar'
-import { getOrgSidByPath, typeValues } from '@/api/cheliang/dictcommons'
+import { getOrgSidByPath, getTypeValueList } from '@/api/cheliang/dictcommons'
 import specialrebatemanagementAdd from './specialrebatemanagementAdd'
 import specialrebatemanagementInfo from './specialrebatemanagementInfo'
 
@@ -350,7 +350,7 @@ export default {
   },
   methods: {
     init() {
-      typeValues({ type: 'rebateType' }).then((res) => {
+      getTypeValueList({ type: 'rebateType', groupNum: 'ZX' }).then((res) => {
         if (res.success) {
           this.rebateType_list = res.data
         }