Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatecheck.js

@@ -94,7 +94,7 @@ export default {
   // 查看明细
   specialRebateCheckDetails: function(data) {
     return request({
-      url: '/scm/v1/scmspecialrebatecheckapply/specialRebateCheckDetails/' + data,
+      url: '/scm/v1/scmspecialrebatecheckapplydetail/specialRebateCheckDetails/' + data,
       method: 'get'
     })
   },

anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheck.vue

@@ -279,6 +279,7 @@ export default {
     },
     handleClick() {
       this.$parent.resetState()
+      this.$parent.handleReset()
     },
     toEdit(row) {
       this.viewState = 2

anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue

@@ -457,7 +457,7 @@ export default {
         size: 5,
         total: 0
       }
-      this.init()
+      this.getList()
     },
     getNumber(val, limit) {
       val = val.replace(/[^0-9.]/g, '') // 保留数字
@@ -524,7 +524,7 @@ export default {
     // 二次调整页面--调整说明模块
     adjustmentMoneyAdd() {
       // 剩余预计返利 = 列表预提返利-其中预提费用-一次上传返利金额(列表一次上传金额-一次费用-待确定）
-      this.formobj.surplusRebate = Math.round((parseFloat(this.formobj.estimateRebate !== '' ? this.formobj.estimateRebate : 0) - parseFloat(this.formobj.expectCost !== '' ? this.formobj.expectCost : 0) - (parseFloat(this.formobj.uploadMoney !== '' ? this.formobj.uploadMoney : 0) - parseFloat(this.formobj.onceTreatCost !== '' ? this.formobj.onceTreatCost : 0) - parseFloat(this.formobj.onceSuppCost !== '' ? this.formobj.onceSuppCost : 0) - parseFloat(this.formobj.stayDetermineMoneyNew !== '' ? this.formobj.stayDetermineMoneyNew : 0))) * 100) / 100
+      this.formobj.surplusRebate = Math.round((parseFloat(this.formobj.estimateRebate !== '' ? this.formobj.estimateRebate : 0) - parseFloat(this.formobj.withholdCost !== '' ? this.formobj.withholdCost : 0) - (parseFloat(this.formobj.uploadMoney !== '' ? this.formobj.uploadMoney : 0) - parseFloat(this.formobj.onceTreatCost !== '' ? this.formobj.onceTreatCost : 0) - parseFloat(this.formobj.onceSuppCost !== '' ? this.formobj.onceSuppCost : 0) - parseFloat(this.formobj.stayDetermineMoneyNew !== '' ? this.formobj.stayDetermineMoneyNew : 0))) * 100) / 100
       // 调整金额合计 = 其中含返利之和 - 剩余预提返利
       this.formobj.adjustmentMoney = Math.round((parseFloat(this.formobj.firstRebate !== '' ? this.formobj.firstRebate : 0) + parseFloat(this.formobj.secondRebate !== '' ? this.formobj.secondRebate : 0) - parseFloat(this.formobj.surplusRebate !== '' ? this.formobj.surplusRebate : 0)) * 100) / 100
     },

anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobecheckedByUpdate.vue

@@ -264,8 +264,8 @@ export default {
     },
     isAdjustmentInput(val) {
       let money = '0'
-      // 上传金额(一次上传金额 + 二次上传金额) - 费用 - 待确定金额 - 预提返利
-      money = Math.round((parseFloat(val.uploadMoney !== '' ? val.uploadMoney : 0) + parseFloat(val.secondaryUploadMoney !== '' ? val.secondaryUploadMoney : 0) - parseFloat(val.stayDetermineMoney !== '' ? val.stayDetermineMoney : 0) - (parseFloat(val.onceTreatCost !== '' ? val.onceTreatCost : 0) + parseFloat(val.onceSuppCost !== '' ? val.onceSuppCost : 0) + parseFloat(val.secondTreatCost !== '' ? val.secondTreatCost : 0) + parseFloat(val.secondSuppCost !== '' ? val.secondSuppCost : 0)) - parseFloat(val.estimateRebate !== '' ? val.estimateRebate : 0)) * 100) / 100
+      // 上传金额(一次上传金额 + 二次上传金额) - 其中费用 - 待确定金额 - （预提返利 - 其中预提费用）
+      money = Math.round((parseFloat(val.uploadMoney !== '' ? val.uploadMoney : 0) + parseFloat(val.secondaryUploadMoney !== '' ? val.secondaryUploadMoney : 0) - parseFloat(val.stayDetermineMoney !== '' ? val.stayDetermineMoney : 0) - (parseFloat(val.onceTreatCost !== '' ? val.onceTreatCost : 0) + parseFloat(val.onceSuppCost !== '' ? val.onceSuppCost : 0) + parseFloat(val.secondTreatCost !== '' ? val.secondTreatCost : 0) + parseFloat(val.secondSuppCost !== '' ? val.secondSuppCost : 0)) - (parseFloat(val.estimateRebate !== '' ? val.estimateRebate : 0) - parseFloat(val.expectTreatCost !== '' ? val.expectTreatCost : 0) - parseFloat(val.expectSuppCost !== '' ? val.expectSuppCost : 0))) * 100) / 100
       if (val.stayDetermineMoney === '0') {
         if (parseFloat(money) > 0) {
           this.isAdjustment = '是'

anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/relation/specialrebatetobecheckedAdd.vue

@@ -30,7 +30,7 @@
             <el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="120" />
             <el-table-column prop="rebateName" label="返利名称" align="center" width="150" />
             <el-table-column prop="estimateRebate" label="预计返利" align="center" width="150" />
-            <el-table-column prop="expectCost" label="其中预提费用" align="center" width="150" />
+            <el-table-column prop="withholdCost" label="其中预提费用" align="center" width="150" />
             <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="150" />

anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/relation/specialrebatetobecheckedInfo.vue

@@ -28,7 +28,7 @@
             <el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="120" />
             <el-table-column prop="rebateName" label="返利名称" align="center" width="150" />
             <el-table-column prop="estimateRebate" label="预计返利" align="center" width="150" />
-            <el-table-column prop="expectCost" label="其中预提费用" align="center" width="150" />
+            <el-table-column prop="withholdCost" label="其中预提费用" align="center" width="150" />
             <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="150" />

anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/relation/yiheduizhuanxiangfanli.vue

@@ -18,7 +18,7 @@
             <el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="120" />
             <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="140" />
+            <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" />

anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheck.vue

@@ -272,6 +272,7 @@ export default {
     },
     handleClick() {
       this.$parent.resetState()
+      this.$parent.handleReset()
     },
     toEdit(row) {
       this.viewState = 2

anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckAdd.vue

@@ -180,7 +180,7 @@ export default {
           if (this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].rebateTypeValue === e.rebateTypeValue) {
             this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].num = parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].num) + parseFloat(1)
             this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withRebate = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withRebate !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withRebate : 0) + parseFloat(e.estimateRebate !== '' ? e.estimateRebate : 0)) * 100) / 100
-            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].expectCost = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].expectCost !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].expectCost : 0) + parseFloat(e.expectCost !== '' ? e.expectCost : 0)) * 100) / 100
+            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withholdCost = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withholdCost !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withholdCost : 0) + parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100
             this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].uploadMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].uploadMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].uploadMoney : 0) + (parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0))) * 100) / 100
             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
