From 8eefbe36084e90cdcb7097c6316479c5e39c6e92 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Fri, 21 Feb 2025 18:00:45 +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=E7=AE=A1=E7=90=86=E3=80=81=E4=B8=93=E9=A1=B9=E8=BF=94?=
 =?UTF-8?q?=E5=88=A9=E7=AE=A1=E7=90=86=E3=80=81=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=E7=9A=84=E5=AD=97=E6=AE=B5=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E5=8F=8A=E5=A2=9E=E5=8A=A0=E9=83=A8=E5=88=86=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bicyclerebatetobechecked.vue              | 82 +++++++++-------
 .../bicyclerebatemanagement.vue               | 95 +++++++++++--------
 .../specialrebatetobechecked.vue              | 69 ++++++++------
 .../specialrebatemanagement.vue               | 69 ++++++++------
 4 files changed, 184 insertions(+), 131 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 dc911326db..114de6b73a 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
@@ -58,47 +58,55 @@
         </div>
         <div class="">
           <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange" show-summary :summary-method="getSummaries">
-            <el-table-column fixed type="selection" align="center" width="60"/>
-            <el-table-column fixed label="序号" type="index" :index="indexMethod" align="center" width="80"/>
-            <el-table-column label="操作" align="center" width="180">
+            <el-table-column fixed type="selection" align="center" width="55"/>
+            <el-table-column fixed label="序号" type="index" :index="indexMethod" align="center" width="60"/>
+            <el-table-column fixed label="操作" align="center" width="130">
               <template slot-scope="scope">
                 <el-button type="primary" v-if="scope.row.onceCheckState == '0'" size="mini" @click="toSave(scope.row)">修改</el-button>
                 <el-button type="primary" v-else size="mini" @click="toAdjust(scope.row)">调整</el-button>
               </template>
             </el-table-column>
-            <el-table-column label="上传状态" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.uploadState == '0' ? '未上传' : scope.row.uploadState == '1' ? '已上传' : ''}}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="一次核对状态" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.onceCheckState == '0' ? '否' : scope.row.onceCheckState == '1' ? '是' : scope.row.onceCheckState == '2' ? '一次核对中' : '' }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="createOrgName" label="分公司" align="center" 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 fixed prop="purchaseSystemName" label="采购系统" align="center" width="140" />
+            <el-table-column fixed prop="vinNo" label="车架号" align="center" width="90" />
             <el-table-column prop="vehModelName" label="车型" align="center" min-width="200" />
-            <el-table-column prop="vinNo" label="车架号" align="center" width="150" />
-            <el-table-column prop="manufactorSettlementPrice" label="车辆入库价" align="center" width="140" />
-            <el-table-column prop="freight" label="其中运费" align="center" width="120" />
-            <el-table-column prop="createTime" label="创建日期" align="center" width="120" />
-            <el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="120" />
+            <el-table-column prop="palceGenDate" label="所属年月" align="center" width="85" />
+            <el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="90" />
             <el-table-column prop="rebateName" label="返利名称" align="center" min-width="150" />
