Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordersubmit/SubmitVo.java

@@ -17,4 +17,6 @@ public class SubmitVo implements Vo {
     private String intermediaryMobile;
     //返利费用
     private String agencyFee;
+    //返利总和
+    private String agencyFeeTotal;
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -2993,6 +2993,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 submitVo.setIntermediaryMobile(busSalesOrderSubmit.getDistributorMobile());
                 if (busSalesOrderSubmit.getDistributorPrice() != null) {
                     submitVo.setAgencyFee(busSalesOrderSubmit.getDistributorPrice().toString());
+                    if (priceInfo != null) {
+                        submitVo.setAgencyFeeTotal(busSalesOrderSubmit.getDistributorPrice().multiply(new BigDecimal(priceInfo.getNumber())).toString());
+                    }
+
                 }
                 vo.setIntermediary1(submitVo);
             }
@@ -3002,6 +3006,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 submitVo.setIntermediaryMobile(busSalesOrderSubmit.getDistributorMobileTwo());
                 if (busSalesOrderSubmit.getDistributorPriceTwo() != null) {
                     submitVo.setAgencyFee(busSalesOrderSubmit.getDistributorPriceTwo().toString());
+                    if (priceInfo != null) {
+                        submitVo.setAgencyFeeTotal(busSalesOrderSubmit.getDistributorPriceTwo().multiply(new BigDecimal(priceInfo.getNumber())).toString());
+                    }
                 }
                 vo.setIntermediary2(submitVo);
             }

anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue

@@ -479,13 +479,13 @@ export default {
         //   btnKey: 'toAdd',
         //   btnLabel: '新增'
         // },
-        // {
-        //   type: 'primary',
-        //   size: 'small',
-        //   icon: 'edit',
-        //   btnKey: 'toEdit',
-        //   btnLabel: '编辑'
-        // },
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'edit',
+          btnKey: 'toEdit',
+          btnLabel: '编辑'
+        },
         // {
         //   type: 'danger',
         //   size: 'small',

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderSubmitVo.java

@@ -17,4 +17,6 @@ public class OrderSubmitVo implements Vo {
     private String intermediaryMobile;
 
     private String agencyFee;
+
+    private String agencyFeeTotal;
 }