@@ -197,7 +197,7 @@ export default {
             rebateTypeValue: e.rebateTypeValue,
             num: 1,
             withRebate: e.estimateRebate,
-            expectCost: e.expectCost,
+            withholdCost: e.withholdCost,
             brandName: e.brandName,
             brandSid: e.brandSid,
             uploadMoney: Math.round((parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0)) * 100) / 100,
@@ -217,7 +217,7 @@ export default {
           if (this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate) {
             this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].num = parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].num) + parseFloat(1)
             this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withRebate = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withRebate !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withRebate : 0) + parseFloat(s.estimateRebate !== '' ? s.estimateRebate : 0)) * 100) / 100
-            this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].expectCost = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].expectCost !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].expectCost : 0) + parseFloat(s.expectCost !== '' ? s.expectCost : 0)) * 100) / 100
+            this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdCost = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdCost !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdCost : 0) + parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100
             this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].uploadMoney = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].uploadMoney !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].uploadMoney : 0) + (parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0))) * 100) / 100
             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
@@ -232,7 +232,7 @@ export default {
             withholdingDate: s.withholdingDate,
             num: 1,
             withRebate: s.estimateRebate,
-            expectCost: s.expectCost,
+            withholdCost: s.withholdCost,
             brandName: s.brandName,
             brandSid: s.brandSid,
             uploadMoney: Math.round((parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0)) * 100) / 100,
