bxs-tools-ui 1.4.1 → 1.4.3

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_ba01e47c_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_ba01e47c_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_ba01e47c_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_dc62a686_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_dc62a686_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_dc62a686_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__);
 /* unused harmony reexport * */
 
 
@@ -3345,11 +3345,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=ba01e47c&
+// 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=dc62a686&
 
 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_ba01e47c_render = function render() {
+var add_and_takevue_type_template_id_dc62a686_render = function render() {
   var _vm = this,
     _c = _vm._self._c,
     _setup = _vm._self._setupProxy;
@@ -3405,9 +3405,9 @@ var add_and_takevue_type_template_id_ba01e47c_render = function render() {
         key: key,
         class: (_class = {
           'bxt-aat-table-content-cell': true
-        }, defineProperty_default()(_class, "bxt-aat-table-content-cell_".concat(key), true), defineProperty_default()(_class, 'bxt-aat-table-content-cell__zero', !record[key]), defineProperty_default()(_class, 'bxt-aat-table-content-cell__purpose', key === 'take' && _vm.columnWidthObj.purpose), _class),
+        }, defineProperty_default()(_class, "bxt-aat-table-content-cell_".concat(key), true), defineProperty_default()(_class, 'bxt-aat-table-content-cell__zero', !record[key]), defineProperty_default()(_class, 'bxt-aat-table-content-cell__purpose', ['take', 'draw_value'].includes(key) && _vm.columnWidthObj.purpose), _class),
         style: {
-          'min-width': "".concat((_vm.columnWidthObj[key] || 3) + (key === 'take' ? _vm.columnWidthObj.purpose : 0), "em")
+          'min-width': "".concat((_vm.columnWidthObj[key] || 3) + (['take', 'draw_value'].includes(key) ? _vm.columnWidthObj.purpose : 0), "em")
         },
         attrs: {
           "data-stat-id": "zjlqblsz",
@@ -3425,7 +3425,7 @@ var add_and_takevue_type_template_id_ba01e47c_render = function render() {
         domProps: {
           "innerHTML": _vm._s(record[key])
         }
-      }), recordIndex !== 0 && key === 'take' && _vm.columnWidthObj.purpose ? _c('span', {
+      }), recordIndex !== 0 && ['take', 'draw_value'].includes(key) && _vm.columnWidthObj.purpose ? _c('span', {
         style: {
           width: "".concat(_vm.columnWidthObj.purpose, "em")
         }
@@ -3645,7 +3645,7 @@ var add_and_takevue_type_template_id_ba01e47c_render = function render() {
 };
 var staticRenderFns = [];
 
-// CONCATENATED MODULE: ./packages/add-and-take/index.vue?vue&type=template&id=ba01e47c&
+// CONCATENATED MODULE: ./packages/add-and-take/index.vue?vue&type=template&id=dc62a686&
 
 // EXTERNAL MODULE: ./node_modules/tslib/tslib.es6.js
 var tslib_es6 = __webpack_require__(0);
@@ -4455,7 +4455,7 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
                 age: '年龄'
             };
             addAndTakeDetailData.forEach(function (d, i) {
-                if (!['add', 'take'].includes(d.key)) {
+                if (!['add', 'take', 'draw_value'].includes(d.key)) {
                     d.uniKey = d.key + "_" + i;
                 }
                 tableHeaderData[d.uniKey || d.key] = d.name && d.name.replace(/^(.+)([(（])/, '<p>$1</p>$2');
@@ -4645,17 +4645,17 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
                         reqParams = (_c = {
                                 uuid: _resultUuid,
                                 pbData: '',
-                                productId: params.productKey,
-                                insuranceId: params.insuranceKey,
-                                bonus: {
-                                    value: _formValus.bonus
-                                },
-                                rate: {
-                                    value: _formValus.customRate || _formValus.rate
-                                },
-                                yearBonusRate: _formValus.yearBonusRate,
-                                latestYearBonusRate: _formValus.latestYearBonusRate
+                                productId: params.productKey
+                            },
+                            _c[type === 'reduceBaof' ? 'drawInsuranceId' : 'accountInsuranceId'] = params.insuranceKey,
+                            _c.bonus = {
+                                value: _formValus.bonus
                             },
+                            _c.rate = {
+                                value: _formValus.customRate || _formValus.rate
+                            },
+                            _c.yearBonusRate = _formValus.yearBonusRate,
+                            _c.latestYearBonusRate = _formValus.latestYearBonusRate,
                             _c[type === 'reduceBaof' ? 'drawData' : 'addAndTakeData'] = caclAccountData ? caclAccountData.addAndTakeData : null,
                             _c);
                         if (!_resultUuid) {
@@ -4721,7 +4721,7 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
         if (index <= 0) {
             return;
         }
-        if (!['add', 'take'].includes(key)) {
+        if (!['add', 'take', 'draw_value'].includes(key)) {
             return;
         }
         var _a = this, insuredAge = _a.insuredAge, interestInitData = _a.interestInitData, addAndTakeDetailData = _a.addAndTakeDetailData, accountData = _a.accountData;
@@ -4730,7 +4730,7 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
         }
         var purposeOption = PURPOSE_OPTIONS.find(function (o) { return o.val === item.purpose; });
         this.formData = {
-            type: key,
+            type: 'draw_value' === key ? 'take' : key,
             beginYear: item.year,
             endYear: item.year,
             baof: item[key] || null,
@@ -4801,11 +4801,13 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
         });
     };
     AddAndTake.prototype.onClickRecommendCase = function () {
+        var _this = this;
         var _addAndTakeData = Object(lodash["get"])(this, 'accountData.addAndTakeData', []) || [];
         var _addAndTakeDetailData = Object(lodash["get"])(this, 'addAndTakeDetailData', []) || [];
         _addAndTakeData.forEach(function (e) {
             e.adjustData = [];
-            var _detail = _addAndTakeDetailData.find(function (d) { return e.key === d.key; });
+            var recommendValueKey = _this.type === 'reduceBaof' && e.key === 'take' ? 'draw_value' : e.key;
+            var _detail = _addAndTakeDetailData.find(function (d) { return recommendValueKey === d.key; });
             if (_detail) {
                 _detail.details = _detail.recommendDetails;
                 _detail.values = _detail.recommendValues;
@@ -4974,8 +4976,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=ba01e47c&prod&lang=css&
-var add_and_takevue_type_style_index_0_id_ba01e47c_prod_lang_css_ = __webpack_require__(137);
+// EXTERNAL MODULE: ./packages/add-and-take/index.vue?vue&type=style&index=0&id=dc62a686&prod&lang=css&
+var add_and_takevue_type_style_index_0_id_dc62a686_prod_lang_css_ = __webpack_require__(137);
 
 // CONCATENATED MODULE: ./packages/add-and-take/index.vue
 
@@ -4988,7 +4990,7 @@ var add_and_takevue_type_style_index_0_id_ba01e47c_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_ba01e47c_render,
+  add_and_takevue_type_template_id_dc62a686_render,
   staticRenderFns,
   false,
   null,

package/lib/index.js

@@ -27225,8 +27225,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_ba01e47c_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_ba01e47c_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_ba01e47c_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_dc62a686_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_dc62a686_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_dc62a686_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__);
 /* unused harmony reexport * */
 
 
@@ -34084,11 +34084,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=ba01e47c&
+// 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=dc62a686&
 
 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_ba01e47c_render = function render() {
+var add_and_takevue_type_template_id_dc62a686_render = function render() {
   var _vm = this,
     _c = _vm._self._c,
     _setup = _vm._self._setupProxy;
@@ -34144,9 +34144,9 @@ var add_and_takevue_type_template_id_ba01e47c_render = function render() {
         key: key,
         class: (_class = {
           'bxt-aat-table-content-cell': true
-        }, defineProperty_default()(_class, "bxt-aat-table-content-cell_".concat(key), true), defineProperty_default()(_class, 'bxt-aat-table-content-cell__zero', !record[key]), defineProperty_default()(_class, 'bxt-aat-table-content-cell__purpose', key === 'take' && _vm.columnWidthObj.purpose), _class),
+        }, defineProperty_default()(_class, "bxt-aat-table-content-cell_".concat(key), true), defineProperty_default()(_class, 'bxt-aat-table-content-cell__zero', !record[key]), defineProperty_default()(_class, 'bxt-aat-table-content-cell__purpose', ['take', 'draw_value'].includes(key) && _vm.columnWidthObj.purpose), _class),
         style: {
-          'min-width': "".concat((_vm.columnWidthObj[key] || 3) + (key === 'take' ? _vm.columnWidthObj.purpose : 0), "em")
+          'min-width': "".concat((_vm.columnWidthObj[key] || 3) + (['take', 'draw_value'].includes(key) ? _vm.columnWidthObj.purpose : 0), "em")
         },
         attrs: {
           "data-stat-id": "zjlqblsz",
@@ -34164,7 +34164,7 @@ var add_and_takevue_type_template_id_ba01e47c_render = function render() {
         domProps: {
           "innerHTML": _vm._s(record[key])
         }
-      }), recordIndex !== 0 && key === 'take' && _vm.columnWidthObj.purpose ? _c('span', {
+      }), recordIndex !== 0 && ['take', 'draw_value'].includes(key) && _vm.columnWidthObj.purpose ? _c('span', {
         style: {
           width: "".concat(_vm.columnWidthObj.purpose, "em")
         }
@@ -34384,7 +34384,7 @@ var add_and_takevue_type_template_id_ba01e47c_render = function render() {
 };
 var staticRenderFns = [];
 
-// CONCATENATED MODULE: ./packages/add-and-take/index.vue?vue&type=template&id=ba01e47c&
+// CONCATENATED MODULE: ./packages/add-and-take/index.vue?vue&type=template&id=dc62a686&
 
 // EXTERNAL MODULE: ./node_modules/tslib/tslib.es6.js
 var tslib_es6 = __webpack_require__(0);
@@ -36060,7 +36060,7 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
                 age: '年龄'
             };
             addAndTakeDetailData.forEach(function (d, i) {
-                if (!['add', 'take'].includes(d.key)) {
+                if (!['add', 'take', 'draw_value'].includes(d.key)) {
                     d.uniKey = d.key + "_" + i;
                 }
                 tableHeaderData[d.uniKey || d.key] = d.name && d.name.replace(/^(.+)([(（])/, '<p>$1</p>$2');
@@ -36250,17 +36250,17 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
                         reqParams = (_c = {
                                 uuid: _resultUuid,
                                 pbData: '',
-                                productId: params.productKey,
-                                insuranceId: params.insuranceKey,
-                                bonus: {
-                                    value: _formValus.bonus
-                                },
-                                rate: {
-                                    value: _formValus.customRate || _formValus.rate
-                                },
-                                yearBonusRate: _formValus.yearBonusRate,
-                                latestYearBonusRate: _formValus.latestYearBonusRate
+                                productId: params.productKey
+                            },
+                            _c[type === 'reduceBaof' ? 'drawInsuranceId' : 'accountInsuranceId'] = params.insuranceKey,
+                            _c.bonus = {
+                                value: _formValus.bonus
                             },
+                            _c.rate = {
+                                value: _formValus.customRate || _formValus.rate
+                            },
+                            _c.yearBonusRate = _formValus.yearBonusRate,
+                            _c.latestYearBonusRate = _formValus.latestYearBonusRate,
                             _c[type === 'reduceBaof' ? 'drawData' : 'addAndTakeData'] = caclAccountData ? caclAccountData.addAndTakeData : null,
                             _c);
                         if (!_resultUuid) {
@@ -36326,7 +36326,7 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
         if (index <= 0) {
             return;
         }
-        if (!['add', 'take'].includes(key)) {
+        if (!['add', 'take', 'draw_value'].includes(key)) {
             return;
         }
         var _a = this, insuredAge = _a.insuredAge, interestInitData = _a.interestInitData, addAndTakeDetailData = _a.addAndTakeDetailData, accountData = _a.accountData;
@@ -36335,7 +36335,7 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
         }
         var purposeOption = PURPOSE_OPTIONS.find(function (o) { return o.val === item.purpose; });
         this.formData = {
-            type: key,
+            type: 'draw_value' === key ? 'take' : key,
             beginYear: item.year,
             endYear: item.year,
             baof: item[key] || null,
@@ -36406,11 +36406,13 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
         });
     };
     AddAndTake.prototype.onClickRecommendCase = function () {
+        var _this = this;
         var _addAndTakeData = Object(lodash["get"])(this, 'accountData.addAndTakeData', []) || [];
         var _addAndTakeDetailData = Object(lodash["get"])(this, 'addAndTakeDetailData', []) || [];
         _addAndTakeData.forEach(function (e) {
             e.adjustData = [];
-            var _detail = _addAndTakeDetailData.find(function (d) { return e.key === d.key; });
+            var recommendValueKey = _this.type === 'reduceBaof' && e.key === 'take' ? 'draw_value' : e.key;
+            var _detail = _addAndTakeDetailData.find(function (d) { return recommendValueKey === d.key; });
             if (_detail) {
                 _detail.details = _detail.recommendDetails;
                 _detail.values = _detail.recommendValues;
@@ -36579,8 +36581,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=ba01e47c&prod&lang=css&
-var add_and_takevue_type_style_index_0_id_ba01e47c_prod_lang_css_ = __webpack_require__(110);
+// EXTERNAL MODULE: ./packages/add-and-take/index.vue?vue&type=style&index=0&id=dc62a686&prod&lang=css&
+var add_and_takevue_type_style_index_0_id_dc62a686_prod_lang_css_ = __webpack_require__(110);
 
 // CONCATENATED MODULE: ./packages/add-and-take/index.vue
 
@@ -36593,7 +36595,7 @@ var add_and_takevue_type_style_index_0_id_ba01e47c_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_ba01e47c_render,
+  add_and_takevue_type_template_id_dc62a686_render,
   staticRenderFns,
   false,
   null,

package/package.json

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

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

@@ -42,10 +42,11 @@
                 'bxt-aat-table-content-cell': true,
                 [`bxt-aat-table-content-cell_${key}`]: true,
                 'bxt-aat-table-content-cell__zero': !record[key],
-                'bxt-aat-table-content-cell__purpose': key === 'take' && columnWidthObj.purpose
+                'bxt-aat-table-content-cell__purpose': ['take', 'draw_value'].includes(key) && columnWidthObj.purpose
               }"
               :style="{
-                'min-width': `${(columnWidthObj[key] || 3) + (key === 'take' ? columnWidthObj.purpose : 0)}em`
+                'min-width': `${(columnWidthObj[key] || 3) +
+                  (['take', 'draw_value'].includes(key) ? columnWidthObj.purpose : 0)}em`
               }"
               data-stat-id="zjlqblsz"
               :data-stat-ep="
@@ -58,7 +59,7 @@
             >
               <span v-html="record[key]"></span>
               <span
-                v-if="recordIndex !== 0 && key === 'take' && columnWidthObj.purpose"
+                v-if="recordIndex !== 0 && ['take', 'draw_value'].includes(key) && columnWidthObj.purpose"
                 :style="{
                   width: `${columnWidthObj.purpose}em`
                 }"
@@ -377,7 +378,7 @@ export default class AddAndTake extends Vue {
     };
     addAndTakeDetailData.forEach((d, i) => {
       // 为解决接口返回的数组中key相同的问题
-      if (!['add', 'take'].includes(d.key)) {
+      if (!['add', 'take', 'draw_value'].includes(d.key)) {
         d.uniKey = `${d.key}_${i}`;
       }
       tableHeaderData[d.uniKey || d.key] = d.name && d.name.replace(/^(.+)([(（])/, '<p>$1</p>$2');
@@ -458,7 +459,7 @@ export default class AddAndTake extends Vue {
       accountData = resultData.accountData;
     }
 
-    // 设备默认追加领取、减额领取数据
+    // 设备默认追加领取、减保领取数据
     if (!(accountData && accountData.addAndTakeData && accountData.addAndTakeData.length)) {
       accountData = {
         accountPart: type,
@@ -568,7 +569,7 @@ export default class AddAndTake extends Vue {
       uuid: _resultUuid,
       pbData: '',
       productId: params.productKey,
-      insuranceId: params.insuranceKey,
+      [type === 'reduceBaof' ? 'drawInsuranceId' : 'accountInsuranceId']: params.insuranceKey,
       bonus: {
         value: _formValus.bonus
       },
@@ -641,7 +642,7 @@ export default class AddAndTake extends Vue {
     if (index <= 0) {
       return;
     }
-    if (!['add', 'take'].includes(key)) {
+    if (!['add', 'take', 'draw_value'].includes(key)) {
       return;
     }
     const { insuredAge, interestInitData, addAndTakeDetailData, accountData } = this;
@@ -650,7 +651,9 @@ export default class AddAndTake extends Vue {
     }
     const purposeOption = PURPOSE_OPTIONS.find(o => o.val === item.purpose);
     this.formData = {
-      type: key,
+      // WYJHS-13, 追加领取、减保领取并存，利益结果中的 take key 拆分为 take / draw_value，后者用于减保领取
+      // 提交时的类型数据在外层区分，为 addAndTakeData: [{key: take},...], drawData: [{key: take}, ...]，因此 formData.type 仍是 take
+      type: 'draw_value' === key ? 'take' : key,
       beginYear: item.year,
       endYear: item.year,
       baof: item[key] || null,
@@ -727,7 +730,10 @@ export default class AddAndTake extends Vue {
     const _addAndTakeDetailData = _get(this, 'addAndTakeDetailData', []) || [];
     _addAndTakeData.forEach(e => {
       e.adjustData = [];
-      const _detail = _addAndTakeDetailData.find(d => e.key === d.key);
+      // WYJHS-13, 追加领取、减保领取并存，利益结果中的 take key 拆分为 take / draw_value，后者用于减保领取
+      // 提交时的类型数据在外层区分，为 addAndTakeData: [{key: take},...], drawData: [{key: take}, ...]
+      const recommendValueKey = this.type === 'reduceBaof' && e.key === 'take' ? 'draw_value' : e.key;
+      const _detail = _addAndTakeDetailData.find(d => recommendValueKey === d.key);
       if (_detail) {
         _detail.details = _detail.recommendDetails;
         _detail.values = _detail.recommendValues;

package/packages/add-and-take/readme.md

@@ -1,7 +1,7 @@
 <!--仅用于绕过 eslint-loader 校验的错误信息：Parsing error: Invalid character-->
 <!--??以目前现象看，文档首字符不为 "<" 会报错??-->
-## 追加领取（减额领取）（AddAndTake）
-**说明：** 计划书的追加领取模块。减额领取可以认为是追加领取的一种，两者数据结构是相同的，只是险种中对应的字段（accountData、reduceBaofData）不同、校验数据的接口不同。  
+## 追加领取（减保领取）（AddAndTake）
+**说明：** 计划书的追加领取模块。减保领取可以认为是追加领取的一种，两者数据结构是相同的，只是险种中对应的字段（accountData、reduceBaofData）不同、校验数据的接口不同。  
 **内容：** 该模块包含两个子模块，一个展示数据的 Table 模块，一个用于编辑数据的 Form 模块，模块内部实现子模块的切换逻辑。  
 **属性：** type、inputData、params、footer、submoduleName  
 **方法：** goToTable、confirm、updateData  

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

@@ -4,7 +4,7 @@ import { convertEleOrderListToObj, converUnit10000 } from './common';
  * **初始化险种数据**
  * - 补充一些显示文案
  * - 转换元素的选项字段
- * - 预设一些后面可能用到的字段，如追加领取、减额领取
+ * - 预设一些后面可能用到的字段，如追加领取、减保领取
  * @author Lizhao <lz@winbaoxian.com>
  * @date 2022-04-26
  * @param {IProdInsurance} insData 必传。险种数据（单个）

package/packages/bxs-utils/readme.md

@@ -180,7 +180,7 @@ getAgeFromBirth('2000-01-10', '2022-01-09')
 <ul>
 <li>补充一些显示文案</li>
 <li>转换元素的选项字段</li>
-<li>预设一些后面可能用到的字段，如追加领取、减额领取</li>
+<li>预设一些后面可能用到的字段，如追加领取、减保领取</li>
 </ul></dd>
 <dt><a href="#insuranceDataHandler">insuranceDataHandler(insData, productData)</a> ⇒ <code>IProdInsurance</code></dt>
 <dd><p><strong>处理险种数据</strong></p>
@@ -197,7 +197,7 @@ getAgeFromBirth('2000-01-10', '2022-01-09')
 <ul>
 <li>补充一些显示文案</li>
 <li>转换元素的选项字段</li>
-<li>预设一些后面可能用到的字段，如追加领取、减额领取</li>
+<li>预设一些后面可能用到的字段，如追加领取、减保领取</li>
 </ul>
 
 **Kind**: global function  

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

@@ -322,7 +322,7 @@ export default class BxtProductTable extends Vue {
     addAndTake: '追加领取',
     add: '追加保费',
     take: '部分领取',
-    reduceBaof: '减额领取'
+    reduceBaof: '减保领取'
   };
   personPopConfig = {
     visible: false
@@ -433,7 +433,11 @@ export default class BxtProductTable extends Vue {
       if (ins.key !== popupConf.data.insuranceKey) {
         return;
       }
-      ins.accountData = accountData;
+      if (popupConf.type === 'reduceBaof') {
+        ins.reduceBaofData = accountData;
+      } else {
+        ins.accountData = accountData;
+      }
     });
     console.log(accountData);
     console.log(interestData);