bxs-tools-ui 1.5.2 → 1.5.4

package/lib/add-and-take/index.js

@@ -1343,8 +1343,8 @@ module.exports = function GetIntrinsic(name, allowMissing) {
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_709ddead_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(108);
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_709ddead_prod_lang_css___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_709ddead_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_48fd684a_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(108);
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_48fd684a_prod_lang_css___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_48fd684a_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__);
 /* unused harmony reexport * */
 
 
@@ -1527,7 +1527,7 @@ function initProductData(prodData) {
     });
     return prodData;
 }
-function productDataHandler(prodData, prodVerifyData, personData) {
+function productDataHandler(prodData, prodVerifyData, personData, parmas) {
     var _a;
     return Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __awaiter */ "b"])(this, void 0, Promise, function () {
         var productVerifyData, hasProduct, hasVerifyData, hasPersonData, personOrderList;
@@ -1542,7 +1542,7 @@ function productDataHandler(prodData, prodVerifyData, personData) {
                         multipleInsuredHandler(personData);
                     }
                     if (!(prodData.feeValidateMode === 'single')) return [3, 2];
-                    return [4, getSingleInsurancesVerifyData(prodData, personData).catch(function () { })];
+                    return [4, getSingleInsurancesVerifyData(prodData, personData, parmas).catch(function () { })];
                 case 1:
                     productVerifyData = _b.sent();
                     return [3, 3];
@@ -1761,8 +1761,9 @@ function multipleInsuredHandler(personData) {
     }
     return personData;
 }
-function getSingleInsurancesVerifyData(prodData, personData) {
+function getSingleInsurancesVerifyData(prodData, personData, parmas) {
     var _a, _b;
+    if (parmas === void 0) { parmas = {}; }
     var personOrderList = personData.personOrderList;
     if (!(personOrderList && personOrderList.length)) {
         return null;
@@ -1787,6 +1788,8 @@ function getSingleInsurancesVerifyData(prodData, personData) {
         return ins.key === 'common' || ins.isGroup ? list : list.concat(ins.key);
     }, []);
     return getAndCacheInsurancesVerifyData({
+        pbId: prodData.isTemp ? null : parmas.planbookId,
+        productId: prodData.key,
         insuredList: insuredList,
         insuranceIdList: insuranceIdList
     });
@@ -3344,11 +3347,11 @@ __webpack_require__.r(__webpack_exports__);
 var defineProperty = __webpack_require__(26);
 var defineProperty_default = /*#__PURE__*/__webpack_require__.n(defineProperty);
 
-// CONCATENATED MODULE: ./node_modules/babel-loader/lib??ref--1!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/vue-loader/lib??vue-loader-options!./packages/add-and-take/index.vue?vue&type=template&id=709ddead&
+// CONCATENATED MODULE: ./node_modules/babel-loader/lib??ref--1!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/vue-loader/lib??vue-loader-options!./packages/add-and-take/index.vue?vue&type=template&id=48fd684a&
 
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { defineProperty_default()(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-var add_and_takevue_type_template_id_709ddead_render = function render() {
+var add_and_takevue_type_template_id_48fd684a_render = function render() {
   var _vm = this,
     _c = _vm._self._c,
     _setup = _vm._self._setupProxy;
@@ -3644,7 +3647,7 @@ var add_and_takevue_type_template_id_709ddead_render = function render() {
 };
 var staticRenderFns = [];
 
-// CONCATENATED MODULE: ./packages/add-and-take/index.vue?vue&type=template&id=709ddead&
+// CONCATENATED MODULE: ./packages/add-and-take/index.vue?vue&type=template&id=48fd684a&
 
 // EXTERNAL MODULE: ./node_modules/tslib/tslib.es6.js
 var tslib_es6 = __webpack_require__(0);
@@ -3742,6 +3745,7 @@ function initInterestFormValues(values, data) {
     bonus: values.bonus || null,
     customBonusRate: values.customBonusRate || null,
     rate: values.rate || null,
+    takeType: values.takeType || null,
     customRate: values.customRate || null
   };
   Object.keys(formData).filter(function (k) {
@@ -3782,6 +3786,7 @@ function convertInterestFormValues(values, data) {
   var _highestEndBonusRate = Object(lodash["get"])(data, 'bonusRateData.highestEndBonusRate');
   var bonus = values.bonus,
     customBonusRate = values.customBonusRate,
+    takeType = values.takeType,
     rate = values.rate,
     customRate = values.customRate;
   var _yearBonusRate = bonus === '_custom' ? customBonusRate || _highestYearBonusRate : null;
@@ -3791,6 +3796,7 @@ function convertInterestFormValues(values, data) {
     bonus: bonus === '_custom' ? 'mid' : bonus,
     yearBonusRate: _yearBonusRate ? Number((_yearBonusRate / 100).toFixed(2)) : null,
     endBonusRate: _endBonusRate ? Number((_endBonusRate / 100).toFixed(2)) : null,
+    takeType: takeType,
     rate: rate === '_custom' ? _customRate : rate,
     customRate: rate === '_custom' ? _customRate || _initRate || 4 : null
   };
@@ -4650,6 +4656,9 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
                             _c.bonus = {
                                 value: _formValus.bonus
                             },
+                            _c.takeType = {
+                                value: _formValus.takeType
+                            },
                             _c.rate = {
                                 value: _formValus.customRate || _formValus.rate
                             },
@@ -4979,8 +4988,8 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
 
 // CONCATENATED MODULE: ./packages/add-and-take/index.vue?vue&type=script&lang=ts&
  /* harmony default export */ var packages_add_and_takevue_type_script_lang_ts_ = (add_and_takevue_type_script_lang_ts_); 
-// EXTERNAL MODULE: ./packages/add-and-take/index.vue?vue&type=style&index=0&id=709ddead&prod&lang=css&
-var add_and_takevue_type_style_index_0_id_709ddead_prod_lang_css_ = __webpack_require__(137);
+// EXTERNAL MODULE: ./packages/add-and-take/index.vue?vue&type=style&index=0&id=48fd684a&prod&lang=css&
+var add_and_takevue_type_style_index_0_id_48fd684a_prod_lang_css_ = __webpack_require__(137);
 
 // CONCATENATED MODULE: ./packages/add-and-take/index.vue
 
@@ -4993,7 +5002,7 @@ var add_and_takevue_type_style_index_0_id_709ddead_prod_lang_css_ = __webpack_re
 
 var add_and_take_component = Object(componentNormalizer["a" /* default */])(
   packages_add_and_takevue_type_script_lang_ts_,
-  add_and_takevue_type_template_id_709ddead_render,
+  add_and_takevue_type_template_id_48fd684a_render,
   staticRenderFns,
   false,
   null,

package/lib/adjust-baoe/index.js

@@ -19675,7 +19675,7 @@ function initProductData(prodData) {
     });
     return prodData;
 }
-function productDataHandler(prodData, prodVerifyData, personData) {
+function productDataHandler(prodData, prodVerifyData, personData, parmas) {
     var _a;
     return Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __awaiter */ "b"])(this, void 0, Promise, function () {
         var productVerifyData, hasProduct, hasVerifyData, hasPersonData, personOrderList;
@@ -19690,7 +19690,7 @@ function productDataHandler(prodData, prodVerifyData, personData) {
                         multipleInsuredHandler(personData);
                     }
                     if (!(prodData.feeValidateMode === 'single')) return [3, 2];
-                    return [4, getSingleInsurancesVerifyData(prodData, personData).catch(function () { })];
+                    return [4, getSingleInsurancesVerifyData(prodData, personData, parmas).catch(function () { })];
                 case 1:
                     productVerifyData = _b.sent();
                     return [3, 3];
@@ -19909,8 +19909,9 @@ function multipleInsuredHandler(personData) {
     }
     return personData;
 }
-function getSingleInsurancesVerifyData(prodData, personData) {
+function getSingleInsurancesVerifyData(prodData, personData, parmas) {
     var _a, _b;
+    if (parmas === void 0) { parmas = {}; }
     var personOrderList = personData.personOrderList;
     if (!(personOrderList && personOrderList.length)) {
         return null;
@@ -19935,6 +19936,8 @@ function getSingleInsurancesVerifyData(prodData, personData) {
         return ins.key === 'common' || ins.isGroup ? list : list.concat(ins.key);
     }, []);
     return getAndCacheInsurancesVerifyData({
+        pbId: prodData.isTemp ? null : parmas.planbookId,
+        productId: prodData.key,
         insuredList: insuredList,
         insuranceIdList: insuranceIdList
     });

package/lib/bxs-utils/index.js

@@ -19938,7 +19938,7 @@ function initProductData(prodData) {
     });
     return prodData;
 }
-function productDataHandler(prodData, prodVerifyData, personData) {
+function productDataHandler(prodData, prodVerifyData, personData, parmas) {
     var _a;
     return Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __awaiter */ "b"])(this, void 0, Promise, function () {
         var productVerifyData, hasProduct, hasVerifyData, hasPersonData, personOrderList;
@@ -19953,7 +19953,7 @@ function productDataHandler(prodData, prodVerifyData, personData) {
                         multipleInsuredHandler(personData);
                     }
                     if (!(prodData.feeValidateMode === 'single')) return [3, 2];
-                    return [4, getSingleInsurancesVerifyData(prodData, personData).catch(function () { })];
+                    return [4, getSingleInsurancesVerifyData(prodData, personData, parmas).catch(function () { })];
                 case 1:
                     productVerifyData = _b.sent();
                     return [3, 3];
@@ -20172,8 +20172,9 @@ function multipleInsuredHandler(personData) {
     }
     return personData;
 }
-function getSingleInsurancesVerifyData(prodData, personData) {
+function getSingleInsurancesVerifyData(prodData, personData, parmas) {
     var _a, _b;
+    if (parmas === void 0) { parmas = {}; }
     var personOrderList = personData.personOrderList;
     if (!(personOrderList && personOrderList.length)) {
         return null;
@@ -20198,6 +20199,8 @@ function getSingleInsurancesVerifyData(prodData, personData) {
         return ins.key === 'common' || ins.isGroup ? list : list.concat(ins.key);
     }, []);
     return getAndCacheInsurancesVerifyData({
+        pbId: prodData.isTemp ? null : parmas.planbookId,
+        productId: prodData.key,
         insuredList: insuredList,
         insuranceIdList: insuranceIdList
     });

package/lib/index.js

@@ -23000,7 +23000,7 @@ function initProductData(prodData) {
     });
     return prodData;
 }
-function productDataHandler(prodData, prodVerifyData, personData) {
+function productDataHandler(prodData, prodVerifyData, personData, parmas) {
     var _a;
     return Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __awaiter */ "b"])(this, void 0, Promise, function () {
         var productVerifyData, hasProduct, hasVerifyData, hasPersonData, personOrderList;
@@ -23015,7 +23015,7 @@ function productDataHandler(prodData, prodVerifyData, personData) {
                         multipleInsuredHandler(personData);
                     }
                     if (!(prodData.feeValidateMode === 'single')) return [3, 2];
-                    return [4, getSingleInsurancesVerifyData(prodData, personData).catch(function () { })];
+                    return [4, getSingleInsurancesVerifyData(prodData, personData, parmas).catch(function () { })];
                 case 1:
                     productVerifyData = _b.sent();
                     return [3, 3];
@@ -23234,8 +23234,9 @@ function multipleInsuredHandler(personData) {
     }
     return personData;
 }
-function getSingleInsurancesVerifyData(prodData, personData) {
+function getSingleInsurancesVerifyData(prodData, personData, parmas) {
     var _a, _b;
+    if (parmas === void 0) { parmas = {}; }
     var personOrderList = personData.personOrderList;
     if (!(personOrderList && personOrderList.length)) {
         return null;
@@ -23260,6 +23261,8 @@ function getSingleInsurancesVerifyData(prodData, personData) {
         return ins.key === 'common' || ins.isGroup ? list : list.concat(ins.key);
     }, []);
     return getAndCacheInsurancesVerifyData({
+        pbId: prodData.isTemp ? null : parmas.planbookId,
+        productId: prodData.key,
         insuredList: insuredList,
         insuranceIdList: insuranceIdList
     });
@@ -27224,8 +27227,8 @@ module.exports = function (str, opts) {
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_709ddead_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(56);
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_709ddead_prod_lang_css___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_709ddead_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_48fd684a_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(56);
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_48fd684a_prod_lang_css___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_48fd684a_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__);
 /* unused harmony reexport * */
 
 
@@ -30697,8 +30700,8 @@ module.exports = function spread(callback) {
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_bcf28ff2_prod_lang_postcss___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(88);
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_bcf28ff2_prod_lang_postcss___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_bcf28ff2_prod_lang_postcss___WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_b2e93ff0_prod_lang_postcss___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(88);
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_b2e93ff0_prod_lang_postcss___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_b2e93ff0_prod_lang_postcss___WEBPACK_IMPORTED_MODULE_0__);
 /* unused harmony reexport * */
 
 
@@ -34056,8 +34059,8 @@ function isSlowBuffer (obj) {
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_56388a14_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(92);
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_56388a14_prod_lang_css___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_56388a14_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_fa4891e6_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(92);
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_fa4891e6_prod_lang_css___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_fa4891e6_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__);
 /* unused harmony reexport * */
 
 
@@ -34083,11 +34086,11 @@ __webpack_require__.d(__webpack_exports__, "ProductInfo", function() { return /*
 var defineProperty = __webpack_require__(8);
 var defineProperty_default = /*#__PURE__*/__webpack_require__.n(defineProperty);
 
-// CONCATENATED MODULE: ./node_modules/babel-loader/lib??ref--1!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/vue-loader/lib??vue-loader-options!./packages/add-and-take/index.vue?vue&type=template&id=709ddead&
+// CONCATENATED MODULE: ./node_modules/babel-loader/lib??ref--1!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/vue-loader/lib??vue-loader-options!./packages/add-and-take/index.vue?vue&type=template&id=48fd684a&
 
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { defineProperty_default()(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-var add_and_takevue_type_template_id_709ddead_render = function render() {
+var add_and_takevue_type_template_id_48fd684a_render = function render() {
   var _vm = this,
     _c = _vm._self._c,
     _setup = _vm._self._setupProxy;
@@ -34383,7 +34386,7 @@ var add_and_takevue_type_template_id_709ddead_render = function render() {
 };
 var staticRenderFns = [];
 
-// CONCATENATED MODULE: ./packages/add-and-take/index.vue?vue&type=template&id=709ddead&
+// CONCATENATED MODULE: ./packages/add-and-take/index.vue?vue&type=template&id=48fd684a&
 
 // EXTERNAL MODULE: ./node_modules/tslib/tslib.es6.js
 var tslib_es6 = __webpack_require__(0);
@@ -35098,6 +35101,7 @@ function initInterestFormValues(values, data) {
     bonus: values.bonus || null,
     customBonusRate: values.customBonusRate || null,
     rate: values.rate || null,
+    takeType: values.takeType || null,
     customRate: values.customRate || null
   };
   Object.keys(formData).filter(function (k) {
@@ -35138,6 +35142,7 @@ function convertInterestFormValues(values, data) {
   var _highestEndBonusRate = Object(lodash["get"])(data, 'bonusRateData.highestEndBonusRate');
   var bonus = values.bonus,
     customBonusRate = values.customBonusRate,
+    takeType = values.takeType,
     rate = values.rate,
     customRate = values.customRate;
   var _yearBonusRate = bonus === '_custom' ? customBonusRate || _highestYearBonusRate : null;
@@ -35147,6 +35152,7 @@ function convertInterestFormValues(values, data) {
     bonus: bonus === '_custom' ? 'mid' : bonus,
     yearBonusRate: _yearBonusRate ? Number((_yearBonusRate / 100).toFixed(2)) : null,
     endBonusRate: _endBonusRate ? Number((_endBonusRate / 100).toFixed(2)) : null,
+    takeType: takeType,
     rate: rate === '_custom' ? _customRate : rate,
     customRate: rate === '_custom' ? _customRate || _initRate || 4 : null
   };
@@ -36255,6 +36261,9 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
                             _c.bonus = {
                                 value: _formValus.bonus
                             },
+                            _c.takeType = {
+                                value: _formValus.takeType
+                            },
                             _c.rate = {
                                 value: _formValus.customRate || _formValus.rate
                             },
@@ -36584,8 +36593,8 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
 
 // CONCATENATED MODULE: ./packages/add-and-take/index.vue?vue&type=script&lang=ts&
  /* harmony default export */ var packages_add_and_takevue_type_script_lang_ts_ = (add_and_takevue_type_script_lang_ts_); 
-// EXTERNAL MODULE: ./packages/add-and-take/index.vue?vue&type=style&index=0&id=709ddead&prod&lang=css&
-var add_and_takevue_type_style_index_0_id_709ddead_prod_lang_css_ = __webpack_require__(110);
+// EXTERNAL MODULE: ./packages/add-and-take/index.vue?vue&type=style&index=0&id=48fd684a&prod&lang=css&
+var add_and_takevue_type_style_index_0_id_48fd684a_prod_lang_css_ = __webpack_require__(110);
 
 // CONCATENATED MODULE: ./packages/add-and-take/index.vue
 
@@ -36598,7 +36607,7 @@ var add_and_takevue_type_style_index_0_id_709ddead_prod_lang_css_ = __webpack_re
 
 var add_and_take_component = normalizeComponent(
   packages_add_and_takevue_type_script_lang_ts_,
-  add_and_takevue_type_template_id_709ddead_render,
+  add_and_takevue_type_template_id_48fd684a_render,
   staticRenderFns,
   false,
   null,
@@ -39300,8 +39309,8 @@ var insure_calculate_component = normalizeComponent(
 )
 
 /* harmony default export */ var insure_calculate = (insure_calculate_component.exports);
-// CONCATENATED MODULE: ./node_modules/babel-loader/lib??ref--1!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/vue-loader/lib??vue-loader-options!./packages/person-info/index.vue?vue&type=template&id=bcf28ff2&
-var person_infovue_type_template_id_bcf28ff2_render = function render() {
+// CONCATENATED MODULE: ./node_modules/babel-loader/lib??ref--1!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/vue-loader/lib??vue-loader-options!./packages/person-info/index.vue?vue&type=template&id=b2e93ff0&
+var person_infovue_type_template_id_b2e93ff0_render = function render() {
   var _vm = this,
     _c = _vm._self._c,
     _setup = _vm._self._setupProxy;
@@ -39513,9 +39522,9 @@ var person_infovue_type_template_id_bcf28ff2_render = function render() {
     })], 1) : _vm._e()] : _vm._e()];
   })], 2)], 1);
 };
-var person_infovue_type_template_id_bcf28ff2_staticRenderFns = [];
+var person_infovue_type_template_id_b2e93ff0_staticRenderFns = [];
 
-// CONCATENATED MODULE: ./packages/person-info/index.vue?vue&type=template&id=bcf28ff2&
+// CONCATENATED MODULE: ./packages/person-info/index.vue?vue&type=template&id=b2e93ff0&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib??ref--1!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/vue-loader/lib??vue-loader-options!./packages/components/form-item/title-item.vue?vue&type=template&id=0bfe2bcc&
 var title_itemvue_type_template_id_0bfe2bcc_render = function render() {
@@ -40316,6 +40325,7 @@ var person_infovue_type_script_lang_ts_a;
 
 
 
+
 var person_infovue_type_script_lang_ts_BxtPersonInfo = (function (_super) {
     Object(tslib_es6["d" /* __extends */])(BxtPersonInfo, _super);
     function BxtPersonInfo() {
@@ -40354,11 +40364,11 @@ var person_infovue_type_script_lang_ts_BxtPersonInfo = (function (_super) {
     BxtPersonInfo.prototype.change = function (ele) {
         if (ele === void 0) { ele = {}; }
         return Object(tslib_es6["b" /* __awaiter */])(this, void 0, void 0, function () {
-            var _a, inputData, personData, verifyData, allPersonsData, productGroupList, promises_1;
+            var _a, inputData, personData, verifyData, params, allPersonsData, productGroupList, promises_1;
             return Object(tslib_es6["e" /* __generator */])(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = this, inputData = _a.inputData, personData = _a.personData, verifyData = _a.verifyData;
+                        _a = this, inputData = _a.inputData, personData = _a.personData, verifyData = _a.verifyData, params = _a.params;
                         if (!inputData) {
                             return [2];
                         }
@@ -40377,7 +40387,9 @@ var person_infovue_type_script_lang_ts_BxtPersonInfo = (function (_super) {
                             .forEach(function (g) {
                             g.prodOrderList.map(function (p) {
                                 Object(product["a" /* clearAddAndTakeAndAdjustBaoeData */])(p);
-                                promises_1.push(Object(product["d" /* productDataHandler */])(p, verifyData && verifyData[p.key], allPersonsData));
+                                promises_1.push(Object(product["d" /* productDataHandler */])(p, Object(lodash["get"])(verifyData, "[" + p.key + "]"), allPersonsData, {
+                                    planbookId: Object(lodash["get"])(params, 'planbookId')
+                                }));
                             });
                         });
                         return [4, Promise.all(promises_1)];
@@ -40472,8 +40484,8 @@ var person_infovue_type_script_lang_ts_BxtPersonInfo = (function (_super) {
 
 // CONCATENATED MODULE: ./packages/person-info/index.vue?vue&type=script&lang=ts&
  /* harmony default export */ var packages_person_infovue_type_script_lang_ts_ = (person_infovue_type_script_lang_ts_); 
-// EXTERNAL MODULE: ./packages/person-info/index.vue?vue&type=style&index=0&id=bcf28ff2&prod&lang=postcss&
-var person_infovue_type_style_index_0_id_bcf28ff2_prod_lang_postcss_ = __webpack_require__(206);
+// EXTERNAL MODULE: ./packages/person-info/index.vue?vue&type=style&index=0&id=b2e93ff0&prod&lang=postcss&
+var person_infovue_type_style_index_0_id_b2e93ff0_prod_lang_postcss_ = __webpack_require__(206);
 
 // CONCATENATED MODULE: ./packages/person-info/index.vue
 
@@ -40486,8 +40498,8 @@ var person_infovue_type_style_index_0_id_bcf28ff2_prod_lang_postcss_ = __webpack
 
 var person_info_component = normalizeComponent(
   packages_person_infovue_type_script_lang_ts_,
-  person_infovue_type_template_id_bcf28ff2_render,
-  person_infovue_type_template_id_bcf28ff2_staticRenderFns,
+  person_infovue_type_template_id_b2e93ff0_render,
+  person_infovue_type_template_id_b2e93ff0_staticRenderFns,
   false,
   null,
   null,
@@ -40496,8 +40508,8 @@ var person_info_component = normalizeComponent(
 )
 
 /* harmony default export */ var person_info = (person_info_component.exports);
-// CONCATENATED MODULE: ./node_modules/babel-loader/lib??ref--1!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/vue-loader/lib??vue-loader-options!./packages/product-info/index.vue?vue&type=template&id=56388a14&
-var product_infovue_type_template_id_56388a14_render = function render() {
+// CONCATENATED MODULE: ./node_modules/babel-loader/lib??ref--1!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/vue-loader/lib??vue-loader-options!./packages/product-info/index.vue?vue&type=template&id=fa4891e6&
+var product_infovue_type_template_id_fa4891e6_render = function render() {
   var _vm = this,
     _c = _vm._self._c,
     _setup = _vm._self._setupProxy;
@@ -40807,9 +40819,9 @@ var product_infovue_type_template_id_56388a14_render = function render() {
     })], 2)];
   })], 2) : _vm._e();
 };
-var product_infovue_type_template_id_56388a14_staticRenderFns = [];
+var product_infovue_type_template_id_fa4891e6_staticRenderFns = [];
 
-// CONCATENATED MODULE: ./packages/product-info/index.vue?vue&type=template&id=56388a14&
+// CONCATENATED MODULE: ./packages/product-info/index.vue?vue&type=template&id=fa4891e6&
 
 // EXTERNAL MODULE: ./node_modules/md5/md5.js
 var md5 = __webpack_require__(50);
@@ -40921,7 +40933,9 @@ function _initPageData() {
           }).forEach(function (g) {
             return g.prodOrderList.forEach(function (p) {
               Object(product["c" /* initProductData */])(p);
-              promises.push(Object(product["d" /* productDataHandler */])(p, data.verifyData[p.key], inputData.personData));
+              promises.push(Object(product["d" /* productDataHandler */])(p, data.verifyData[p.key], inputData.personData, {
+                planbookId: data.pbId
+              }));
             });
           });
           _context.next = 9;
@@ -41504,7 +41518,9 @@ var product_infovue_type_script_lang_ts_BxtProductInfo = (function (_super) {
                         if (options.type === 'change') {
                             Object(product["a" /* clearAddAndTakeAndAdjustBaoeData */])(productData);
                         }
-                        return [4, Object(product["d" /* productDataHandler */])(productData, this.verifyData && this.verifyData[productData.key], this.personData)];
+                        return [4, Object(product["d" /* productDataHandler */])(productData, Object(lodash["get"])(this, "verifyData[" + productData.key + "]"), this.personData, {
+                                planbookId: Object(lodash["get"])(this, 'params.planbookId')
+                            })];
                     case 1:
                         _a.sent();
                         if (options.type === 'change') {
@@ -41807,8 +41823,8 @@ var product_infovue_type_script_lang_ts_BxtProductInfo = (function (_super) {
 
 // CONCATENATED MODULE: ./packages/product-info/index.vue?vue&type=script&lang=ts&
  /* harmony default export */ var packages_product_infovue_type_script_lang_ts_ = (product_infovue_type_script_lang_ts_); 
-// EXTERNAL MODULE: ./packages/product-info/index.vue?vue&type=style&index=0&id=56388a14&prod&lang=css&
-var product_infovue_type_style_index_0_id_56388a14_prod_lang_css_ = __webpack_require__(232);
+// EXTERNAL MODULE: ./packages/product-info/index.vue?vue&type=style&index=0&id=fa4891e6&prod&lang=css&
+var product_infovue_type_style_index_0_id_fa4891e6_prod_lang_css_ = __webpack_require__(232);
 
 // CONCATENATED MODULE: ./packages/product-info/index.vue
 
@@ -41821,8 +41837,8 @@ var product_infovue_type_style_index_0_id_56388a14_prod_lang_css_ = __webpack_re
 
 var product_info_component = normalizeComponent(
   packages_product_infovue_type_script_lang_ts_,
-  product_infovue_type_template_id_56388a14_render,
-  product_infovue_type_template_id_56388a14_staticRenderFns,
+  product_infovue_type_template_id_fa4891e6_render,
+  product_infovue_type_template_id_fa4891e6_staticRenderFns,
   false,
   null,
   null,

package/lib/insure-calculate/index.js

@@ -20668,7 +20668,7 @@ function initProductData(prodData) {
     });
     return prodData;
 }
-function productDataHandler(prodData, prodVerifyData, personData) {
+function productDataHandler(prodData, prodVerifyData, personData, parmas) {
     var _a;
     return Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __awaiter */ "b"])(this, void 0, Promise, function () {
         var productVerifyData, hasProduct, hasVerifyData, hasPersonData, personOrderList;
@@ -20683,7 +20683,7 @@ function productDataHandler(prodData, prodVerifyData, personData) {
                         multipleInsuredHandler(personData);
                     }
                     if (!(prodData.feeValidateMode === 'single')) return [3, 2];
-                    return [4, getSingleInsurancesVerifyData(prodData, personData).catch(function () { })];
+                    return [4, getSingleInsurancesVerifyData(prodData, personData, parmas).catch(function () { })];
                 case 1:
                     productVerifyData = _b.sent();
                     return [3, 3];
@@ -20902,8 +20902,9 @@ function multipleInsuredHandler(personData) {
     }
     return personData;
 }
-function getSingleInsurancesVerifyData(prodData, personData) {
+function getSingleInsurancesVerifyData(prodData, personData, parmas) {
     var _a, _b;
+    if (parmas === void 0) { parmas = {}; }
     var personOrderList = personData.personOrderList;
     if (!(personOrderList && personOrderList.length)) {
         return null;
@@ -20928,6 +20929,8 @@ function getSingleInsurancesVerifyData(prodData, personData) {
         return ins.key === 'common' || ins.isGroup ? list : list.concat(ins.key);
     }, []);
     return getAndCacheInsurancesVerifyData({
+        pbId: prodData.isTemp ? null : parmas.planbookId,
+        productId: prodData.key,
         insuredList: insuredList,
         insuranceIdList: insuranceIdList
     });

package/lib/person-info/index.js

@@ -20668,7 +20668,7 @@ function initProductData(prodData) {
     });
     return prodData;
 }
-function productDataHandler(prodData, prodVerifyData, personData) {
+function productDataHandler(prodData, prodVerifyData, personData, parmas) {
     var _a;
     return Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __awaiter */ "b"])(this, void 0, Promise, function () {
         var productVerifyData, hasProduct, hasVerifyData, hasPersonData, personOrderList;
@@ -20683,7 +20683,7 @@ function productDataHandler(prodData, prodVerifyData, personData) {
                         multipleInsuredHandler(personData);
                     }
                     if (!(prodData.feeValidateMode === 'single')) return [3, 2];
-                    return [4, getSingleInsurancesVerifyData(prodData, personData).catch(function () { })];
+                    return [4, getSingleInsurancesVerifyData(prodData, personData, parmas).catch(function () { })];
                 case 1:
                     productVerifyData = _b.sent();
                     return [3, 3];
@@ -20902,8 +20902,9 @@ function multipleInsuredHandler(personData) {
     }
     return personData;
 }
-function getSingleInsurancesVerifyData(prodData, personData) {
+function getSingleInsurancesVerifyData(prodData, personData, parmas) {
     var _a, _b;
+    if (parmas === void 0) { parmas = {}; }
     var personOrderList = personData.personOrderList;
     if (!(personOrderList && personOrderList.length)) {
         return null;
@@ -20928,6 +20929,8 @@ function getSingleInsurancesVerifyData(prodData, personData) {
         return ins.key === 'common' || ins.isGroup ? list : list.concat(ins.key);
     }, []);
     return getAndCacheInsurancesVerifyData({
+        pbId: prodData.isTemp ? null : parmas.planbookId,
+        productId: prodData.key,
         insuredList: insuredList,
         insuranceIdList: insuranceIdList
     });
@@ -25808,8 +25811,8 @@ var component = Object(componentNormalizer["a" /* default */])(
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_bcf28ff2_prod_lang_postcss___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(131);
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_bcf28ff2_prod_lang_postcss___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_bcf28ff2_prod_lang_postcss___WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_b2e93ff0_prod_lang_postcss___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(131);
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_b2e93ff0_prod_lang_postcss___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_b2e93ff0_prod_lang_postcss___WEBPACK_IMPORTED_MODULE_0__);
 /* unused harmony reexport * */
 
 
@@ -25847,7 +25850,7 @@ var component = Object(componentNormalizer["a" /* default */])(
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/babel-loader/lib??ref--1!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/vue-loader/lib??vue-loader-options!./packages/person-info/index.vue?vue&type=template&id=bcf28ff2&
+// CONCATENATED MODULE: ./node_modules/babel-loader/lib??ref--1!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/vue-loader/lib??vue-loader-options!./packages/person-info/index.vue?vue&type=template&id=b2e93ff0&
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c,
@@ -26062,7 +26065,7 @@ var render = function render() {
 };
 var staticRenderFns = [];
 
-// CONCATENATED MODULE: ./packages/person-info/index.vue?vue&type=template&id=bcf28ff2&
+// CONCATENATED MODULE: ./packages/person-info/index.vue?vue&type=template&id=b2e93ff0&
 
 // EXTERNAL MODULE: ./node_modules/tslib/tslib.es6.js
 var tslib_es6 = __webpack_require__(0);
@@ -26071,6 +26074,9 @@ var tslib_es6 = __webpack_require__(0);
 var external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_ = __webpack_require__(4);
 var external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_default = /*#__PURE__*/__webpack_require__.n(external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_);
 
+// EXTERNAL MODULE: ./node_modules/lodash/lodash.js
+var lodash = __webpack_require__(5);
+
 // EXTERNAL MODULE: ./packages/bxs-utils/index.ts + 3 modules
 var bxs_utils = __webpack_require__(7);
 
@@ -26692,6 +26698,7 @@ var person_infovue_type_script_lang_ts_a;
 
 
 
+
 var person_infovue_type_script_lang_ts_BxtPersonInfo = (function (_super) {
     Object(tslib_es6["d" /* __extends */])(BxtPersonInfo, _super);
     function BxtPersonInfo() {
@@ -26730,11 +26737,11 @@ var person_infovue_type_script_lang_ts_BxtPersonInfo = (function (_super) {
     BxtPersonInfo.prototype.change = function (ele) {
         if (ele === void 0) { ele = {}; }
         return Object(tslib_es6["b" /* __awaiter */])(this, void 0, void 0, function () {
-            var _a, inputData, personData, verifyData, allPersonsData, productGroupList, promises_1;
+            var _a, inputData, personData, verifyData, params, allPersonsData, productGroupList, promises_1;
             return Object(tslib_es6["e" /* __generator */])(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = this, inputData = _a.inputData, personData = _a.personData, verifyData = _a.verifyData;
+                        _a = this, inputData = _a.inputData, personData = _a.personData, verifyData = _a.verifyData, params = _a.params;
                         if (!inputData) {
                             return [2];
                         }
@@ -26753,7 +26760,9 @@ var person_infovue_type_script_lang_ts_BxtPersonInfo = (function (_super) {
                             .forEach(function (g) {
                             g.prodOrderList.map(function (p) {
                                 Object(bxs_utils["clearAddAndTakeAndAdjustBaoeData"])(p);
-                                promises_1.push(Object(bxs_utils["productDataHandler"])(p, verifyData && verifyData[p.key], allPersonsData));
+                                promises_1.push(Object(bxs_utils["productDataHandler"])(p, Object(lodash["get"])(verifyData, "[" + p.key + "]"), allPersonsData, {
+                                    planbookId: Object(lodash["get"])(params, 'planbookId')
+                                }));
                             });
                         });
                         return [4, Promise.all(promises_1)];
@@ -26848,8 +26857,8 @@ var person_infovue_type_script_lang_ts_BxtPersonInfo = (function (_super) {
 
 // CONCATENATED MODULE: ./packages/person-info/index.vue?vue&type=script&lang=ts&
  /* harmony default export */ var packages_person_infovue_type_script_lang_ts_ = (person_infovue_type_script_lang_ts_); 
-// EXTERNAL MODULE: ./packages/person-info/index.vue?vue&type=style&index=0&id=bcf28ff2&prod&lang=postcss&
-var person_infovue_type_style_index_0_id_bcf28ff2_prod_lang_postcss_ = __webpack_require__(214);
+// EXTERNAL MODULE: ./packages/person-info/index.vue?vue&type=style&index=0&id=b2e93ff0&prod&lang=postcss&
+var person_infovue_type_style_index_0_id_b2e93ff0_prod_lang_postcss_ = __webpack_require__(214);
 
 // CONCATENATED MODULE: ./packages/person-info/index.vue
 

package/lib/product-info/index.js

@@ -21425,7 +21425,7 @@ function initProductData(prodData) {
     });
     return prodData;
 }
-function productDataHandler(prodData, prodVerifyData, personData) {
+function productDataHandler(prodData, prodVerifyData, personData, parmas) {
     var _a;
     return Object(tslib__WEBPACK_IMPORTED_MODULE_0__[/* __awaiter */ "b"])(this, void 0, Promise, function () {
         var productVerifyData, hasProduct, hasVerifyData, hasPersonData, personOrderList;
@@ -21440,7 +21440,7 @@ function productDataHandler(prodData, prodVerifyData, personData) {
                         multipleInsuredHandler(personData);
                     }
                     if (!(prodData.feeValidateMode === 'single')) return [3, 2];
-                    return [4, getSingleInsurancesVerifyData(prodData, personData).catch(function () { })];
+                    return [4, getSingleInsurancesVerifyData(prodData, personData, parmas).catch(function () { })];
                 case 1:
                     productVerifyData = _b.sent();
                     return [3, 3];
@@ -21659,8 +21659,9 @@ function multipleInsuredHandler(personData) {
     }
     return personData;
 }
-function getSingleInsurancesVerifyData(prodData, personData) {
+function getSingleInsurancesVerifyData(prodData, personData, parmas) {
     var _a, _b;
+    if (parmas === void 0) { parmas = {}; }
     var personOrderList = personData.personOrderList;
     if (!(personOrderList && personOrderList.length)) {
         return null;
@@ -21685,6 +21686,8 @@ function getSingleInsurancesVerifyData(prodData, personData) {
         return ins.key === 'common' || ins.isGroup ? list : list.concat(ins.key);
     }, []);
     return getAndCacheInsurancesVerifyData({
+        pbId: prodData.isTemp ? null : parmas.planbookId,
+        productId: prodData.key,
         insuredList: insuredList,
         insuranceIdList: insuranceIdList
     });
@@ -32553,8 +32556,8 @@ function isSlowBuffer (obj) {
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_56388a14_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(135);
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_56388a14_prod_lang_css___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_56388a14_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_fa4891e6_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(135);
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_fa4891e6_prod_lang_css___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_fa4891e6_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__);
 /* unused harmony reexport * */
 
 
@@ -32568,7 +32571,7 @@ function isSlowBuffer (obj) {
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/babel-loader/lib??ref--1!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/vue-loader/lib??vue-loader-options!./packages/product-info/index.vue?vue&type=template&id=56388a14&
+// CONCATENATED MODULE: ./node_modules/babel-loader/lib??ref--1!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/vue-loader/lib??vue-loader-options!./packages/product-info/index.vue?vue&type=template&id=fa4891e6&
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c,
@@ -32881,7 +32884,7 @@ var render = function render() {
 };
 var staticRenderFns = [];
 
-// CONCATENATED MODULE: ./packages/product-info/index.vue?vue&type=template&id=56388a14&
+// CONCATENATED MODULE: ./packages/product-info/index.vue?vue&type=template&id=fa4891e6&
 
 // EXTERNAL MODULE: ./node_modules/tslib/tslib.es6.js
 var tslib_es6 = __webpack_require__(0);
@@ -33021,7 +33024,9 @@ function _initPageData() {
           }).forEach(function (g) {
             return g.prodOrderList.forEach(function (p) {
               Object(bxs_utils["initProductData"])(p);
-              promises.push(Object(bxs_utils["productDataHandler"])(p, data.verifyData[p.key], inputData.personData));
+              promises.push(Object(bxs_utils["productDataHandler"])(p, data.verifyData[p.key], inputData.personData, {
+                planbookId: data.pbId
+              }));
             });
           });
           _context.next = 9;
@@ -33616,7 +33621,9 @@ var product_infovue_type_script_lang_ts_BxtProductInfo = (function (_super) {
                         if (options.type === 'change') {
                             Object(bxs_utils["clearAddAndTakeAndAdjustBaoeData"])(productData);
                         }
-                        return [4, Object(bxs_utils["productDataHandler"])(productData, this.verifyData && this.verifyData[productData.key], this.personData)];
+                        return [4, Object(bxs_utils["productDataHandler"])(productData, Object(lodash["get"])(this, "verifyData[" + productData.key + "]"), this.personData, {
+                                planbookId: Object(lodash["get"])(this, 'params.planbookId')
+                            })];
                     case 1:
                         _a.sent();
                         if (options.type === 'change') {
@@ -33919,8 +33926,8 @@ var product_infovue_type_script_lang_ts_BxtProductInfo = (function (_super) {
 
 // CONCATENATED MODULE: ./packages/product-info/index.vue?vue&type=script&lang=ts&
  /* harmony default export */ var packages_product_infovue_type_script_lang_ts_ = (product_infovue_type_script_lang_ts_); 
-// EXTERNAL MODULE: ./packages/product-info/index.vue?vue&type=style&index=0&id=56388a14&prod&lang=css&
-var product_infovue_type_style_index_0_id_56388a14_prod_lang_css_ = __webpack_require__(240);
+// EXTERNAL MODULE: ./packages/product-info/index.vue?vue&type=style&index=0&id=fa4891e6&prod&lang=css&
+var product_infovue_type_style_index_0_id_fa4891e6_prod_lang_css_ = __webpack_require__(240);
 
 // EXTERNAL MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(9);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bxs-tools-ui",
-  "version": "1.5.2",
+  "version": "1.5.4",
   "description": "微易前端业务组件",
   "main": "lib/index.js",
   "files": [

package/packages/add-and-take/handler.js

@@ -51,6 +51,7 @@ export function initInterestFormValues(values, data) {
     bonus: values.bonus || null,
     customBonusRate: values.customBonusRate || null,
     rate: values.rate || null,
+    takeType: values.takeType || null,
     customRate: values.customRate || null
   };
 
@@ -94,7 +95,7 @@ export function convertInterestFormValues(values, data) {
   const _highestYearBonusRate = _get(data, 'bonusRateData.highestYearBonusRate');
   const _highestEndBonusRate = _get(data, 'bonusRateData.highestEndBonusRate');
 
-  const { bonus, customBonusRate, rate, customRate } = values;
+  const { bonus, customBonusRate, takeType, rate, customRate } = values;
   const _yearBonusRate = bonus === '_custom' ? customBonusRate || _highestYearBonusRate : null;
   const _endBonusRate = bonus === '_custom' ? customBonusRate || _highestEndBonusRate : null;
   const _customRate = customRate ? Number((customRate / 100).toFixed(4)) : null;
@@ -102,6 +103,7 @@ export function convertInterestFormValues(values, data) {
     bonus: bonus === '_custom' ? 'mid' : bonus,
     yearBonusRate: _yearBonusRate ? Number((_yearBonusRate / 100).toFixed(2)) : null,
     endBonusRate: _endBonusRate ? Number((_endBonusRate / 100).toFixed(2)) : null,
+    takeType,
     rate: rate === '_custom' ? _customRate : rate,
     customRate: rate === '_custom' ? _customRate || _initRate || 4 : null
   };

package/packages/add-and-take/index.vue

@@ -573,6 +573,9 @@ export default class AddAndTake extends Vue {
       bonus: {
         value: _formValus.bonus
       },
+      takeType: {
+        value: _formValus.takeType
+      },
       rate: {
         value: _formValus.customRate || _formValus.rate
       },

package/packages/bxs-utils/planbook/product.ts

@@ -49,9 +49,10 @@ export function initProductData(prodData : IPbProduct) : IPbProduct {
  * @param {IPbProduct} prodData 必传。产品数据（单个）
  * @param {object} productVerifyData 必传。产品校验条件（单个）
  * @param {IPbPersons} personData 必传。人员信息，包括被保人、投保人、投保人配偶
+ * @param {object} parmas 补充参数，目前只有 planbookId
  * @returns {IPbProduct} 产品数据（单个）
  */
-export async function productDataHandler(prodData : IPbProduct, prodVerifyData : any, personData : IPbPersons) : Promise<IPbProduct> {
+export async function productDataHandler(prodData : IPbProduct, prodVerifyData : any, personData : IPbPersons, parmas?: any) : Promise<IPbProduct> {
   if (!prodData) {
     return prodData
   }
@@ -60,7 +61,7 @@ export async function productDataHandler(prodData : IPbProduct, prodVerifyData :
     multipleInsuredHandler(personData)
   }
   if (prodData.feeValidateMode === 'single') {
-    productVerifyData = await getSingleInsurancesVerifyData(prodData, personData).catch(() => {})
+    productVerifyData = await getSingleInsurancesVerifyData(prodData, personData, parmas).catch(() => {})
   } else {
     productVerifyData = prodVerifyData
   }
@@ -314,7 +315,7 @@ function multipleInsuredHandler (personData : IPbPersons) {
  * @param {IPbPersons} personData 必传。人员信息，包括被保人、投保人、投保人配偶
  * @returns 请求函数的 Promise
  */
-function getSingleInsurancesVerifyData (prodData : IPbProduct, personData : IPbPersons) {
+function getSingleInsurancesVerifyData (prodData : IPbProduct, personData : IPbPersons, parmas : any = {}) {
   const personOrderList : IPbPerson [] = personData.personOrderList
   if (!(personOrderList && personOrderList.length)) {
     return null
@@ -338,6 +339,8 @@ function getSingleInsurancesVerifyData (prodData : IPbProduct, personData : IPbP
     return ins.key === 'common' || ins.isGroup ? list : list.concat(ins.key)
   }, []);
   return getAndCacheInsurancesVerifyData({
+    pbId: prodData.isTemp ? null : parmas.planbookId,
+    productId: prodData.key,
     insuredList,
     insuranceIdList
   })

package/packages/person-info/index.vue

@@ -135,6 +135,7 @@
 </template>
 <script lang="ts">
 import Vue from 'vue';
+import { get as _get } from 'lodash';
 import {
   convertEleOrderListToObj,
   personDataHandler,
@@ -216,7 +217,7 @@ export default class BxtPersonInfo extends Vue {
     inputDom.focus();
   }
   async change(ele: any = {}) {
-    const { inputData, personData, verifyData } = this;
+    const { inputData, personData, verifyData, params } = this;
     if (!inputData) {
       return;
     }
@@ -237,7 +238,11 @@ export default class BxtPersonInfo extends Vue {
         .forEach(g => {
           g.prodOrderList.map(p => {
             clearAddAndTakeAndAdjustBaoeData(p);
-            promises.push(productDataHandler(p, verifyData && verifyData[p.key], allPersonsData));
+            promises.push(
+              productDataHandler(p, _get(verifyData, `[${p.key}]`), allPersonsData, {
+                planbookId: _get(params, 'planbookId')
+              })
+            );
           });
         });
       await Promise.all(promises);

package/packages/planbook-input/components/person-pop.vue

@@ -25,6 +25,7 @@
 </template>
 <script lang="ts">
 import Vue from 'vue';
+import { get as _get } from 'lodash';
 import { Component, Prop, Watch } from 'vue-property-decorator';
 import {
   deepCopy,
@@ -61,6 +62,11 @@ export default class BxtPersonPop extends Vue {
   })
   verifyData: any;
 
+  @Prop({
+    default: () => ({})
+  })
+  params: any;
+
   @Watch('value', {
     immediate: true,
     deep: true
@@ -89,11 +95,11 @@ export default class BxtPersonPop extends Vue {
     this.currentValue = false;
   }
   async confirm() {
-    const { inputData, verifyData, copyInputData } = this;
+    const { inputData, verifyData, copyInputData, params } = this;
     if (!inputData) {
       return;
     }
-    inputData.personData.personOrderList = copyInputData.personData.personOrderList;
+    inputData.personData.personOrderList = copyInputData?.personData?.personOrderList;
     const allPersonsData = inputData.personData;
     const productGroupList = inputData.productGroupList || [];
     if (allPersonsData) {
@@ -103,7 +109,11 @@ export default class BxtPersonPop extends Vue {
         g.prodOrderList &&
           g.prodOrderList.map(p => {
             clearAddAndTakeAndAdjustBaoeData(p);
-            promises.push(productDataHandler(p, verifyData && verifyData[p.key], allPersonsData));
+            promises.push(
+              productDataHandler(p, _get(verifyData, `[${p.key}]`), allPersonsData, {
+                planbookId: _get(params, 'planbookId')
+              })
+            );
           });
       });
       await Promise.all(promises);

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

@@ -146,7 +146,8 @@
         :group-key="params.groupKey"
         :product-key="params.productKey"
         :params="{
-          allowCustomResult: true
+          allowCustomResult: true,
+          planbookId: params.planbookId
         }"
         @change="cgProduct"
         @openCrmPerson="personPopConfig.visible = true"
@@ -164,8 +165,9 @@
         :input-data="inputData"
         :resultData="{
           // uuid: 'e34ac050a9f14bc2a821dd6833f803cf', // 7080-追加领取 uuid（测试）
-          uuid: 'a25ae1bc496045248bb4082e31fa2aec', // 11661-减保领取 uuid（测试）
+          // uuid: 'a25ae1bc496045248bb4082e31fa2aec', // 11661-减保领取 uuid（测试）
           // uuid: 'c387da25d0f34d35a4e40d1a1d27c5cb', // 5167-减保领取 uuid（测试）
+          // uuid: '862a7ecfba834c8ebe7fe5054aeb08e1', // 13767-追加领取、减保领取 uuid（测试）
           insuredAge: 30,
           accountData: {
             accountName: '',
@@ -191,6 +193,7 @@
           bonus: 'low',
           yearBonusRate: 1.2,
           endBonusRate: 1.2,
+          takeType: 'account',
           rate: null,
           customRate: 0.047
         }"
@@ -216,6 +219,9 @@
       v-model="personPopConfig.visible"
       :input-data="inputData"
       :verify-data="verifyData"
+      :params="{
+        planbookId: params.planbookId
+      }"
       @change="$emit('changePerson')"
     />
   </div>

package/packages/planbook-input/helper.js

@@ -23,7 +23,11 @@ export async function initPageData(data) {
       .forEach(g => {
         return g.prodOrderList.forEach(p => {
           initProductData(p);
-          promises.push(productDataHandler(p, data.verifyData[p.key], inputData.personData));
+          promises.push(
+            productDataHandler(p, data.verifyData[p.key], inputData.personData, {
+              planbookId: data.pbId
+            })
+          );
         });
       });
     await Promise.all(promises);

package/packages/planbook-input/index.vue

@@ -6,11 +6,12 @@
           <PersonInfo
             :key="person.key"
             :input-data="inputData"
-            :verify-data="planbookData.verifyData"
+            :verify-data="planbookData?.verifyData"
             :person-data="person"
             :is-show-crm-person="true"
             :params="{
-              brokerFlag: planbookData.brokerFlag
+              brokerFlag: planbookData?.brokerFlag,
+              planbookId: planbookData?.pbId
             }"
             @change="changePersonInfo"
           />
@@ -24,13 +25,13 @@
             v-if="!p.hide || pi < g.defNum"
             :key="p.key"
             :input-data="inputData"
-            :verify-data="planbookData.verifyData"
+            :verify-data="planbookData?.verifyData"
             :params="{
-              planbookId: URL_PARAM.planbookId,
+              planbookId: Number(URL_PARAM.planbookId),
               publicPbUuid: URL_PARAM.publicPbUuid,
               groupKey: g.key,
               productKey: p.key,
-              interestProductList: planbookData.interestProductList
+              interestProductList: planbookData?.interestProductList
             }"
             @confirm="confirmProduct"
             @changePerson="changePersonInfo"
@@ -278,7 +279,7 @@ export default class BxtPlanbookInput extends Vue {
       totalBaof: calcTotalBaof(inputData.productGroupList),
       userUuid: this.URL_PARAM.userUuid
     };
-    let resultData = createPlanbookDataToMake(this.planbookData, options);
+    let resultData: any = createPlanbookDataToMake(this.planbookData, options);
     if (!resultData) {
       this.$toast('请选择险种');
       return Promise.reject();
@@ -295,7 +296,9 @@ export default class BxtPlanbookInput extends Vue {
         body: QS.stringify({
           jd: JSON.stringify(resultData),
           userUuid: options.userUuid,
-          signature: createMd5Token(resultData)
+          signature: createMd5Token(resultData, {
+            groupDataKey: resultData.productGroupList[0]?.key
+          })
         })
       }
     )

package/packages/product-info/index.vue

@@ -357,7 +357,9 @@ export default class BxtProductInfo extends Vue {
     if (options.type === 'change') {
       clearAddAndTakeAndAdjustBaoeData(productData);
     }
-    await productDataHandler(productData, this.verifyData && this.verifyData[productData.key], this.personData);
+    await productDataHandler(productData, _get(this, `verifyData[${productData.key}]`), this.personData, {
+      planbookId: _get(this, 'params.planbookId')
+    });
     if (options.type === 'change') {
       this.createInsuranceInputResultEle(options.insData, options.eleData);
     } else {