Merge branch 'dev' into pre-production

src/views/distribution/inventory/CreateOrder.vue

@@ -2430,6 +2430,10 @@ const onEditLoad = async () => {
           val.deliveryPrice = isNumber(val.deliveryPrice) ? Number(val.deliveryPrice) : 0;
           val.pickupPrice = isNumber(val.pickupPrice) ? Number(val.pickupPrice) : 0;
           val.subtotalFreight = isNumber(val.subtotalFreight) ? Number(val.subtotalFreight) : 0;
+          val.subtotalPickup = isNumber(val.subtotalPickup) ? Number(val.subtotalPickup) : 0;
+          val.subtotalDeliveryFee = isNumber(val.subtotalDeliveryFee)
+            ? Number(val.subtotalDeliveryFee)
+            : 0;
           /** 系统维护 -- 干线计价方式 */
           val.systemChargeType = val.systemChargeType || 1;
           /** 系统维护 -- 配送计价方式 */

src/views/waybill/CreateZeroOrder.vue

@@ -1907,6 +1907,10 @@ const initPageInfo = async () => {
           val.deliveryPrice = isNumber(val.deliveryPrice) ? Number(val.deliveryPrice) : 0;
           val.pickupPrice = isNumber(val.pickupPrice) ? Number(val.pickupPrice) : 0;
           val.subtotalFreight = isNumber(val.subtotalFreight) ? Number(val.subtotalFreight) : 0;
+          val.subtotalPickup = isNumber(val.subtotalPickup) ? Number(val.subtotalPickup) : 0;
+          val.subtotalDeliveryFee = isNumber(val.subtotalDeliveryFee)
+            ? Number(val.subtotalDeliveryFee)
+            : 0;
 
           /** 系统维护 -- 干线计价方式 */
           val.systemChargeType = val.systemChargeType || 1;
@@ -2039,7 +2043,7 @@ const handleAdd = () => {
     }
   }
 
-  details.goodsList.push({
+  const _obj = {
     /** 货物名称  */
     goodsName: '',
     /** 品类Id */
@@ -2073,7 +2077,11 @@ const handleAdd = () => {
     /** 运费小计 */
     subtotalFreight: 0,
     goodsListOptions: [],
-  });
+  };
+
+  handleAssignmentItemPrice(_obj);
+
+  details.goodsList.push(_obj);
 };
 
 /** 移除 */