bxs-tools-ui 1.4.2 → 1.5.0

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_2db79502_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_2db79502_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_2db79502_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_9fbec60c_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_9fbec60c_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_9fbec60c_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=2db79502&
+// 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=9fbec60c&
 
 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_2db79502_render = function render() {
+var add_and_takevue_type_template_id_9fbec60c_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_2db79502_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_2db79502_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")
         }
@@ -3583,7 +3583,7 @@ var add_and_takevue_type_template_id_2db79502_render = function render() {
         return _vm.openFormPicker('add');
       }
     }
-  }, [_vm._v("追加")]) : _vm._e(), _vm.scene === 3 && ['reduceBaof'].includes(_vm.type) ? _c('span', {
+  }, [_vm._v("追加")]) : _vm._e(), ['reduceBaof'].includes(_vm.type) ? _c('span', {
     staticClass: "bxt-aat-footer-recommend-btn",
     attrs: {
       "data-stat-id": "tjfa",
@@ -3645,7 +3645,7 @@ var add_and_takevue_type_template_id_2db79502_render = function render() {
 };
 var staticRenderFns = [];
 
-// CONCATENATED MODULE: ./packages/add-and-take/index.vue?vue&type=template&id=2db79502&
+// CONCATENATED MODULE: ./packages/add-and-take/index.vue?vue&type=template&id=9fbec60c&
 
 // 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');
@@ -4616,11 +4616,11 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
             console.log(error);
         });
     };
