bxs-tools-ui 1.2.0-2 → 1.2.0-4

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

@@ -84,10 +84,6 @@ header,
 footer {
 	display: block;
 }
-.bxt-add-and-take {
-	padding: 9px;
-	background: #f2f2f2
-}
 .bxt-add-and-take.bxt-add-and-take--footer::after {
   display: block;
   height: constant(safe-area-inset-bottom);
@@ -101,7 +97,7 @@ footer {
 		padding-bottom: 55px;
 }
 .bxt-add-and-take .bxt-aat-table {
-		padding: 15px;
+		padding: 12px;
 		background: #fff;
 		border-radius: 6px
 }
@@ -130,6 +126,7 @@ footer {
 }
 .bxt-add-and-take .bxt-aat-table .bxt-aat-bonus li .bxt-aat-bonus-desc.active {
 					font-size: 13px;
+					font-weight: bold;
 					color: #0a64fe;
 					background: #e6effe;
 }
@@ -166,14 +163,30 @@ footer {
 						padding: 12px 2px;
 						text-align: center;
 						overflow: hidden;
+						white-space: nowrap;
 }
 .bxt-add-and-take .bxt-aat-table .bxt-aat-table-content .bxt-aat-table-content-left .bxt-aat-table-content-record:nth-child(2n) .bxt-aat-table-content-cell, .bxt-add-and-take .bxt-aat-table .bxt-aat-table-content .bxt-aat-table-content-right .bxt-aat-table-content-record:nth-child(2n) .bxt-aat-table-content-cell {
 						background: rgba(0, 0, 0, 0.02);
 }
 .bxt-add-and-take .bxt-aat-table .bxt-aat-table-content .bxt-aat-table-content-left .bxt-aat-table-content-record:nth-child(1) .bxt-aat-table-content-cell, .bxt-add-and-take .bxt-aat-table .bxt-aat-table-content .bxt-aat-table-content-right .bxt-aat-table-content-record:nth-child(1) .bxt-aat-table-content-cell {
-						padding: 6px 2px;
+						display: -webkit-box;
+						display: -webkit-flex;
+						display: -moz-box;
+						display: -ms-flexbox;
+						display: flex;
+						-webkit-box-align: center;
+						-webkit-align-items: center;
+						   -moz-box-align: center;
+						    -ms-flex-align: center;
+						        align-items: center;
+						-webkit-box-pack: center;
+						-webkit-justify-content: center;
+						   -moz-box-pack: center;
+						    -ms-flex-pack: center;
+						        justify-content: center;
 						height: 33px;
-						line-height: 33px;
+						padding: 6px 2px;
+						white-space: normal;
 						background: rgba(229, 229, 229, 1);
 }
 .bxt-add-and-take .bxt-aat-table .bxt-aat-table-content .bxt-aat-table-content-left {
@@ -186,41 +199,39 @@ footer {
 				width: 75%;
 				overflow: auto
 }
-.bxt-add-and-take .bxt-aat-table .bxt-aat-table-content .bxt-aat-table-content-right .bxt-aat-table-content-record .bxt-aat-table-content-cell {
-						white-space: normal;
-}
-.bxt-add-and-take .bxt-aat-table .bxt-aat-table-content .bxt-aat-table-content-right .bxt-aat-table-content-record .bxt-aat-table-content-cell__zero {
-						color: #999;
+.bxt-add-and-take .bxt-aat-table .bxt-aat-table-content .bxt-aat-table-content-right .bxt-aat-table-content-record .bxt-aat-table-content-cell__zero span:nth-child(1) {
+							color: #999;
 }
 .bxt-add-and-take .bxt-aat-table .bxt-aat-table-content .bxt-aat-table-content-right .bxt-aat-table-content-record .bxt-aat-table-content-cell__purpose {
-						display: inline-block;
-						padding: 1px 3px;
-						color: rgba(10, 100, 254, 1);
-						background: rgba(10, 100, 254, 0.1);
-						-webkit-transform: scale(0.8334);
-						        transform: scale(0.8334);
-						-webkit-transform-origin: left center;
-						        transform-origin: left center;
+						min-width: 45%
+}
+.bxt-add-and-take .bxt-aat-table .bxt-aat-table-content .bxt-aat-table-content-right .bxt-aat-table-content-record .bxt-aat-table-content-cell__purpose span:nth-child(2) {
+							display: inline-block;
+							padding: 1px 3px;
+							color: rgba(10, 100, 254, 1);
+							background: rgba(10, 100, 254, 0.1);
+							-webkit-transform: scale(0.8334);
+							        transform: scale(0.8334);
+							-webkit-transform-origin: left center;
+							        transform-origin: left center;
 }
 .bxt-add-and-take .bxt-aat-table .bxt-aat-table-content .bxt-aat-table-content-right .bxt-aat-table-content-record:nth-child(1) .bxt-aat-table-content-cell {
 						line-height: normal;
 }
 .bxt-add-and-take .bxt-aat-form {
 		font-size: 13px;
-		background: white;
-		border-radius: 6px
+		background: white
 }
 .bxt-add-and-take .bxt-aat-form .bxt-aat-form-items {
 			padding: 15px 0
 }
 .bxt-add-and-take .bxt-aat-form .bxt-aat-form-items .bx-form-item .bxt-aat-form-item-title {
-					margin-bottom: 12px;
 					font-size: 13px;
 					color: #999;
 }
 .bxt-add-and-take .bxt-aat-form .bxt-aat-form-items .bx-form-item .bx-input {
 					width: 150px;
-					border: 1px solid #999;
+					border: 1px solid #ccc;
 					border-radius: 50px
 }
 .bxt-add-and-take .bxt-aat-form .bxt-aat-form-items .bx-form-item .bx-input .bx-input-body {
@@ -242,7 +253,7 @@ footer {
 .bxt-add-and-take .bxt-aat-form .bxt-aat-form-items .bxt-aat-form-purpose .bxt-aat-form-purpose-options .bxt-aat-form-purpose-option {
 						display: inline-block;
 						min-width: 50px;
-						margin: 0 6px 15px 0;
+						margin: 15px 9px 0 0;
 						padding: 3px 6px;
 						text-align: center;
 						background: rgba(0, 0, 0, 0.04);
@@ -256,6 +267,7 @@ footer {
 .bxt-add-and-take .bxt-aat-form .bxt-aat-form-items .bxt-aat-form-purpose .bxt-aat-form-purpose-options .bx-input {
 						display: inline-block;
 						width: 130px;
+						margin-left: 3px;
 						font-size: 13px
 }
 .bxt-add-and-take .bxt-aat-form .bxt-aat-form-items .bxt-aat-form-purpose .bxt-aat-form-purpose-options .bx-input .bx-input-control {
@@ -268,6 +280,7 @@ footer {
 				display: -moz-box;
 				display: -ms-flexbox;
 				display: flex;
+				margin-top: 12px;
 				font-size: 13px
 }
 .bxt-add-and-take .bxt-aat-form .bxt-aat-form-items .bxt-aat-form-item-content .bxt-aat-form-item-select {
@@ -281,8 +294,9 @@ footer {
 .bxt-add-and-take .bxt-aat-form .bxt-aat-form-items .bxt-aat-form-item-content .bxt-aat-form-item-select .bxt-aat-form-item-select__button {
 						display: inline-block;
 						width: 100%;
+						min-height: 28px;
 						padding: 5px 12px 5px 6px;
-						border: 1px solid #999;
+						border: 1px solid #ccc;
 						border-radius: 50px;
 						-webkit-box-sizing: border-box;
 						   -moz-box-sizing: border-box;
@@ -313,11 +327,14 @@ footer {
 					        transform: translate(-50%, -50%);
 					width: 50%;
 					height: 1px;
-					border-bottom: 1px solid #999;
+					border-bottom: 1px solid #ccc;
 					content: ' ';
 }
+.bxt-add-and-take .bxt-aat-form .bxt-aat-form-items .bxt-aat-form-item-baof {
+				margin-top: 12px;
+}
 .bxt-add-and-take .bxt-aat-form .bxt-aat-form-items .bxt-aat-form-baof-tips {
-				margin: 6px 0;
+				margin: 12px 0;
 				line-height: 145%;
 				color: #999;
 				font-size: 12px
@@ -354,39 +371,54 @@ footer {
 			display: flex
 }
 .bxt-add-and-take .bxt-aat-footer .bxt-aat-footer-wrapper span {
-				-webkit-box-flex: 4;
-				-webkit-flex: 4;
-				   -moz-box-flex: 4;
-				    -ms-flex: 4;
-				        flex: 4;
+				-webkit-box-flex: 1;
+				-webkit-flex: 1;
+				   -moz-box-flex: 1;
+				    -ms-flex: 1;
+				        flex: 1;
 				margin-right: 9px;
 				padding: 9px 0;
-				border: 1px solid #e5e5e5;
+				color: #508cee;
+				border: 1px solid #508cee;
 				border-radius: 6px;
 				background: white;
-				text-align: center
-}
-.bxt-add-and-take .bxt-aat-footer .bxt-aat-footer-wrapper span:first-child {
-					-webkit-box-flex: 2;
-					-webkit-flex: 2;
-					   -moz-box-flex: 2;
-					    -ms-flex: 2;
-					        flex: 2;
-}
-.bxt-add-and-take .bxt-aat-footer .bxt-aat-footer-wrapper span:last-child {
-					-webkit-box-flex: 3;
-					-webkit-flex: 3;
-					   -moz-box-flex: 3;
-					    -ms-flex: 3;
-					        flex: 3;
-					margin-right: 0;
-					color: white;
-					border: 1px solid #508cee;
-					background: #508cee;
+				text-align: center;
+}
+.bxt-add-and-take .bxt-aat-footer .bxt-aat-footer-wrapper span.bxt-aat-footer-delete-all-btn {
+				display: -webkit-box;
+				display: -webkit-flex;
+				display: -moz-box;
+				display: -ms-flexbox;
+				display: flex;
+				-webkit-box-align: center;
+				-webkit-align-items: center;
+				   -moz-box-align: center;
+				    -ms-flex-align: center;
+				        align-items: center;
+				padding: 0;
+				border: 0;
+				color: #333;
+				background: none;
+				text-align: left
+}
+.bxt-add-and-take .bxt-aat-footer .bxt-aat-footer-wrapper span.bxt-aat-footer-delete-all-btn .icon-delete_rubbish {
+					margin-right: 3px;
+					font-size: 24px;
+					font-weight: bold;
+					vertical-align: middle;
+}
+.bxt-add-and-take .bxt-aat-footer .bxt-aat-footer-wrapper span.bxt-aat-footer-delete-all-btn em {
+					vertical-align: middle;
+}
+.bxt-add-and-take .bxt-aat-footer .bxt-aat-footer-wrapper span.bxt-aat-footer-ok-btn {
+				margin-right: 0;
+				color: white;
+				border: 1px solid #508cee;
+				background: #508cee;
 }
 .bxt-add-and-take .bxt-aat-tips {
 		line-height: 145%;
-		padding: 12px 0 6px;
+		padding: 12px 12px 6px;
 		font-size: 12px;
 		color: #999;
 }

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

@@ -6142,8 +6142,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_55cfa8be_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(165);
-/* 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_55cfa8be_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_55cfa8be_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_623c293b_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(165);
+/* 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_623c293b_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_623c293b_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__);
 /* unused harmony reexport * */
 
 
@@ -6179,7 +6179,7 @@ __webpack_require__.r(__webpack_exports__);
 var defineProperty = __webpack_require__(175);
 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=55cfa8be&
+// 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=623c293b&
 
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -6246,19 +6246,21 @@ var render = function render() {
     }), function (key) {
       return _c('div', {
         key: key,
-        staticClass: "bxt-aat-table-content-cell",
+        class: {
+          'bxt-aat-table-content-cell': true,
+          'bxt-aat-table-content-cell__zero': !record[key],
+          'bxt-aat-table-content-cell__purpose': key === 'take'
+        },
         on: {
           "click": function click($event) {
             return _vm.onClickToForm(key, record);
           }
         }
       }, [_c('span', {
-        class: {
-          'bxt-aat-table-content-cell__zero': !record[key]
+        domProps: {
+          "innerHTML": _vm._s(record[key])
         }
-      }, [_vm._v("\n                " + _vm._s(record[key]) + "\n              ")]), key === 'take' && record.purpose ? _c('span', {
-        staticClass: "bxt-aat-table-content-cell__purpose"
-      }, [_vm._v("\n                " + _vm._s(record.purpose) + "\n              ")]) : _vm._e()]);
+      }), key === 'take' && record.purpose ? _c('span', [_vm._v("\n                " + _vm._s(record.purpose) + "\n              ")]) : _vm._e()]);
     }), 0);
   }), 0)])]) : _vm._e(), _vm.subName === 'Form' ? _c('div', {
     staticClass: "bxt-aat-form"
@@ -6304,7 +6306,9 @@ var render = function render() {
     }
   }, [_c('header', {
     staticClass: "bxt-aat-form-item-title"
-  }, [_vm._v("\n            " + _vm._s(_vm.formData.type === 'add' ? '追加金额' : '领取金额') + "\n          ")]), _c('bxs-input', {
+  }, [_vm._v("\n            " + _vm._s(_vm.formData.type === 'add' ? '追加金额' : '领取金额') + "\n          ")]), _c('div', {
+    staticClass: "bxt-aat-form-item-baof"
+  }, [_c('bxs-input', {
     attrs: {
       "placeholder": "请输入金额",
       "maxlength": 9,
@@ -6319,7 +6323,7 @@ var render = function render() {
     }
   }), !['reduceBaof'].includes(_vm.type) && ['take'].includes(_vm.formData.type) ? _c('p', {
     staticClass: "bxt-aat-form-baof-tips"
-  }, [_vm._v("\n            根据低档收益，最大领取金额约\n            "), _c('span', [_vm._v(_vm._s(_vm.ensureCanTakeAmount))]), _vm._v(" 元"), _c('br'), _vm._v("仅供参考，实际领取以保单账户价值为准\n          ")]) : _vm._e()], 1), ['take'].includes(_vm.formData.type) ? _c('bxs-form-item', {
+  }, [_vm._v("\n              根据低档收益，最大领取金额约\n              "), _c('span', [_vm._v(_vm._s(_vm.ensureCanTakeAmount))]), _vm._v(" 元，仅供参考，实际领取以保单账户价值为准；\n            ")]) : _vm._e()], 1)]), ['take'].includes(_vm.formData.type) ? _c('bxs-form-item', {
     staticClass: "bxt-aat-form-purpose"
   }, [_c('header', {
     staticClass: "bxt-aat-form-item-title"
@@ -6335,21 +6339,15 @@ var render = function render() {
       on: {
         "click": function click($event) {
           _vm.formData.purpose = o.val;
-          _vm.isShowCustomPurpose = _vm.formData.purpose === '';
         }
       }
     }, [_vm._v("\n              " + _vm._s(o.desc) + "\n            ")]);
   }), _vm.formData.purpose === '' ? [_c('bxs-input', {
     attrs: {
       "placeholder": "请输入，5个字以内",
-      "maxlength": 50,
+      "maxlength": 5,
       "autocomplete": "off"
     },
-    on: {
-      "focus": function focus($event) {
-        _vm.isShowCustomPurpose = true;
-      }
-    },
     model: {
       value: _vm.formData.customPurpose,
       callback: function callback($$v) {
@@ -6357,29 +6355,39 @@ var render = function render() {
       },
       expression: "formData.customPurpose"
     }
-  }), _vm.isShowCustomPurpose ? _c('span', {
-    staticClass: "bxt-aat-form-purpose-option active",
-    on: {
-      "click": function click($event) {
-        _vm.isShowCustomPurpose = false;
-      }
-    }
-  }, [_vm._v("\n                确定\n              ")]) : _vm._e()] : _vm._e()], 2)]) : _vm._e()], 1)], 1) : _vm._e(), _c('div', {
+  })] : _vm._e()], 2)]) : _vm._e()], 1)], 1) : _vm._e(), _c('div', {
     staticClass: "bxt-aat-tips"
-  }, [_vm._v("\n      温馨提示：以上演示说明为本平台对上述产品的理解便于保险从业人员学习、交流，演示数据仅供参考，请以实际为准。\n    ")]), _vm.footer ? _c('footer', {
+  }, [_vm._v("\n      以上演示为便于保险从业人员学习交流使用，演示数据仅供参考。\n    ")]), _vm.footer ? _c('footer', {
     staticClass: "bxt-aat-footer"
   }, [_c('div', {
     staticClass: "bxt-aat-footer-wrapper"
-  }, [_vm.isShowDeleteAllBtn ? _c('span', {
-    staticClass: "delete",
+  }, [_vm.subName === 'Table' ? [_vm.isShowDeleteAllBtn ? _c('span', {
+    staticClass: "bxt-aat-footer-delete-all-btn",
     on: {
       "click": _vm.deleteAllData
     }
-  }, [_vm._v("\n          清空记录\n        ")]) : _vm._e(), _vm.subName === 'Form' ? [_c('span', {
+  }, [_c('i', {
+    staticClass: "iconfont icon-delete_rubbish"
+  }), _c('em', [_vm._v("清空")])]) : _vm._e(), ['addAndTake', 'add'].includes(_vm.type) ? _c('span', {
     on: {
-      "click": _vm.goToTable
+      "click": function click($event) {
+        return _vm.openFormPicker('add');
+      }
+    }
+  }, [_vm._v("追加")]) : _vm._e(), ['addAndTake', 'take', 'reduceBaof'].includes(_vm.type) ? _c('span', {
+    on: {
+      "click": function click($event) {
+        return _vm.openFormPicker('take');
+      }
     }
-  }, [_vm._v("返回")]), _vm.formData.isShowDelete ? _c('span', {
+  }, [_vm._v("领取")]) : _vm._e(), _c('span', {
+    staticClass: "bxt-aat-footer-ok-btn",
+    on: {
+      "click": function click($event) {
+        return _vm.tableConfirm();
+      }
+    }
+  }, [_vm._v("确定")])] : _vm._e(), _vm.subName === 'Form' ? [_vm.formData.isShowDelete ? _c('span', {
     staticClass: "delete",
     on: {
       "click": function click($event) {
@@ -6388,18 +6396,19 @@ var render = function render() {
         }));
       }
     }
-  }, [_vm._v("\n            删除" + _vm._s(_vm.formData.beginYear) + "-" + _vm._s(_vm.formData.endYear) + "年记录\n          ")]) : _vm._e()] : _vm._e(), _c('span', {
+  }, [_vm._v("\n            删除" + _vm._s(_vm.formData.beginYear) + "-" + _vm._s(_vm.formData.endYear) + "年记录\n          ")]) : _vm._e(), _c('span', {
+    staticClass: "bxt-aat-footer-ok-btn",
     on: {
       "click": function click($event) {
-        _vm.subName === 'Table' ? _vm.tableConfirm() : _vm.formConfirm();
+        return _vm.formConfirm();
       }
     }
-  }, [_vm._v("确定")])], 2)]) : _vm._e()]) : _vm._e();
+  }, [_vm._v("确定")])] : _vm._e()], 2)]) : _vm._e()]) : _vm._e();
 };
 
 var staticRenderFns = [];
 