@@ -273,7 +273,7 @@ export default {
           if (this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].rebateTypeValue === e.rebateTypeValue) {
             this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].num = parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].num) + parseFloat(1)
             this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withRebate = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withRebate !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withRebate : 0) + parseFloat(e.estimateRebate !== '' ? e.estimateRebate : 0)) * 100) / 100
-            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].expectCost = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].expectCost !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].expectCost : 0) + parseFloat(e.expectCost !== '' ? e.expectCost : 0)) * 100) / 100
+            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withholdCost = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withholdCost !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withholdCost : 0) + parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100
             this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].uploadMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].uploadMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].uploadMoney : 0) + (parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0))) * 100) / 100
             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
@@ -290,7 +290,7 @@ export default {
             rebateTypeValue: e.rebateTypeValue,
             num: 1,
             withRebate: e.estimateRebate,
-            expectCost: e.expectCost,
+            withholdCost: e.withholdCost,
             brandName: e.brandName,
             brandSid: e.brandSid,
             uploadMoney: Math.round((parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0)) * 100) / 100,
@@ -310,7 +310,7 @@ export default {
           if (this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate) {
             this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].num = parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].num) + parseFloat(1)
             this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withRebate = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withRebate !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withRebate : 0) + parseFloat(s.estimateRebate !== '' ? s.estimateRebate : 0)) * 100) / 100
-            this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].expectCost = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].expectCost !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].expectCost : 0) + parseFloat(s.expectCost !== '' ? s.expectCost : 0)) * 100) / 100
+            this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdCost = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdCost !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdCost : 0) + parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100
             this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].uploadMoney = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].uploadMoney !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].uploadMoney : 0) + (parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0))) * 100) / 100
             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
@@ -325,7 +325,7 @@ export default {
             withholdingDate: s.withholdingDate,
             num: 1,
             withRebate: s.estimateRebate,
-            expectCost: s.expectCost,
+            withholdCost: s.withholdCost,
             brandName: s.brandName,
             brandSid: s.brandSid,
             uploadMoney: Math.round((parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0)) * 100) / 100,

anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue

@@ -76,7 +76,7 @@
             <el-table-column prop="rebateName" label="返利名称" align="center" min-width="150" />
             <el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="120" />
             <el-table-column prop="estimateRebate" label="预计返利" align="center" width="120" />
-            <el-table-column prop="expectCost" label="其中预提费用" align="center" width="140" />
+            <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" />
@@ -466,7 +466,7 @@ export default {
         size: 5,
         total: 0
       }
