fix: 处理编辑积分商品副单价显示异常

src/locales/zh-CN/order.ts

@@ -530,7 +530,7 @@ export default {
   'saleOrder.xuanze': '选择',
   'saleOrder.danjumingxi': '单据明细',
   'saleOrder.xiangguanxinxi': '相关信息',
-  'saleOrder.dinggoushuliang': '订购数量',
+  'saleOrder.dinggoushuliang': '订单数量',
   'saleOrder.danjia(yuan)': '单价(元)',
   'saleOrder.fahuoshuliang': '发货数量',
   'saleOrder.fahuojine': '发货金额(元)',

src/pages/commodity/products/addProductsItem/priceAttributeForm.tsx

@@ -349,7 +349,6 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => {
           if (updateFlag.current) { // 初次渲染tab 再次进入tab采用缓存数据
             if (productInfoByEdit.unitPriceAndPicList[i]?.unitPrice) {
               let unitPric = productInfoByEdit.unitPriceAndPicList[i]?.unitPrice
-              // _tempObj[intl.formatMessage({ id: 'commodity.products.addProductsItem.priceAttributeForm.unitPrice' })] = orderlyLadderPrice(unitPric)
               const _price = orderlyLadderPrice(unitPric)
               const _priceRate = productInfoByEdit.unitPriceAndPicList[i]?.priceRate
               _tempObj[intl.formatMessage({ id: 'commodity.products.addProductsItem.priceAttributeForm.unitPrice' })] = _price
@@ -363,13 +362,14 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => {
           } else {
             if (_tableDataSource[i] && tableDataSource[i] && tableDataSource[i][intl.formatMessage({ id: 'commodity.products.addProductsItem.priceAttributeForm.unitPrice' })]) {
               let unitPric = _tableDataSource[i] && tableDataSource[i] && tableDataSource[i][intl.formatMessage({ id: 'commodity.products.addProductsItem.priceAttributeForm.unitPrice' })]
-              // _tempObj[intl.formatMessage({ id: 'commodity.products.addProductsItem.priceAttributeForm.unitPrice' })] = orderlyLadderPrice(unitPric)
               const _price = orderlyLadderPrice(unitPric)
               const _priceRate = _tableDataSource[i] && tableDataSource[i] && tableDataSource[i][intl.formatMessage({ id: 'commodity.products.addProductsItem.priceAttributeForm.assistantUniquePriceRate' })]
               _tempObj[intl.formatMessage({ id: 'commodity.products.addProductsItem.priceAttributeForm.unitPrice' })] = _price
               _tempObj[intl.formatMessage({ id: 'commodity.products.addProductsItem.priceAttributeForm.assistantUniquePriceRate' })] = _priceRate
               setAssistantUniquePriceRate(_priceRate)
-              _tempObj[intl.formatMessage({ id: 'commodity.products.addProductsItem.priceAttributeForm.planPrice' })] = (Number(_price) * Number(_priceRate) / 100).toFixed(2)
+              const _priceNumber = Object.keys(_price)[0] === '0-0' ? Object.values(_price)[0] : Object.values(_price)
+              _tempObj[intl.formatMessage({ id: 'commodity.products.addProductsItem.priceAttributeForm.planPrice' })] = Array.isArray(_priceNumber) ? _priceNumber.map(_p => (Number(_p) * Number(_priceRate) / 100).toFixed(2)) : (Number(_priceNumber) * Number(_priceRate) / 100).toFixed(2)
+              // _tempObj[intl.formatMessage({ id: 'commodity.products.addProductsItem.priceAttributeForm.planPrice' })] = (Number(_price) * Number(_priceRate) / 100).toFixed(2)
             } else {
               _tempObj[intl.formatMessage({ id: 'commodity.products.addProductsItem.priceAttributeForm.unitPrice' })] = {}
             }
@@ -412,6 +412,7 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => {
         _tableDataSource.map(item => item[intl.formatMessage({ id: 'commodity.products.addProductsItem.priceAttributeForm.unitPrice' })] = {})
       }
     }
+    console.log(_tableDataSource, '_tableDataSource')
     setTableDataSource(productName ? _tableDataSource : []) // 通过商品名称来判断是否显示表格数据
 
     constructedPrarams()

src/pages/transaction/saleOrder/addSaleDelevedOrder/constant/index.tsx

@@ -3,9 +3,6 @@ import { getIntl } from "umi"
 /** 新增销售发货单 初始值转换 */
 export const procurmentRenderInit = (initValue: any) => {
   return {
-    vendorMemberId: initValue.vendorMemberId,
-    vendorMemberName: initValue.vendorMemberName,
-    vendorRoleId: initValue.vendorRoleId,
     product: initValue.product,
     receipts: getIntl().formatMessage({ id: 'saleOrder.dingdan', defaultMessage: '订单' }),
     receiptsType: getIntl().formatMessage({ id: 'saleOrder.xiaoshoufahuodan', defaultMessage: '销售发货单' }),
@@ -17,7 +14,7 @@ export const procurmentRenderInit = (initValue: any) => {
   }
 }
 
-/** 新增销售发货单 回显物料字段转换 */
+/** 新增销售发货单 回显物料/商品字段转换 */
 export const procurementRenderField = (data) => {
   const _orderProductRequests = data.product.products
   return _orderProductRequests.map(item => {
@@ -26,8 +23,7 @@ export const procurementRenderField = (data) => {
       id: item.productId,
       code: item.productNo,
       type: item.spec,
-      memberId: data.vendorMemberId,
-      memberRoleId: data.vendorRoleId,
+      orderQuantity: item.quantity,
     }
   })
 }
@@ -80,10 +76,10 @@ export const productInfoColumns: any[] = [
     key: 'unit',
   },
   {
-    title: intl.formatMessage({ id: 'saleOrder.dinggoushuliang', defaultMessage: '订购数量' }),
-    dataIndex: 'quantity',
+    title: intl.formatMessage({ id: 'saleOrder.dinggoushuliang', defaultMessage: '订单数量' }),
+    dataIndex: 'orderQuantity',
     align: 'center',
-    key: 'quantity',
+    key: 'orderQuantity',
   },
   {
     title: intl.formatMessage({ id: 'saleOrder.danjia(yuan)', defaultMessage: '单价(元)' }),
@@ -94,9 +90,9 @@ export const productInfoColumns: any[] = [
   },
   {
     title: intl.formatMessage({ id: 'saleOrder.fahuoshuliang', defaultMessage: '发货数量' }),
-    dataIndex: 'count',
+    dataIndex: 'deliveryQuantity',
     align: 'center',
-    key: 'count',
+    key: 'deliveryQuantity',
     formItem: 'input',
     editable: true,
   },

src/pages/transaction/saleOrder/addSaleDelevedOrder/effects/index.ts

-import { FormEffectHooks, ISchemaFormActions, ISchemaFormAsyncActions } from '@formily/antd';
 import { getProductCustomerGetCustomerCategoryTree, getProductSelectGetSelectBrand } from '@/services/ProductV2Api';
-import { PageStatus, usePageStatus } from '@/hooks/usePageStatus';
-import { useLinkageUtils } from '@/utils/formEffectUtils';
-
-export const useMaterialTableChangeForAmount = (ctx: ISchemaFormActions | ISchemaFormAsyncActions, update) => {
-  FormEffectHooks.onFieldValueChange$('products').subscribe(state => {
-    // 强制渲染一次, 用于触发金额总数
-    update()
-  })
-}
-
-export const useInitShowField = () => {
-  const { pageStatus } = usePageStatus()
-  const utils = useLinkageUtils()
-  FormEffectHooks.onFormInit$().subscribe(() => {
-    // 初始化一些详情数据
-
-    // if (pageStatus === PageStatus.ADD) {
-    //   utils.hide('orderNo')
-    //   utils.hide('createTime')
-    // }
-  })
-}
 
 // 高级筛选schema中用于输入搜索品牌的Effect
 export const searchBrandOptionEffect = (context: any, fieldName: string) => {

src/pages/transaction/saleOrder/addSaleDelevedOrder/index.tsx

@@ -6,7 +6,7 @@ import { createFormActions } from '@formily/antd'
 import { SaveOutlined } from '@ant-design/icons'
 import NiceForm from '@/components/NiceForm'
 import { increaseSchema } from './schema'
-import { useMaterialTableChangeForAmount } from './effects'
+// import { useMaterialTableChangeForAmount } from './effects'
 import { procurementProcessField, procurementRenderField, procurmentRenderInit } from './constant'
 import { useUpdate } from '@umijs/hooks'
 import { help } from '../../common'
@@ -60,18 +60,19 @@ const AddSaleDelevedOrder:React.FC<{}> = () => {
       setBtnLoading(true)
 
       const _params = procurementProcessField(params)
-      if(id) {
-        fnResult = await postPurchaseRequisitionUpdate({..._params, id})
-      } else {
-        fnResult = await postPurchaseRequisitionCreate(_params)
-      }
-      if (fnResult.code === 1000) {
-        setTimeout(() => {
-          history.push("/memberCenter/procurementAbility/purchaseRequisition/readyAddBill")
-        }, 1000)
-      } else {
+      console.log(_params)
+      // if(id) {
+      //   fnResult = await postPurchaseRequisitionUpdate({..._params, id})
+      // } else {
+      //   fnResult = await postPurchaseRequisitionCreate(_params)
+      // }
+      // if (fnResult.code === 1000) {
+      //   setTimeout(() => {
+      //     history.push("/memberCenter/procurementAbility/purchaseRequisition/readyAddBill")
+      //   }, 1000)
+      // } else {
         setBtnLoading(false)
-      }
+      // }
     } catch (error) {
       setBtnLoading(false)
       error?.message && message.error(error.message)
@@ -114,8 +115,6 @@ const AddSaleDelevedOrder:React.FC<{}> = () => {
             onSubmit={handleSubmit}
             effects={($, ctx) => {
               $('onFormMount').subscribe(() => { })
-              // 物料信息的改动 渲染总额
-              useMaterialTableChangeForAmount(ctx, update)
 
               // 注入表单完成进度
               formContext.useAttachmentChangeForContext(ctx)

src/pages/transaction/saleOrder/addSaleDelevedOrder/model/useProductTable.tsx

@@ -6,7 +6,8 @@ import { useIntl } from 'umi';
 import ProductTableCell, { ProductEditableRow } from '../components/productTableCell';
 
 export const getUnitPriceTotal = (record) => {
-  const purchaseCount = Number(record['quantity']) || 0
+  console.log(record, 'rrr')
+  const purchaseCount = Number(record['deliveryQuantity']) || 0
   return Number(((record.price || 0) * purchaseCount).toFixed(2))
 }
 

src/pages/transaction/saleOrder/addSaleDelevedOrder/schema/index.ts

@@ -59,13 +59,14 @@ const basicInfo: ISchema = {
             disabledDate: current => {
               return current && current < moment().startOf('day')
             },
+            showTime: true,
             style: { width: '100%' }
           },
           "x-mega-props": {
             span: 1
           }
         },
-        purpose: {
+        inventoryName: {
           type: 'string',
           title: intl.formatMessage({ id: 'saleOrder.duiyingcangku', defaultMessage: '对应仓库' }),
           "x-rules": [
@@ -78,7 +79,7 @@ const basicInfo: ISchema = {
             span: 1
           }
         },
-        purpose1: {
+        inventoryRole: {
           type: 'string',
           title: intl.formatMessage({ id: 'saleOrder.cangkurenyuan', defaultMessage: '仓库人员' }),
           "x-rules": [

src/pages/transaction/saleOrder/readyAddDelevedOrder/index.tsx

@@ -9,18 +9,17 @@ import { FORM_FILTER_PATH } from '@/formSchema/const'
 import Submit from '@/components/NiceForm/components/Submit'
 import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
 import '../index.less'
-import { getOrderVendorPage, getOrderVendorSellDeliveryPage } from '@/services/OrderNewV2Api';
+import { getOrderVendorSellDeliveryPage } from '@/services/OrderNewV2Api';
 
-export interface AddSaleDelevedOrderProps {}
+export interface ReadyAddSaleDelevedOrderProps {}
 
 const fetchTableData = async (params) => {
-  params.outerStatus = 100
-  const { data } = await getOrderVendorPage(params)
+  const { data } = await getOrderVendorSellDeliveryPage(params)
   return data
 }
 
 /** 待新增销售发货单 */
-const AddSaleDelevedOrder:React.FC<AddSaleDelevedOrderProps> = (props) => {
+const ReadyAddSaleDelevedOrder:React.FC<ReadyAddSaleDelevedOrderProps> = (props) => {
   const {
     columns,
     ref
@@ -59,6 +58,6 @@ const AddSaleDelevedOrder:React.FC<AddSaleDelevedOrderProps> = (props) => {
   </PageHeaderWrapper>
 }
 
-AddSaleDelevedOrder.defaultProps = {}
+ReadyAddSaleDelevedOrder.defaultProps = {}
 
-export default AddSaleDelevedOrder
+export default ReadyAddSaleDelevedOrder