bxs-tools-ui 2.0.0-1 → 2.0.0

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

@@ -510,12 +510,12 @@
 						-webkit-transform-origin: left center;
 						        transform-origin: left center;
 }
-.fixed {
+.bxt_aatit_fixed {
   position: fixed;
   width: inherit;
-  line-height: 0.875rem !important;
+  line-height: normal !important;
   min-height: 50px;
-.fixed-head {
+.bxt_aatit_fixed_head {
     display: -webkit-box !important;
     display: -webkit-flex !important;
     display: -moz-box !important;

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

@@ -1060,8 +1060,8 @@ module.exports = _defineProperty, module.exports.__esModule = true, module.expor
 /***/ (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_interest_form_vue_vue_type_style_index_0_id_1faba23d_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(109);
-/* 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_interest_form_vue_vue_type_style_index_0_id_1faba23d_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_interest_form_vue_vue_type_style_index_0_id_1faba23d_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_interest_form_vue_vue_type_style_index_0_id_53ea0b16_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(109);
+/* 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_interest_form_vue_vue_type_style_index_0_id_53ea0b16_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_interest_form_vue_vue_type_style_index_0_id_53ea0b16_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__);
 /* unused harmony reexport * */
 
 
@@ -1082,8 +1082,8 @@ module.exports = _defineProperty, module.exports.__esModule = true, module.expor
 /***/ (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_interest_table_vue_vue_type_style_index_0_id_6dd87975_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(111);
-/* 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_interest_table_vue_vue_type_style_index_0_id_6dd87975_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_interest_table_vue_vue_type_style_index_0_id_6dd87975_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_interest_table_vue_vue_type_style_index_0_id_3ea742ea_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(111);
+/* 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_interest_table_vue_vue_type_style_index_0_id_3ea742ea_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_interest_table_vue_vue_type_style_index_0_id_3ea742ea_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__);
 /* unused harmony reexport * */
 
 
@@ -1093,8 +1093,8 @@ module.exports = _defineProperty, module.exports.__esModule = true, module.expor
 /***/ (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_c7502cda_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(112);
-/* 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_c7502cda_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_c7502cda_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_97071088_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(112);
+/* 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_97071088_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_97071088_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__);
 /* unused harmony reexport * */
 
 
@@ -2671,8 +2671,8 @@ module.exports = {
 // 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/add-and-take/index.vue?vue&type=template&id=c7502cda&
-var add_and_takevue_type_template_id_c7502cda_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/add-and-take/index.vue?vue&type=template&id=97071088&
+var add_and_takevue_type_template_id_97071088_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _vm.addAndTakeDetailData && _vm.addAndTakeDetailData.length ? _c('div', {
@@ -2733,7 +2733,7 @@ var add_and_takevue_type_template_id_c7502cda_render = function render() {
 };
 var staticRenderFns = [];
 
-// CONCATENATED MODULE: ./packages/add-and-take/index.vue?vue&type=template&id=c7502cda&
+// CONCATENATED MODULE: ./packages/add-and-take/index.vue?vue&type=template&id=97071088&
 
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/defineProperty.js
 var defineProperty = __webpack_require__(14);
@@ -2847,8 +2847,8 @@ var PURPOSE_OPTIONS = [
     { val: '', desc: '自定义' },
 ];
 
-// 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/components/interest-form.vue?vue&type=template&id=1faba23d&
-var interest_formvue_type_template_id_1faba23d_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/add-and-take/components/interest-form.vue?vue&type=template&id=53ea0b16&
+var interest_formvue_type_template_id_53ea0b16_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('section', {
@@ -3064,9 +3064,9 @@ var interest_formvue_type_template_id_1faba23d_render = function render() {
     }
   })], 1)], 1);
 };
-var interest_formvue_type_template_id_1faba23d_staticRenderFns = [];
+var interest_formvue_type_template_id_53ea0b16_staticRenderFns = [];
 
-// CONCATENATED MODULE: ./packages/add-and-take/components/interest-form.vue?vue&type=template&id=1faba23d&
+// CONCATENATED MODULE: ./packages/add-and-take/components/interest-form.vue?vue&type=template&id=53ea0b16&
 
 // EXTERNAL MODULE: ./packages/bxs-utils/planbook/index.ts
 var planbook = __webpack_require__(15);
@@ -3633,9 +3633,6 @@ function initPickerConfig() {
       return options.filter(function (o) {
         return !minTakeYear || o.val >= minTakeYear;
       }).filter(function (o) {
-        return type === 'reduceBaof' || o.val >= 6;
-      }) // 前5年有领取手续费，不能领取（与老系统保持一致）。From hyw
-      .filter(function (o) {
         return !hadAddYearSet.has(o.val);
       });
     },
@@ -3721,8 +3718,8 @@ function initPickerConfig() {
 });
 // CONCATENATED MODULE: ./packages/add-and-take/components/interest-form.vue?vue&type=script&lang=js&
  /* harmony default export */ var components_interest_formvue_type_script_lang_js_ = (interest_formvue_type_script_lang_js_); 
-// EXTERNAL MODULE: ./packages/add-and-take/components/interest-form.vue?vue&type=style&index=0&id=1faba23d&prod&lang=css&
-var interest_formvue_type_style_index_0_id_1faba23d_prod_lang_css_ = __webpack_require__(141);
+// EXTERNAL MODULE: ./packages/add-and-take/components/interest-form.vue?vue&type=style&index=0&id=53ea0b16&prod&lang=css&
+var interest_formvue_type_style_index_0_id_53ea0b16_prod_lang_css_ = __webpack_require__(141);
 
 // CONCATENATED MODULE: ./packages/add-and-take/components/interest-form.vue
 
@@ -3735,8 +3732,8 @@ var interest_formvue_type_style_index_0_id_1faba23d_prod_lang_css_ = __webpack_r
 
 var interest_form_component = Object(componentNormalizer["a" /* default */])(
   components_interest_formvue_type_script_lang_js_,
-  interest_formvue_type_template_id_1faba23d_render,
-  interest_formvue_type_template_id_1faba23d_staticRenderFns,
+  interest_formvue_type_template_id_53ea0b16_render,
+  interest_formvue_type_template_id_53ea0b16_staticRenderFns,
   false,
   null,
   null,
@@ -4380,9 +4377,9 @@ var interest_items_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var interest_items = (interest_items_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/add-and-take/components/interest-table.vue?vue&type=template&id=6dd87975&
+// 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/components/interest-table.vue?vue&type=template&id=3ea742ea&
 
-var interest_tablevue_type_template_id_6dd87975_render = function render() {
+var interest_tablevue_type_template_id_3ea742ea_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('section', {
@@ -4410,14 +4407,14 @@ var interest_tablevue_type_template_id_6dd87975_render = function render() {
   }], function (record) {
     return _c('div', {
       key: JSON.stringify(record),
-      staticClass: "bxt_aatit_content_record fixed",
+      staticClass: "bxt_aatit_content_record bxt_aatit_fixed",
       style: {
         top: _vm.fixedTop + 'px'
       }
     }, _vm._l(['year', 'age'], function (key) {
       return _c('div', {
         key: key,
-        staticClass: "bxt_aatit_content_cell fixed-head",
+        staticClass: "bxt_aatit_content_cell bxt_aatit_fixed_head",
         class: {
           ageAndYear: record[key] === '年度'
         }
@@ -4454,7 +4451,7 @@ var interest_tablevue_type_template_id_6dd87975_render = function render() {
   }), _vm.isShow ? _vm._l(_vm.addAndTakeTable.slice(0, 1), function (record, recordIndex) {
     return _c('div', {
       key: recordIndex,
-      staticClass: "bxt_aatit_content_record fixed",
+      staticClass: "bxt_aatit_content_record bxt_aatit_fixed",
       style: {
         top: _vm.fixedTop + 'px'
       }
@@ -4464,7 +4461,7 @@ var interest_tablevue_type_template_id_6dd87975_render = function render() {
       var _class2;
       return _c('div', {
         key: key,
-        staticClass: "bxt_aatit_content_cell fixed-head",
+        staticClass: "bxt_aatit_content_cell bxt_aatit_fixed_head",
         class: (_class2 = {}, defineProperty_default()(_class2, "aatit_content_cell_".concat(key), true), defineProperty_default()(_class2, "zero", !record[key]), defineProperty_default()(_class2, "purpose", ['take', 'draw_value'].includes(key) && _vm.columnWidthObj.purpose), _class2),
         style: {
           'min-width': "".concat((_vm.columnWidthObj[key] || 3) + (['take', 'draw_value'].includes(key) ? _vm.columnWidthObj.purpose : 0), "em")
@@ -4507,9 +4504,9 @@ var interest_tablevue_type_template_id_6dd87975_render = function render() {
     }
   }, [_vm._v("\n        确定\n      ")])])]) : _vm._e()]);
 };
-var interest_tablevue_type_template_id_6dd87975_staticRenderFns = [];
+var interest_tablevue_type_template_id_3ea742ea_staticRenderFns = [];
 
-// CONCATENATED MODULE: ./packages/add-and-take/components/interest-table.vue?vue&type=template&id=6dd87975&
+// CONCATENATED MODULE: ./packages/add-and-take/components/interest-table.vue?vue&type=template&id=3ea742ea&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib??ref--1!./node_modules/vue-loader/lib??vue-loader-options!./packages/add-and-take/components/interest-table.vue?vue&type=script&lang=js&
 
@@ -4682,8 +4679,8 @@ var interestTableTimer = null;
 });
 // CONCATENATED MODULE: ./packages/add-and-take/components/interest-table.vue?vue&type=script&lang=js&
  /* harmony default export */ var components_interest_tablevue_type_script_lang_js_ = (interest_tablevue_type_script_lang_js_); 
-// EXTERNAL MODULE: ./packages/add-and-take/components/interest-table.vue?vue&type=style&index=0&id=6dd87975&prod&lang=css&
-var interest_tablevue_type_style_index_0_id_6dd87975_prod_lang_css_ = __webpack_require__(143);
+// EXTERNAL MODULE: ./packages/add-and-take/components/interest-table.vue?vue&type=style&index=0&id=3ea742ea&prod&lang=css&
+var interest_tablevue_type_style_index_0_id_3ea742ea_prod_lang_css_ = __webpack_require__(143);
 
 // CONCATENATED MODULE: ./packages/add-and-take/components/interest-table.vue
 
@@ -4696,8 +4693,8 @@ var interest_tablevue_type_style_index_0_id_6dd87975_prod_lang_css_ = __webpack_
 
 var interest_table_component = Object(componentNormalizer["a" /* default */])(
   components_interest_tablevue_type_script_lang_js_,
-  interest_tablevue_type_template_id_6dd87975_render,
-  interest_tablevue_type_template_id_6dd87975_staticRenderFns,
+  interest_tablevue_type_template_id_3ea742ea_render,
+  interest_tablevue_type_template_id_3ea742ea_staticRenderFns,
   false,
   null,
   null,
@@ -4980,7 +4977,7 @@ external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_default.a.use(external_vant
                       }
                       resolve();
                     }).catch(function () {
-                      self.interestFormValue = convertInterestFormValues(oFormValue, interestInitData);
+                      self.interestFormValue = convertInterestFormValues(oFormValue || self.interestFormValue, interestInitData);
                       resolve();
                     });
                   });
@@ -5171,8 +5168,8 @@ external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_default.a.use(external_vant
 });
 // CONCATENATED MODULE: ./packages/add-and-take/index.vue?vue&type=script&lang=js&
  /* harmony default export */ var packages_add_and_takevue_type_script_lang_js_ = (add_and_takevue_type_script_lang_js_); 
-// EXTERNAL MODULE: ./packages/add-and-take/index.vue?vue&type=style&index=0&id=c7502cda&prod&lang=css&
-var add_and_takevue_type_style_index_0_id_c7502cda_prod_lang_css_ = __webpack_require__(144);
+// EXTERNAL MODULE: ./packages/add-and-take/index.vue?vue&type=style&index=0&id=97071088&prod&lang=css&
+var add_and_takevue_type_style_index_0_id_97071088_prod_lang_css_ = __webpack_require__(144);
 
 // CONCATENATED MODULE: ./packages/add-and-take/index.vue
 
@@ -5185,7 +5182,7 @@ var add_and_takevue_type_style_index_0_id_c7502cda_prod_lang_css_ = __webpack_re
 
 var add_and_take_component = Object(componentNormalizer["a" /* default */])(
   packages_add_and_takevue_type_script_lang_js_,
-  add_and_takevue_type_template_id_c7502cda_render,
+  add_and_takevue_type_template_id_97071088_render,
   staticRenderFns,
   false,
   null,

package/lib/index.css

@@ -510,12 +510,12 @@
 						-webkit-transform-origin: left center;
 						        transform-origin: left center;
 }
-.fixed {
+.bxt_aatit_fixed {
   position: fixed;
   width: inherit;
-  line-height: 0.875rem !important;
+  line-height: normal !important;
   min-height: 50px;
-.fixed-head {
+.bxt_aatit_fixed_head {
     display: -webkit-box !important;
     display: -webkit-flex !important;
     display: -moz-box !important;

package/lib/index.js

@@ -27563,8 +27563,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_interest_form_vue_vue_type_style_index_0_id_1faba23d_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(55);
-/* 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_interest_form_vue_vue_type_style_index_0_id_1faba23d_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_interest_form_vue_vue_type_style_index_0_id_1faba23d_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_interest_form_vue_vue_type_style_index_0_id_53ea0b16_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(55);
+/* 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_interest_form_vue_vue_type_style_index_0_id_53ea0b16_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_interest_form_vue_vue_type_style_index_0_id_53ea0b16_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__);
 /* unused harmony reexport * */
 
 
@@ -27583,8 +27583,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_interest_table_vue_vue_type_style_index_0_id_6dd87975_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(57);
-/* 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_interest_table_vue_vue_type_style_index_0_id_6dd87975_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_interest_table_vue_vue_type_style_index_0_id_6dd87975_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_interest_table_vue_vue_type_style_index_0_id_3ea742ea_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(57);
+/* 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_interest_table_vue_vue_type_style_index_0_id_3ea742ea_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_interest_table_vue_vue_type_style_index_0_id_3ea742ea_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__);
 /* unused harmony reexport * */
 
 
@@ -27593,8 +27593,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_c7502cda_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(58);
-/* 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_c7502cda_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_c7502cda_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_97071088_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(58);
+/* 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_97071088_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_97071088_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__);
 /* unused harmony reexport * */
 
 
@@ -34149,8 +34149,8 @@ __webpack_require__.d(__webpack_exports__, "InsureCalculate", function() { retur
 __webpack_require__.d(__webpack_exports__, "PersonInfo", function() { return /* reexport */ person_info; });
 __webpack_require__.d(__webpack_exports__, "ProductInfo", function() { return /* reexport */ product_info; });
 
-// 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=c7502cda&
-var add_and_takevue_type_template_id_c7502cda_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/add-and-take/index.vue?vue&type=template&id=97071088&
+var add_and_takevue_type_template_id_97071088_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _vm.addAndTakeDetailData && _vm.addAndTakeDetailData.length ? _c('div', {
@@ -34211,7 +34211,7 @@ var add_and_takevue_type_template_id_c7502cda_render = function render() {
 };
 var staticRenderFns = [];
 
-// CONCATENATED MODULE: ./packages/add-and-take/index.vue?vue&type=template&id=c7502cda&
+// CONCATENATED MODULE: ./packages/add-and-take/index.vue?vue&type=template&id=97071088&
 
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/defineProperty.js
 var defineProperty = __webpack_require__(6);
@@ -34325,8 +34325,8 @@ var PURPOSE_OPTIONS = [
     { val: '', desc: '自定义' },
 ];
 
-// 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/components/interest-form.vue?vue&type=template&id=1faba23d&
-var interest_formvue_type_template_id_1faba23d_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/add-and-take/components/interest-form.vue?vue&type=template&id=53ea0b16&
+var interest_formvue_type_template_id_53ea0b16_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('section', {
@@ -34542,9 +34542,9 @@ var interest_formvue_type_template_id_1faba23d_render = function render() {
     }
   })], 1)], 1);
 };
-var interest_formvue_type_template_id_1faba23d_staticRenderFns = [];
+var interest_formvue_type_template_id_53ea0b16_staticRenderFns = [];
 
-// CONCATENATED MODULE: ./packages/add-and-take/components/interest-form.vue?vue&type=template&id=1faba23d&
+// CONCATENATED MODULE: ./packages/add-and-take/components/interest-form.vue?vue&type=template&id=53ea0b16&
 
 // EXTERNAL MODULE: ./packages/bxs-utils/planbook/common.ts
 var common = __webpack_require__(5);
@@ -35224,9 +35224,6 @@ function initPickerConfig() {
       return options.filter(function (o) {
         return !minTakeYear || o.val >= minTakeYear;
       }).filter(function (o) {
-        return type === 'reduceBaof' || o.val >= 6;
-      }) // 前5年有领取手续费，不能领取（与老系统保持一致）。From hyw
-      .filter(function (o) {
         return !hadAddYearSet.has(o.val);
       });
     },
@@ -35312,8 +35309,8 @@ function initPickerConfig() {
 });
 // CONCATENATED MODULE: ./packages/add-and-take/components/interest-form.vue?vue&type=script&lang=js&
  /* harmony default export */ var components_interest_formvue_type_script_lang_js_ = (interest_formvue_type_script_lang_js_); 
-// EXTERNAL MODULE: ./packages/add-and-take/components/interest-form.vue?vue&type=style&index=0&id=1faba23d&prod&lang=css&
-var interest_formvue_type_style_index_0_id_1faba23d_prod_lang_css_ = __webpack_require__(114);
+// EXTERNAL MODULE: ./packages/add-and-take/components/interest-form.vue?vue&type=style&index=0&id=53ea0b16&prod&lang=css&
+var interest_formvue_type_style_index_0_id_53ea0b16_prod_lang_css_ = __webpack_require__(114);
 
 // CONCATENATED MODULE: ./packages/add-and-take/components/interest-form.vue
 
@@ -35326,8 +35323,8 @@ var interest_formvue_type_style_index_0_id_1faba23d_prod_lang_css_ = __webpack_r
 
 var interest_form_component = normalizeComponent(
   components_interest_formvue_type_script_lang_js_,
-  interest_formvue_type_template_id_1faba23d_render,
-  interest_formvue_type_template_id_1faba23d_staticRenderFns,
+  interest_formvue_type_template_id_53ea0b16_render,
+  interest_formvue_type_template_id_53ea0b16_staticRenderFns,
   false,
   null,
   null,
@@ -35971,9 +35968,9 @@ var interest_items_component = normalizeComponent(
 )
 
 /* harmony default export */ var interest_items = (interest_items_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/add-and-take/components/interest-table.vue?vue&type=template&id=6dd87975&
+// 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/components/interest-table.vue?vue&type=template&id=3ea742ea&
 
-var interest_tablevue_type_template_id_6dd87975_render = function render() {
+var interest_tablevue_type_template_id_3ea742ea_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('section', {
@@ -36001,14 +35998,14 @@ var interest_tablevue_type_template_id_6dd87975_render = function render() {
   }], function (record) {
     return _c('div', {
       key: JSON.stringify(record),
-      staticClass: "bxt_aatit_content_record fixed",
+      staticClass: "bxt_aatit_content_record bxt_aatit_fixed",
       style: {
         top: _vm.fixedTop + 'px'
       }
     }, _vm._l(['year', 'age'], function (key) {
       return _c('div', {
         key: key,
-        staticClass: "bxt_aatit_content_cell fixed-head",
+        staticClass: "bxt_aatit_content_cell bxt_aatit_fixed_head",
         class: {
           ageAndYear: record[key] === '年度'
         }
@@ -36045,7 +36042,7 @@ var interest_tablevue_type_template_id_6dd87975_render = function render() {
   }), _vm.isShow ? _vm._l(_vm.addAndTakeTable.slice(0, 1), function (record, recordIndex) {
     return _c('div', {
       key: recordIndex,
-      staticClass: "bxt_aatit_content_record fixed",
+      staticClass: "bxt_aatit_content_record bxt_aatit_fixed",
       style: {
         top: _vm.fixedTop + 'px'
       }
@@ -36055,7 +36052,7 @@ var interest_tablevue_type_template_id_6dd87975_render = function render() {
       var _class2;
       return _c('div', {
         key: key,
-        staticClass: "bxt_aatit_content_cell fixed-head",
+        staticClass: "bxt_aatit_content_cell bxt_aatit_fixed_head",
         class: (_class2 = {}, defineProperty_default()(_class2, "aatit_content_cell_".concat(key), true), defineProperty_default()(_class2, "zero", !record[key]), defineProperty_default()(_class2, "purpose", ['take', 'draw_value'].includes(key) && _vm.columnWidthObj.purpose), _class2),
         style: {
           'min-width': "".concat((_vm.columnWidthObj[key] || 3) + (['take', 'draw_value'].includes(key) ? _vm.columnWidthObj.purpose : 0), "em")
@@ -36098,9 +36095,9 @@ var interest_tablevue_type_template_id_6dd87975_render = function render() {
     }
   }, [_vm._v("\n        确定\n      ")])])]) : _vm._e()]);
 };
-var interest_tablevue_type_template_id_6dd87975_staticRenderFns = [];
+var interest_tablevue_type_template_id_3ea742ea_staticRenderFns = [];
 
-// CONCATENATED MODULE: ./packages/add-and-take/components/interest-table.vue?vue&type=template&id=6dd87975&
+// CONCATENATED MODULE: ./packages/add-and-take/components/interest-table.vue?vue&type=template&id=3ea742ea&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib??ref--1!./node_modules/vue-loader/lib??vue-loader-options!./packages/add-and-take/components/interest-table.vue?vue&type=script&lang=js&
 
@@ -36273,8 +36270,8 @@ var interestTableTimer = null;
 });
 // CONCATENATED MODULE: ./packages/add-and-take/components/interest-table.vue?vue&type=script&lang=js&
  /* harmony default export */ var components_interest_tablevue_type_script_lang_js_ = (interest_tablevue_type_script_lang_js_); 
-// EXTERNAL MODULE: ./packages/add-and-take/components/interest-table.vue?vue&type=style&index=0&id=6dd87975&prod&lang=css&
-var interest_tablevue_type_style_index_0_id_6dd87975_prod_lang_css_ = __webpack_require__(116);
+// EXTERNAL MODULE: ./packages/add-and-take/components/interest-table.vue?vue&type=style&index=0&id=3ea742ea&prod&lang=css&
+var interest_tablevue_type_style_index_0_id_3ea742ea_prod_lang_css_ = __webpack_require__(116);
 
 // CONCATENATED MODULE: ./packages/add-and-take/components/interest-table.vue
 
@@ -36287,8 +36284,8 @@ var interest_tablevue_type_style_index_0_id_6dd87975_prod_lang_css_ = __webpack_
 
 var interest_table_component = normalizeComponent(
   components_interest_tablevue_type_script_lang_js_,
-  interest_tablevue_type_template_id_6dd87975_render,
-  interest_tablevue_type_template_id_6dd87975_staticRenderFns,
+  interest_tablevue_type_template_id_3ea742ea_render,
+  interest_tablevue_type_template_id_3ea742ea_staticRenderFns,
   false,
   null,
   null,
@@ -36571,7 +36568,7 @@ external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_default.a.use(external_vant
                       }
                       resolve();
                     }).catch(function () {
-                      self.interestFormValue = convertInterestFormValues(oFormValue, interestInitData);
+                      self.interestFormValue = convertInterestFormValues(oFormValue || self.interestFormValue, interestInitData);
                       resolve();
                     });
                   });
@@ -36762,8 +36759,8 @@ external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_default.a.use(external_vant
 });
 // CONCATENATED MODULE: ./packages/add-and-take/index.vue?vue&type=script&lang=js&
  /* harmony default export */ var packages_add_and_takevue_type_script_lang_js_ = (add_and_takevue_type_script_lang_js_); 
-// EXTERNAL MODULE: ./packages/add-and-take/index.vue?vue&type=style&index=0&id=c7502cda&prod&lang=css&
-var add_and_takevue_type_style_index_0_id_c7502cda_prod_lang_css_ = __webpack_require__(117);
+// EXTERNAL MODULE: ./packages/add-and-take/index.vue?vue&type=style&index=0&id=97071088&prod&lang=css&
+var add_and_takevue_type_style_index_0_id_97071088_prod_lang_css_ = __webpack_require__(117);
 
 // CONCATENATED MODULE: ./packages/add-and-take/index.vue
 
@@ -36776,7 +36773,7 @@ var add_and_takevue_type_style_index_0_id_c7502cda_prod_lang_css_ = __webpack_re
 
 var add_and_take_component = normalizeComponent(
   packages_add_and_takevue_type_script_lang_js_,
-  add_and_takevue_type_template_id_c7502cda_render,
+  add_and_takevue_type_template_id_97071088_render,
   staticRenderFns,
   false,
   null,

package/package.json

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

package/packages/add-and-take/components/interest-form.vue

@@ -514,10 +514,7 @@ export default {
           hadAddYearSet.add(i);
         }
       });
-      return options
-        .filter(o => !minTakeYear || o.val >= minTakeYear)
-        .filter(o => type === 'reduceBaof' || o.val >= 6) // 前5年有领取手续费，不能领取（与老系统保持一致）。From hyw
-        .filter(o => !hadAddYearSet.has(o.val));
+      return options.filter(o => !minTakeYear || o.val >= minTakeYear).filter(o => !hadAddYearSet.has(o.val));
     },
     onClickOpenYearPicker(key) {
       const { formValues, beginYearOptions } = this;

package/packages/add-and-take/components/interest-table.vue

@@ -17,13 +17,13 @@
           <div
             v-for="record in [{ year: '年度', age: '年龄' }]"
             :key="JSON.stringify(record)"
-            class="bxt_aatit_content_record fixed"
+            class="bxt_aatit_content_record bxt_aatit_fixed"
             :style="{ top: fixedTop + 'px' }"
           >
             <div
               v-for="key in ['year', 'age']"
               :key="key"
-              class="bxt_aatit_content_cell fixed-head"
+              class="bxt_aatit_content_cell bxt_aatit_fixed_head"
               :class="{ ageAndYear: record[key] === '年度' }"
             >
               <span> {{ record[key] }} </span>
@@ -68,13 +68,13 @@
           <div
             v-for="(record, recordIndex) in addAndTakeTable.slice(0, 1)"
             :key="recordIndex"
-            class="bxt_aatit_content_record fixed"
+            class="bxt_aatit_content_record bxt_aatit_fixed"
             :style="{ top: fixedTop + 'px' }"
           >
             <div
               v-for="key in Object.keys(record).filter(k => !['year', 'age', 'purpose'].includes(k))"
               :key="key"
-              class="bxt_aatit_content_cell fixed-head"
+              class="bxt_aatit_content_cell bxt_aatit_fixed_head"
               :class="{
                 [`aatit_content_cell_${key}`]: true,
                 zero: !record[key],
@@ -277,13 +277,13 @@ export default {
 <style>
 @import './interest-table.css';
 
-.fixed {
+.bxt_aatit_fixed {
   position: fixed;
   width: inherit;
-  line-height: 0.875rem !important;
+  line-height: normal !important;
   min-height: 50px;
 
-  .fixed-head {
+  .bxt_aatit_fixed_head {
     display: flex !important;
     justify-content: center;
     align-items: center;

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

@@ -320,7 +320,10 @@ export default {
                     resolve();
                   })
                   .catch(() => {
-                    self.interestFormValue = convertInterestFormValues(oFormValue, interestInitData);
+                    self.interestFormValue = convertInterestFormValues(
+                      oFormValue || self.interestFormValue,
+                      interestInitData
+                    );
                     resolve();
                   });
               });