bxs-tools-ui 1.2.0 → 1.2.1

package/lib/product-info/index.css

@@ -1,6 +1,57 @@
+:root {
+
+	/* 主色 */
+
+	/* 品牌色 */
+
+	/* 默认色 */
+
+	/* 背景色 */
+
+	/* 全局背景色(用于分割内容模块的底色)，搜索框 */
+
+	/* 动态区评论引导背景、列表内下拉展开 */
 
+	/* 功能色 */
+
+	/* 删除、小红点、标签 */
+
+	/* 底部bar、标签、价格 */
+
+	/* 标签 */
+
+	/* 辅助色，公告，提示 */
+
+	/* 文字 */
+
+	/* 用于标题信息、重要内容文字信息 */
+
+	/* 次要文字 */
+
+	/* 次辅助，补充文本，next箭头左侧提示文字 */
+
+	/* 列表暗提示文字，next箭头 */
+
+	/* 失效按钮、icon(如不可点按钮、圈选时其中不可选的圆、券类失效状态 */
+
+	/* 线条 */
+
+	/* 分割线 */
+
+	/* 遮罩层 透明度 */
+
+	/* 普通浮层底部遮罩，如对话框、半浮层下的遮罩层 */
+
+	/* 无遮罩情况下的浮动弹层，tost */
+
+	/* 需要看到遮罩下方内容的变化，如计划书字体大小变化时、有浮动菜单时 */
+
+	/* type 对应的 color 列表 */
+}
 .bxt-item-select .bx-input .bx-input-value .bx-input-body .bx-input-control {
           text-align: right;
+          color: #333 !important;
+          -webkit-text-fill-color: #333 !important;
 }
 
 :root {
@@ -109,7 +160,7 @@ footer {
 		width: 18rem;
 		padding: 15px 0;
 		line-height: normal;
-		font-size: 15px;
+		font-size: 17px;
 		font-weight: bold;
 		vertical-align: middle
 }
@@ -277,6 +328,10 @@ footer {
 .bxt-product-info .bxt-product-info-form .bx-form-item .bx-form-item__inner .bx-form-item__content input {
 						text-align: right;
 }
+.bxt-product-info .bxt-product-info-form .bx-form-item .bx-form-item__inner .bx-form-item__content .bx-input-icon .bx-icon,
+						.bxt-product-info .bxt-product-info-form .bx-form-item .bx-form-item__inner .bx-form-item__content .bx-input-icon .icon-edit2 {
+							color: #666 !important;
+}
 .bxt-product-info .bxt-product-info-form .bx-form-item.bxt-ins-form-radio-btn .bx-form-item__inner .bx-form-item__content {
 						margin-right: -5px
 }
@@ -331,6 +386,36 @@ footer {
 						line-height: normal;
 						vertical-align: middle;
 }
+.bxt-product-info .bxt-product-info-form .bx-form-item .bxt-ins-unit-tips {
+				display: inline-block;
+				position: absolute;
+				top: 60%;
+				right: 55px;
+				margin-top: 11px;
+				line-height: normal
+}
+.bxt-product-info .bxt-product-info-form .bx-form-item .bxt-ins-unit-tips em {
+					position: absolute;
+					top: -3px;
+					left: 50%;
+					display: inline-block;
+					width: 6px;
+					height: 6px;
+					background: #666;
+					-webkit-transform: translateX(-50%) rotate(45deg);
+					        transform: translateX(-50%) rotate(45deg);
+					content: ' ';
+}
+.bxt-product-info .bxt-product-info-form .bx-form-item .bxt-ins-unit-tips span {
+					position: relative;
+					display: inline-block;
+					padding: 1px 12px;
+					line-height: normal;
+					background: #666;
+					color: #fff;
+					font-size: 12px;
+					border-radius: 4px;
+}
 .bxt-product-info .bxt-product-info-form .bxt-form-item-label-note {
 			padding: 0 15px 15px 15px;
 			font-size: 12px;

package/lib/product-info/index.js

@@ -1896,7 +1896,7 @@ try {
 
 "use strict";
 
-// CONCATENATED MODULE: ./node_modules/babel-loader/lib??ref--1!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/vue-loader/lib??vue-loader-options!./packages/components/form-item/select-item.vue?vue&type=template&id=41b6c7f1&
+// CONCATENATED MODULE: ./node_modules/babel-loader/lib??ref--1!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/vue-loader/lib??vue-loader-options!./packages/components/form-item/select-item.vue?vue&type=template&id=081d6d99&
 var render = function render() {
   var _vm = this,
       _c = _vm._self._c,
@@ -1925,7 +1925,7 @@ var render = function render() {
 
 var staticRenderFns = [];
 
-// CONCATENATED MODULE: ./packages/components/form-item/select-item.vue?vue&type=template&id=41b6c7f1&
+// CONCATENATED MODULE: ./packages/components/form-item/select-item.vue?vue&type=template&id=081d6d99&
 
 // EXTERNAL MODULE: ./node_modules/tslib/tslib.es6.js
 var tslib_es6 = __webpack_require__(0);
@@ -2044,8 +2044,8 @@ var select_itemvue_type_script_lang_ts_BxtSelectItem = (function (_super) {
 
 // CONCATENATED MODULE: ./packages/components/form-item/select-item.vue?vue&type=script&lang=ts&
  /* harmony default export */ var form_item_select_itemvue_type_script_lang_ts_ = (select_itemvue_type_script_lang_ts_); 
-// EXTERNAL MODULE: ./packages/components/form-item/select-item.vue?vue&type=style&index=0&id=41b6c7f1&prod&lang=postcss&
-var select_itemvue_type_style_index_0_id_41b6c7f1_prod_lang_postcss_ = __webpack_require__(51);
+// EXTERNAL MODULE: ./packages/components/form-item/select-item.vue?vue&type=style&index=0&id=081d6d99&prod&lang=postcss&
+var select_itemvue_type_style_index_0_id_081d6d99_prod_lang_postcss_ = __webpack_require__(51);
 
 // EXTERNAL MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(7);
@@ -2074,7 +2074,7 @@ var component = Object(componentNormalizer["a" /* default */])(
 
 /***/ }),
 
-/***/ 164:
+/***/ 165:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -2085,7 +2085,7 @@ var component = Object(componentNormalizer["a" /* default */])(
 
 /***/ }),
 
-/***/ 174:
+/***/ 175:
 /***/ (function(module, exports, __webpack_require__) {
 
 // extracted by mini-css-extract-plugin
@@ -2103,8 +2103,8 @@ var component = Object(componentNormalizer["a" /* default */])(
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_68725d72_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(174);
-/* 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_68725d72_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_68725d72_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_58aae3be_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(175);
+/* 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_58aae3be_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_58aae3be_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__);
 /* unused harmony reexport * */
 
 
@@ -2755,7 +2755,7 @@ module.exports = function bind(fn, thisArg) {
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/babel-loader/lib??ref--1!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/vue-loader/lib??vue-loader-options!./packages/product-info/index.vue?vue&type=template&id=68725d72&
+// CONCATENATED MODULE: ./node_modules/babel-loader/lib??ref--1!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/vue-loader/lib??vue-loader-options!./packages/product-info/index.vue?vue&type=template&id=58aae3be&
 var render = function render() {
   var _vm = this,
       _c = _vm._self._c,
@@ -2824,6 +2824,7 @@ var render = function render() {
           "autosize": "",
           "type": "text",
           "border": "",
+          "autocomplete": "off",
           "placeholder": ele.placeholder,
           "disabled": !!ele.isDisabled,
           "readonly": !!ele.isDisabled,
@@ -2834,6 +2835,16 @@ var render = function render() {
           }
         },
         on: {
+          "focus": function focus($event) {
+            _vm.activeInputKey = ele.key;
+            _vm.numberUnitStr = _vm.getAmountUnit(ele);
+          },
+          "blur": function blur($event) {
+            _vm.activeInputKey = '';
+          },
+          "input": function input($event) {
+            _vm.numberUnitStr = _vm.getAmountUnit(ele);
+          },
           "change": function change($event) {
             return _vm.change({
               insData: ins,
@@ -2852,7 +2863,9 @@ var render = function render() {
           },
           expression: "ele.value"
         }
-      })], 1)] : _vm._e(), ['cmCommonRadioBtn'].includes(ele.componentName) ? [_c('bxs-form-item', {
+      }), _vm.activeInputKey === ele.key && _vm.numberUnitStr ? _c('div', {
+        staticClass: "bxt-ins-unit-tips"
+      }, [_c('em'), _c('span', [_vm._v("\n                  " + _vm._s(_vm.numberUnitStr) + "\n                ")])]) : _vm._e()], 1)] : _vm._e(), ['cmCommonRadioBtn'].includes(ele.componentName) ? [_c('bxs-form-item', {
         directives: [{
           name: "show",
           rawName: "v-show",
@@ -2976,7 +2989,7 @@ var render = function render() {
             return !o.isHide && !o.isDisabled && !o.isInvalid;
           }),
           "disabled": _vm.isDisabled(ele),
-          "right-icon": "arrow-right"
+          "right-icon": _vm.isDisabled(ele) ? '' : 'arrow-right'
         },
         on: {
           "change": function change($event) {
@@ -3004,7 +3017,7 @@ var render = function render() {
 
 var staticRenderFns = [];
 
-// CONCATENATED MODULE: ./packages/product-info/index.vue?vue&type=template&id=68725d72&
+// CONCATENATED MODULE: ./packages/product-info/index.vue?vue&type=template&id=58aae3be&
 
 // EXTERNAL MODULE: ./node_modules/tslib/tslib.es6.js
 var tslib_es6 = __webpack_require__(0);
@@ -3029,7 +3042,7 @@ var title_item = __webpack_require__(70);
 var external_root_bxs_commonjs_bxs_ui_vue_commonjs2_bxs_ui_vue_amd_bxs_ui_vue_ = __webpack_require__(3);
 
 // EXTERNAL MODULE: ./node_modules/bxs-ui-vue/esm/index.css
-var esm = __webpack_require__(89);
+var esm = __webpack_require__(90);
 
 // CONCATENATED MODULE: ./node_modules/ts-loader??ref--0!./node_modules/vue-loader/lib??vue-loader-options!./packages/product-info/index.vue?vue&type=script&lang=ts&
 var _a;
@@ -3044,7 +3057,10 @@ var _a;
 var product_infovue_type_script_lang_ts_BxtProductInfo = (function (_super) {
     Object(tslib_es6["d" /* __extends */])(BxtProductInfo, _super);
     function BxtProductInfo() {
-        return _super !== null && _super.apply(this, arguments) || this;
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.activeInputKey = '';
+        _this.numberUnitStr = '';
+        return _this;
     }
     Object.defineProperty(BxtProductInfo.prototype, "personData", {
         get: function () {
@@ -3189,6 +3205,23 @@ var product_infovue_type_script_lang_ts_BxtProductInfo = (function (_super) {
         }
         return '当前投保人不能加该险种，<em>修改</em>投保人信息后选择';
     };
+    BxtProductInfo.prototype.getAmountUnit = function (ele) {
+        var digits = isNaN(ele.value * 1) ? 0 : Math.floor(Math.log10(ele.value) + 1);
+        switch (digits) {
+            case 5:
+                return '万';
+            case 6:
+                return '十万';
+            case 7:
+                return '百万';
+            case 8:
+                return '千万';
+            case 9:
+                return '亿';
+            default:
+                return '';
+        }
+    };
     BxtProductInfo.prototype.validate = function () {
         return Object(tslib_es6["b" /* __awaiter */])(this, void 0, void 0, function () {
             var insKeys, validateInfo, _i, insKeys_1, k, info;
@@ -3264,8 +3297,8 @@ var product_infovue_type_script_lang_ts_BxtProductInfo = (function (_super) {
 
 // CONCATENATED MODULE: ./packages/product-info/index.vue?vue&type=script&lang=ts&
  /* harmony default export */ var packages_product_infovue_type_script_lang_ts_ = (product_infovue_type_script_lang_ts_); 
-// EXTERNAL MODULE: ./packages/product-info/index.vue?vue&type=style&index=0&id=68725d72&prod&lang=css&
-var product_infovue_type_style_index_0_id_68725d72_prod_lang_css_ = __webpack_require__(196);
+// EXTERNAL MODULE: ./packages/product-info/index.vue?vue&type=style&index=0&id=58aae3be&prod&lang=css&
+var product_infovue_type_style_index_0_id_58aae3be_prod_lang_css_ = __webpack_require__(196);
 
 // EXTERNAL MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(7);
@@ -4261,8 +4294,8 @@ module.exports = {
 /***/ (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_select_item_vue_vue_type_style_index_0_id_41b6c7f1_prod_lang_postcss___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(19);
-/* 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_select_item_vue_vue_type_style_index_0_id_41b6c7f1_prod_lang_postcss___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_select_item_vue_vue_type_style_index_0_id_41b6c7f1_prod_lang_postcss___WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_select_item_vue_vue_type_style_index_0_id_081d6d99_prod_lang_postcss___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(19);
+/* 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_select_item_vue_vue_type_style_index_0_id_081d6d99_prod_lang_postcss___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_select_item_vue_vue_type_style_index_0_id_081d6d99_prod_lang_postcss___WEBPACK_IMPORTED_MODULE_0__);
 /* unused harmony reexport * */
 
 
@@ -6175,7 +6208,7 @@ var title_itemvue_type_script_lang_ts_BxtTitleItem = (function (_super) {
 // CONCATENATED MODULE: ./packages/components/form-item/title-item.vue?vue&type=script&lang=ts&
  /* harmony default export */ var form_item_title_itemvue_type_script_lang_ts_ = (title_itemvue_type_script_lang_ts_); 
 // EXTERNAL MODULE: ./packages/components/form-item/title-item.vue?vue&type=style&index=0&id=069698f6&prod&lang=postcss&
-var title_itemvue_type_style_index_0_id_069698f6_prod_lang_postcss_ = __webpack_require__(164);
+var title_itemvue_type_style_index_0_id_069698f6_prod_lang_postcss_ = __webpack_require__(165);
 
 // EXTERNAL MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(7);
@@ -6525,13 +6558,6 @@ function convertPersonData(allPersonsData, type) {
 
 /***/ }),
 
-/***/ 89:
-/***/ (function(module, exports, __webpack_require__) {
-
-// extracted by mini-css-extract-plugin
-
-/***/ }),
-
 /***/ 9:
 /***/ (function(module, exports) {
 
@@ -6547,6 +6573,13 @@ function _typeof(obj) {
 
 module.exports = _typeof, module.exports.__esModule = true, module.exports["default"] = module.exports;
 
+/***/ }),
+
+/***/ 90:
+/***/ (function(module, exports, __webpack_require__) {
+
+// extracted by mini-css-extract-plugin
+
 /***/ })
 
 /******/ });

package/package.json

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

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

@@ -54,7 +54,7 @@ export function getBeginYearOpts(values, options = {}) {
   return yearOptions;
 }
 
-export function rebuildAccountData(values, accountData) {
+export function rebuildAccountDataBySetting(values, accountData) {
   if (!values || !accountData || !accountData.addAndTakeData) {
     return accountData;
   }
@@ -108,6 +108,40 @@ export function rebuildAccountData(values, accountData) {
   return accountData;
 }
 
+export function rebuildAccountDataByResult(detailsData, accountData) {
+  if (!detailsData || !accountData || !accountData.addAndTakeData) {
+    return accountData;
+  }
+  accountData.addAndTakeData.forEach(item => {
+    const detailData = detailsData.find(e => e.key === item.key);
+    const values = detailData && detailData.values;
+    const details = detailData && detailData.details;
+    if (!(values && values.length)) {
+      item.adjustData = [];
+      return;
+    }
+    const adjustData = [];
+    values.forEach((ele, index) => {
+      if (!ele) {
+        return;
+      }
+      const lastAdjustData = adjustData[Math.max(0, adjustData.length - 1)];
+      if (lastAdjustData && lastAdjustData[1] === index && lastAdjustData[2] === ele) {
+        lastAdjustData[1] = index + 1;
+        return;
+      }
+      adjustData.push([
+        index + 1, // 开始年度
+        index + 1, // 结束年度
+        ele, // 金额
+        details && details[index] ? details[index] : '' // 用途
+      ]);
+    });
+    item.adjustData = adjustData;
+  });
+  return accountData;
+}
+
 export function getEnsureCanTakeAmount(initialData, options = {}) {
   if (!initialData || !options) {
     return 0;
@@ -136,3 +170,41 @@ export function getEnsureCanTakeAmount(initialData, options = {}) {
   let precision = Math.max(Math.pow(10, Math.floor(Math.log(ensureAmount) / Math.log(10) - 2)), 100);
   return ensureAmount ? Math.floor(ensureAmount / precision) * precision : 0;
 }
+
+export function calcColumnsWidth(tableData) {
+  const widthObj = {};
+  if (!(tableData && tableData.length)) {
+    return widthObj;
+  }
+  const keys = Object.keys(tableData[0]).filter(k => !['year', 'age'].includes(k));
+  keys.push('purpose');
+  keys.forEach(k => {
+    if (['purpose'].includes(k)) {
+      widthObj[k] = 0;
+      return;
+    }
+    if (['take', 'add'].includes(k)) {
+      widthObj[k] = 3;
+      return;
+    }
+    widthObj[k] = 5;
+  });
+  keys.forEach(k => {
+    tableData.forEach((ele, eleIndex) => {
+      if (eleIndex === 0) {
+        return;
+      }
+
+      let contentCount = 0;
+      if (k === 'purpose') {
+        if (ele.purpose) {
+          contentCount = (ele[k] + '').length * 0.8334 + 1;
+        }
+      } else {
+        contentCount = (ele[k] + '').length * 0.5 + 1;
+      }
+      widthObj[k] = Math.max(contentCount, widthObj[k]);
+    });
+  });
+  return widthObj;
+}

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

@@ -56,7 +56,7 @@
 			& .bxt-aat-table-content-left,
 			& .bxt-aat-table-content-right {
 				display: inline-block;
-				width: 25%;
+				width: 16%;
 				font-size: 13px;
 				vertical-align: top;
 				text-align: left;
@@ -68,7 +68,6 @@
 					& .bxt-aat-table-content-cell {
 						display: inline-block;
 						flex: 1;
-						min-width: 30%;
 						padding: 12px 2px;
 						text-align: center;
 						overflow: hidden;
@@ -117,7 +116,7 @@
 			}
 
 			& .bxt-aat-table-content-right {
-				width: 75%;
+				width: 84%;
 				overflow: auto;
 
 				& .bxt-aat-table-content-record {
@@ -128,17 +127,25 @@
 					}
 
 					& .bxt-aat-table-content-cell__purpose {
-						min-width: 45%;
+						text-align: right;
+
+						& span {
+							vertical-align: middle;
+						}
 
 						& span:nth-child(2) {
-							display: inline-block;
-							margin-left: 5px;
-							padding: 1px 3px;
-							color: rgba(10, 100, 254, 1);
-							background: rgba(10, 100, 254, 0.1);
-							transform: scale(0.8334);
-							transform-origin: left center;
-							border-radius: 2px;
+							text-align: left;
+
+							& em {
+								display: inline-block;
+								margin-left: 5px;
+								padding: 1px 3px;
+								color: rgba(10, 100, 254, 1);
+								background: rgba(10, 100, 254, 0.1);
+								transform: scale(0.8334);
+								transform-origin: left center;
+								border-radius: 2px;
+							}
 						}
 					}
 				}

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

@@ -54,8 +54,12 @@
               :key="key"
               :class="{
                 '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'
+                'bxt-aat-table-content-cell__purpose': key === 'take' && columnWidthObj.purpose
+              }"
+              :style="{
+                'min-width': `${(columnWidthObj[key] || 3) + (key === 'take' ? columnWidthObj.purpose : 0)}em`
               }"
               data-stat-id="zjlqblsz"
               :data-stat-ep="
@@ -67,8 +71,15 @@
               @click="onClickToForm(key, record, recordIndex)"
             >
               <span v-html="record[key]"></span>
-              <span v-if="key === 'take' && record.purpose">
-                {{ record.purpose }}
+              <span
+                v-if="recordIndex !== 0 && key === 'take' && columnWidthObj.purpose"
+                :style="{
+                  width: `${columnWidthObj.purpose}em`
+                }"
+              >
+                <em v-if="record.purpose">
+                  {{ record.purpose }}
+                </em>
               </span>
             </div>
           </div>
@@ -97,7 +108,7 @@
                     type
                   })
                 "
-                @click="onClickOpenPicker('beginYear')"
+                @click="onClickOpenYearPicker('beginYear')"
               >
                 {{ formData.beginYear | filterOption(beginYearOptions) }}
                 <i class="iconfont icon-arrows_right"></i>
@@ -113,7 +124,7 @@
                     type
                   })
                 "
-                @click="onClickOpenPicker('endYear')"
+                @click="onClickOpenYearPicker('endYear')"
               >
                 {{ formData.endYear | filterOption(beginYearOptions) }}
                 <i class="iconfont icon-arrows_right"></i>
@@ -269,7 +280,14 @@ import { Toast, Picker } from 'bxs-ui-vue';
 import 'bxs-ui-vue/lib/index.css';
 import { convertPersonData, convertProductData } from 'packages/bxs-utils/planbook/index';
 import { IS_PRODUCT_ENV, AAT_FORM_RULES, PURPOSE_OPTIONS, NONEED_PROD_KEYS, NONEED_INS_KEYS } from './constant.js';
-import { initAddAndTakeData, getBeginYearOpts, getEnsureCanTakeAmount, rebuildAccountData } from './handler.js';
+import {
+  initAddAndTakeData,
+  getBeginYearOpts,
+  getEnsureCanTakeAmount,
+  rebuildAccountDataBySetting,
+  rebuildAccountDataByResult,
+  calcColumnsWidth
+} from './handler.js';
 import SelectItem from 'packages/components/form-item/select-item.vue';
 
 Vue.use(Toast);
@@ -439,6 +457,10 @@ export default class AddAndTake extends Vue {
     );
   }
 
+  get columnWidthObj() {
+    return calcColumnsWidth(this.addAndTakeTable);
+  }
+
   @Watch('subName', {})
   watchMName(val: Boolean) {
     this.$emit('update:submoduleName', val);
@@ -533,7 +555,7 @@ export default class AddAndTake extends Vue {
   }
   getAddAndTakeData(values = null) {
     const { resultData, params, type, personData, productData, interestFormData, accountData } = this;
-    const caclAccountData = rebuildAccountData(values, cloneDeep(accountData));
+    const caclAccountData = rebuildAccountDataBySetting(values, cloneDeep(accountData));
     const apis = {
       addAndTake: '/interest/addAndTake/detail',
       draw: '/interest/draw/detail',
@@ -597,11 +619,11 @@ export default class AddAndTake extends Vue {
           this.$toast(info);
           return Promise.reject();
         }
-        this.accountData = caclAccountData;
         data.forEach(d => {
           d.values = d.values && d.values.map(v => (v ? Math.round(v) : v));
         });
         this.initAddAndTakeData = data;
+        this.accountData = rebuildAccountDataByResult(data, cloneDeep(accountData));
         return Promise.resolve(data);
       });
   }
@@ -688,7 +710,7 @@ export default class AddAndTake extends Vue {
     this.beginYearOptions = options;
     this.subName = 'Form';
   }
-  onClickOpenPicker(key) {
+  onClickOpenYearPicker(key) {
     let self: any = this;
     const { formData, beginYearOptions } = self;
     const options = key === 'beginYear' ? beginYearOptions : beginYearOptions.filter(o => o.val >= formData.beginYear);