-            <el-table-column prop="estimateRebate" label="预计返利" align="center" width="120" />
-            <el-table-column prop="withholdCost" label="其中预提费用" align="center" width="140" />
-            <el-table-column prop="palceGenDate" label="所属年月" align="center" width="120" />
-            <el-table-column prop="uploadDate" label="上传日期" align="center" width="120" />
-            <el-table-column prop="uploadMoney" label="上传金额" align="center" width="120" />
-            <el-table-column prop="secondaryUploadDate" label="二次上传日期" align="center" width="140" />
-            <el-table-column prop="secondaryUploadMoney" label="二次上传金额" align="center" width="140" />
-            <el-table-column prop="stayDetermineMoney" label="待确定金额" align="center" width="130" />
-            <el-table-column prop="money" label="费用" align="center" width="120" />
-            <el-table-column prop="diffAmount" label="差异金额" align="center" width="120" />
-            <el-table-column prop="isAdjustment" label="是否调整" align="center" width="120" />
-            <el-table-column prop="adjustmentMoney" label="调整金额" align="center" width="120" />
+            <el-table-column label="金额" align="center">
+              <el-table-column prop="estimateRebate" label="预提" align="center" width="100" />
+              <el-table-column prop="uploadMoney" label="上传" align="center" width="100" />
+              <el-table-column prop="secondaryUploadMoney" label="二次上传" align="center" width="100" />
+              <el-table-column prop="stayDetermineMoney" label="待确定" align="center" width="100" />
+              <el-table-column prop="adjustmentMoney" label="调整" align="center" width="100" />
+              <el-table-column prop="notUploadMoney" label="未上传" align="center" width="100" />
+            </el-table-column>
+            <el-table-column label="其中费用" align="center">
+              <el-table-column prop="withholdCost" label="预提" align="center" width="100" />
+              <el-table-column prop="money" label="上传" align="center" width="100" />
+            </el-table-column>
+            <el-table-column label="日期" align="center">
+              <el-table-column prop="createTime" label="创建日期" align="center" width="95" />
+              <el-table-column prop="withholdingDate" label="预提" align="center" width="95" />
+              <el-table-column prop="uploadDate" label="上传" align="center" width="95" />
+              <el-table-column prop="secondaryUploadDate" label="二次上传" align="center" width="95" />
+            </el-table-column>
+            <el-table-column label="状态" align="center">
+              <el-table-column label="上传" align="center" width="70">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.uploadState == '0' ? '未上传' : scope.row.uploadState == '1' ? '已上传' : ''}}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="一次核对" align="center" width="120">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.onceCheckState == '0' ? '否' : scope.row.onceCheckState == '1' ? '是' : scope.row.onceCheckState == '2' ? '一次核对中' : '' }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column prop="secondCheckState" label="二次核对" align="center" width="120" />
+            </el-table-column>
+            <el-table-column prop="isAdjustment" label="是否调整" align="center" width="90" />
             <el-table-column prop="adjustmentRemarks" label="调整说明" align="center" min-width="300" />
+            <el-table-column prop="brandName" label="品牌" align="center" width="120" />
+            <el-table-column prop="createOrgName" label="分公司" align="center" width="150" />
           </el-table>
         </div>
         <div class="pages">
@@ -841,4 +849,12 @@ export default {
   margin-left: 120px !important;
   width: calc(100% - 115px);
 }
+/*表格列设置fixed后固定列出现下边框的设置*/
+/deep/ .el-table__fixed {
+  height: 100% !important;
+}
+/*表格列设置fixed后固定列出现下边框的设置*/
+/deep/ .el-table__fixed-right {
+  height: 100% !important;
+}
 </style>
diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagement.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagement.vue
index 7a4c355b0b..8ff6546308 100644
--- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagement.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagement.vue
@@ -56,52 +56,63 @@
         </div>
         <div class="">
           <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange" show-summary :summary-method="getSummaries">
-            <el-table-column fixed type="selection" align="center" width="80" />
-            <el-table-column fixed label="序号" type="index" :index="indexMethod" align="center" width="80" />
-            <el-table-column fixed label="操作" align="center" width="180">
+            <el-table-column fixed type="selection" align="center" width="55" />
+            <el-table-column fixed label="序号" type="index" :index="indexMethod" align="center" width="60" />
+            <el-table-column fixed label="操作" align="center" width="130">
               <template slot-scope="scope">
                 <el-button type="primary" :disabled="scope.row.state !== '0'" size="mini" @click="toEdit(scope.row)">编辑</el-button>
                 <el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
               </template>
             </el-table-column>
