From 1fe56ac3bc0006122ee85ffd173b59cb4014554d Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Mon, 21 Oct 2024 17:51:21 +0800
Subject: [PATCH 1/2] 1

---
 .../ScmSpecialrebateCheckapplydetailMapper.xml               | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.xml
index c9c76b8d00..5d01cf9852 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.xml
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.xml
@@ -43,7 +43,10 @@
                SUM(ssc.`adjustmentMoney`)                                             adjustmentMoney,
                SUM(ssc.expectItureCost + ssc.expectTreatCost + ssc.expectSuppCost) AS withholdCost,
                SUM(ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost +
-                   ssc.secondTreatCost + ssc.secondSuppCost)                       AS money
+                   ssc.secondTreatCost + ssc.secondSuppCost)                       AS money,
+               SUM(ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost +
+                   ssc.secondTreatCost + ssc.secondSuppCost) -
+               SUM(ssc.expectItureCost + ssc.expectTreatCost + ssc.expectSuppCost) AS fyAdjustmentMoney
         FROM scm_specialrebate_checkapplydetail ssc
         WHERE ssc.`mainSid` = #{sid}
         GROUP BY ssc.withholdingDate

From b2606ce32019e2c5dc964a02247f6e430fef12b8 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Mon, 21 Oct 2024 17:54:59 +0800
Subject: [PATCH 2/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

---
 .../specialrebatecheckAdd.vue                 | 12 +++++++++-
 .../specialrebatecheckInfo.vue                |  8 ++++---
 .../specialrebatemanagementInfo.vue           | 22 +++++++++++++++----
 .../relation/specialInfo.vue                  | 22 +++++++++++++++----
 .../zhuanxiangfanliheduiDaiBanInfo.vue        |  8 ++++---
 .../zhuanxiangfanliheduiEdit.vue              | 16 +++++++++++---
 .../zhuanxiangfanliheduiYiBanInfo.vue         |  8 ++++---
 7 files changed, 75 insertions(+), 21 deletions(-)

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 23b47c094f..1047a8c91f 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
@@ -32,7 +32,8 @@
             <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="adjustmentMoney" label="返利调整金额" align="center" />
+            <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" />
             <el-table-column label="明细" align="center">
               <template slot-scope="scope">
                 <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
@@ -50,6 +51,7 @@
             <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-button type="primary" size="mini" @click="handleLook()">查看</el-button>
@@ -185,6 +187,7 @@ export default {
             this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].stayDetermineMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].stayDetermineMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].stayDetermineMoney : 0) + parseFloat(e.stayDetermineMoney !== '' ? e.stayDetermineMoney : 0)) * 100) / 100
             this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].adjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].adjustmentMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].adjustmentMoney : 0) + parseFloat(e.adjustmentMoney !== '' ? e.adjustmentMoney : 0)) * 100) / 100
             this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].money = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].money !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].money : 0) + parseFloat(e.money !== '' ? e.money : 0)) * 100) / 100
+            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].fyAdjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].fyAdjustmentMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].fyAdjustmentMoney : 0) + (parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0))) * 100) / 100
             this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].specialRebateSids.push(e.sid)
             v = 1
             break
@@ -204,6 +207,7 @@ export default {
             stayDetermineMoney: e.stayDetermineMoney,
             adjustmentMoney: e.adjustmentMoney,
             money: e.money,
+            fyAdjustmentMoney: Math.round((parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100,
             specialRebateSids: [e.sid],
             sid: '',
             mainSid: ''
@@ -222,6 +226,7 @@ export default {
             this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].stayDetermineMoney = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].stayDetermineMoney !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].stayDetermineMoney : 0) + parseFloat(s.stayDetermineMoney !== '' ? s.stayDetermineMoney : 0)) * 100) / 100
             this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].adjustmentMoney = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].adjustmentMoney !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].adjustmentMoney : 0) + parseFloat(s.adjustmentMoney !== '' ? s.adjustmentMoney : 0)) * 100) / 100
             this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].money = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].money !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].money : 0) + parseFloat(s.money !== '' ? s.money : 0)) * 100) / 100
