From 322f100997489bcea97d820ca890b2866b677092 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Thu, 27 Feb 2025 10:57:55 +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=E5=BE=85=E6=A0=B8=E5=AF=B9=E3=80=81=E4=B8=93=E9=A1=B9?=
 =?UTF-8?q?=E8=BF=94=E5=88=A9=E5=BE=85=E6=A0=B8=E5=AF=B9--=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E5=88=97=E8=A1=A8=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bicyclerebatecheck/bicyclerebatetobechecked.vue  | 12 ++++++++++--
 .../specialrebatecheck/specialrebatetobechecked.vue  |  4 ++--
 2 files changed, 12 insertions(+), 4 deletions(-)

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 53cbbf938e..03132d9e8f 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
@@ -41,7 +41,9 @@
                 <el-date-picker v-model="listQuery.params.uploadEndDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
               </el-form-item>
               <el-form-item label="返利类型">
-                <el-input v-model="listQuery.params.rebateTypeValue" placeholder="" clearable/>
+                <el-select v-model="listQuery.params.rebateTypeValue" placeholder="请选择" filterable clearable>
+                  <el-option v-for="item in rebateType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
+                </el-select>
               </el-form-item>
               <el-form-item label="返利名称">
                 <el-input v-model="listQuery.params.rebateName" placeholder="" clearable/>
@@ -417,7 +419,7 @@ import ButtonBar from '@/components/ButtonBar'
 import bicyclerebatecheck from './bicyclerebatecheck'
 import bicyclerebatecheckAdd from './bicyclerebatecheckAdd'
 import bicyclerebatetobecheckedByUpdate from './bicyclerebatetobecheckedByUpdate'
-import { getOrgSidByPath } from '@/api/cheliang/dictcommons'
+import { getOrgSidByPath, getTypeValueList } from '@/api/cheliang/dictcommons'
 
 export default {
   name: 'BicycleRebateToBeChecked',
@@ -457,6 +459,7 @@ export default {
       listAll: [],
       sids: [],
       FormLoading: false,
+      rebateType_list: [],
       state_list: [
         {
           dictKey: '0',
@@ -562,6 +565,11 @@ export default {
   },
   methods: {
     init() {
+      getTypeValueList({ type: 'rebateType', groupNum: 'DC' }).then((res) => {
+        if (res.success) {
+          this.rebateType_list = res.data
+        }
+      })
       getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
         if (resp.success) {
           this.listQuery.params.createOrgSid = resp.data
diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue
index 259fcbd4c8..af1d677f15 100644
--- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue
@@ -400,7 +400,7 @@ import ButtonBar from '@/components/ButtonBar'
 import specialrebatecheck from './specialrebatecheck'
 import specialrebatecheckAdd from './specialrebatecheckAdd'
 import specialrebatetobecheckedByUpdate from './specialrebatetobecheckedByUpdate'
-import { getOrgSidByPath, typeValues } from '@/api/cheliang/dictcommons'
+import { getOrgSidByPath, getTypeValueList } from '@/api/cheliang/dictcommons'
 
 export default {
   name: 'SpecialRebateToBeChecked',
@@ -552,7 +552,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
         }