-            <el-table-column label="状态" align="center" width="150">
-              <template slot-scope="scope">
-                <span>{{ scope.row.state == '0' ? '未计提' : scope.row.state == '1' ? '计提中' : scope.row.state == '2' ? '待核对' : scope.row.state == '3' ? '核对中' : scope.row.state == '4' ? '已核对' : '' }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="一次核对状态" align="center" width="160">
-              <template slot-scope="scope">
-                <span>{{ scope.row.onceCheckState == '1' ? '是' : scope.row.onceCheckState == '0' ? '否' : scope.row.onceCheckState == '2' ? '一次核对中' : '' }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="createOrgName" label="分公司" align="center" width="150" />
-            <el-table-column prop="brandName" label="品牌" align="center" width="200" />
-            <el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="140" />
+            <el-table-column fixed prop="purchaseSystemName" label="采购系统" align="center" width="140" />
+            <el-table-column fixed prop="vinNo" label="车架号" align="center" width="90" />
             <el-table-column prop="vehModelName" label="车型" align="center" width="200" />
-            <el-table-column prop="vinNo" label="车架号" align="center" width="150" />
-            <el-table-column prop="manufactorSettlementPrice" label="车辆入库价" align="center" width="140" />
-            <el-table-column prop="freight" label="其中运费" align="center" width="120" />
-            <el-table-column prop="topAmount" label="其中上装金额" align="center" width="140" />
-            <el-table-column prop="createTime" label="创建日期" align="center" width="120" />
-            <el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="150" />
+            <el-table-column prop="palceGenDate" label="所属年月" align="center" width="85" />
+            <el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="90" />
             <el-table-column prop="rebateName" label="返利名称" align="center" width="150" />
-            <el-table-column prop="calculationModeValue" label="计算方式" align="center" width="100" />
-            <el-table-column prop="calculationStandard" label="计算标准" align="center" width="100" />
-            <el-table-column prop="estimateRebate" label="预计返利" align="center" width="120" />
-            <el-table-column prop="expectCost" label="其中预计费用" align="center" width="160" />
-            <el-table-column prop="palceGenDate" label="所属年月" align="center" width="120" />
-            <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="120" />
-            <el-table-column prop="secondaryUploadDate" label="二次上传日期" align="center" width="120" />
-            <el-table-column prop="secondaryUploadMoney" label="二次上传金额" align="center" width="120" />
-            <el-table-column prop="stayDetermineMoney" label="待确定金额" align="center" width="120" />
-            <el-table-column prop="money" label="费用" align="center" width="120" />
-            <el-table-column prop="isAdjustment" label="是否调整" align="center" width="100" />
-            <el-table-column prop="diffAmount" label="差异金额" align="center" width="120" />
-            <el-table-column prop="adjustmentMoney" label="调整金额" align="center" width="120" />
-            <el-table-column prop="adjustmentRemarks" label="调整说明" align="center" min-width="200" />
+            <el-table-column label="返利金额" align="center">
+              <el-table-column prop="estimateRebate" label="预提" align="center" width="100" />
+              <el-table-column prop="uploadMoney" label="上传" align="center" width="100" />
+              <el-table-column prop="secondaryUploadMoney" label="二次上传" align="center" width="100" />
+              <el-table-column prop="stayDetermineMoney" label="待确定" align="center" width="100" />
+              <el-table-column prop="adjustmentMoney" label="调整" align="center" width="100" />
+              <el-table-column prop="notUploadMoney" label="未上传" align="center" width="100" />
+            </el-table-column>
+            <el-table-column label="其中费用" align="center">
+              <el-table-column prop="expectCost" label="预提" align="center" width="100" />
+              <el-table-column prop="money" label="上传" align="center" width="100" />
+            </el-table-column>
+            <el-table-column label="日期" align="center">
+              <el-table-column prop="createTime" label="创建" align="center" width="95" />
+              <el-table-column prop="withholdingDate" label="预提" align="center" width="95" />
+              <el-table-column prop="uploadDate" label="上传" align="center" width="95" />
+              <el-table-column prop="secondaryUploadDate" label="二次上传" align="center" width="95" />
+            </el-table-column>
+            <el-table-column label="状态" align="center">
+              <el-table-column label="流程" align="center" width="70">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.state == '0' ? '未计提' : scope.row.state == '1' ? '计提中' : scope.row.state == '2' ? '待核对' : scope.row.state == '3' ? '核对中' : scope.row.state == '4' ? '已核对' : '' }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="一次核对状态" align="center" width="120">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.onceCheckState == '1' ? '是' : scope.row.onceCheckState == '0' ? '否' : scope.row.onceCheckState == '2' ? '一次核对中' : '' }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column prop="secondCheckState" label="二次核对" align="center" width="120" />
+            </el-table-column>
+            <el-table-column prop="manufactorSettlementPrice" label="车辆入库价" align="center" width="110" />
+            <el-table-column label="其中" align="center">
+              <el-table-column prop="freight" label="运费" align="center" width="100" />
+              <el-table-column prop="topAmount" label="上装" align="center" width="100" />
+            </el-table-column>
+            <el-table-column label="返利计算" align="center">
+              <el-table-column prop="calculationModeValue" label="方式" align="center" width="80" />
+              <el-table-column prop="calculationStandard" label="标准" align="center" width="100" />
+            </el-table-column>
             <el-table-column prop="remarks" label="备注" align="center" min-width="200" />