+            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[l].fyAdjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[l].fyAdjustmentMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[l].fyAdjustmentMoney : 0) + (parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0))) * 100) / 100
             this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].specialRebateSids.push(s.sid)
             k = 1
             break
@@ -239,6 +244,7 @@ export default {
             stayDetermineMoney: s.stayDetermineMoney,
             adjustmentMoney: s.adjustmentMoney,
             money: s.money,
+            fyAdjustmentMoney: Math.round((parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100,
             specialRebateSids: [s.sid],
             sid: '',
             mainSid: ''
@@ -278,6 +284,7 @@ export default {
             this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].stayDetermineMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].stayDetermineMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].stayDetermineMoney : 0) + parseFloat(e.stayDetermineMoney !== '' ? e.stayDetermineMoney : 0)) * 100) / 100
             this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].adjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].adjustmentMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].adjustmentMoney : 0) + parseFloat(e.adjustmentMoney !== '' ? e.adjustmentMoney : 0)) * 100) / 100
             this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].money = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].money !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].money : 0) + parseFloat(e.money !== '' ? e.money : 0)) * 100) / 100
+            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].fyAdjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].fyAdjustmentMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].fyAdjustmentMoney : 0) + (parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0))) * 100) / 100
             this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].specialRebateSids.push(e.sid)
             v = 1
             break
@@ -297,6 +304,7 @@ export default {
             stayDetermineMoney: e.stayDetermineMoney,
             adjustmentMoney: e.adjustmentMoney,
             money: e.money,
+            fyAdjustmentMoney: Math.round((parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100,
             specialRebateSids: [e.sid],
             sid: '',
             mainSid: ''
@@ -315,6 +323,7 @@ export default {
             this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].stayDetermineMoney = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].stayDetermineMoney !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].stayDetermineMoney : 0) + parseFloat(s.stayDetermineMoney !== '' ? s.stayDetermineMoney : 0)) * 100) / 100
             this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].adjustmentMoney = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].adjustmentMoney !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].adjustmentMoney : 0) + parseFloat(s.adjustmentMoney !== '' ? s.adjustmentMoney : 0)) * 100) / 100
             this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].money = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].money !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].money : 0) + parseFloat(s.money !== '' ? s.money : 0)) * 100) / 100
+            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[l].fyAdjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[l].fyAdjustmentMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[l].fyAdjustmentMoney : 0) + (parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0))) * 100) / 100
             this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].specialRebateSids.push(s.sid)
             k = 1
             break
