bxs-tools-ui 3.3.2 → 3.4.0

package/packages/person-info/demo/index.vue

@@ -22,9 +22,6 @@ export default class PersonInfoDemo extends Vue {
   verifyData = null
   personData = null
   created() {
-    if (!this.URL_PARAM.publicPbUuid) {
-      this.URL_PARAM.publicPbUuid = '5d6499946bbb47bb8f6a286e9d4eee77'
-    }
     document.body.style.backgroundColor = '#f2f2f2'
     this.getPlanbookData()
   }
@@ -33,7 +30,8 @@ export default class PersonInfoDemo extends Vue {
   }
   getPlanbookData() {
     getPlanbookData({
-      publicPbUuid: this.URL_PARAM.publicPbUuid
+      insuranceTypeId: this.URL_PARAM.planbookId || 13767,
+      resultUuid: this.URL_PARAM.uuid
     })
       .then(async (data: any) => {
         await initPageData(data)

package/packages/planbook-input/components/product-table.vue

@@ -119,6 +119,7 @@
       @confirm="confirm(productData)"
     >
       <ProductInfo
+        v-if="popupConf.prodVisible"
         ref="productInfo"
         :user="user"
         :input-data="inputData"
@@ -183,7 +184,6 @@
         :input-data="inputData"
         :params="{
           planbookId: params.planbookId,
-          publicPbUuid: params.publicPbUuid,
           groupKey: params.groupKey,
           productKey: params.productKey
         }"
@@ -338,22 +338,11 @@ export default class BxtProductTable extends Vue {
   }
 
   fnShowAddAndTake(ins, name) {
-    if (ins.isGroup) {
-      return false
-    }
     const { productData, params } = this
     const hasInterest = params.interestProductList && params.interestProductList.includes(productData.key)
     const isProductChecked = productData.hadChoice
-    let titleEle = ins.eleOrderList.find(ele => ele.key === 'title')
-    let isInsuranceChecked = titleEle && titleEle.value
-    if (ins.groupKey) {
-      const groupInsurance = productData.mulInsOrderList.find(item => item.key === ins.groupKey)
-      if (groupInsurance) {
-        titleEle = groupInsurance.eleOrderList.find(ele => ele.key === 'title')
-        const insuranceIdEle = groupInsurance.eleOrderList.find(ele => ele.key === 'insuranceId')
-        isInsuranceChecked = titleEle && titleEle.value && insuranceIdEle.value === ins.key
-      }
-    }
+    const titleEle = ins.eleOrderList.find(ele => ele.key === 'title')
+    const isInsuranceChecked = titleEle && titleEle.value
     if (name === 'accountData') {
       return hasInterest && isProductChecked && isInsuranceChecked && ins.accountData && ins.accountData.accountPart
     }

package/packages/planbook-input/helper.js

@@ -12,7 +12,6 @@ import {
   clearAddAndTakeAndAdjustBaoeData,
   convertProductData,
   verifyProductRules,
-  convertEleOrderListToObj,
   getExpressionParamMap
 } from '../bxs-utils/index'
 import { calcPlanbookProduct, uploadPlanBookResult, getUnderwriteEffectiveRules } from '../../src/api/index.js'
@@ -141,8 +140,6 @@ export function setPageDataBaseOnResult(inputData, exportData, policyInfo, optio
           // 已生成的计划书取回的产品数据，赋值到初始化中的产品对象中
           for (let k in prod) {
             if (k == 'mulInsOrderList') {
-              // 清除组合险
-              prod.mulInsOrderList = prod.mulInsOrderList.filter(ins => !ins.isGroup)
               // 已生成的计划书取回的险种数据，赋值到初始化中的险种对象中
               prod.mulInsOrderList.forEach(ins => {
                 const eInsuranceData = eProductData.mulInsOrderList.find(m => m.key === ins.key)
@@ -240,7 +237,8 @@ export async function createdProductDataToCalc(inputData, options = {}) {
               'shmInsData',
               'totalBaof',
               // 'calcResultExp', // 不能删除，后面有依赖
-              'revalidateFlag'
+              'revalidateFlag',
+              'deriveRequired'
             ].includes(k)
           ) {
             tempIns[k] = ins[k]
@@ -260,7 +258,6 @@ export async function createdProductDataToCalc(inputData, options = {}) {
         productData
       })
       const reqData = {
-        publicPbUuid: options.publicPbUuid || null,
         insuranceTypeId: options.planbookId ? options.planbookId * 1 : null,
         personData: {
           personOrderList: convertPersonData(
@@ -318,20 +315,6 @@ export function receiveProductData(inputData, rProductData, options = {}) {
       }
     })
 
-    productData.mulInsOrderList.forEach(ins => {
-      if (ins.isGroup) {
-        return
-      }
-      const groupInsData = convertEleOrderListToObj(ins)
-      const insuranceId = groupInsData.isCheckbox ? groupInsData.insuranceId[0] : groupInsData.insuranceId
-      const checkedIns = productData.mulInsOrderList.find(i => i.key === insuranceId)
-      for (const key in checkedIns) {
-        if (['allowSamePerson', 'code', 'eleOrderList', 'groupKey', 'groupName', 'huomian', 'key', 'name'].indexOf(key) === -1) {
-          ins[key] = checkedIns[key]
-        }
-      }
-    })
-
     const hasSomeCheckedIns = rProductData.mulInsOrderList.some(ins => ins.title)
     productData.hadChoice = hasSomeCheckedIns
     productData.totalBaof = hasSomeCheckedIns ? rProductData.totalBaof : null
@@ -499,12 +482,11 @@ export function genProductUniqueKeyWithNS(namespace, groupKey, productKey) {
 }
 
 export async function calcProductData(inputData, options, cb) {
-  const { planbookId, publicPbUuid, groupKey, productKey, isIgnoreError, isIgnoreLoading, productCalcNamespace } = options || {}
+  const { planbookId, groupKey, productKey, isIgnoreError, productCalcNamespace } = options || {}
   const productUniqueKey = genProductUniqueKeyWithNS(productCalcNamespace, groupKey, productKey)
   try {
     const params = await createdProductDataToCalc(inputData, {
       planbookId,
-      publicPbUuid,
       groupKey,
       productKey
     })
@@ -524,26 +506,16 @@ export async function calcProductData(inputData, options, cb) {
         })
       }
     }
-    let resData = null
-    if (publicPbUuid) {
-      resData = await calcPlanbookProduct({
-        jd: params.jd
+    const resData = await calcPlanbookProduct(
+      qs.stringify({
+        jd: params.jd,
+        signature: params.signature,
+        clientVersion: params.clientVersion,
+        isIos: params.isIos
       })
-    } else {
-      resData = await calcPlanbookProduct(
-        qs.stringify({
-          jd: params.jd,
-          signature: params.signature,
-          clientVersion: params.clientVersion,
-          isIos: params.isIos
-        }),
-        {
-          isIgnoreLoading
-        }
-      ).catch(err => {
-        return Promise.reject(err)
-      })
-    }
+    ).catch(err => {
+      return Promise.reject(err)
+    })
 
     if (!resData.success || !resData.data) {
       if (resData.code === '002017') {
@@ -635,7 +607,7 @@ export async function calcProductData(inputData, options, cb) {
 }
 
 export async function doubleCalcProductData(inputData, verifyData, options = {}) {
-  const { user, planbookId, publicPbUuid, groupKey, productKey, isIgnoreError, productCalcNamespace, executeSource } = options
+  const { user, planbookId, groupKey, productKey, isIgnoreError, productCalcNamespace, executeSource } = options
   const personData = inputData && inputData.personData
   const productGroupList = inputData && inputData.productGroupList ? inputData.productGroupList : []
   const productGroup = productGroupList.find(g => g.key === groupKey)
@@ -656,7 +628,6 @@ export async function doubleCalcProductData(inputData, verifyData, options = {})
     await calcProductData(inputData, {
       user,
       planbookId,
-      publicPbUuid,
       groupKey,
       productKey,
       executeSource,
@@ -672,7 +643,6 @@ export async function doubleCalcProductData(inputData, verifyData, options = {})
       await calcProductData(inputData, {
         user,
         planbookId,
-        publicPbUuid,
         groupKey,
         productKey,
         executeSource,
@@ -684,7 +654,7 @@ export async function doubleCalcProductData(inputData, verifyData, options = {})
 }
 
 export function calcAllProductData(inputData, verifyData, options) {
-  const { planbookId, publicPbUuid, userUuid, appid, productCalcNamespace, executeSource } = options
+  const { planbookId, userUuid, appid, productCalcNamespace, executeSource } = options
   const productGroupList = (_get(inputData, 'productGroupList') || []).filter(g => g.prodOrderList)
   const prodOrderList = productGroupList
     .map(g => g.prodOrderList)
@@ -708,7 +678,6 @@ export function calcAllProductData(inputData, verifyData, options) {
             return doubleCalcProductData(inputData, verifyData, {
               planbookId,
               executeSource,
-              publicPbUuid,
               groupKey: g.key,
               productKey: p.key,
               isIgnoreError: true,
@@ -801,13 +770,7 @@ export async function makePlanbook(inputData, options = {}) {
       clientVersion: appVersion,
       isIos
     })
-  ).then(({ success, data, info }) => {
-    if (!success || !data) {
-      Toast(info || '生成计划书失败')
-      return Promise.reject()
-    }
-    return Promise.resolve(data)
-  })
+  )
 }
 
 export function convertInputDataToResultData(inputData, options = {}) {
@@ -930,7 +893,7 @@ export function cleanNeedlessResultData(resultData) {
 // 获取产品险种标签；入参过滤与 findInsuranceTag().catch 与 compare3 fetchInsuranceSaleStatusMap 一致
 export async function getProductInsuranceTags(inputData, options = {}, key = 'salesStatus') {
   const product = getProductFromInputData(inputData, options)
-  const mulInsOrderList = (_get(product, 'mulInsOrderList') || []).filter(ins => !ins.isGroup)
+  const mulInsOrderList = _get(product, 'mulInsOrderList') || []
 
   if (!mulInsOrderList.length) {
     return {}

package/packages/planbook-input/index.vue

@@ -2,20 +2,19 @@
   <div class="bxt-planbook" v-if="inputData">
     <div class="bxt-planbook-person">
       <div class="bxt-person-container" v-if="inputData.personData">
-        <template v-for="person in inputData.personData.personOrderList">
-          <PersonInfo
-            :key="person.key"
-            :input-data="inputData"
-            :verify-data="planbookData && planbookData.verifyData"
-            :person-data="person"
-            :is-show-crm-person="true"
-            :params="{
-              brokerFlag: planbookData && planbookData.brokerFlag,
-              planbookId: planbookData && planbookData.pbId
-            }"
-            @change="changePersonInfo"
-          />
-        </template>
+        <PersonInfo
+          v-for="person in inputData.personData.personOrderList"
+          :key="person.key"
+          :input-data="inputData"
+          :verify-data="planbookData && planbookData.verifyData"
+          :person-data="person"
+          :is-show-crm-person="true"
+          :params="{
+            brokerFlag: planbookData && planbookData.brokerFlag,
+            planbookId: planbookData && planbookData.pbId
+          }"
+          @change="changePersonInfo"
+        />
       </div>
     </div>
     <div class="bxt-planbook-product">
@@ -30,7 +29,6 @@
             :verify-data="planbookData && planbookData.verifyData"
             :params="{
               planbookId: Number(URL_PARAM.planbookId),
-              publicPbUuid: URL_PARAM.publicPbUuid,
               groupKey: g.key,
               productKey: p.key,
               interestProductList: planbookData && planbookData.interestProductList
@@ -95,12 +93,10 @@ export default class BxtPlanbookInput extends Vue {
   getPlanbookData() {
     const self = this
     const { URL_PARAM, userInfo } = self
-    const { planbookId, publicPbUuid, uuid } = URL_PARAM
+    const { planbookId, uuid } = URL_PARAM
     return getPlanbookData({
       insuranceTypeId: planbookId || 13767,
-      resultUuid: uuid,
-      publicPbUuid
-      // publicPbUuid: '5d6499946bbb47bb8f6a286e9d4eee77'
+      resultUuid: uuid
     })
       .then(async (data: any) => {
         await initPageData(data, {
@@ -117,7 +113,7 @@ export default class BxtPlanbookInput extends Vue {
   }
   autoImportData() {
     const { URL_PARAM, userInfo, exportData, verifyData, inputData } = this
-    const { planbookId, publicPbUuid } = URL_PARAM
+    const { planbookId } = URL_PARAM
     if (inputData) {
       inputData.productGroupList
         .filter((g: IPbProductGroup) => g.prodOrderList)
@@ -126,7 +122,6 @@ export default class BxtPlanbookInput extends Vue {
             doubleCalcProductData(inputData, verifyData, {
               user: userInfo,
               planbookId: Number(planbookId),
-              publicPbUuid,
               groupKey: g.key,
               productKey: p.key,
               executeSource: exportData ? 'import' : 'init',
@@ -143,7 +138,7 @@ export default class BxtPlanbookInput extends Vue {
   }
   changePersonInfo(person: IPbPerson, ele: any = {}) {
     const { URL_PARAM, userInfo, exportData, verifyData, inputData } = this
-    const { planbookId, publicPbUuid } = URL_PARAM
+    const { planbookId } = URL_PARAM
     if (inputData) {
       inputData.productGroupList
         .filter((g: IPbProductGroup) => g.prodOrderList)
@@ -155,7 +150,6 @@ export default class BxtPlanbookInput extends Vue {
                 user: userInfo,
                 planbookId: Number(planbookId),
                 executeSource: exportData ? 'import' : 'init',
-                publicPbUuid,
                 groupKey: g.key,
                 productKey: p.key,
                 isIgnoreError: true,
@@ -178,7 +172,7 @@ export default class BxtPlanbookInput extends Vue {
   confirmProduct(options: any, inst: any) {
     const self = this
     const { URL_PARAM, userInfo, inputData } = self
-    const { planbookId, publicPbUuid } = URL_PARAM
+    const { planbookId } = URL_PARAM
     const { groupKey, productKey } = options
     inst.$refs.productInfo
       .validate()
@@ -186,7 +180,6 @@ export default class BxtPlanbookInput extends Vue {
         return calcProductData(inputData, {
           user: userInfo,
           planbookId: Number(planbookId),
-          publicPbUuid,
           groupKey,
           productKey,
           executeSource: 'confirm'
@@ -209,11 +202,10 @@ export default class BxtPlanbookInput extends Vue {
       return Promise.reject()
     }
 
-    const { pbType, planbookId, publicPbUuid, userUuid } = URL_PARAM
+    const { pbType, planbookId, userUuid } = URL_PARAM
     const options: any = {
       pbType,
       insuranceTypeId: Number(planbookId) || null,
-      publicPbUuid,
       totalBaof: calcTotalBaof(inputData?.productGroupList),
       userUuid
     }
@@ -223,7 +215,7 @@ export default class BxtPlanbookInput extends Vue {
           theme: inputData?.theme,
           uuid: data
         })
-        location.href = `${PBF_HOSTNAME}/planBook/planBookResult/pages/${publicPbUuid ? 'planbkPurely' : 'planbkTemplatev2'}.html?${urlParam}`
+        location.href = `${PBF_HOSTNAME}/planBook/planBookResult/pages/planbkTemplatev2.html?${urlParam}`
       }
     })
   }

package/packages/planbook-input/readme.md

@@ -175,9 +175,9 @@ import {
 | ------------------------------------------------------- | --------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------- | -------------------------------------- |
 | `initPageData(data)`                                    | 初始化计划书数据，依次处理人员数据和所有产品数据                                                          | `data`：接口返回的原始数据                                                                  | Promise\<data\>                        |
 | `setPageDataBaseOnResult(data)`                         | 将已生成结果中的导出数据（`exportData`）回填到初始化数据中，用于「编辑已有计划书」场景                    | `data`：同上                                                                                | data                                   |
-| `calcProductData(inputData, options)`              | 对指定产品发起一次试算请求，并将结果写回 `inputData`                                                      | `inputData`；`options`：`{ planbookId, publicPbUuid, groupKey, productKey, isIgnoreError }` | Promise                                |
+| `calcProductData(inputData, options)`              | 对指定产品发起一次试算请求，并将结果写回 `inputData`                                                      | `inputData`；`options`：`{ planbookId, groupKey, productKey, isIgnoreError }` | Promise                                |
 | `doubleCalcProductData(inputData, verifyData, options)` | 先执行 `productDataHandler` 再执行 `calcProductData`，对存在 `revalidateFlag` 的产品自动执行二次试算 | 同上，额外需要 `verifyData`                                                                 | Promise                                |
-| `makePlanbook(inputData, options)`       | 生成计划书                                                              | `inputData`；`options`：`{ pbType, insuranceTypeId, publicPbUuid, totalBaof, userUuid }` | Object / null                          |
+| `makePlanbook(inputData, options)`       | 生成计划书                                                              | `inputData`；`options`：`{ pbType, insuranceTypeId, totalBaof, userUuid }` | Object / null                          |
 | `setupUnderwriteRuleToInputData(inputData)`             | 将核保规则（underwrite rule）应用到 inputData，返回处理后的 inputData                                     | `inputData`                                                                                 | Promise\<inputData\>                   |
-| `createdProductDataToCalc(inputData, options)`          | 生成试算接口的请求参数（jd + signature）                                                                  | `inputData`；`options`：`{ planbookId, publicPbUuid, groupKey, productKey }`                | Promise\<{ errorMsg, jd, signature }\> |
+| `createdProductDataToCalc(inputData, options)`          | 生成试算接口的请求参数（jd + signature）                                                                  | `inputData`；`options`：`{ planbookId, groupKey, productKey }`                | Promise\<{ errorMsg, jd, signature }\> |
 | `receiveProductData(inputData, rProductData, options)`  | 将试算接口返回的产品数据写回 `inputData`                                                                  | `inputData`；`rProductData`：接口返回的产品数据；`options`                                  | productData                            |

package/packages/product-info/components/product-insurance-form.md

@@ -0,0 +1,46 @@
+# ProductInsuranceForm
+
+## 说明
+
+单个险种表单：渲染 `ins.eleOrderList`（标题 + 选中后的输入/单选/下拉等）。供 `ProductInfo` 在普通险与组合子险中复用。
+
+非目标：组合险组头开关、组内互斥逻辑（由父组件处理）。
+
+## Props
+
+| 参数 | 说明 | 类型 | 默认值 |
+|------|------|------|--------|
+| `ins` | 必传，险种数据 | Object | — |
+| `ins-mode` | 场景：`normal` 普通险 / `groupSub` 组合子险（内部挂 `bxt-product-group-sub` 等 class，title 走 `title-change`） | String | `normal` |
+| `product-key` | 产品 key，用于 DOM id | Number / String | `null` |
+| `mul-ins-order-list` | 产品下全部险种（豁免标签等） | Array | `[]` |
+| `person-data` | 人员信息（豁免提示） | Object | `{}` |
+| `recommend-values` | 保额/保费推荐值 | Object | `{}` |
+| `insurance-sale-status` | 停售状态映射 | Object | `{}` |
+| `show-huomian-tips` | 是否展示豁免设置提示 | Boolean | `false` |
+| `is-follow` | 是否与上一险种紧贴 | Boolean | `false` |
+
+## Events
+
+| 事件 | 说明 | 参数 |
+|------|------|------|
+| `change` | 元素变更（普通险含 title；组合子险 title 除外） | `{ insData, eleData }` |
+| `title-change` | 仅 `insMode=groupSub`：标题勾选，由父做互斥后再 `onChange` | `{ insData, eleData }` |
+| `openCrmPerson` | 点击豁免提示 | — |
+
+## Methods
+
+| 方法 | 说明 |
+|------|------|
+| `validate` | 调用内部 `van-form.validate` |
+
+## 依赖
+
+- Vant：`van-form` / `van-field` / `van-radio` 等
+- `CommonTitle` / `CommonRadio` / `CommonSelect`
+
+## 埋点清单
+
+| 事件类型 | 触发节点 | statId | 备注 |
+|----------|----------|--------|------|
+| 点击 | 标题 / 单选 / 下拉 | `product_insurance_${ele.key}` | 声明式 `data-stat-id` |