瀏覽代碼

相关扩展字段设置值问题处理

chenzhfa 2 年之前
父節點
當前提交
cc162e2e41

+ 14 - 2
src/components/OrderGoodsList/index.js

@@ -560,6 +560,8 @@ class OrderGoodsList extends PureComponent {
         orderCartData[i].amount =
           parseFloat(orderCartData[i].salePrice || "0") *
           parseFloat(orderCartData[i].mainNum || "0");
+
+        
         // 计算促销后金额:促销价 * 主数量 - 均摊促销金额(整单降价均摊)
         const afterPromAmount =
           parseFloat(orderCartData[i].promPrice || "0") *
@@ -568,6 +570,9 @@ class OrderGoodsList extends PureComponent {
           afterPromAmount - parseFloat(orderCartData[i].promAmount || "0");
         totalDealAmount +=
           afterPromAmount - parseFloat(orderCartData[i].promAmount || "0");
+
+        orderCartData[i].ext09 = orderCartData[i].salePrice || "0";
+        orderCartData[i].ext10 = afterPromAmount - parseFloat(orderCartData[i].promAmount || "0");;
       }
       // 冲抵费用均摊
       const offsetAmount = parseFloat(nextProps.offsetAmount || "0");
@@ -942,6 +947,7 @@ class OrderGoodsList extends PureComponent {
     let newAllWeight = 0; // 总重量
     let newAllVolume = 0; // 总体积
     let newTotalNum = 0; // 总数量(订货数量)
+    let ext04 = 0;
     for (let i = 0; i < orderCartData.length; i++) {
       newTotalAmount +=
         parseFloat(orderCartData[i].salePrice || "0") *
@@ -953,13 +959,17 @@ class OrderGoodsList extends PureComponent {
       newAllWeight += parseFloat(orderCartData[i].rowWeight);
       newAllVolume += parseFloat(orderCartData[i].rowVolume);
       newTotalNum += parseFloat(orderCartData[i].orderNum);
+      ext04 += parseFloat(orderCartData[i].promPrice || "0") *
+      parseFloat(orderCartData[i].mainNum || "0") -
+      parseFloat(orderCartData[i].promAmount || "0")
     }
     this.fillGiftWeightAndVolume({
       newTotalAmount,
       newTotalDealAmount,
       newAllWeight,
       newAllVolume,
-      newTotalNum
+      newTotalNum,
+      ext04
     });
   }
   // 如果有赠品,补充赠品体积重量
@@ -968,6 +978,7 @@ class OrderGoodsList extends PureComponent {
     const { selectedGiftProms } = this.state;
     const newTotalAmount = value.newTotalAmount;
     const newTotalDealAmount = value.newTotalDealAmount;
+    const ext04 = value.ext04;
     // 累加赠品数量、体积、重量
     let newTotalNum = value.newTotalNum;
     let newAllWeight = value.newAllWeight || 0;
@@ -989,7 +1000,8 @@ class OrderGoodsList extends PureComponent {
       newTotalDealAmount,
       newAllWeight,
       newAllVolume,
-      newTotalNum
+      newTotalNum,
+      ext04
     });
   }
   // 删除商品

+ 6 - 2
src/pages/Buyer/orderEdit/index.js

@@ -70,6 +70,7 @@ class OrderEidt extends PureComponent {
       totalNum: 0, // 总数量
       totalDealAmount: 0, // 订单成交金额
       totalAmount: 0, // 商品总金额(订单原金额)
+      ext04:0,
       promAmount: 0, // 促销金额
       supplierId: "", // 供应商
       transportModeId: "", // 运输方式
@@ -938,7 +939,8 @@ class OrderEidt extends PureComponent {
       totalDealAmount: value.newTotalDealAmount - offsetAmount,
       totalWeight: value.newAllWeight,
       totalVolume: value.newAllVolume,
-      totalNum: value.newTotalNum
+      totalNum: value.newTotalNum,
+      ext04:value.newTotalAmount
     });
   }
 
@@ -1202,7 +1204,8 @@ class OrderEidt extends PureComponent {
       totalNum,
       ifEditOrder,
       saleModel,
-      ifOneSupplier
+      ifOneSupplier,
+      ext04
     } = this.state;
     // 默认地址
     let addressData = this.state.addressData;
@@ -1246,6 +1249,7 @@ class OrderEidt extends PureComponent {
       totalWeight: totalWeight, // 总重量
       totoalVolume: totalVolume, // 总体积
       totalNum: totalNum, // 总数量
+      ext04:ext04,
       reqOrderSource: "01", // 门户
       srcOrderId: srcOrderId,
       srcOrderCode: srcOrderCode,

+ 2 - 0
src/pages/Buyer/orderEdit/orderTools.js

@@ -35,6 +35,8 @@ export const setItemsDefaultData = (orderItems, ifTransProdInfo) => {
     newItem.salePrice = newItem.salePrice || item.salePrice;
     newItem.promPrice = newItem.salePrice || item.salePrice;
     newItem.dealPrice = newItem.salePrice || item.salePrice;
+    newItem.ext09 = newItem.salePrice || item.salePrice;
+    newItem.ext10 = (newItem.salePrice || item.salePrice) * item.orderNum;
     newItem.stock = item.stock || 0; // 库存
     newItem.currency = currency.id;
     newItem.currencyId = currency.id;

+ 2 - 1
src/pages/Buyer/returnOrderEdit/index.js

@@ -516,7 +516,8 @@ class OrderEidt extends PureComponent {
       totalReturnAmount: value.newTotaltotalReturnAmount,
       totalWeight: value.newAllWeight,
       totalVolume: value.newAllVolume,
-      totalNum: value.newTotalNum
+      totalNum: value.newTotalNum,
+      ext04: value.ext04
     });
   }