+            <el-table-column prop="brandName" label="品牌" align="center" width="140" />
+            <el-table-column prop="createOrgName" label="分公司" align="center" width="150" />
           </el-table>
         </div>
         <div class="pages">
@@ -559,4 +570,12 @@ export default {
 }
 </script>
 <style scoped>
+/*表格列设置fixed后固定列出现下边框的设置*/
+/deep/ .el-table__fixed {
+  height: 100% !important;
+}
+/*表格列设置fixed后固定列出现下边框的设置*/
+/deep/ .el-table__fixed-right {
+  height: 100% !important;
+}
 </style>
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 bcca43b973..d5892e58d6 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
@@ -57,43 +57,54 @@
         </div>
         <div class="">
           <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange" show-summary :summary-method="getSummaries">
-            <el-table-column fixed type="selection" align="center" width="60"/>
-            <el-table-column fixed label="序号" type="index" :index="indexMethod" align="center" width="80"/>
-            <el-table-column label="操作" align="center" width="180">
+            <el-table-column fixed type="selection" align="center" width="55"/>
+            <el-table-column fixed label="序号" type="index" :index="indexMethod" align="center" width="60"/>
+            <el-table-column label="操作" align="center" width="130">
               <template slot-scope="scope">
                 <el-button type="primary" v-if="scope.row.onceCheckState == '0'" size="mini" @click="toSave(scope.row)">修改</el-button>
                 <el-button type="primary" v-else size="mini" @click="toAdjust(scope.row)">调整</el-button>
               </template>
             </el-table-column>
-            <el-table-column label="上传状态" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.uploadState == '0' ? '未上传' : scope.row.uploadState == '1' ? '已上传' : ''}}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="一次核对状态" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.onceCheckState == '0' ? '否' : scope.row.onceCheckState == '1' ? '是' : scope.row.onceCheckState == '2' ? '一次核对中' : '' }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="createOrgName" label="分公司" align="center" 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="createTime" label="创建日期" align="center" width="120" />
-            <el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="120" />
+            <el-table-column prop="palceGenDate" label="所属年月" align="center" width="85" />
+            <el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="90" />
             <el-table-column prop="rebateName" label="返利名称" align="center" min-width="150" />
