Merge branch 'release' into 'jd_dev'

Release分支代码合并到jd分支20241218

See merge request !10

src/pages/tally/mixOrderList.vue

@@ -15,7 +15,9 @@
               <view class="flex-sub">{{$t('用途')}}</view>
               <view class="flex-sub">{{$t("数量")}}</view>
             </view>
-            <view v-for="(v, index) in warehouseList" :key="'order-' + index">
+            <view v-for="(order, index) in warehouseList" :key="'order-' + index">
+              <view v-for="(item, index) in order.orderWarehouseInBackItemDoList" :key="'item-' + index">
+                <view v-for="(v, index) in item.orderWarehouseInDetailsVOList" :key="'order-' + index">
                   <view class="flex text-center padding-sm" :key="'goods-' + index">
                     <view class="flex-sub">{{ $lang.locale==='zh-Hans'? v.prodTitleZh:v.prodTitleEn }}</view>
                     <view class="flex-sub">
@@ -25,7 +27,9 @@
                     <view class="flex-sub"><dict-tag :type="DICT_TYPE.ECW_PRODUCT_MATERIAL" :value="v.material" /></view>
                     <view class="flex-sub">{{ getProductNamesByIds(v.prodAttrIds) }}</view>
                     <view class="flex-sub">{{ getProductUsageByIds(v.usageIds) }}</view>
-                <view class="flex-sub">{{ v.num }}</view>
+                    <view class="flex-sub">{{ v.quantityAll }}</view>
+                  </view>
+                </view>
               </view>
             </view>
           </view>