Merge branch 'jinfa-20221102' into 'jinfa-20221102'

src/pages/transaction/purchaseOrder/orderCollectSrm/components/orderMaterialsDrawer/index.tsx

@@ -80,6 +80,10 @@ export interface OrderMaterialsDrawerProps {
    * 下单模式
    */
   orderMode: number,
+  /**
+   * 订单id
+   */
+  orderId: string,
 }
 
 export interface OrderMaterialsDrawerRef {
@@ -141,6 +145,7 @@ const OrderMaterialsDrawer: React.ForwardRefRenderFunction<OrderMaterialsDrawerR
     onClose,
     contractId,
     orderMode,
+    orderId
   } = props;
   const [checkedKeysState, setCheckedKeysState] = useState([]);
   const [halfCheckedState, setHalfCheckedState] = useState([]);
@@ -225,11 +230,10 @@ const OrderMaterialsDrawer: React.ForwardRefRenderFunction<OrderMaterialsDrawerR
   };
 
   const defaultMaterialsList = (dataSource: MaterialsListItem[]) => {
-    console.log(requisitionListValue.current, 'requisitionListValue.current',dataSource)
     const requisitionValue: { [key: string]: string } = {};
     dataSource.forEach(({ children }) => {
       children?.forEach(child => {
-        requisitionValue[child.key] =  requisitionListValue.current[child.key] as string || child?.purchaseProductSalesManResponse?.purchaseRemainingQuantity + ''
+        requisitionValue[child.key] = requisitionListValue.current[child.key] as string || child?.purchaseProductSalesManResponse?.purchaseRemainingQuantity + ''
       })
     })
 
@@ -250,9 +254,12 @@ const OrderMaterialsDrawer: React.ForwardRefRenderFunction<OrderMaterialsDrawerR
     if (!contractId) {
       return { data: [], totalCount: 0 };
     }
-    const requestFunction = isPurchaseOrderContract
-      ? getContractManagePagePurchaseMateriels
-      : getContractManagePagePurchaseMaterielList
+
+    let requestFunction = getContractManagePagePurchaseMaterielList
+    if (isPurchaseOrderContract) {
+      params.orderId = orderId
+      requestFunction = getContractManagePagePurchaseMateriels
+    }
     const res = await requestFunction({
       ...(params as any),
       current: `${params.current}`,
@@ -534,7 +541,7 @@ const OrderMaterialsDrawer: React.ForwardRefRenderFunction<OrderMaterialsDrawerR
       }
     });
     initCheckeds.current = checkeds;
-    
+
     // 设置Form初始值
     const requisitionValue: { [key: string]: string } = {};
     for (let i = 0; i < normalized.length; i++) {
@@ -608,13 +615,14 @@ const OrderMaterialsDrawer: React.ForwardRefRenderFunction<OrderMaterialsDrawerR
           onSelectAll: handlehandleSelectAll,
           getCheckboxProps: (record) => {
             const _disabled = record.contractFreeCount < 1;
-            const _options=[]
-            if(_disabled) {
-                _options.push(record)
+            const _options = []
+            if (_disabled) {
+              _options.push(record)
             }
-            return { disabled: _disabled,options:_options } }
+            return { disabled: _disabled, options: _options }
           }
         }
+        }
         defaultPageSize={10}
         expandable={isPurchaseOrderContract ? {
           expandedRowRender,

src/pages/transaction/purchaseOrder/orderCollectSrm/index.tsx

@@ -507,8 +507,7 @@ const PurchaseOrderDetail: React.FC<PurchaseOrderDetailProps> = (props) => {
         mergeArr.push({ ...convertOrderMaterialData(item) });
       }
     });
-    console.log(mergeArr,'mergeArr',productDataValue); 
-    
+
     mergeArr = mergeArr.map((item) => ({
       ...item,
       // 兼容之前订单物料数据
@@ -690,6 +689,7 @@ const PurchaseOrderDetail: React.FC<PurchaseOrderDetailProps> = (props) => {
       value={[]}
       onConfirm={handleOrderMaterialsConfirm}
       ref={orderMaterialsDrawerRef}
+      orderId={id}
     />
 
   </div>)