-            <el-table-column prop="estimateRebate" label="预计返利" align="center" width="120" />
-            <el-table-column prop="withholdCost" label="其中预提费用" align="center" width="140" />
-            <el-table-column prop="palceGenDate" label="所属年月" align="center" width="120" />
-            <el-table-column prop="uploadDate" label="上传日期" align="center" width="120" />
-            <el-table-column prop="uploadMoney" label="上传金额" align="center" width="120" />
-            <el-table-column prop="secondaryUploadDate" label="二次上传日期" align="center" width="140" />
-            <el-table-column prop="secondaryUploadMoney" label="二次上传金额" align="center" width="140" />
-            <el-table-column prop="stayDetermineMoney" label="待确定金额" align="center" width="130" />
-            <el-table-column prop="money" label="费用" align="center" width="120" />
-            <el-table-column prop="diffAmount" label="差异金额" align="center" width="120" />
-            <el-table-column prop="isAdjustment" label="是否调整" align="center" width="120" />
-            <el-table-column prop="adjustmentMoney" label="调整金额" align="center" width="120" />
+
+            <el-table-column label="金额" align="center">
+              <el-table-column prop="estimateRebate" label="预提" align="center" width="100" />
+              <el-table-column prop="uploadMoney" label="上传" align="center" width="100" />
+              <el-table-column prop="secondaryUploadMoney" label="二次上传" align="center" width="100" />
+              <el-table-column prop="stayDetermineMoney" label="待确定" align="center" width="100" />
+              <el-table-column prop="adjustmentMoney" label="调整" align="center" width="100" />
+              <el-table-column prop="notUploadMoney" label="未上传" align="center" width="100" />
+            </el-table-column>
+            <el-table-column label="其中费用" align="center">
+              <el-table-column prop="withholdCost" label="预提" align="center" width="100" />
+              <el-table-column prop="money" label="上传" align="center" width="100" />
+            </el-table-column>
+            <el-table-column label="日期" align="center">
+              <el-table-column prop="createTime" label="创建日期" align="center" width="95" />
+              <el-table-column prop="withholdingDate" label="预提" align="center" width="95" />
+              <el-table-column prop="uploadDate" label="上传" align="center" width="95" />
+              <el-table-column prop="secondaryUploadDate" label="二次上传" align="center" width="95" />
+            </el-table-column>
+            <el-table-column label="状态" align="center">
+              <el-table-column label="上传" align="center" width="70">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.uploadState == '0' ? '未上传' : scope.row.uploadState == '1' ? '已上传' : ''}}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="一次核对" align="center" width="120">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.onceCheckState == '0' ? '否' : scope.row.onceCheckState == '1' ? '是' : scope.row.onceCheckState == '2' ? '一次核对中' : '' }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column prop="secondCheckState" label="二次核对" align="center" width="120" />
+            </el-table-column>
+            <el-table-column prop="isAdjustment" label="是否调整" align="center" width="90" />
             <el-table-column prop="adjustmentRemarks" label="调整说明" align="center" min-width="300" />
+            <el-table-column prop="brandName" label="品牌" align="center" width="120" />
+            <el-table-column prop="createOrgName" label="分公司" align="center" width="150" />
           </el-table>
         </div>
         <div class="pages">
diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagement.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagement.vue
index 794aa4a28b..1df8cd08c9 100644
--- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagement.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagement.vue
@@ -48,45 +48,52 @@
         </div>
         <div class="">
           <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange" show-summary :summary-method="getSummaries">
-            <el-table-column fixed type="selection" align="center" width="80"/>
-            <el-table-column fixed label="序号" type="index" :index="indexMethod" align="center" width="80px"/>
-            <el-table-column fixed label="操作" align="center" width="180px" >
+            <el-table-column fixed type="selection" align="center" width="55" />
+            <el-table-column fixed label="序号" type="index" :index="indexMethod" align="center" width="60" />
+            <el-table-column fixed label="操作" align="center" width="130">
               <template slot-scope="scope">
                 <el-button type="primary" :disabled="scope.row.state !== '0'" size="mini" @click="toEdit(scope.row)">编辑</el-button>
                 <el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
               </template>
             </el-table-column>
