Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java

@@ -523,7 +523,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
                             ydzf = rebate.getOnceTreatCost();
                         }
                         if (null != rebate.getOnceSuppCost()) {
-                            ydd = rebate.getOnceTreatCost();
+                            ydd = rebate.getOnceSuppCost();
                         }
                         if (StringUtils.isNotBlank(rebate.getStayDetermineMoneyNew())) {
                             ydqd = new BigDecimal(rebate.getStayDetermineMoneyNew());
@@ -533,7 +533,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
                             esc = new BigDecimal(rebate.getSecondaryUploadMoney());
                         }
                         if (null != rebate.getSecondItureCost()) {
-                            efpzc = rebate.getOnceItureCost();
+                            efpzc = rebate.getSecondItureCost();
                         }
                         if (null != rebate.getTempItureCost()) {
                             edfpzc = rebate.getTempItureCost();
@@ -541,8 +541,8 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
                         if (null != rebate.getSecondTreatCost()) {
                             efpdzf = rebate.getSecondTreatCost();
                         }
-                        if (null != rebate.getTempItureCost()) {
-                            edfpdzf = rebate.getTempItureCost();
+                        if (null != rebate.getTempTreatCost()) {
+                            edfpdzf = rebate.getTempTreatCost();
                         }
                         if (null != rebate.getSecondSuppCost()) {
                             efpdd = rebate.getSecondSuppCost();

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

@@ -61,6 +61,11 @@
                 <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="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="purchaseSystemName" label="采购系统" align="center" width="140" />
             <el-table-column prop="brandName" label="品牌" align="center" width="120" />