-// CONCATENATED MODULE: ./packages/add-and-take/index.vue?vue&type=template&id=55cfa8be&
+// CONCATENATED MODULE: ./packages/add-and-take/index.vue?vue&type=template&id=623c293b&
 
 // EXTERNAL MODULE: ./node_modules/tslib/tslib.es6.js
 var tslib_es6 = __webpack_require__(0);
@@ -6588,9 +6597,20 @@ function rebuildAccountData(values, accountData) {
     tempAdjust.push(item);
     tempValue = item[2];
   });
-  tempAddAndTake.adjustData = tempAdjust.filter(function (ad) {
-    return !!ad[2];
-  });
+
+  if (tempAddAndTake) {
+    tempAddAndTake.adjustData = tempAdjust.filter(function (ad) {
+      return !!ad[2];
+    });
+  } else {
+    accountData.addAndTakeData.push({
+      key: values.type,
+      adjustData: tempAdjust.filter(function (ad) {
+        return !!ad[2];
+      })
+    });
+  }
+
   return accountData;
 }
 function getEnsureCanTakeAmount(initialData) {
@@ -6660,7 +6680,6 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
         _this.formData = {};
         _this.interestFormData = {};
         _this.beginYearOptions = [];
-        _this.isShowCustomPurpose = true;
         _this.AAT_FORM_RULES = AAT_FORM_RULES;
         _this.PURPOSE_OPTIONS = PURPOSE_OPTIONS;
         return _this;
@@ -6722,9 +6741,9 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
             };
             initAddAndTakeData.forEach(function (d, i) {
                 if (!['add', 'take'].includes(d.key)) {
-                    d.key = d.key + "_" + i;
+                    d.uniKey = d.key + "_" + i;
                 }
-                tableHeaderData[d.key] = d.name;
+                tableHeaderData[d.uniKey || d.key] = d.name && d.name.replace(/^(.+)([(（])/, '<p>$1</p>$2');
             });
             var startPolicyNo = initInterestData.startPolicyNo, startIndex = initInterestData.startIndex, reduceIndex = initInterestData.reduceIndex;
             var maxlength = initAddAndTakeData.reduce(function (a, b) { return Math.max(a, b.values.length || 0); }, 0);
@@ -6736,7 +6755,7 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
                 };
                 initAddAndTakeData.map(function (item) {
                     if (item.values) {
-                        record[item.key] = item.values[i] || 0;
+                        record[item.uniKey || item.key] = item.values[i] || 0;
                     }
                     if (item.details) {
                         record.purpose = item.details[i] || '';
@@ -6780,12 +6799,12 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
         this.$emit('update:submoduleName', val);
     };
     AddAndTake.prototype.created = function () {
-        var _a = this, resultData = _a.resultData, params = _a.params, submoduleName = _a.submoduleName, insuranceData = _a.insuranceData;
+        var _a = this, resultData = _a.resultData, submoduleName = _a.submoduleName, insuranceData = _a.insuranceData;
         this.subName = submoduleName;
         var key = ['reduceBaof'].includes(this.type) ? 'reduceBaofData' : 'accountData';
         this.accountData = insuranceData && insuranceData[key];
         if (resultData && resultData.uuid) {
-            this.accountData = resultData[key];
+            this.accountData = resultData.accountData;
         }
         if (!this.accountData) {
             this.$toast('缺少配置信息');
@@ -6808,7 +6827,7 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
             pbData: '',
             productId: params.productKey
         };
-        if (!resultData && resultData.uuid) {
+        if (!(resultData && resultData.uuid)) {
             var cloneProductData_1 = Object(planbook["f" /* convertProductData */])(cloneDeep_default()(productData));
             NONEED_PROD_KEYS.forEach(function (ele) {
                 delete cloneProductData_1[ele];
@@ -6883,7 +6902,7 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
             },
             _a[type === 'reduceBaof' ? 'drawData' : 'addAndTakeData'] = caclAccountData ? caclAccountData.addAndTakeData : null,
             _a);
-        if (!resultData && resultData.uuid) {
+        if (!(resultData && resultData.uuid)) {
             var cloneProductData_2 = Object(planbook["f" /* convertProductData */])(cloneDeep_default()(productData));
             NONEED_PROD_KEYS.forEach(function (ele) {
                 delete cloneProductData_2[ele];
@@ -6925,7 +6944,7 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
             }
             _this.accountData = caclAccountData;
             data.forEach(function (d) {
-                d.values = d.values && d.values.map(function (v) { return (v ? Number(v.toFixed(2)) : v); });
+                d.values = d.values && d.values.map(function (v) { return (v ? Math.round(v) : v); });
             });
             _this.initAddAndTakeData = data;
             return Promise.resolve(data);
@@ -6955,7 +6974,9 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
             return;
         }
         var _a = this, insuredAge = _a.insuredAge, initInterestData = _a.initInterestData, initAddAndTakeData = _a.initAddAndTakeData, accountData = _a.accountData;
-        var tempItem = accountData.addAndTakeData && accountData.addAndTakeData.find(function (a) { return a.key === _this.formData.type; });
+        if (!(initInterestData && initAddAndTakeData)) {
+            return;
+        }
         var purposeOption = PURPOSE_OPTIONS.find(function (o) { return o.val === item.purpose; });
         this.formData = {
             type: key,
@@ -6967,6 +6988,7 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
             isShowDelete: !!item[key]
         };
         var startPolicyNo = initInterestData.startPolicyNo, startIndex = initInterestData.startIndex;
+        var tempItem = accountData.addAndTakeData && accountData.addAndTakeData.find(function (a) { return a.key === _this.formData.type; });
         this.beginYearOptions = getBeginYearOpts(this.formData, {
             data: initAddAndTakeData,
             startPolicyNo: startPolicyNo,
@@ -6976,6 +6998,37 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
         });
         this.subName = 'Form';
     };
+    AddAndTake.prototype.openFormPicker = function (key) {
+        var _a = this, insuredAge = _a.insuredAge, initInterestData = _a.initInterestData, initAddAndTakeData = _a.initAddAndTakeData;
+        if (!(initInterestData && initAddAndTakeData)) {
+            return;
+        }
+        var startPolicyNo = initInterestData.startPolicyNo, startIndex = initInterestData.startIndex;
+        var maxLength = initAddAndTakeData.reduce(function (a, b) { return Math.max(a, b.values.length); }, 0);
+        var options = [];
+        for (var i = 0; i < maxLength; i++) {
+            var year = i + startPolicyNo;
+            options.push({
+                val: year,
+                desc: "\u7B2C" + year + "\u5E74," + (insuredAge + startIndex + i + 1) + "\u5C81"
+            });
+        }
+        if (!options.length) {
+            return;
+        }
+        var firstOption = options[0];
+        this.formData = {
+            type: key,
+            beginYear: firstOption.val,
+            endYear: firstOption.val,
+            baof: null,
+            purpose: '',
+            customPurpose: '',
+            isShowDelete: false
+        };
+        this.beginYearOptions = options;
+        this.subName = 'Form';
+    };
     AddAndTake.prototype.onClickOpenPicker = function (key) {
         var self = this;
         var formData = self.formData, beginYearOptions = self.beginYearOptions;
@@ -7110,8 +7163,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=55cfa8be&prod&lang=css&
-var add_and_takevue_type_style_index_0_id_55cfa8be_prod_lang_css_ = __webpack_require__(177);
+// EXTERNAL MODULE: ./packages/add-and-take/index.vue?vue&type=style&index=0&id=623c293b&prod&lang=css&
+var add_and_takevue_type_style_index_0_id_623c293b_prod_lang_css_ = __webpack_require__(177);
 
 // EXTERNAL MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(7);