Merge branch 'featStrategies' into dev

src/pages/transaction/purchaseOrder/orderCollect/components/mergeOrderModalTable/index.tsx

@@ -13,6 +13,7 @@ import { mergeSearchSchema } from './schema'
 import NestTable from '@/components/NestTable'
 import { PublicApi } from '@/services/api'
 import { getUnitPriceTotal } from '../../model/useProductTable'
+import { usePageStatus } from '@/hooks/usePageStatus'
 
 export interface MergeOrderModalTableProps {
   title: string,
@@ -23,6 +24,7 @@ export interface MergeOrderModalTableProps {
   handleUpdate?: any,
 }
 
+// const { pageStatus } = usePageStatus()
 
 const formActions = createFormActions();
 
@@ -188,11 +190,12 @@ const MergeOrderModalTable:React.FC<MergeOrderModalTableProps> = (props) => {
       message.error("请选择待合并订单")
       return;
     }
-
-    let _selectedRows = dataSource.data.filter(item => selectedRowKeys.includes(item.id))
+    let _originSource = [...dataSource.data]
+    // 只选一个子级 selectedRowKeys可能为空
+    let _selectedRows = _originSource.filter(item => selectedRowKeys.includes(item.id))
     setSelectedRows(() => _selectedRows)
 
-    let allchildren = dataSource.data.map(item => item["productDateilss"]).reduce((prev, next) => prev.concat(next), [])
+    let allchildren = _originSource.map(item => item["productDateilss"]).reduce((prev, next) => prev.concat(next), [])
     let _childSelectedRows = allchildren.filter(item => childSelectedRowKeys.includes(item.id))
     setChildSelectedRows(() => _childSelectedRows)
 
@@ -203,24 +206,27 @@ const MergeOrderModalTable:React.FC<MergeOrderModalTableProps> = (props) => {
 
     // 开始数量合并
     let processOrderProductRequests = schemaAction.getFieldValue("orderProductRequests")
-    processOrderProductRequests.map(item => {
+    let __ = processOrderProductRequests.map(item => {
       item["productId"] = item.id
       if(item.id === currentClickRow.id) {
         let count = _childSelectedRows.length > 1 ? _childSelectedRows.reduce((a, b) => a.purchaseCount + b.purchaseCount) : _childSelectedRows[0].purchaseCount
+        // @to fix 第一次合并无法填入采购数量 新增情况下：手工模式不累加，报价单模式累加；编辑模式都累加
         item.purchaseCount = count + item.purchaseCount || 0
         item['money'] = getUnitPriceTotal(item)
       }
       return item
     })
-    schemaAction.setFieldValue("orderProductRequests", processOrderProductRequests)
+    schemaAction.setFieldValue("orderProductRequests", __)
+
+    console.log(_originSource, selectedRowKeys, childSelectedRowKeys, selectedRows, childSelectedRows, _selectedRows, _childSelectedRows)
 
     // 生成orderProducts参数
     let _orderProducts = _childSelectedRows.map(item => {
-      for(let _index in _selectedRows) {
-        let _childKey = _selectedRows[_index]["productDateilss"].map(_ => _.id)
+      for(let _index in _originSource) {
+        let _childKey = _originSource[_index]["productDateilss"].map(_ => _.id)
         if(_childKey.includes(item.id)) {
           return {
-            mergeOrderId: _selectedRows[_index]["id"],
+            mergeOrderId: _originSource[_index]["id"],
             productId: item["productId"]
           }
         }
@@ -230,7 +236,7 @@ const MergeOrderModalTable:React.FC<MergeOrderModalTableProps> = (props) => {
     let hasVal = schemaAction.getFieldValue("ordeProducts") || []
     schemaAction.setFieldValue("ordeProducts", [..._orderProducts, ...hasVal])
 
-    // console.log("开始合并", currentClickRow, schemaAction.getFieldValue("orderProductRequests"), processOrderProductRequests, _orderProducts)
+    console.log("开始合并", currentClickRow, __, _orderProducts)
     // 执行update 更新总价
     handleUpdate()
 

src/pages/transaction/purchaseOrder/orderCollect/components/productTableCell/index.tsx

@@ -45,7 +45,7 @@ export const ProductTableCell:React.FC<ProductTableCellProps> = ({
   formItemProps={},
   ...restProps
 }) => {
-  // const formItemRef = useRef<any>();
+  const formItemRef = useRef<any>();
   const { form } = useContext(EditableContext);
   const save = async e => {
     try {
@@ -68,12 +68,13 @@ export const ProductTableCell:React.FC<ProductTableCellProps> = ({
           let keyValue = {}
           keyValue[dataIndex] = v
           form.setFieldsValue(keyValue)
+          console.log(keyValue, 'obj', v)
         }
 
         return <Input
           style={{width: 140}}
           type='number'
-          // ref={formItemRef}
+          ref={formItemRef}
           onChange={save}
           {...formItemProps}
           id={dataIndex + record.id}
@@ -85,6 +86,7 @@ export const ProductTableCell:React.FC<ProductTableCellProps> = ({
 
   let childNode = children;
   if (editable) {
+    console.log(record, 'record')
     childNode =
       <Form.Item
         style={{ margin: 0 }}