Merge branch 'dev_new_order_inventory_detail' into release_v2.27.0

src/views/order/factoryOrderNew/component/OrderInventoryDialog.vue

@@ -153,20 +153,6 @@ const buildQueryParams = () => ({
   inventoryStatus: filterForm.value.inventoryStatus || undefined,
 })
 
-const applyQueryWarehouseName = (records: OrderInventoryData[]) => {
-  const { warehouseId } = filterForm.value
-  if (!warehouseId) {
-    return records
-  }
-  const warehouseName = props.warehouseList.find((w) => w.id === warehouseId)
-    ?.name
-  return records.map((record) => ({
-    ...record,
-    warehouseName: record.inventoryStatus === 3 ? warehouseName : record.warehouseName,
-    
-  }))
-}
-
 const {
   loading,
   currentPage,
@@ -185,10 +171,7 @@ const {
       current,
       size,
     )
-    return {
-      ...res.data,
-      records: applyQueryWarehouseName(res.data.records),
-    }
+    return res.data
   },
 })
 
@@ -272,8 +255,8 @@ const columns = [
       return (
         <span
           style={{
-            color: row.inventoryStatus === 3 ? '#E6A23C' : '',
-            fontWeight: row.inventoryStatus === 3 ? 'bold' : '',
+            color: !row.locationCode ? '#E6A23C' : '',
+            fontWeight: !row.locationCode ? 'bold' : '',
           }}
         >
           {row.salesNum || 0}