From 9da47cceae98ea29df8b8383faae115f400946da Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Wed, 25 Dec 2024 10:37:36 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=B8=93=E9=A1=B9?=
 =?UTF-8?q?=E8=BF=94=E5=88=A9=E6=A0=B8=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../specialrebatecheck/specialrebatecheck.vue |  8 ++--
 .../specialrebatecheckAdd.vue                 | 42 +++++++++----------
 .../specialrebatecheckInfo.vue                | 42 +++++++++----------
 .../zhuanxiangfanliheduiDaiBanInfo.vue        | 42 +++++++++----------
 .../zhuanxiangfanliheduiEdit.vue              | 40 +++++++++---------
 .../zhuanxiangfanliheduiYiBanInfo.vue         | 42 +++++++++----------
 6 files changed, 108 insertions(+), 108 deletions(-)

diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheck.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheck.vue
index 6de360904a..69609aaa85 100644
--- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheck.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheck.vue
@@ -13,7 +13,7 @@
           <div v-show="isSearchShow" class="search">
             <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
               <el-form-item label="分公司">
-                <el-input v-model="listQuery.params.useOrgName" placeholder="" clearable/>
+                <el-input v-model="listQuery.params.createOrgName" placeholder="" clearable/>
               </el-form-item>
               <el-form-item label="申请部门">
                 <el-input v-model="listQuery.params.deptName" placeholder="" clearable/>
@@ -65,7 +65,7 @@
               </template>
             </el-table-column>
             <el-table-column prop="billNo" label="申请编号" align="center" width="180" />
-            <el-table-column prop="useOrgName" label="分公司" align="center" width="120" />
+            <el-table-column prop="createOrgName" label="分公司" align="center" width="120" />
             <el-table-column prop="deptName" label="申请部门" align="center" width="120" />
             <el-table-column prop="createByName" label="申请人" align="center" width="120" />
             <el-table-column prop="createTime" label="申请日期" align="center" width="120" />