@@ -332,6 +341,7 @@ export default {
             stayDetermineMoney: s.stayDetermineMoney,
             adjustmentMoney: s.adjustmentMoney,
             money: s.money,
+            fyAdjustmentMoney: Math.round((parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100,
             specialRebateSids: [s.sid],
             sid: '',
             mainSid: ''
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 75237f32a8..039285d5ac 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
@@ -25,9 +25,10 @@
             <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="adjustmentMoney" label="返利调整金额" align="center" />
+            <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" />
             <el-table-column label="明细" align="center">
-              <template slot-scope="scope">
+              <template>
                 <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
             </el-table-column>
@@ -43,8 +44,9 @@
             <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">
+              <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/specialrebatemanagement/specialrebatemanagementInfo.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagementInfo.vue
index b9eb8f32b2..ee68d6cf6b 100644
--- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagementInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagementInfo.vue
@@ -154,7 +154,7 @@
           <div class="title">调整说明</div>
           <el-row>
             <el-col :span="8">
-              <div class="span-sty">差异金额</div>
+              <div class="span-sty">返利差异金额</div>
               <el-form-item><span class="addinputInfo">{{ formobj.diffAmount }}</span></el-form-item>
             </el-col>
             <el-col :span="8">
@@ -162,10 +162,24 @@
               <el-form-item><span class="addinputInfo">{{ formobj.isAdjustment }}</span></el-form-item>
             </el-col>
             <el-col :span="8">
-              <div class="span-sty">调整金额</div>
+              <div class="span-sty">返利调整金额</div>
               <el-form-item><span class="addinputInfo">{{ formobj.adjustmentMoney }}</span></el-form-item>
             </el-col>
           </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">支出费用调整金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.itureAdjustmentMoney }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">待支付费用调整金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.treatAdjustmentMoney }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">抵顶费用调整金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.suppAdjustmentMoney }}</span></el-form-item>
+            </el-col>
+          </el-row>
           <el-row>
             <el-col :span="24">
               <div class="span-sty">调整说明</div>
@@ -219,10 +233,10 @@ export default {
 </script>
 <style scoped>
 .span-sty {
-  width: 130px !important;
+  width: 140px !important;
 }
 .addinputInfo {
-  margin-left: 120px !important;
+  margin-left: 130px !important;
 }
 </style>
 
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/relation/specialInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/relation/specialInfo.vue
index ef099c5142..2603666499 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/relation/specialInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/relation/specialInfo.vue
@@ -154,7 +154,7 @@
           <div class="title">调整说明</div>
           <el-row>
             <el-col :span="8">
-              <div class="span-sty">差异金额</div>
+              <div class="span-sty">返利差异金额</div>
               <el-form-item><span class="addinputInfo">{{ formobj.diffAmount }}</span></el-form-item>
             </el-col>
             <el-col :span="8">
@@ -162,10 +162,24 @@
               <el-form-item><span class="addinputInfo">{{ formobj.isAdjustment }}</span></el-form-item>
             </el-col>
             <el-col :span="8">
-              <div class="span-sty">调整金额</div>
+              <div class="span-sty">返利调整金额</div>
               <el-form-item><span class="addinputInfo">{{ formobj.adjustmentMoney }}</span></el-form-item>
             </el-col>
           </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">支出费用调整金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.itureAdjustmentMoney }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">待支付费用调整金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.treatAdjustmentMoney }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">抵顶费用调整金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.suppAdjustmentMoney }}</span></el-form-item>
+            </el-col>
+          </el-row>
           <el-row>
             <el-col :span="24">
               <div class="span-sty">调整说明</div>
@@ -219,10 +233,10 @@ export default {
 </script>
 <style scoped>
 .span-sty {
-  width: 130px !important;
+  width: 140px !important;
 }
 .addinputInfo {
-  margin-left: 120px !important;
+  margin-left: 130px !important;
 }
 </style>
 
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 e04074618c..6844fbb130 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
@@ -28,8 +28,9 @@
             <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">
+              <template>
                 <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
             </el-table-column>
@@ -44,9 +45,10 @@
             <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="adjustmentMoney" label="返利调整金额" align="center" />
+            <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" />
             <el-table-column label="明细" align="center">
-              <template slot-scope="scope">
+              <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/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiEdit.vue
index 307bb85a07..5be18a51d3 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
@@ -32,8 +32,9 @@
             <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">
+              <template>
                 <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
             </el-table-column>
@@ -48,9 +49,10 @@
             <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="adjustmentMoney" label="返利调整金额" align="center" />
+            <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" />
             <el-table-column label="明细" align="center">
-              <template slot-scope="scope">
+              <template>
                 <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
             </el-table-column>
@@ -170,6 +172,7 @@ export default {
             this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].stayDetermineMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].stayDetermineMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].stayDetermineMoney : 0) + parseFloat(e.stayDetermineMoney !== '' ? e.stayDetermineMoney : 0)) * 100) / 100
             this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].adjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].adjustmentMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].adjustmentMoney : 0) + parseFloat(e.adjustmentMoney !== '' ? e.adjustmentMoney : 0)) * 100) / 100
             this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].money = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].money !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].money : 0) + parseFloat(e.money !== '' ? e.money : 0)) * 100) / 100
+            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].fyAdjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].fyAdjustmentMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].fyAdjustmentMoney : 0) + (parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0))) * 100) / 100
             this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].specialRebateSids.push(e.sid)
             v = 1
             break
