bxs-tools-ui 1.5.3 → 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 * */
 
 
@@ -3347,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;
@@ -3647,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);
@@ -3745,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) {
@@ -3785,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;
@@ -3794,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
   };
@@ -4653,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
                             },
@@ -4982,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
 
@@ -4996,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/index.js

@@ -27227,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 * */
 
 
@@ -34086,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;
@@ -34386,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);
@@ -35101,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) {
@@ -35141,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;
@@ -35150,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
   };
@@ -36258,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
                             },
@@ -36587,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
 
@@ -36601,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,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bxs-tools-ui",
-  "version": "1.5.3",
+  "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/planbook-input/components/product-table.vue

@@ -165,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: '',
@@ -192,6 +193,7 @@
           bonus: 'low',
           yearBonusRate: 1.2,
           endBonusRate: 1.2,
+          takeType: 'account',
           rate: null,
           customRate: 0.047
         }"