-            <el-table-column label="状态" align="center" width="200">
-              <template slot-scope="scope">
-                <span>{{ scope.row.state == '0' ? '未计提' : scope.row.state == '1' ? '计提中' : scope.row.state == '2' ? '待核对' : scope.row.state == '3' ? '核对中' : scope.row.state == '4' ? '已核对' : scope.row.state == '5' ? '分配中' : scope.row.state == '6' ? '' : scope.row.state == '已分配' ? '' : '' }}</span>
-              </template>
+            <el-table-column fixed prop="purchaseSystemName" label="采购系统" align="center" width="140" />
+            <el-table-column prop="palceGenDate" label="所属年月" align="center" width="85" />
+            <el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="90" />
+            <el-table-column prop="rebateName" label="返利名称" align="center" min-width="150" />
+            <el-table-column label="返利金额" align="center">
+              <el-table-column prop="estimateRebate" label="预提" align="center" width="100" />
+              <el-table-column prop="uploadMoney" label="上传" align="center" width="100" />
+              <el-table-column prop="secondaryUploadMoney" label="二次上传" align="center" width="100" />
+              <el-table-column prop="stayDetermineMoney" label="待确定" align="center" width="100" />
+              <el-table-column prop="adjustmentMoney" label="调整" align="center" width="100" />
+              <el-table-column prop="notUploadMoney" label="未上传" align="center" width="100" />
             </el-table-column>
-            <el-table-column label="一次核对状态" align="center" width="160">
-              <template slot-scope="scope">
-                <span>{{ scope.row.onceCheckState == '1' ? '是' : scope.row.onceCheckState == '0' ? '否' : scope.row.onceCheckState == '2' ? '一次核对中' : '' }}</span>
-              </template>
+            <el-table-column label="其中费用" align="center">
+              <el-table-column prop="expectCost" label="预计" align="center" width="100" />
+              <el-table-column prop="money" label="上传" align="center" width="100" />
+            </el-table-column>
+            <el-table-column label="日期" align="center">
+              <el-table-column prop="createTime" label="创建" align="center" width="95" />
+              <el-table-column prop="withholdingDate" label="预提" align="center" width="95" />
+              <el-table-column prop="uploadDate" label="上传" align="center" width="95" />
+              <el-table-column prop="secondaryUploadDate" label="二次上传" align="center" width="95" />
+            </el-table-column>
+            <el-table-column label="状态" align="center">
+              <el-table-column label="流程" align="center" width="70">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.state == '0' ? '未计提' : scope.row.state == '1' ? '计提中' : scope.row.state == '2' ? '待核对' : scope.row.state == '3' ? '核对中' : scope.row.state == '4' ? '已核对' : scope.row.state == '5' ? '分配中' : scope.row.state == '6' ? '' : scope.row.state == '已分配' ? '' : '' }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="一次核对状态" align="center" width="120">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.onceCheckState == '1' ? '是' : scope.row.onceCheckState == '0' ? '否' : scope.row.onceCheckState == '2' ? '一次核对中' : '' }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column prop="secondCheckState" label="二次核对" align="center" width="120" />
             </el-table-column>
-            <el-table-column prop="createOrgName" label="分公司" align="center" 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="createTime" label="创建日期" align="center" width="120" />
-            <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="estimateRebate" label="预计返利" align="center" width="120" />
-            <el-table-column prop="expectCost" label="其中预计费用" align="center" width="120" />
-            <el-table-column prop="palceGenDate" label="所属年月" align="center" width="120" />
-            <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="120" />
-            <el-table-column prop="secondaryUploadDate" label="二次上传日期" align="center" width="140" />
-            <el-table-column prop="secondaryUploadMoney" label="二次上传金额" align="center" width="140" />
-            <el-table-column prop="stayDetermineMoney" label="其中待确定金额" align="center" width="160" />
-            <el-table-column prop="money" label="其中费用" align="center" width="120" />
-            <el-table-column prop="diffAmount" label="差异金额" align="center" width="120" />
-            <el-table-column prop="isAdjustment" label="是否调整" align="center" width="120" />
-            <el-table-column prop="adjustmentMoney" label="调整金额" align="center" width="120" />
-            <el-table-column prop="adjustmentRemarks" label="调整说明" align="center" min-width="200" />
             <el-table-column prop="remarks" label="备注" align="center" min-width="200" />
+            <el-table-column prop="brandName" label="品牌" align="center" width="120" />
+            <el-table-column prop="createOrgName" label="分公司" align="center" width="150" />
           </el-table>
         </div>
         <div class="pages">