@@ -149,7 +149,7 @@ export default {
       listLoading: false,
       listQuery: {
         params: {
-          useOrgName: '',
+          createOrgName: '',
           deptName: '',
           createByName: '',
           billNo: '',
@@ -274,7 +274,7 @@ export default {
     handleReset() {
       this.listQuery = {
         params: {
-          useOrgName: '',
+          createOrgName: '',
           deptName: '',
           createByName: '',
           billNo: '',
diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckAdd.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckAdd.vue
index 61a8c52146..aba6aba05e 100644
--- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckAdd.vue
@@ -49,16 +49,16 @@
             <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
             <el-table-column prop="purchaseSystemName" label="采购系统" align="center" min-width="120" />
             <el-table-column prop="brandName" label="品牌" align="center" min-width="100" />
-            <el-table-column prop="rebateTypeValue" label="返利类型" align="center" />
-            <el-table-column prop="num" label="数量" align="center" />
-            <el-table-column prop="withRebate" label="预提金额" align="center" />
-            <el-table-column prop="withholdCost" label="其中预提费用" align="center" />
-            <el-table-column prop="uploadMoney" label="上传金额" align="center" />
-            <el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
-            <el-table-column prop="money" label="其中费用" align="center" />
-            <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" />
-            <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" />
-            <el-table-column label="明细" align="center">
+            <el-table-column prop="rebateTypeValue" label="返利类型" align="center" min-width="120" />
+            <el-table-column prop="num" label="数量" align="center" min-width="100" />
+            <el-table-column prop="withRebate" label="预提金额" align="center" min-width="120" />
+            <el-table-column prop="withholdCost" label="其中预提费用" align="center" min-width="140" />
+            <el-table-column prop="uploadMoney" label="上传金额" align="center" min-width="120" />
+            <el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" min-width="150" />
+            <el-table-column prop="money" label="其中费用" align="center" min-width="120" />
+            <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
+            <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
+            <el-table-column label="明细" align="center" min-width="100">
               <template>
                 <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
@@ -69,17 +69,17 @@
             <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
             <el-table-column prop="purchaseSystemName" label="采购系统" align="center" min-width="120" />
             <el-table-column prop="brandName" label="品牌" align="center" min-width="100" />
-            <el-table-column prop="withholdingDate" label="预提年月" align="center" />
-            <el-table-column prop="num" label="预提数量" align="center" />
-            <el-table-column prop="withRebate" label="预提金额" align="center" />
-            <el-table-column prop="withholdCost" label="其中预提费用" align="center" />
-            <el-table-column prop="uploadMoney" label="上传金额" align="center" />
-            <el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
-            <el-table-column prop="money" label="其中费用" align="center" />
-            <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" />
-            <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" />
-            <el-table-column label="明细" align="center">
-              <template slot-scope="scope">
+            <el-table-column prop="withholdingDate" label="预提年月" align="center" min-width="120" />
+            <el-table-column prop="num" label="预提数量" align="center" min-width="120" />
+            <el-table-column prop="withRebate" label="预提金额" align="center" min-width="120" />
+            <el-table-column prop="withholdCost" label="其中预提费用" align="center" min-width="140" />
+            <el-table-column prop="uploadMoney" label="上传金额" align="center" min-width="120" />
+            <el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" min-width="150" />
+            <el-table-column prop="money" label="其中费用" align="center" min-width="120" />
+            <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
+            <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
+            <el-table-column label="明细" align="center" min-width="100">
+              <template>
                 <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
             </el-table-column>
diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckInfo.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckInfo.vue
index 0d7c0d8a52..d6fd6ba665 100644
--- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckInfo.vue
@@ -46,36 +46,36 @@
             <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
             <el-table-column prop="purchaseSystemName" label="采购系统" align="center" min-width="120" />
             <el-table-column prop="brandName" label="品牌" align="center" min-width="100" />
-            <el-table-column prop="rebateTypeValue" label="返利类型" align="center" />
-            <el-table-column prop="num" label="数量" align="center" />
-            <el-table-column prop="withRebate" label="预提金额" align="center" />
-            <el-table-column prop="withholdCost" label="其中预提费用" align="center" />
-            <el-table-column prop="uploadMoney" label="上传金额" align="center" />
-            <el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
-            <el-table-column prop="money" label="其中费用" align="center" />
-            <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" />
-            <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" />
-            <el-table-column label="明细" align="center">
+            <el-table-column prop="rebateTypeValue" label="返利类型" align="center" min-width="120" />
+            <el-table-column prop="num" label="数量" align="center" min-width="100" />
+            <el-table-column prop="withRebate" label="预提金额" align="center" min-width="120" />
+            <el-table-column prop="withholdCost" label="其中预提费用" align="center" min-width="140" />
+            <el-table-column prop="uploadMoney" label="上传金额" align="center" min-width="120" />
+            <el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" min-width="150" />
+            <el-table-column prop="money" label="其中费用" align="center" min-width="120" />
+            <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
+            <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
+            <el-table-column label="明细" align="center" min-width="100">
               <template>
                 <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
           <div class="title">本月上传返利核对情况(按预提年月统计)</div>
-          <el-table :key="lastSpecialrebateKey" :data="formobj.scmLastSpecialrebateCheckapplydetailDetails" :index="index" border style="width: 100%">
+          <el-table :key="lastSpecialrebateKey" :data="formobj.scmLastSpecialrebateCheckapplydetailDetails" border style="width: 100%">
             <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
             <el-table-column prop="purchaseSystemName" label="采购系统" align="center" min-width="120" />
             <el-table-column prop="brandName" label="品牌" align="center" min-width="100" />
-            <el-table-column prop="withholdingDate" label="预提年月" align="center" />
-            <el-table-column prop="num" label="预提数量" align="center" />
-            <el-table-column prop="withRebate" label="预提金额" align="center" />
-            <el-table-column prop="withholdCost" label="其中预提费用" align="center" />
-            <el-table-column prop="uploadMoney" label="上传金额" align="center" />
-            <el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
-            <el-table-column prop="money" label="其中费用" align="center" />
-            <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" />
-            <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" />
-            <el-table-column label="明细" align="center">
+            <el-table-column prop="withholdingDate" label="预提年月" align="center" min-width="120" />
+            <el-table-column prop="num" label="预提数量" align="center" min-width="120" />
+            <el-table-column prop="withRebate" label="预提金额" align="center" min-width="120" />
+            <el-table-column prop="withholdCost" label="其中预提费用" align="center" min-width="140" />
+            <el-table-column prop="uploadMoney" label="上传金额" align="center" min-width="120" />
+            <el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" min-width="150" />
+            <el-table-column prop="money" label="其中费用" align="center" min-width="120" />
+            <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
+            <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
+            <el-table-column label="明细" align="center" min-width="100">
               <template>
                 <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiDaiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiDaiBanInfo.vue
index c1acbfa1cb..54468544fb 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiDaiBanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiDaiBanInfo.vue
@@ -46,36 +46,36 @@
             <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
             <el-table-column prop="purchaseSystemName" label="采购系统" align="center" min-width="120" />
             <el-table-column prop="brandName" label="品牌" align="center" min-width="100" />
-            <el-table-column prop="rebateTypeValue" label="返利类型" align="center" />
-            <el-table-column prop="num" label="数量" align="center" />
-            <el-table-column prop="withRebate" label="预提金额" align="center" />
-            <el-table-column prop="withholdCost" label="其中预提费用" align="center" />
-            <el-table-column prop="uploadMoney" label="上传金额" align="center" />
-            <el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
-            <el-table-column prop="money" label="其中费用" align="center" />
-            <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" />
-            <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" />
-            <el-table-column label="明细" align="center">
+            <el-table-column prop="rebateTypeValue" label="返利类型" align="center" min-width="120" />
+            <el-table-column prop="num" label="数量" align="center" min-width="100" />
+            <el-table-column prop="withRebate" label="预提金额" align="center" min-width="120" />
+            <el-table-column prop="withholdCost" label="其中预提费用" align="center" min-width="140" />
+            <el-table-column prop="uploadMoney" label="上传金额" align="center" min-width="120" />
+            <el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" min-width="150" />
+            <el-table-column prop="money" label="其中费用" align="center" min-width="120" />
+            <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
+            <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
+            <el-table-column label="明细" align="center" min-width="100">
               <template>
                 <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
           <div class="title">本月上传返利核对情况(按预提年月统计)</div>
-          <el-table :key="lastSpecialrebateKey" :data="formobj.scmLastSpecialrebateCheckapplydetailDetails" :index="index" border style="width: 100%">
+          <el-table :key="lastSpecialrebateKey" :data="formobj.scmLastSpecialrebateCheckapplydetailDetails" border style="width: 100%">
             <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
             <el-table-column prop="purchaseSystemName" label="采购系统" align="center" min-width="120" />
             <el-table-column prop="brandName" label="品牌" align="center" min-width="100" />
-            <el-table-column prop="withholdingDate" label="预提年月" align="center" />
-            <el-table-column prop="num" label="预提数量" align="center" />
-            <el-table-column prop="withRebate" label="预提金额" align="center" />
-            <el-table-column prop="withholdCost" label="其中预提费用" align="center" />
-            <el-table-column prop="uploadMoney" label="上传金额" align="center" />
-            <el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
-            <el-table-column prop="money" label="其中费用" align="center" />
-            <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" />
-            <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" />
-            <el-table-column label="明细" align="center">
+            <el-table-column prop="withholdingDate" label="预提年月" align="center" min-width="120" />
+            <el-table-column prop="num" label="预提数量" align="center" min-width="120" />
+            <el-table-column prop="withRebate" label="预提金额" align="center" min-width="120" />
+            <el-table-column prop="withholdCost" label="其中预提费用" align="center" min-width="140" />
+            <el-table-column prop="uploadMoney" label="上传金额" align="center" min-width="120" />
+            <el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" min-width="150" />
+            <el-table-column prop="money" label="其中费用" align="center" min-width="120" />
+            <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
+            <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
+            <el-table-column label="明细" align="center" min-width="100">
               <template>
                 <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiEdit.vue
index 4241be551a..3b1209e226 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiEdit.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiEdit.vue
@@ -48,16 +48,16 @@
             <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
             <el-table-column prop="purchaseSystemName" label="采购系统" align="center" min-width="120" />
             <el-table-column prop="brandName" label="品牌" align="center" min-width="100" />
-            <el-table-column prop="rebateTypeValue" label="返利类型" align="center" />
-            <el-table-column prop="num" label="数量" align="center" />
-            <el-table-column prop="withRebate" label="预提金额" align="center" />
-            <el-table-column prop="withholdCost" label="其中预提费用" align="center" />
-            <el-table-column prop="uploadMoney" label="上传金额" align="center" />
-            <el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
-            <el-table-column prop="money" label="其中费用" align="center" />
-            <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" />
-            <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" />
-            <el-table-column label="明细" align="center">
+            <el-table-column prop="rebateTypeValue" label="返利类型" align="center" min-width="120" />
+            <el-table-column prop="num" label="数量" align="center" min-width="100" />
+            <el-table-column prop="withRebate" label="预提金额" align="center" min-width="120" />
+            <el-table-column prop="withholdCost" label="其中预提费用" align="center" min-width="140" />
+            <el-table-column prop="uploadMoney" label="上传金额" align="center" min-width="120" />
+            <el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" min-width="150" />
+            <el-table-column prop="money" label="其中费用" align="center" min-width="120" />
+            <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
+            <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
+            <el-table-column label="明细" align="center" min-width="100">
               <template>
                 <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
@@ -68,16 +68,16 @@
             <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
             <el-table-column prop="purchaseSystemName" label="采购系统" align="center" min-width="120" />
             <el-table-column prop="brandName" label="品牌" align="center" min-width="100" />
-            <el-table-column prop="withholdingDate" label="预提年月" align="center" />
-            <el-table-column prop="num" label="预提数量" align="center" />
-            <el-table-column prop="withRebate" label="预提金额" align="center" />
-            <el-table-column prop="withholdCost" label="其中预提费用" align="center" />
-            <el-table-column prop="uploadMoney" label="上传金额" align="center" />
-            <el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
-            <el-table-column prop="money" label="其中费用" align="center" />
-            <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" />
-            <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" />
-            <el-table-column label="明细" align="center">
+            <el-table-column prop="withholdingDate" label="预提年月" align="center" min-width="120" />
+            <el-table-column prop="num" label="预提数量" align="center" min-width="120" />
+            <el-table-column prop="withRebate" label="预提金额" align="center" min-width="120" />
+            <el-table-column prop="withholdCost" label="其中预提费用" align="center" min-width="140" />
+            <el-table-column prop="uploadMoney" label="上传金额" align="center" min-width="120" />
+            <el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" min-width="150" />
+            <el-table-column prop="money" label="其中费用" align="center" min-width="120" />
+            <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
+            <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
+            <el-table-column label="明细" align="center" min-width="100">
               <template>
                 <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiYiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiYiBanInfo.vue
index 21dfea469a..39d4bd7ccb 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiYiBanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiYiBanInfo.vue
@@ -44,36 +44,36 @@
             <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
             <el-table-column prop="purchaseSystemName" label="采购系统" align="center" min-width="120" />
             <el-table-column prop="brandName" label="品牌" align="center" min-width="100" />
-            <el-table-column prop="rebateTypeValue" label="返利类型" align="center" />
-            <el-table-column prop="num" label="数量" align="center" />
-            <el-table-column prop="withRebate" label="预提金额" align="center" />
-            <el-table-column prop="withholdCost" label="其中预提费用" align="center" />
-            <el-table-column prop="uploadMoney" label="上传金额" align="center" />
-            <el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
-            <el-table-column prop="money" label="其中费用" align="center" />
-            <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" />
-            <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" />
-            <el-table-column label="明细" align="center">
+            <el-table-column prop="rebateTypeValue" label="返利类型" align="center" min-width="120" />
+            <el-table-column prop="num" label="数量" align="center" min-width="100" />
+            <el-table-column prop="withRebate" label="预提金额" align="center" min-width="120" />
+            <el-table-column prop="withholdCost" label="其中预提费用" align="center" min-width="140" />
+            <el-table-column prop="uploadMoney" label="上传金额" align="center" min-width="120" />
+            <el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" min-width="150" />
+            <el-table-column prop="money" label="其中费用" align="center" min-width="120" />
+            <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
+            <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
+            <el-table-column label="明细" align="center" min-width="100">
               <template>
                 <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
             </el-table-column>
           </el-table>
           <div class="title">本月上传返利核对情况(按预提年月统计)</div>
-          <el-table :key="lastSpecialrebateKey" :data="formobj.scmLastSpecialrebateCheckapplydetailDetails" :index="index" border style="width: 100%">
+          <el-table :key="lastSpecialrebateKey" :data="formobj.scmLastSpecialrebateCheckapplydetailDetails" border style="width: 100%">
             <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
             <el-table-column prop="purchaseSystemName" label="采购系统" align="center" min-width="120" />
             <el-table-column prop="brandName" label="品牌" align="center" min-width="100" />
-            <el-table-column prop="withholdingDate" label="预提年月" align="center" />
-            <el-table-column prop="num" label="预提数量" align="center" />
-            <el-table-column prop="withRebate" label="预提金额" align="center" />
-            <el-table-column prop="withholdCost" label="其中预提费用" align="center" />
-            <el-table-column prop="uploadMoney" label="上传金额" align="center" />
-            <el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" />
-            <el-table-column prop="money" label="其中费用" align="center" />
-            <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" />
-            <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" />
-            <el-table-column label="明细" align="center">
+            <el-table-column prop="withholdingDate" label="预提年月" align="center" min-width="120" />
+            <el-table-column prop="num" label="预提数量" align="center" min-width="120" />
+            <el-table-column prop="withRebate" label="预提金额" align="center" min-width="120" />
+            <el-table-column prop="withholdCost" label="其中预提费用" align="center" min-width="140" />
+            <el-table-column prop="uploadMoney" label="上传金额" align="center" min-width="120" />
+            <el-table-column prop="stayDetermineMoney" label="其中待确认金额" align="center" min-width="150" />
+            <el-table-column prop="money" label="其中费用" align="center" min-width="120" />
+            <el-table-column prop="adjustmentMoney" label="返利调整金额" align="center" min-width="140" />
+            <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" min-width="160" />
+            <el-table-column label="明细" align="center" min-width="100">
               <template>
                 <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>

From 765cecb00961ca9b2b94063701f013b5b936fa2b Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Wed, 25 Dec 2024 10:42:03 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=9B=9E=E6=AC=BE?=
 =?UTF-8?q?=E8=BF=94=E5=88=A9=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 5bb47ec8a7..3ee71653af 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
@@ -7,7 +7,7 @@
         <div class="searchcon">
           <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
           <div v-show="isSearchShow" class="search">
-            <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
+            <el-form ref="listQueryform" :inline="true" :model="listQuery" class="tab-header">
               <el-form-item label="分公司">
                 <el-input v-model="listQuery.params.createOrgName" placeholder="" clearable/>
               </el-form-item>