fix: 处理新增订单物料商品再次选择数据重复问题，询价报价下单时间段传参异常

src/pages/transaction/purchaseOrder/orderCollectB2b/constant/index.tsx

@@ -85,7 +85,7 @@ export const procurementRenderField = (data) => {
 /** B2B询价报价下单 字段转换 */
 export const procurementProcessField = (value) => {
   value.products = value.products.map(item => {
-    return {
+    let obj = {
       ...item,
       productId: item.commodityId,
       skuId: item.productId,
@@ -101,6 +101,10 @@ export const procurementProcessField = (value) => {
       supplyRoleId: item.upperMemberRoleId,
       supplyMemberName: item.upperMemberName,
     }
+    delete obj.imgUrl
+    delete obj.address
+    delete obj.logistics
+    return obj
   })
   return value
 }

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

@@ -315,11 +315,11 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = () => {
           telephone: addressDetail.tel,
           defaultConsignee: !!addressDetail.isDefault,
         }
-      }
-
         if(params?.timeLine) {
-        params.consignee.startTime = params.timeLine.split('-')[0]
-        params.consignee.endTime = params.timeLine.split('-')[1]
+          params.consignee.deliverDate = `${params.deliverDate} ${params.timeLine} `
+        } else {
+          params.consignee.deliverDate = params.deliverDate
+        }
       }
 
       // 其他需求

src/pages/transaction/purchaseOrder/orderCollectRequisition/components/materialModalTable/index.tsx

@@ -89,11 +89,16 @@ const MaterialModalTable:React.FC<MaterialModalTableProps> = (props) => {
 
   const addMaterialProcessField = (value, origin) => {
     let tempOriginData = [...origin]
-    if(Array.isArray(value)) {
+    // 对选中值去重
+    const _value = Object.values(value.reduce((item, next)=>{
+      item[next.id] = next
+      return item
+    },{}))
+    if(Array.isArray(_value)) {
       const vendorMemberName = schemaAction.getFieldValue('vendorMemberName')
       const vendorMemberId = schemaAction.getFieldValue('vendorMemberId')
       const vendorRoleId = schemaAction.getFieldValue('vendorRoleId')
-      let processData = value.map(v => ({
+      let processData = _value.map(v => ({
         ...v,
         tax: true,
         // @ 配送方式 默认物流

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

@@ -89,8 +89,13 @@ const MaterialModalTable:React.FC<MaterialModalTableProps> = (props) => {
 
   const addMaterialProcessField = (value, origin) => {
     let tempOriginData = [...origin]
-    if(Array.isArray(value)) {
-      let processData = value.map(v => {
+    // 对选中值去重
+    const _value = Object.values(value.reduce((item, next)=>{
+      item[next.id] = next
+      return item
+    },{}))
+    if(Array.isArray(_value)) {
+      let processData = _value.map(v => {
         let temp: any = {};
         temp.id = v.id;
         temp.code = v.materielNo;
@@ -123,25 +128,10 @@ const MaterialModalTable:React.FC<MaterialModalTableProps> = (props) => {
   }
 
   const handleConfirm = async () => {
-    // 判断所选择的商品是否属于同一个工作流
-    console.log(rowSelectionCtl, 'rowSelectionCtl')
-    // @ts-ignore
-    // const res = await PublicApi.postOrderIsWorkFlow({
-    //   memberId: schemaAction.getFieldValue('vendorMemberId'),
-    //   memberRoleId: schemaAction.getFieldValue('vendorRoleId'),
-    //   productIds: rowSelectionCtl.selectRow.map(item => item.associatedDataId),
-    //   orderMode: schemaAction.getFieldValue('orderMode')
-    // }, { ctlType: 'none' })
-
-    // if (res.code === 1000) {
     const productData = schemaAction.getFieldValue('products')
     schemaAction.setFieldValue('products', addMaterialProcessField(rowSelectionCtl.selectRow, productData))
     confirmModal && confirmModal()
     setVisible(false)
-    // }
-    // else {
-    //   message.error(res.message)
-    // }
   }
 
   const fetchMaterialList = (values) => {

src/pages/transaction/purchaseRequisition/increaseRequisition/components/materialModalTable/index.tsx

 import React, { useEffect } from 'react'
-import { history } from 'umi'
 import ModalTable, { ModalTableProps } from '@/components/ModalTable'
 import { fetchOrderApi } from '../../apis'
 import { FormEffectHooks, ISchemaFormActions, ISchemaFormAsyncActions } from '@formily/antd'
@@ -9,7 +8,7 @@ import Search from '@/components/NiceForm/components/Search'
 import Submit from '@/components/NiceForm/components/Submit';
 import Children from '@/components/NiceForm/components/Children';
 import { addRequesitionMaterialSchema } from '../../schema/modal'
-import { Button, Tooltip } from 'antd'
+import { Tooltip } from 'antd'
 import { QuestionCircleOutlined } from '@ant-design/icons'
 import { clearModalParams } from '@/utils'
 import CustomCategorySearch from '@/components/NiceForm/components/CustomCategorySearch'
@@ -87,8 +86,13 @@ const MaterialModalTable:React.FC<MaterialModalTableProps> = (props) => {
 
   const addMaterialProcessField = (value, origin) => {
     let tempOriginData = [...origin]
-    if(Array.isArray(value)) {
-      let processData = value.map(v => {
+    // 对选中值去重
+    const _value = Object.values(value.reduce((item, next)=>{
+      item[next.id] = next
+      return item
+    },{}))
+    if(Array.isArray(_value)) {
+      let processData = _value.map(v => {
         let temp: any = {};
         temp.id = v.id;
         temp.code = v.code;