-    AddAndTake.prototype.getAddAndTakeData = function (values) {
+    AddAndTake.prototype.getAddAndTakeData = function (newAccountData) {
         var _a;
-        if (values === void 0) { values = null; }
+        if (newAccountData === void 0) { newAccountData = null; }
         return Object(tslib_es6["b" /* __awaiter */])(this, void 0, void 0, function () {
-            var _formValus, _b, params, type, personData, productData, accountData, _resultUuid, caclAccountData, apis, api, url, reqParams, cloneProductData_2;
+            var _formValus, _b, params, type, personData, productData, accountData, _resultUuid, apis, api, url, reqParams, cloneProductData_2;
             var _c;
             var _this = this;
             return Object(tslib_es6["e" /* __generator */])(this, function (_d) {
@@ -4633,7 +4633,6 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
                         }
                         _b = this, params = _b.params, type = _b.type, personData = _b.personData, productData = _b.productData, accountData = _b.accountData;
                         _resultUuid = Object(lodash["get"])(this, 'resultData.uuid');
-                        caclAccountData = rebuildAccountDataBySetting(values, Object(lodash["cloneDeep"])(accountData));
                         apis = {
                             addAndTake: '/interest/addAndTake/detail',
                             draw: '/interest/draw/detail',
@@ -4656,7 +4655,7 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
                             },
                             _c.yearBonusRate = _formValus.yearBonusRate,
                             _c.latestYearBonusRate = _formValus.latestYearBonusRate,
-                            _c[type === 'reduceBaof' ? 'drawData' : 'addAndTakeData'] = caclAccountData ? caclAccountData.addAndTakeData : null,
+                            _c[type === 'reduceBaof' ? 'drawData' : 'addAndTakeData'] = newAccountData ? newAccountData.addAndTakeData : null,
                             _c);
                         if (!_resultUuid) {
                             cloneProductData_2 = Object(planbook["f" /* convertProductData */])(Object(lodash["cloneDeep"])(productData));
@@ -4721,7 +4720,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 +4729,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,18 +4800,21 @@ 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', []) || [];
+        var newDetailsData = Object(lodash["cloneDeep"])(_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 = newDetailsData.find(function (d) { return recommendValueKey === d.key; });
             if (_detail) {
                 _detail.details = _detail.recommendDetails;
                 _detail.values = _detail.recommendValues;
             }
         });
-        this.accountData = rebuildAccountDataByResult(_addAndTakeDetailData, Object(lodash["cloneDeep"])(this.accountData), this.type);
-        this.getAddAndTakeData();
+        var newAccountData = rebuildAccountDataByResult(newDetailsData, Object(lodash["cloneDeep"])(this.accountData), this.type);
+        this.getAddAndTakeData(newAccountData);
     };
     AddAndTake.prototype.deleteAllData = function () {
         this.accountData.addAndTakeData.forEach(function (d) {
@@ -4822,7 +4824,8 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
     };
     AddAndTake.prototype.updateData = function (values) {
         var _this = this;
-        return this.getAddAndTakeData(values)
+        var newAccountData = rebuildAccountDataBySetting(values, Object(lodash["cloneDeep"])(this.accountData));
+        return this.getAddAndTakeData(newAccountData)
             .then(function () { return _this.goToTable(); })
             .catch(function () { });
     };
@@ -4974,8 +4977,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=2db79502&prod&lang=css&
-var add_and_takevue_type_style_index_0_id_2db79502_prod_lang_css_ = __webpack_require__(137);
+// EXTERNAL MODULE: ./packages/add-and-take/index.vue?vue&type=style&index=0&id=9fbec60c&prod&lang=css&
+var add_and_takevue_type_style_index_0_id_9fbec60c_prod_lang_css_ = __webpack_require__(137);
 
 // CONCATENATED MODULE: ./packages/add-and-take/index.vue
 
@@ -4988,7 +4991,7 @@ var add_and_takevue_type_style_index_0_id_2db79502_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_2db79502_render,
+  add_and_takevue_type_template_id_9fbec60c_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_2db79502_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_2db79502_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_2db79502_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_9fbec60c_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_9fbec60c_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_9fbec60c_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=2db79502&
+// 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=9fbec60c&
 
 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_2db79502_render = function render() {
+var add_and_takevue_type_template_id_9fbec60c_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_2db79502_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_2db79502_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")
         }
@@ -34322,7 +34322,7 @@ var add_and_takevue_type_template_id_2db79502_render = function render() {
         return _vm.openFormPicker('add');
       }
     }
-  }, [_vm._v("追加")]) : _vm._e(), _vm.scene === 3 && ['reduceBaof'].includes(_vm.type) ? _c('span', {
+  }, [_vm._v("追加")]) : _vm._e(), ['reduceBaof'].includes(_vm.type) ? _c('span', {
     staticClass: "bxt-aat-footer-recommend-btn",
     attrs: {
       "data-stat-id": "tjfa",
@@ -34384,7 +34384,7 @@ var add_and_takevue_type_template_id_2db79502_render = function render() {
 };
 var staticRenderFns = [];
 
-// CONCATENATED MODULE: ./packages/add-and-take/index.vue?vue&type=template&id=2db79502&
+// CONCATENATED MODULE: ./packages/add-and-take/index.vue?vue&type=template&id=9fbec60c&
 
 // 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');
@@ -36221,11 +36221,11 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
             console.log(error);
         });
     };
-    AddAndTake.prototype.getAddAndTakeData = function (values) {
+    AddAndTake.prototype.getAddAndTakeData = function (newAccountData) {
         var _a;
-        if (values === void 0) { values = null; }
+        if (newAccountData === void 0) { newAccountData = null; }
         return Object(tslib_es6["b" /* __awaiter */])(this, void 0, void 0, function () {
-            var _formValus, _b, params, type, personData, productData, accountData, _resultUuid, caclAccountData, apis, api, url, reqParams, cloneProductData_2;
+            var _formValus, _b, params, type, personData, productData, accountData, _resultUuid, apis, api, url, reqParams, cloneProductData_2;
             var _c;
             var _this = this;
             return Object(tslib_es6["e" /* __generator */])(this, function (_d) {
@@ -36238,7 +36238,6 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
                         }
                         _b = this, params = _b.params, type = _b.type, personData = _b.personData, productData = _b.productData, accountData = _b.accountData;
                         _resultUuid = Object(lodash["get"])(this, 'resultData.uuid');
-                        caclAccountData = rebuildAccountDataBySetting(values, Object(lodash["cloneDeep"])(accountData));
                         apis = {
                             addAndTake: '/interest/addAndTake/detail',
                             draw: '/interest/draw/detail',
@@ -36261,7 +36260,7 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
                             },
                             _c.yearBonusRate = _formValus.yearBonusRate,
                             _c.latestYearBonusRate = _formValus.latestYearBonusRate,
-                            _c[type === 'reduceBaof' ? 'drawData' : 'addAndTakeData'] = caclAccountData ? caclAccountData.addAndTakeData : null,
+                            _c[type === 'reduceBaof' ? 'drawData' : 'addAndTakeData'] = newAccountData ? newAccountData.addAndTakeData : null,
                             _c);
                         if (!_resultUuid) {
                             cloneProductData_2 = Object(product["b" /* convertProductData */])(Object(lodash["cloneDeep"])(productData));
@@ -36326,7 +36325,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 +36334,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,18 +36405,21 @@ 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', []) || [];
+        var newDetailsData = Object(lodash["cloneDeep"])(_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 = newDetailsData.find(function (d) { return recommendValueKey === d.key; });
             if (_detail) {
                 _detail.details = _detail.recommendDetails;
                 _detail.values = _detail.recommendValues;
             }
         });
-        this.accountData = rebuildAccountDataByResult(_addAndTakeDetailData, Object(lodash["cloneDeep"])(this.accountData), this.type);
-        this.getAddAndTakeData();
+        var newAccountData = rebuildAccountDataByResult(newDetailsData, Object(lodash["cloneDeep"])(this.accountData), this.type);
+        this.getAddAndTakeData(newAccountData);
     };
     AddAndTake.prototype.deleteAllData = function () {
         this.accountData.addAndTakeData.forEach(function (d) {
@@ -36427,7 +36429,8 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
     };
     AddAndTake.prototype.updateData = function (values) {
         var _this = this;
-        return this.getAddAndTakeData(values)
+        var newAccountData = rebuildAccountDataBySetting(values, Object(lodash["cloneDeep"])(this.accountData));
+        return this.getAddAndTakeData(newAccountData)
             .then(function () { return _this.goToTable(); })
             .catch(function () { });
     };
@@ -36579,8 +36582,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=2db79502&prod&lang=css&
-var add_and_takevue_type_style_index_0_id_2db79502_prod_lang_css_ = __webpack_require__(110);
+// EXTERNAL MODULE: ./packages/add-and-take/index.vue?vue&type=style&index=0&id=9fbec60c&prod&lang=css&
+var add_and_takevue_type_style_index_0_id_9fbec60c_prod_lang_css_ = __webpack_require__(110);
 
 // CONCATENATED MODULE: ./packages/add-and-take/index.vue
 
@@ -36593,7 +36596,7 @@ var add_and_takevue_type_style_index_0_id_2db79502_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_2db79502_render,
+  add_and_takevue_type_template_id_9fbec60c_render,
   staticRenderFns,
   false,
   null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bxs-tools-ui",
-  "version": "1.4.2",
+  "version": "1.5.0",
   "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`
                 }"
@@ -202,7 +203,7 @@
             >追加</span
           >
           <span
-            v-if="scene === 3 && ['reduceBaof'].includes(type)"
+            v-if="['reduceBaof'].includes(type)"
             class="bxt-aat-footer-recommend-btn"
             data-stat-id="tjfa"
             :data-stat-ep="JSON.stringify({ type })"
@@ -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');
@@ -548,14 +549,13 @@ export default class AddAndTake extends Vue {
         console.log(error);
       });
   }
-  async getAddAndTakeData(values = null) {
+  async getAddAndTakeData(newAccountData: any = null) {
     const _formValus = await this.validateInterestFormValues().catch(() => {});
     if (!_formValus) {
       return;
     }
     const { params, type, personData, productData, accountData } = this;
     const _resultUuid = _get(this, 'resultData.uuid');
-    const caclAccountData = rebuildAccountDataBySetting(values, cloneDeep(accountData));
     const apis = {
       addAndTake: '/interest/addAndTake/detail',
       draw: '/interest/draw/detail',
@@ -577,7 +577,7 @@ export default class AddAndTake extends Vue {
       },
       yearBonusRate: _formValus.yearBonusRate,
       latestYearBonusRate: _formValus.latestYearBonusRate,
-      [type === 'reduceBaof' ? 'drawData' : 'addAndTakeData']: caclAccountData ? caclAccountData.addAndTakeData : null
+      [type === 'reduceBaof' ? 'drawData' : 'addAndTakeData']: newAccountData ? newAccountData.addAndTakeData : null
     };
     if (!_resultUuid) {
       const cloneProductData = convertProductData(cloneDeep(productData));
@@ -641,7 +641,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 +650,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,
@@ -725,16 +727,20 @@ export default class AddAndTake extends Vue {
   onClickRecommendCase() {
     const _addAndTakeData = _get(this, 'accountData.addAndTakeData', []) || [];
     const _addAndTakeDetailData = _get(this, 'addAndTakeDetailData', []) || [];
+    const newDetailsData = cloneDeep(_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 = newDetailsData.find(d => recommendValueKey === d.key);
       if (_detail) {
         _detail.details = _detail.recommendDetails;
         _detail.values = _detail.recommendValues;
       }
     });
-    this.accountData = rebuildAccountDataByResult(_addAndTakeDetailData, cloneDeep(this.accountData), this.type);
-    this.getAddAndTakeData();
+    const newAccountData = rebuildAccountDataByResult(newDetailsData, cloneDeep(this.accountData), this.type);
+    this.getAddAndTakeData(newAccountData);
   }
   deleteAllData() {
     this.accountData.addAndTakeData.forEach(d => {
@@ -743,7 +749,8 @@ export default class AddAndTake extends Vue {
     this.getAddAndTakeData();
   }
   updateData(values) {
-    return this.getAddAndTakeData(values)
+    const newAccountData = rebuildAccountDataBySetting(values, cloneDeep(this.accountData));
+    return this.getAddAndTakeData(newAccountData)
       .then(() => this.goToTable())
       .catch(() => {});
   }

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

@@ -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);

package/packages/planbook-input/index.vue

@@ -101,6 +101,8 @@ export default class BxtPlanbookInput extends Vue {
       parmas.resultUuid = this.URL_PARAM.uuid;
     } else if (this.URL_PARAM.publicPbUuid) {
       parmas.publicPbUuid = this.URL_PARAM.publicPbUuid || '5d6499946bbb47bb8f6a286e9d4eee77';
+    } else {
+      parmas.insuranceTypeId = '3933';
     }
     let apiPromise = fetch('https://app.winbaoxian.cn/planBook/public/init', {
       method: 'POST',