-      this.init()
+      this.getList()
     },
     getNumber(val, limit) {
       val = val.replace(/[^0-9.]/g, '') // 保留数字
@@ -530,7 +530,7 @@ export default {
     // 二次调整页面--调整说明模块
     adjustmentMoneyAdd() {
       // 剩余预计返利 = 列表预提返利-其中预提费用-一次上传返利金额(列表一次上传金额-一次费用-待确定）
-      this.formobj.surplusRebate = Math.round((parseFloat(this.formobj.estimateRebate !== '' ? this.formobj.estimateRebate : 0) - parseFloat(this.formobj.expectCost !== '' ? this.formobj.expectCost : 0) - (parseFloat(this.formobj.uploadMoney !== '' ? this.formobj.uploadMoney : 0) - parseFloat(this.formobj.onceItureCost !== '' ? this.formobj.onceItureCost : 0) - parseFloat(this.formobj.onceTreatCost !== '' ? this.formobj.onceTreatCost : 0) - parseFloat(this.formobj.onceSuppCost !== '' ? this.formobj.onceSuppCost : 0) - parseFloat(this.formobj.stayDetermineMoneyNew !== '' ? this.formobj.stayDetermineMoneyNew : 0))) * 100) / 100
+      this.formobj.surplusRebate = Math.round((parseFloat(this.formobj.estimateRebate !== '' ? this.formobj.estimateRebate : 0) - parseFloat(this.formobj.withholdCost !== '' ? this.formobj.withholdCost : 0) - (parseFloat(this.formobj.uploadMoney !== '' ? this.formobj.uploadMoney : 0) - parseFloat(this.formobj.onceItureCost !== '' ? this.formobj.onceItureCost : 0) - parseFloat(this.formobj.onceTreatCost !== '' ? this.formobj.onceTreatCost : 0) - parseFloat(this.formobj.onceSuppCost !== '' ? this.formobj.onceSuppCost : 0) - parseFloat(this.formobj.stayDetermineMoneyNew !== '' ? this.formobj.stayDetermineMoneyNew : 0))) * 100) / 100
       // 调整金额合计 = 其中含返利之和 - 剩余预提返利
       this.formobj.adjustmentMoney = Math.round((parseFloat(this.formobj.firstRebate !== '' ? this.formobj.firstRebate : 0) + parseFloat(this.formobj.secondRebate !== '' ? this.formobj.secondRebate : 0) - parseFloat(this.formobj.surplusRebate !== '' ? this.formobj.surplusRebate : 0)) * 100) / 100
     },

anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobecheckedByUpdate.vue

@@ -262,8 +262,8 @@ export default {
     },
     isAdjustmentInput(val) {
       let money = '0'
-      // 上传金额(一次上传金额 + 二次上传金额) - 费用 - 待确定金额 - 预提返利
-      money = Math.round((parseFloat(val.uploadMoney !== '' ? val.uploadMoney : 0) + parseFloat(val.secondaryUploadMoney !== '' ? val.secondaryUploadMoney : 0) - parseFloat(val.stayDetermineMoney !== '' ? val.stayDetermineMoney : 0) - (parseFloat(val.onceItureCost !== '' ? val.onceItureCost : 0) + parseFloat(val.onceTreatCost !== '' ? val.onceTreatCost : 0) + parseFloat(val.onceSuppCost !== '' ? val.onceSuppCost : 0) + parseFloat(val.secondItureCost !== '' ? val.secondItureCost : 0) + parseFloat(val.secondTreatCost !== '' ? val.secondTreatCost : 0) + parseFloat(val.secondSuppCost !== '' ? val.secondSuppCost : 0)) - parseFloat(val.estimateRebate !== '' ? val.estimateRebate : 0)) * 100) / 100
+      // 上传金额(一次上传金额 + 二次上传金额) - 费用 - 待确定金额 - (预提返利 - 其中预提费用)
+      money = Math.round((parseFloat(val.uploadMoney !== '' ? val.uploadMoney : 0) + parseFloat(val.secondaryUploadMoney !== '' ? val.secondaryUploadMoney : 0) - parseFloat(val.stayDetermineMoney !== '' ? val.stayDetermineMoney : 0) - (parseFloat(val.onceItureCost !== '' ? val.onceItureCost : 0) + parseFloat(val.onceTreatCost !== '' ? val.onceTreatCost : 0) + parseFloat(val.onceSuppCost !== '' ? val.onceSuppCost : 0) + parseFloat(val.secondItureCost !== '' ? val.secondItureCost : 0) + parseFloat(val.secondTreatCost !== '' ? val.secondTreatCost : 0) + parseFloat(val.secondSuppCost !== '' ? val.secondSuppCost : 0)) - (parseFloat(val.estimateRebate !== '' ? val.estimateRebate : 0) - parseFloat(val.expectItureCost !== '' ? val.expectItureCost : 0) - parseFloat(val.expectTreatCost !== '' ? val.expectTreatCost : 0) - parseFloat(val.expectSuppCost !== '' ? val.expectSuppCost : 0))) * 100) / 100
       if (val.stayDetermineMoney === '0') {
         if (parseFloat(money) > 0) {
           this.isAdjustment = '是'

anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagement.vue

@@ -58,7 +58,7 @@
             </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 == '5' ? '分配中' : scope.row.state == '6' ? '' : scope.row.state == '已分配' ? '' : '' }}</span>
+                <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 prop="createOrgName" label="分公司" align="center" width="150" />

anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/relation/specialrebatetobecheckedAdd.vue

@@ -30,7 +30,7 @@
             <el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="120" />
             <el-table-column prop="rebateName" label="返利名称" align="center" width="150" />
             <el-table-column prop="estimateRebate" label="预计返利" align="center" width="150" />
-            <el-table-column prop="expectCost" label="其中预提费用" align="center" width="150" />
+            <el-table-column prop="withholdCost" label="其中预提费用" align="center" width="150" />
             <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="150" />

anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/relation/specialrebatetobecheckedInfo.vue

@@ -28,7 +28,7 @@
             <el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="120" />
             <el-table-column prop="rebateName" label="返利名称" align="center" width="150" />
             <el-table-column prop="estimateRebate" label="预计返利" align="center" width="150" />
-            <el-table-column prop="expectCost" label="其中预提费用" align="center" width="150" />
+            <el-table-column prop="withholdCost" label="其中预提费用" align="center" width="150" />
             <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="150" />

anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/relation/yiheduizhuanxiangfanli.vue

@@ -18,7 +18,7 @@
             <el-table-column prop="rebateTypeValue" label="返利类型" align="center" width="120" />
             <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="140" />
+            <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" />

anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiEdit.vue

@@ -165,7 +165,7 @@ export default {
           if (this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].rebateTypeValue === e.rebateTypeValue) {
             this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].num = parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].num) + parseFloat(1)
             this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withRebate = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withRebate !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withRebate : 0) + parseFloat(e.estimateRebate !== '' ? e.estimateRebate : 0)) * 100) / 100
