From 0163fbc39e9bb41200f6a73f563b22d5ce693f3e Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Tue, 24 Dec 2024 09:05:59 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8D=95=E8=BD=A6?=
 =?UTF-8?q?=E8=BF=94=E5=88=A9=E7=AE=A1=E7=90=86--=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bikerebatemanagement/bicyclerebatemanagementEdit.vue        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementEdit.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementEdit.vue
index f424e4ebb8..dcd3c20720 100644
--- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementEdit.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementEdit.vue
@@ -52,7 +52,7 @@
               <el-form-item prop="calculationStandard"><el-input class="addinputInfo addinputw" v-model="formobj.calculationStandard" @keyup.native="formobj.calculationStandard = getNumber(formobj.calculationStandard, 2)" clearable placeholder="" /></el-form-item>
             </el-col>
           </el-row>
-          <div class="title">车辆信息({{ formobj.vinNo }} — {{ formobj.brandName }} — {{ formobj.purchaseSystemName }})</div>
+          <div class="title">车辆信息({{ formobj.vinNo }} — {{ formobj.purchaseSystemName }} — {{ formobj.brandName }})</div>
           <el-row>
             <el-col :span="8">
               <div class="span-sty">厂家结算价</div>

From 4f35dad3753c23ed985882025c7852b4b4623877 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Tue, 24 Dec 2024 09:31:23 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=9B=9E=E6=AC=BE?=
 =?UTF-8?q?=E8=BF=94=E5=88=A9=E6=A0=B8=E5=AF=B9=20--=20=E9=A2=84=E8=AE=A1?=
 =?UTF-8?q?=E8=BF=94=E5=88=A9=E6=94=B9=E4=B8=BA=E9=A2=84=E6=8F=90=E8=BF=94?=
 =?UTF-8?q?=E5=88=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../huikuanhedui/collectionrebatetobechecked.vue              | 2 +-
 .../huikuanhedui/collectionrebatetobecheckedAdd.vue           | 2 +-
 .../huikuanhedui/collectionrebatetobecheckedInfo.vue          | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobechecked.vue b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobechecked.vue
index d0c1e130a6..f95f8735a7 100644
--- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobechecked.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobechecked.vue
@@ -82,7 +82,7 @@
             <el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="150" />
             <el-table-column prop="rebateName" label="返利名称" align="center" min-width="150" />
             <el-table-column prop="calculationStandard" label="计算标准" align="center" width="120" />
-            <el-table-column prop="estimateRebate" label="预计返利" align="center" width="130" />
+            <el-table-column prop="estimateRebate" label="预提返利" align="center" width="130" />
             <el-table-column prop="withholdingDate" label="预提日期" align="center" width="120" />
             <el-table-column prop="uploadDate" label="上传日期" align="center" width="120" />
             <el-table-column prop="uploadMoney" label="上传金额" align="center" width="130" />
diff --git a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobecheckedAdd.vue b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobecheckedAdd.vue
index e6c775d65b..9a426ee413 100644
--- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobecheckedAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobecheckedAdd.vue
@@ -80,7 +80,7 @@
             <el-table-column prop="carModelName" label="车型" align="center" min-width="150" />
             <el-table-column prop="vinNo" label="车架号" align="center" width="150" />
             <el-table-column prop="costPrice" label="回款金额" align="center" width="130" />
-            <el-table-column prop="estimateRebate" label="预计返利" align="center" width="130" />
+            <el-table-column prop="estimateRebate" label="预提返利" align="center" width="130" />
             <el-table-column prop="uploadMoney" label="上传金额" align="center" width="130" />
             <el-table-column prop="adjustmentMoney" label="调整金额" align="center" width="130" />
           </el-table>
diff --git a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobecheckedInfo.vue b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobecheckedInfo.vue
index 087dd16bf7..07ba46365b 100644
--- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobecheckedInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobecheckedInfo.vue
@@ -45,7 +45,7 @@
           </el-row>
           <el-row>
             <el-col :span="8">
-              <div class="span-sty">预计返利</div>
+              <div class="span-sty">预提返利</div>
               <el-form-item><span class="addinputInfo">{{ formobj.estimateRebate }}</span></el-form-item>
             </el-col>
             <el-col :span="8">
@@ -73,7 +73,7 @@
             <el-table-column prop="carModelName" label="车型" align="center" min-width="150" />
             <el-table-column prop="vinNo" label="车架号" align="center" width="150" />
             <el-table-column prop="costPrice" label="回款金额" align="center" width="130" />
-            <el-table-column prop="estimateRebate" label="预计返利" align="center" width="130" />
+            <el-table-column prop="estimateRebate" label="预提返利" align="center" width="130" />
             <el-table-column prop="uploadMoney" label="上传金额" align="center" width="130" />
             <el-table-column prop="adjustmentMoney" label="调整金额" align="center" width="130" />
           </el-table>

From e8d0b675248c776857c91daa13882e38b6e902c6 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Tue, 24 Dec 2024 09:33:10 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=9B=9E=E6=AC=BE?=
 =?UTF-8?q?=E8=BF=94=E5=88=A9=20--=20=E6=96=B0=E5=A2=9E=E5=BC=B9=E6=A1=86?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=B8=AD=E5=A2=9E=E5=8A=A0=E6=AC=BE=E9=A1=B9?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../huikuanguanli/collectionrebatemanagement.vue                 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanguanli/collectionrebatemanagement.vue b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanguanli/collectionrebatemanagement.vue
index f4b3dd7117..5bb47ec8a7 100644
--- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanguanli/collectionrebatemanagement.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanguanli/collectionrebatemanagement.vue
@@ -144,6 +144,7 @@
         <el-table-column prop="createOrgName" label="分公司" align="center" min-width="150" />
         <el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="140" />
         <el-table-column prop="brandName" label="品牌" align="center" width="120" />
+        <el-table-column prop="costTitleValue" label="款项名称" align="center" min-width="120" />
         <el-table-column prop="collectionTypeValue" label="回款方式" align="center" width="150" />
         <el-table-column prop="manufaSaleChannelValue" label="厂家回款通路" align="center" width="160" />
         <el-table-column prop="collectionMoney" label="回款金额" align="center" width="130" />

From 0c926367f261d64d45fc98c10a1e3d6311f09c42 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Tue, 24 Dec 2024 09:37:01 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../huikuanhedui/collectionrebatetobecheckedAdd.vue             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobecheckedAdd.vue b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobecheckedAdd.vue
index 9a426ee413..beb83e53c9 100644
--- a/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobecheckedAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatetobecheckedAdd.vue
@@ -47,7 +47,7 @@
           </el-row>
           <el-row>
             <el-col :span="8">
-              <div class="span-sty">预计返利</div>
+              <div class="span-sty">预提返利</div>
               <el-form-item><span class="addinputInfo">{{ formobj.estimateRebate }}</span></el-form-item>
             </el-col>
             <el-col :span="8">