feat: 支持新增产品类型映射

src/store/order.js

@@ -12,7 +12,7 @@ import {
 import { findProductInThreeLevel, findProductInTwoLevel } from '@/views/create-order/hooks'
 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 {ActivityProductName, productTypeMap} from '@/views/create-order/data'
 import { checkRequired } from "@/views/create-order/hooks/checkRequired"
 import { sortOrderInfo } from '@/views/create-order/components/schema-form/resort/'
 import { getRandomString, sleep } from '@/utils/utils'
@@ -69,6 +69,18 @@ export default {
     invoiceInfo: {},
   },
   getters: {
+    productTypeMapAll (state) {
+      const result = {}
+      state.productListAll.forEach(item => {
+        (item?.children || []).forEach(kItem => {
+          result[kItem.value] = kItem.class_name
+        })
+      })
+      return result
+    },
+    useProductTypeMapAll (_, getters) {
+      return Object.assign({}, getters.productTypeMapAll, productTypeMap)
+    },
     productListWithHistory(state) {
       if (Array.isArray(state.historyProductList) && state.historyProductList.length > 0) {
         const children = state.historyProductList.map(item => {
@@ -239,7 +251,7 @@ export default {
   },
   mutations: {
     setInvoiceInfo(state, payload = {}) {
-      state.invoiceInfo = payload 
+      state.invoiceInfo = payload
     },
     setHistoryProductList(state, payload = {}) {
       if (!payload.code) return
@@ -374,7 +386,7 @@ export default {
         } catch (error) {
           console.log(error)
         } finally {
-           commit('setLoadingState', { key: 'orderDetail', value: false }) 
+           commit('setLoadingState', { key: 'orderDetail', value: false })
         }
     },
     // 获取产品备选项信息

src/views/create-order/admin-order-list.vue

@@ -271,7 +271,6 @@
 import {mapState, mapActions, mapGetters} from 'vuex'
 import ProductTypeSelector from "@/views/create-order/components/product-info-submodule/ProductTypeSelector.vue";
 import { debounce } from "lodash";
-import {productTypeMap} from "@/views/create-order/data";
 import CreateOrderDialog from './components/CreateOrderDialog.vue'
 import NewSetOrderInfo from "@/views/create-order/components/newSetOrderInfo.vue";
 import iInvoice from "@/views/order/components/uploadInvoice.vue";
@@ -972,6 +971,7 @@ export default {
   computed: {
     ...mapGetters('order', [
       'saleChannelOptions',
+      'useProductTypeMapAll'
     ]),
     ...mapState({
       productTypeOptions: state => state.order.productListAll,
@@ -1068,7 +1068,7 @@ export default {
         searchContent: this.searchContent,
         sort_type: this.sortState.sort_type,
         sort_classify: this.sortState.sort_classify,
-        productType: this.productTypeResult.map(v => productTypeMap[v]),
+        productType: this.productTypeResult.map(v => this.useProductTypeMapAll[v]),
         auditStatus: payload.auditStatus !== '' ? Number(payload.auditStatus) : -1,
         contractStatus: payload.contractStatus !== '' ? Number(payload.contractStatus) : -1,
         payMoneyMax: payload.payMoneyMax !== '' ? Number(payload.payMoneyMax) : -1,

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

@@ -1,5 +1,6 @@
 import { getCommonParams, getCommonFilterParams } from "./common";
-import { productTypeMap, productKeyMap } from '@/views/create-order/data'
+import {  productKeyMap } from '@/views/create-order/data'
+import {useProductTypeMapAllOfJs} from "@/views/create-order/hooks/utils";
 
 export const NOTICE_TEXT = {
   price: '计算价格 缺少字段: '
@@ -50,6 +51,7 @@ export class Parameters {
   getProductArrParams({ pageForm, productInfo, type }) {
     const commonParams = getCommonParams(pageForm, productInfo)
     const productForm = productInfo?.productCardInfo?.form || {}
+    const productTypeMap = useProductTypeMapAllOfJs()
     const p = {
       productType: productTypeMap[type],
       ...commonParams,
@@ -81,6 +83,7 @@ export class SimpleParameters extends Parameters {
 
   getProductArrParams({ pageForm, productInfo, type }) {
     const commonParams = getCommonParams(pageForm, productInfo)
+    const productTypeMap = useProductTypeMapAllOfJs()
     const p = {
       productType: productTypeMap[type],
       ...commonParams,

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

@@ -1,10 +1,11 @@
 import { Parameters } from './base'
 import { getCommonParams, getCommonFilterParams } from "./common";
-import { schemaKeyMap, productTypeMap } from '@/views/create-order/data'
+import { schemaKeyMap } from '@/views/create-order/data'
 import { calcServiceArrNames } from '@/views/create-order/hooks/service'
 import { getIntersection } from '@/utils/utils'
 import store from '@/store'
 import { cloneDeep } from 'lodash';
+import {useProductTypeMapAllOfJs} from "@/views/create-order/hooks/utils";
 
 export class BigMemberParamsGroup extends Parameters {
 
@@ -31,6 +32,7 @@ export class BigMemberParamsGroup extends Parameters {
   getProductArrParams({ pageForm, productInfo, type }) {
     const commonParams = getCommonParams(pageForm, productInfo)
     const productForm = productInfo?.productCardInfo?.form || {}
+    const productTypeMap = useProductTypeMapAllOfJs()
     const p = {
       productType: productTypeMap[type],
       ...commonParams,

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

@@ -1,7 +1,7 @@
 import { Parameters, NOTICE_TEXT } from './base'
 import { getCommonParams, getCommonFilterParams } from "./common";
-import { productTypeMap } from '@/views/create-order/data'
 import { dateFormatter } from '@/utils/globalFun'
+import {useProductTypeMapAllOfJs} from "@/views/create-order/hooks/utils";
 
 
 export class DataCountPackGroup extends Parameters {
@@ -26,7 +26,7 @@ export class DataCountPackGroup extends Parameters {
     // if (!params.product_code) {
     //   return console.warn(`${NOTICE_TEXT.price}product_code`)
     // }
-    
+
     if (params.tactics === 2) {
       // 赠送
       if (!params.filter?.give_cycle) {
@@ -51,7 +51,7 @@ export class DataCountPackGroup extends Parameters {
     const productForm = productInfo?.productCardInfo?.form || {}
     const periodStart = productForm.validityPeriod?.start
     const periodEnd = productForm.validityPeriod?.end
-
+    const productTypeMap = useProductTypeMapAllOfJs()
     const p = {
       productType: productTypeMap[type],
       service_start_time: periodStart ? dateFormatter(periodStart) : undefined,

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

@@ -2,7 +2,8 @@ import { SimpleParameters } from './base'
 import { getCommonParams, getCommonFilterParams } from "./common";
 import { dateFormatter } from '@/utils/globalFun'
 import { mul } from '@/utils/number'
-import { productTypeMap, productKeyMap, productGroupKeyMap } from '@/views/create-order/data'
+import { productKeyMap, productGroupKeyMap } from '@/views/create-order/data'
+import {useProductTypeMapAllOfJs} from "@/views/create-order/hooks/utils";
 
 export class MarketingGroup extends SimpleParameters {
 
@@ -22,6 +23,7 @@ export class MarketingGroup extends SimpleParameters {
   getProductArrParams({ pageForm, productInfo, type }) {
     const commonParams = getCommonParams(pageForm, productInfo)
     const productForm = productInfo?.productCardInfo?.form || {}
+    const productTypeMap = useProductTypeMapAllOfJs()
     const p = {
       productType: productTypeMap[type],
       ...commonParams,

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

@@ -1,7 +1,8 @@
-import { productTypeMap, schemaKeyMap } from "@/views/create-order/data";
+import { schemaKeyMap } from "@/views/create-order/data";
 import { div } from '@/utils/number'
 import { hasValue } from '@/utils/utils'
 import dayjs from 'dayjs'
+import {useProductTypeMapAllOfJs} from "@/views/create-order/hooks/utils";
 
 export function getFilter(product = {}) {
   const filter = {}
@@ -19,6 +20,7 @@ export function getFilter(product = {}) {
 // 根据 type(大会员) ->拿到 code(dyh)
 export function getProductCodeWithType(type) {
   let r = undefined
+  const productTypeMap = useProductTypeMapAllOfJs()
   for (const key in productTypeMap) {
     const item = productTypeMap[key]
     if (item === type) {

src/views/create-order/components/schema-form/schema-form.vue

@@ -16,11 +16,12 @@
 import SchemaFormRenderer from '@/components/common/form-schema-renderer.vue'
 import { createSchema } from './schema'
 import { mapState, mapMutations, mapActions } from 'vuex'
-import { schemaKeyMap, productKeyMap, productGroupKeyMap, productTypeMap } from '@/views/create-order/data'
+import { schemaKeyMap, productKeyMap, productGroupKeyMap } from '@/views/create-order/data'
 import { mergeWith,cloneDeep, debounce } from 'lodash'
 import { deepEqual } from '@/utils/object'
 import { getIntersection, sleep } from '@/utils/utils'
 import { div } from '@/utils/number'
+import {useProductTypeMapAllOfJs} from "@/views/create-order/hooks/utils";
 
 const dhy001 = 'dyh001'
 
@@ -337,6 +338,7 @@ export default {
       if (Array.isArray(serviceArrMap) && serviceArrMap.length > 0) {
         // 当前产品下是否有相同产品类型的订单
         currentProductTypeList = serviceArrMap.filter(item => {
+          const productTypeMap = useProductTypeMapAllOfJs()
           return productTypeMap[item.productType] === productTypeMap[this.productType] || item._code === this.productType
         })
         noSameOrder = currentProductTypeList.length === 0
@@ -347,6 +349,7 @@ export default {
       }
     },
     async getUserService() {
+      const productTypeMap = useProductTypeMapAllOfJs()
       const payload = {
         phone: this.pageForm.accountTel,
         entName: this.pageForm.companyName,
@@ -499,7 +502,7 @@ export default {
           standardMoney = ''
         }
         this.refreshValue({
-          [key]: this.mergeWith({}, this.value[key], { standardMoney }) 
+          [key]: this.mergeWith({}, this.value[key], { standardMoney })
         })
       })
     },
@@ -766,6 +769,7 @@ export default {
           // 如果某个产品下有正在生效的权益。则只能选择当前产品的关联订单
           // 如果当前产品下无正在生效的权益。则可以选择全部产品的关联订单（此时关联订单只做记录不做开通等其他用途）
           const currentProductTypeList = opt.filter(item => {
+            const productTypeMap = useProductTypeMapAllOfJs()
             return productTypeMap[item.productType] === productTypeMap[this.productType] || item._code === this.productType
           })
           if (currentProductTypeList.length > 0) {
@@ -915,7 +919,7 @@ export default {
       // （1）产品属性为“会员服务”且购买主体为“企业”且付费类型不是升级；
       const entNotUpgrade = this.utilCheckIsVipService() && buySubject === 2 && payment !== 3
       // （2）产品属性为“会员服务”且购买主体为“企业”且付费类型是升级且升级内容有“增购子账号”；
-      const entUpgradeAddSubAccount = this.utilCheckIsVipService() && buySubject === 2 && payment === 3 && hasAddSubAccount 
+      const entUpgradeAddSubAccount = this.utilCheckIsVipService() && buySubject === 2 && payment === 3 && hasAddSubAccount
       // （3）产品类型为大会员且付费类型不是升级；
       const bigNotUpgrade = this.productType === productKeyMap.dhy && payment !== 3
       // （4）产品类型为大会员且付费类型是升级且升级内容有“增购子账号”。
@@ -925,7 +929,7 @@ export default {
       main.show = show
       sub.show = show
       sub.label = '子账号数量'
-      
+
       // 2.账号展示规则
       // (1)主账号默认为1个；
       // (2)子账号付费：仅可输入≥1的正整数；如若未填写则提示“请输入付费账号数量”；
@@ -966,7 +970,7 @@ export default {
       } else if (payment === 3) {
         // 升级
         main.show = false
-        
+
         const upgradeContent = value[schemaKeyMap.upgradeContent]
         if (Array.isArray(upgradeContent)) {
           // 包含增购子账号
@@ -1087,8 +1091,8 @@ export default {
         } else if (productGroupKeyMap.dataCountProduct.includes(type)) {
           this.changeDataPackSchema(value)
         } else if (
-          productGroupKeyMap.marketingProduct.includes(type) || 
-          productGroupKeyMap.ggProduct.includes(type) || 
+          productGroupKeyMap.marketingProduct.includes(type) ||
+          productGroupKeyMap.ggProduct.includes(type) ||
           productGroupKeyMap.entityProduct.includes(type)
         ) {
           this.changeMarketingSchema(value)
@@ -1189,7 +1193,7 @@ export default {
       const { buySubject } = this.pageForm
       this.$set(ma.props, 'buySubject', buySubject)
       this.$set(ma.props, 'upgradeService', payment === 3)
-      
+
       // 1.付费类型为“续费”，则禁用服务列表全部，不支持修改；
       // 2.如果是升级，则禁用已选的
       if (buyOrTrail) {
@@ -1263,7 +1267,7 @@ export default {
         // 3付费类型为“升级”且“升级内容”有“补充服务”或为空，仅可选择不低于关联订单的产品规格（注：特殊处理，大会员自定义版默认展示），其他产品规格不展示。
         this.$set(ma.props, 'onlyShowSelected', false)
         this.$set(ma.props, 'showMessageTip', true)
-        
+
         // 1补充服务  2增购子账号
         if (upgradeContent.length === 1 && upgradeContent.includes(2)) {
           // 仅为增购子账号：默认为关联订单的产品规格，其他产品规格不展示；
@@ -1403,7 +1407,7 @@ export default {
         if (this.value[schemaKeyMap.validityCount]) {
           obj[schemaKeyMap.validityCount] = cloneDeep(this.defaultValue[schemaKeyMap.validityCount])
         }
-        const buyType = [1, 4].includes(this.value[schemaKeyMap.payment]) 
+        const buyType = [1, 4].includes(this.value[schemaKeyMap.payment])
         if (changedArr.includes(schemaKeyMap.payment) && buyType) {
           obj[schemaKeyMap.relatedOrders] = []
         }

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

@@ -325,3 +325,8 @@ export function showActivityCardRateModule(productList, product) {
   }
   return { show: false }
 }
+
+// 获取产品 value 中文映射
+export function useProductTypeMapAllOfJs () {
+  return store.getters["order/useProductTypeMapAll"] || {}
+}

src/views/create-order/order-list.vue

@@ -197,11 +197,11 @@
 import { mapState, mapActions } from 'vuex'
 import ProductTypeSelector from "@/views/create-order/components/product-info-submodule/ProductTypeSelector.vue";
 import { debounce } from "lodash";
-import {productTypeMap} from "@/views/create-order/data";
 import CreateOrderDialog from './components/CreateOrderDialog.vue'
 import NewSetOrderInfo from "@/views/create-order/components/newSetOrderInfo.vue";
 import {formatAutoOrderType} from "@/utils/order/format";
 import dayjs from 'dayjs'
+import {useProductTypeMapAllOfJs} from "@/views/create-order/hooks/utils";
 
 export default {
   name: 'OrderList',
@@ -993,7 +993,7 @@ export default {
         searchContent: this.searchContent,
         sort_type: this.sortState.sort_type,
         sort_classify: this.sortState.sort_classify,
-        productType: this.productTypeResult.map(v => productTypeMap[v])
+        productType: this.productTypeResult.map(v => useProductTypeMapAllOfJs()[v])
       }
 
       return params

vue.config.js

@@ -80,7 +80,7 @@ module.exports = {
     // allowedHosts: 'all',
     proxy: {
       '^/dev-api': {
-        target: 'https://jymmi.jianyu360.com:10082/',
+        target: 'https://web2-qmx_admin.jydev.jianyu360.com',
         changeOrigin: true,
         ws: false,
         logLevel: 'debug',
@@ -89,7 +89,7 @@ module.exports = {
         }
       },
       '^/bigmember': {
-        target: 'https://jymmi.jianyu360.com:10082/',
+        target: 'https://jybx2-webtest.jydev.jianyu360.com',
         changeOrigin: true,
         ws: false,
         logLevel: 'debug',
@@ -98,7 +98,7 @@ module.exports = {
         }
       },
       '^/filemanage': {
-        target: 'https://jymmi.jianyu360.com:10082/',
+        target: 'https://web2-qmx_admin.jydev.jianyu360.com',
         changeOrigin: true,
         ws: false,
         logLevel: 'debug',
@@ -107,13 +107,13 @@ module.exports = {
         }
       },
       '^/jyOrderManager': {
-        target: 'https://jymmi.jianyu360.com:10082/',
+        target: 'https://jybx2-webtest.jydev.jianyu360.com',
         changeOrigin: true,
         ws: false,
         logLevel: 'debug',
       },
       '^/succbi': {
-        target: 'https://jymmi.jianyu360.com:10082/',
+        target: 'https://web2-qmx_admin.jydev.jianyu360.com',
         changeOrigin: true,
         ws: false,
         logLevel: 'debug'