-            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].expectCost = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].expectCost !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].expectCost : 0) + parseFloat(e.expectCost !== '' ? e.expectCost : 0)) * 100) / 100
+            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withholdCost = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withholdCost !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withholdCost : 0) + parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100
             this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].uploadMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].uploadMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].uploadMoney : 0) + (parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0))) * 100) / 100
             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
@@ -182,7 +182,7 @@ export default {
             rebateTypeValue: e.rebateTypeValue,
             num: 1,
             withRebate: e.estimateRebate,
-            expectCost: e.expectCost,
+            withholdCost: e.withholdCost,
             brandName: e.brandName,
             brandSid: e.brandSid,
             uploadMoney: Math.round((parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0)) * 100) / 100,
@@ -202,7 +202,7 @@ export default {
           if (this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate) {
             this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].num = parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].num) + parseFloat(1)
             this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withRebate = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withRebate !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withRebate : 0) + parseFloat(s.estimateRebate !== '' ? s.estimateRebate : 0)) * 100) / 100
-            this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].expectCost = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].expectCost !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].expectCost : 0) + parseFloat(s.expectCost !== '' ? s.expectCost : 0)) * 100) / 100
+            this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdCost = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdCost !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdCost : 0) + parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100
             this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].uploadMoney = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].uploadMoney !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].uploadMoney : 0) + (parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0))) * 100) / 100
             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
@@ -217,7 +217,7 @@ export default {
             withholdingDate: s.withholdingDate,
             num: 1,
             withRebate: s.estimateRebate,
-            expectCost: s.expectCost,
+            withholdCost: s.withholdCost,
             brandName: s.brandName,
             brandSid: s.brandSid,
             uploadMoney: Math.round((parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0)) * 100) / 100,
@@ -258,7 +258,7 @@ export default {
           if (this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].rebateTypeValue === e.rebateTypeValue) {
             this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].num = parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].num) + parseFloat(1)
             this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withRebate = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withRebate !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withRebate : 0) + parseFloat(e.estimateRebate !== '' ? e.estimateRebate : 0)) * 100) / 100
-            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].expectCost = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].expectCost !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].expectCost : 0) + parseFloat(e.expectCost !== '' ? e.expectCost : 0)) * 100) / 100
+            this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withholdCost = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withholdCost !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withholdCost : 0) + parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100
             this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].uploadMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].uploadMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].uploadMoney : 0) + (parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0))) * 100) / 100
             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
@@ -275,7 +275,7 @@ export default {
             rebateTypeValue: e.rebateTypeValue,
             num: 1,
             withRebate: e.estimateRebate,
-            expectCost: e.expectCost,
+            withholdCost: e.withholdCost,
             brandName: e.brandName,
             brandSid: e.brandSid,
             uploadMoney: Math.round((parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0)) * 100) / 100,
@@ -295,7 +295,7 @@ export default {
           if (this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate) {
             this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].num = parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].num) + parseFloat(1)
             this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withRebate = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withRebate !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withRebate : 0) + parseFloat(s.estimateRebate !== '' ? s.estimateRebate : 0)) * 100) / 100
-            this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].expectCost = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].expectCost !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].expectCost : 0) + parseFloat(s.expectCost !== '' ? s.expectCost : 0)) * 100) / 100
+            this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdCost = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdCost !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdCost : 0) + parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100
             this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].uploadMoney = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].uploadMoney !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].uploadMoney : 0) + (parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0))) * 100) / 100
             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
@@ -310,7 +310,7 @@ export default {
             withholdingDate: s.withholdingDate,
             num: 1,
             withRebate: s.estimateRebate,
-            expectCost: s.expectCost,
+            withholdCost: s.withholdCost,
             brandName: s.brandName,
             brandSid: s.brandSid,
             uploadMoney: Math.round((parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0)) * 100) / 100,