@@ -189,6 +192,7 @@ export default {
             stayDetermineMoney: e.stayDetermineMoney,
             adjustmentMoney: e.adjustmentMoney,
             money: e.money,
+            fyAdjustmentMoney: Math.round((parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100,
             specialRebateSids: [e.sid],
             sid: '',
             mainSid: ''
@@ -207,6 +211,7 @@ export default {
             this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].stayDetermineMoney = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].stayDetermineMoney !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].stayDetermineMoney : 0) + parseFloat(s.stayDetermineMoney !== '' ? s.stayDetermineMoney : 0)) * 100) / 100
             this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].adjustmentMoney = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].adjustmentMoney !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].adjustmentMoney : 0) + parseFloat(s.adjustmentMoney !== '' ? s.adjustmentMoney : 0)) * 100) / 100
             this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].money = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].money !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].money : 0) + parseFloat(s.money !== '' ? s.money : 0)) * 100) / 100
+            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[l].fyAdjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[l].fyAdjustmentMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[l].fyAdjustmentMoney : 0) + (parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0))) * 100) / 100
             this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].specialRebateSids.push(s.sid)
             k = 1
             break
@@ -224,6 +229,7 @@ export default {
             stayDetermineMoney: s.stayDetermineMoney,
             adjustmentMoney: s.adjustmentMoney,
             money: s.money,
+            fyAdjustmentMoney: Math.round((parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100,
             specialRebateSids: [s.sid],
             sid: '',
             mainSid: ''
@@ -263,6 +269,7 @@ export default {
             this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].stayDetermineMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].stayDetermineMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].stayDetermineMoney : 0) + parseFloat(e.stayDetermineMoney !== '' ? e.stayDetermineMoney : 0)) * 100) / 100
             this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].adjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].adjustmentMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].adjustmentMoney : 0) + parseFloat(e.adjustmentMoney !== '' ? e.adjustmentMoney : 0)) * 100) / 100
             this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].money = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].money !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].money : 0) + parseFloat(e.money !== '' ? e.money : 0)) * 100) / 100
+            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].fyAdjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].fyAdjustmentMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].fyAdjustmentMoney : 0) + (parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0))) * 100) / 100
             this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].specialRebateSids.push(e.sid)
             v = 1
             break
@@ -282,6 +289,7 @@ export default {
             stayDetermineMoney: e.stayDetermineMoney,
             adjustmentMoney: e.adjustmentMoney,
             money: e.money,
+            fyAdjustmentMoney: Math.round((parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100,
             specialRebateSids: [e.sid],
             sid: '',
             mainSid: ''
@@ -300,6 +308,7 @@ export default {
             this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].stayDetermineMoney = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].stayDetermineMoney !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].stayDetermineMoney : 0) + parseFloat(s.stayDetermineMoney !== '' ? s.stayDetermineMoney : 0)) * 100) / 100
             this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].adjustmentMoney = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].adjustmentMoney !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].adjustmentMoney : 0) + parseFloat(s.adjustmentMoney !== '' ? s.adjustmentMoney : 0)) * 100) / 100
             this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].money = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].money !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].money : 0) + parseFloat(s.money !== '' ? s.money : 0)) * 100) / 100
+            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[l].fyAdjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[l].fyAdjustmentMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[l].fyAdjustmentMoney : 0) + (parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0))) * 100) / 100
             this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].specialRebateSids.push(s.sid)
             k = 1
             break
@@ -317,6 +326,7 @@ export default {
             stayDetermineMoney: s.stayDetermineMoney,
             adjustmentMoney: s.adjustmentMoney,
             money: s.money,
+            fyAdjustmentMoney: Math.round((parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100,
             specialRebateSids: [s.sid],
             sid: '',
             mainSid: ''
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 3de82df964..f9545d4e74 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
@@ -26,8 +26,9 @@
             <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">
+              <template>
                 <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
             </el-table-column>
@@ -42,9 +43,10 @@
             <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="adjustmentMoney" label="返利调整金额" align="center" />
+            <el-table-column prop="fyAdjustmentMoney" label="其中费用调整金额" align="center" />
             <el-table-column label="明细" align="center">
-              <template slot-scope="scope">
+              <template>
                 <el-button type="primary" size="mini" @click="handleLook()">查看</el-button>
               </template>
             </el-table-column>