Merge branch 'feature/v2.4.46' of https://jygit.jydev.jianyu360.cn/jianyu/qmx_page_admin into feature/v2.4.46

src/store/order.js

@@ -10,7 +10,7 @@ import {
   ajaxGetOrderDetail
 } from "../api/modules"
 import { findProductInThreeLevel, findProductInTwoLevel } from '@/views/create-order/hooks'
-import { getProductTypeWithSpecCode } from '@/views/create-order/hooks/utils'
+import { getProductTypeConfWithSpecCode } from '@/views/create-order/hooks/utils'
 import { orderParams, createOrderParams } from '@/views/create-order/components/schema-form/params'
 import { ActivityProductName } from '@/views/create-order/data'
 import { checkRequired } from "@/views/create-order/hooks/checkRequired"
@@ -495,7 +495,7 @@ export default {
             data.serviceArrMap.forEach(item => {
               // 虚拟id，个人服务下无关联订单时候，使用此id代替(仅前端使用)
               item._verId = getRandomString()
-              item._code = getProductTypeWithSpecCode(item.productCode)
+              item._code = getProductTypeConfWithSpecCode(item.productCode)?.code
             })
           }
           return data

src/views/create-order/components/ProductInfoCard.vue

@@ -144,6 +144,8 @@ export default {
         data: e.info,
         index: this.index,
       }
+
+      if (!p.data) return
       if (p.data && p.data?.activityMark) {
         // 处理选中活动的逻辑
         this.addActivityCard(p.data)

src/views/create-order/components/schema-form/params.js

@@ -238,7 +238,7 @@ export function createOrderParams(payload = {}) {
     p.zeroOrderType = r?.label
   }
 
-  console.log(p, pageForm, productInfoList)
+  // console.log(p, pageForm, productInfoList)
 
   return p
 }

src/views/create-order/components/schema-form/resort/index.js

@@ -4,7 +4,7 @@ import { orderMoney0TypeOptions } from '@/views/create-order/data/index.js'
 import { dateFormatter } from '@/utils/globalFun'
 import { getProductCodeWithType, sortCommonForm } from './common'
 import { payWayOptions, productGroupKeyMap, productKeyMap } from '@/views/create-order/data/index.js'
-import { calcSaleTableList } from "@/views/create-order/hooks/utils"
+import { calcSaleTableList, getProductTypeConfWithSpecCode } from "@/views/create-order/hooks/utils"
 import dayjs from 'dayjs'
 import { div } from '@/utils/number'
 
@@ -111,6 +111,9 @@ export function sortOrderInfo(order = {}) {
     productArr = productData.map((pd, index) => {
       const productCode = pd.productItemCode || getProductCodeWithType(pd.product_type)
       const productForm = sortProductFormArr(productCode, pd, order)
+      const actInfo = getProductTypeConfWithSpecCode(productCode)
+
+      Object.assign(pd, actInfo)
 
       const config = {
         productCode,

src/views/create-order/hooks/utils.js

@@ -57,8 +57,8 @@ export function calcChannelSelectorList(code) {
   return channelArr
 }
 
-// 根据规格code(cjdy001)取出商品大类的code
-export function getProductTypeWithSpecCode(code) {
+// 根据规格code(cjdy/cjdy001)取出商品大类的信息
+export function getProductTypeConfWithSpecCode(code) {
   if (!code) return
   const productListGroup = store.state.order.productList.filter(r => !r.activityMark)
   const productList = productListGroup.map(r => {
@@ -68,7 +68,7 @@ export function getProductTypeWithSpecCode(code) {
       return []
     }
   }).flat()
-  return productList.find(product => code.includes(product.code))?.code
+  return productList.find(product => code.includes(product.code))
 }
 
 // 通用：计算业绩归属