bxs-tools-ui 1.2.0-1 → 1.2.0-3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (10) hide show
  1. package/lib/add-and-take/index.css +31 -15
  2. package/lib/add-and-take/index.js +53 -37
  3. package/lib/index.css +31 -15
  4. package/lib/index.js +53 -37
  5. package/package.json +1 -1
  6. package/packages/add-and-take/handler.js +8 -1
  7. package/packages/add-and-take/index.css +19 -13
  8. package/packages/add-and-take/index.vue +30 -27
  9. package/packages/add-and-take/readme.md +38 -12
  10. package/packages/planbook-input/components/product-table.vue +15 -12
package/lib/add-and-take/index.css CHANGED
@@ -166,14 +166,30 @@ footer {
166
166
  padding: 12px 2px;
167
167
  text-align: center;
168
168
  overflow: hidden;
169
+ white-space: nowrap;
169
170
  }
170
171
  .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 {
171
172
  background: rgba(0, 0, 0, 0.02);
172
173
  }
173
174
  .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 {
174
- padding: 6px 2px;
175
+ display: -webkit-box;
176
+ display: -webkit-flex;
177
+ display: -moz-box;
178
+ display: -ms-flexbox;
179
+ display: flex;
180
+ -webkit-box-align: center;
181
+ -webkit-align-items: center;
182
+ -moz-box-align: center;
183
+ -ms-flex-align: center;
184
+ align-items: center;
185
+ -webkit-box-pack: center;
186
+ -webkit-justify-content: center;
187
+ -moz-box-pack: center;
188
+ -ms-flex-pack: center;
189
+ justify-content: center;
175
190
  height: 33px;
176
- line-height: 33px;
191
+ padding: 6px 2px;
192
+ white-space: normal;
177
193
  background: rgba(229, 229, 229, 1);
178
194
  }
179
195
  .bxt-add-and-take .bxt-aat-table .bxt-aat-table-content .bxt-aat-table-content-left {
@@ -186,21 +202,21 @@ footer {
186
202
  width: 75%;
187
203
  overflow: auto
188
204
  }
189
- .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 {
190
- white-space: normal;
191
- }
192
- .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 {
193
- color: #999;
205
+ .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) {
206
+ color: #999;
194
207
  }
195
208
  .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 {
196
- display: inline-block;
197
- padding: 1px 3px;
198
- color: rgba(10, 100, 254, 1);
199
- background: rgba(10, 100, 254, 0.1);
200
- -webkit-transform: scale(0.8334);
201
- transform: scale(0.8334);
202
- -webkit-transform-origin: left center;
203
- transform-origin: left center;
209
+ min-width: 45%
210
+ }
211
+ .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) {
212
+ display: inline-block;
213
+ padding: 1px 3px;
214
+ color: rgba(10, 100, 254, 1);
215
+ background: rgba(10, 100, 254, 0.1);
216
+ -webkit-transform: scale(0.8334);
217
+ transform: scale(0.8334);
218
+ -webkit-transform-origin: left center;
219
+ transform-origin: left center;
204
220
  }
205
221
  .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 {
206
222
  line-height: normal;
package/lib/add-and-take/index.js CHANGED
@@ -6142,8 +6142,8 @@ module.exports = _defineProperty, module.exports.__esModule = true, module.expor
6142
6142
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
6143
6143
 
6144
6144
  "use strict";
6145
- /* 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_78b117e0_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(165);
6146
- /* 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_78b117e0_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_78b117e0_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__);
6145
+ /* 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_0b814651_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(165);
6146
+ /* 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_0b814651_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_0b814651_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__);
6147
6147
  /* unused harmony reexport * */
6148
6148
 
6149
6149
 
@@ -6179,7 +6179,7 @@ __webpack_require__.r(__webpack_exports__);
6179
6179
  var defineProperty = __webpack_require__(175);
6180
6180
  var defineProperty_default = /*#__PURE__*/__webpack_require__.n(defineProperty);
6181
6181
 
6182
- // 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=78b117e0&
6182
+ // 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=0b814651&
6183
6183
 
6184
6184
 
6185
6185
  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,17 @@ var render = function render() {
6246
6246
  }), function (key) {
6247
6247
  return _c('div', {
6248
6248
  key: key,
6249
- staticClass: "bxt-aat-table-content-cell",
6249
+ class: {
6250
+ 'bxt-aat-table-content-cell': true,
6251
+ 'bxt-aat-table-content-cell__zero': !record[key],
6252
+ 'bxt-aat-table-content-cell__purpose': key === 'take'
6253
+ },
6250
6254
  on: {
6251
6255
  "click": function click($event) {
6252
6256
  return _vm.onClickToForm(key, record);
6253
6257
  }
6254
6258
  }
6255
- }, [_c('span', {
6256
- class: {
6257
- 'bxt-aat-table-content-cell__zero': !record[key]
6258
- }
6259
- }, [_vm._v("\n " + _vm._s(record[key]) + "\n ")]), key === 'take' && record.purpose ? _c('span', {
6260
- staticClass: "bxt-aat-table-content-cell__purpose"
6261
- }, [_vm._v("\n " + _vm._s(record.purpose) + "\n ")]) : _vm._e()]);
6259
+ }, [_c('span', [_vm._v("\n " + _vm._s(record[key]) + "\n ")]), key === 'take' && record.purpose ? _c('span', [_vm._v("\n " + _vm._s(record.purpose) + "\n ")]) : _vm._e()]);
6262
6260
  }), 0);
6263
6261
  }), 0)])]) : _vm._e(), _vm.subName === 'Form' ? _c('div', {
6264
6262
  staticClass: "bxt-aat-form"
@@ -6399,7 +6397,7 @@ var render = function render() {
6399
6397
 
6400
6398
  var staticRenderFns = [];
6401
6399
 
6402
- // CONCATENATED MODULE: ./packages/add-and-take/index.vue?vue&type=template&id=78b117e0&
6400
+ // CONCATENATED MODULE: ./packages/add-and-take/index.vue?vue&type=template&id=0b814651&
6403
6401
 
6404
6402
  // EXTERNAL MODULE: ./node_modules/tslib/tslib.es6.js
6405
6403
  var tslib_es6 = __webpack_require__(0);
@@ -6588,9 +6586,20 @@ function rebuildAccountData(values, accountData) {
6588
6586
  tempAdjust.push(item);
6589
6587
  tempValue = item[2];
6590
6588
  });
6591
- tempAddAndTake.adjustData = tempAdjust.filter(function (ad) {
6592
- return !!ad[2];
6593
- });
6589
+
6590
+ if (tempAddAndTake) {
6591
+ tempAddAndTake.adjustData = tempAdjust.filter(function (ad) {
6592
+ return !!ad[2];
6593
+ });
6594
+ } else {
6595
+ accountData.addAndTakeData.push({
6596
+ key: values.type,
6597
+ adjustData: tempAdjust.filter(function (ad) {
6598
+ return !!ad[2];
6599
+ })
6600
+ });
6601
+ }
6602
+
6594
6603
  return accountData;
6595
6604
  }
6596
6605
  function getEnsureCanTakeAmount(initialData) {
@@ -6679,6 +6688,13 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
6679
6688
  enumerable: false,
6680
6689
  configurable: true
6681
6690
  });
6691
+ Object.defineProperty(AddAndTake.prototype, "insuredAge", {
6692
+ get: function () {
6693
+ return (this.resultData && this.resultData.insuredAge) || (this.insurerInfo && this.insurerInfo.age) || 0;
6694
+ },
6695
+ enumerable: false,
6696
+ configurable: true
6697
+ });
6682
6698
  Object.defineProperty(AddAndTake.prototype, "groupData", {
6683
6699
  get: function () {
6684
6700
  var _this = this;
@@ -6705,7 +6721,7 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
6705
6721
  });
6706
6722
  Object.defineProperty(AddAndTake.prototype, "addAndTakeTable", {
6707
6723
  get: function () {
6708
- var _a = this, insurerInfo = _a.insurerInfo, initInterestData = _a.initInterestData, initAddAndTakeData = _a.initAddAndTakeData;
6724
+ var _a = this, insuredAge = _a.insuredAge, initInterestData = _a.initInterestData, initAddAndTakeData = _a.initAddAndTakeData;
6709
6725
  if (!initInterestData || !initAddAndTakeData) {
6710
6726
  return [];
6711
6727
  }
@@ -6715,7 +6731,7 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
6715
6731
  };
6716
6732
  initAddAndTakeData.forEach(function (d, i) {
6717
6733
  if (!['add', 'take'].includes(d.key)) {
6718
- d.key = d.key + "_" + i;
6734
+ d.uniKey = d.key + "_" + i;
6719
6735
  }
6720
6736
  tableHeaderData[d.key] = d.name;
6721
6737
  });
@@ -6725,7 +6741,7 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
6725
6741
  var _loop_1 = function (i) {
6726
6742
  var record = {
6727
6743
  year: i + startPolicyNo,
6728
- age: insurerInfo.age + startIndex + i + 1
6744
+ age: insuredAge + startIndex + i + 1
6729
6745
  };
6730
6746
  initAddAndTakeData.map(function (item) {
6731
6747
  if (item.values) {
@@ -6773,12 +6789,12 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
6773
6789
  this.$emit('update:submoduleName', val);
6774
6790
  };
6775
6791
  AddAndTake.prototype.created = function () {
6776
- var _a = this, resultUuid = _a.resultUuid, params = _a.params, submoduleName = _a.submoduleName, insuranceData = _a.insuranceData;
6792
+ var _a = this, resultData = _a.resultData, submoduleName = _a.submoduleName, insuranceData = _a.insuranceData;
6777
6793
  this.subName = submoduleName;
6778
6794
  var key = ['reduceBaof'].includes(this.type) ? 'reduceBaofData' : 'accountData';
6779
6795
  this.accountData = insuranceData && insuranceData[key];
6780
- if (resultUuid) {
6781
- this.accountData = params[key];
6796
+ if (resultData && resultData.uuid) {
6797
+ this.accountData = resultData.accountData;
6782
6798
  }
6783
6799
  if (!this.accountData) {
6784
6800
  this.$toast('缺少配置信息');
@@ -6789,19 +6805,19 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
6789
6805
  AddAndTake.prototype.getInitInterestData = function () {
6790
6806
  var _this = this;
6791
6807
  var _a;
6792
- var _b = this, resultUuid = _b.resultUuid, params = _b.params, personData = _b.personData, productData = _b.productData;
6808
+ var _b = this, resultData = _b.resultData, params = _b.params, personData = _b.personData, productData = _b.productData;
6793
6809
  var apis = {
6794
6810
  interest: '/interest/init',
6795
- interestPublic: '/public/interest/init'
6811
+ interestPublic: '/public/interest/product/init'
6796
6812
  };
6797
6813
  var api = apis['interest' + (params.publicPbUuid ? 'Public' : '')];
6798
6814
  var url = "https://app.winbaoxian." + (IS_PRODUCT_ENV ? 'com' : 'cn') + "/planBook" + api;
6799
6815
  var reqParams = {
6800
- uuid: resultUuid,
6816
+ uuid: resultData && resultData.uuid,
6801
6817
  pbData: '',
6802
6818
  productId: params.productKey
6803
6819
  };
6804
- if (!resultUuid) {
6820
+ if (!(resultData && resultData.uuid)) {
6805
6821
  var cloneProductData_1 = Object(planbook["f" /* convertProductData */])(cloneDeep_default()(productData));
6806
6822
  NONEED_PROD_KEYS.forEach(function (ele) {
6807
6823
  delete cloneProductData_1[ele];
@@ -6852,18 +6868,18 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
6852
6868
  var _this = this;
6853
6869
  var _b;
6854
6870
  if (values === void 0) { values = null; }
6855
- var _c = this, resultUuid = _c.resultUuid, params = _c.params, type = _c.type, personData = _c.personData, productData = _c.productData, interestFormData = _c.interestFormData, accountData = _c.accountData;
6871
+ var _c = this, resultData = _c.resultData, params = _c.params, type = _c.type, personData = _c.personData, productData = _c.productData, interestFormData = _c.interestFormData, accountData = _c.accountData;
6856
6872
  var caclAccountData = rebuildAccountData(values, cloneDeep_default()(accountData));
6857
6873
  var apis = {
6858
6874
  addAndTake: '/interest/addAndTake/detail',
6859
6875
  draw: '/interest/draw/detail',
6860
- addAndTakePublic: "/public/addAndTake/" + params.insuranceKey + "/" + interestFormData.bonus,
6861
- drawPublic: "/public/drawInsurance/" + interestFormData.bonus
6876
+ addAndTakePublic: '/public/interest/addAndTake/detail',
6877
+ drawPublic: '/public/interest/draw/detail'
6862
6878
  };
6863
6879
  var api = apis[(type === 'reduceBaof' ? 'draw' : 'addAndTake') + (params.publicPbUuid ? 'Public' : '')];
6864
6880
  var url = "https://app.winbaoxian." + (IS_PRODUCT_ENV ? 'com' : 'cn') + "/planBook" + api;
6865
6881
  var reqParams = (_a = {
6866
- uuid: resultUuid,
6882
+ uuid: resultData && resultData.uuid,
6867
6883
  pbData: '',
6868
6884
  productId: params.productKey,
6869
6885
  insuranceId: params.insuranceKey,
@@ -6874,9 +6890,9 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
6874
6890
  value: interestFormData.rate
6875
6891
  }
6876
6892
  },
6877
- _a[type === 'reduceBaof' ? 'drawData' : 'addAndTakeData'] = JSON.stringify(caclAccountData),
6893
+ _a[type === 'reduceBaof' ? 'drawData' : 'addAndTakeData'] = caclAccountData ? caclAccountData.addAndTakeData : null,
6878
6894
  _a);
6879
- if (!resultUuid) {
6895
+ if (!(resultData && resultData.uuid)) {
6880
6896
  var cloneProductData_2 = Object(planbook["f" /* convertProductData */])(cloneDeep_default()(productData));
6881
6897
  NONEED_PROD_KEYS.forEach(function (ele) {
6882
6898
  delete cloneProductData_2[ele];
@@ -6947,7 +6963,7 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
6947
6963
  if (!['add', 'take'].includes(key)) {
6948
6964
  return;
6949
6965
  }
6950
- var _a = this, insurerInfo = _a.insurerInfo, initInterestData = _a.initInterestData, initAddAndTakeData = _a.initAddAndTakeData, accountData = _a.accountData;
6966
+ var _a = this, insuredAge = _a.insuredAge, initInterestData = _a.initInterestData, initAddAndTakeData = _a.initAddAndTakeData, accountData = _a.accountData;
6951
6967
  var tempItem = accountData.addAndTakeData && accountData.addAndTakeData.find(function (a) { return a.key === _this.formData.type; });
6952
6968
  var purposeOption = PURPOSE_OPTIONS.find(function (o) { return o.val === item.purpose; });
6953
6969
  this.formData = {
@@ -6964,7 +6980,7 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
6964
6980
  data: initAddAndTakeData,
6965
6981
  startPolicyNo: startPolicyNo,
6966
6982
  startIndex: startIndex,
6967
- age: insurerInfo.age,
6983
+ age: insuredAge,
6968
6984
  adjustData: tempItem && tempItem.adjustData
6969
6985
  });
6970
6986
  this.subName = 'Form';
@@ -7050,10 +7066,10 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
7050
7066
  ], AddAndTake.prototype, "inputData", void 0);
7051
7067
  Object(tslib_es6["c" /* __decorate */])([
7052
7068
  Object(vue_property_decorator["c" /* Prop */])({
7053
- type: String
7069
+ type: Object
7054
7070
  }),
7055
7071
  Object(tslib_es6["f" /* __metadata */])("design:type", Object)
7056
- ], AddAndTake.prototype, "resultUuid", void 0);
7072
+ ], AddAndTake.prototype, "resultData", void 0);
7057
7073
  Object(tslib_es6["c" /* __decorate */])([
7058
7074
  Object(vue_property_decorator["c" /* Prop */])({
7059
7075
  type: Object,
@@ -7103,8 +7119,8 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
7103
7119
 
7104
7120
  // CONCATENATED MODULE: ./packages/add-and-take/index.vue?vue&type=script&lang=ts&
7105
7121
  /* harmony default export */ var packages_add_and_takevue_type_script_lang_ts_ = (add_and_takevue_type_script_lang_ts_);
7106
- // EXTERNAL MODULE: ./packages/add-and-take/index.vue?vue&type=style&index=0&id=78b117e0&prod&lang=css&
7107
- var add_and_takevue_type_style_index_0_id_78b117e0_prod_lang_css_ = __webpack_require__(177);
7122
+ // EXTERNAL MODULE: ./packages/add-and-take/index.vue?vue&type=style&index=0&id=0b814651&prod&lang=css&
7123
+ var add_and_takevue_type_style_index_0_id_0b814651_prod_lang_css_ = __webpack_require__(177);
7108
7124
 
7109
7125
  // EXTERNAL MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
7110
7126
  var componentNormalizer = __webpack_require__(7);
package/lib/index.css CHANGED
@@ -166,14 +166,30 @@ footer {
166
166
  padding: 12px 2px;
167
167
  text-align: center;
168
168
  overflow: hidden;
169
+ white-space: nowrap;
169
170
  }
170
171
  .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 {
171
172
  background: rgba(0, 0, 0, 0.02);
172
173
  }
173
174
  .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 {
174
- padding: 6px 2px;
175
+ display: -webkit-box;
176
+ display: -webkit-flex;
177
+ display: -moz-box;
178
+ display: -ms-flexbox;
179
+ display: flex;
180
+ -webkit-box-align: center;
181
+ -webkit-align-items: center;
182
+ -moz-box-align: center;
183
+ -ms-flex-align: center;
184
+ align-items: center;
185
+ -webkit-box-pack: center;
186
+ -webkit-justify-content: center;
187
+ -moz-box-pack: center;
188
+ -ms-flex-pack: center;
189
+ justify-content: center;
175
190
  height: 33px;
176
- line-height: 33px;
191
+ padding: 6px 2px;
192
+ white-space: normal;
177
193
  background: rgba(229, 229, 229, 1);
178
194
  }
179
195
  .bxt-add-and-take .bxt-aat-table .bxt-aat-table-content .bxt-aat-table-content-left {
@@ -186,21 +202,21 @@ footer {
186
202
  width: 75%;
187
203
  overflow: auto
188
204
  }
189
- .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 {
190
- white-space: normal;
191
- }
192
- .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 {
193
- color: #999;
205
+ .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) {
206
+ color: #999;
194
207
  }
195
208
  .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 {
196
- display: inline-block;
197
- padding: 1px 3px;
198
- color: rgba(10, 100, 254, 1);
199
- background: rgba(10, 100, 254, 0.1);
200
- -webkit-transform: scale(0.8334);
201
- transform: scale(0.8334);
202
- -webkit-transform-origin: left center;
203
- transform-origin: left center;
209
+ min-width: 45%
210
+ }
211
+ .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) {
212
+ display: inline-block;
213
+ padding: 1px 3px;
214
+ color: rgba(10, 100, 254, 1);
215
+ background: rgba(10, 100, 254, 0.1);
216
+ -webkit-transform: scale(0.8334);
217
+ transform: scale(0.8334);
218
+ -webkit-transform-origin: left center;
219
+ transform-origin: left center;
204
220
  }
205
221
  .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 {
206
222
  line-height: normal;
package/lib/index.js CHANGED
@@ -6831,8 +6831,8 @@ module.exports = baseIsSet;
6831
6831
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
6832
6832
 
6833
6833
  "use strict";
6834
- /* 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_78b117e0_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(55);
6835
- /* 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_78b117e0_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_78b117e0_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__);
6834
+ /* 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_0b814651_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(55);
6835
+ /* 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_0b814651_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_0b814651_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__);
6836
6836
  /* unused harmony reexport * */
6837
6837
 
6838
6838
 
@@ -9757,7 +9757,7 @@ __webpack_require__.d(__webpack_exports__, "ProductInfo", function() { return /*
9757
9757
  var defineProperty = __webpack_require__(74);
9758
9758
  var defineProperty_default = /*#__PURE__*/__webpack_require__.n(defineProperty);
9759
9759
 
9760
- // 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=78b117e0&
9760
+ // 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=0b814651&
9761
9761
 
9762
9762
 
9763
9763
  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; }
@@ -9824,19 +9824,17 @@ var render = function render() {
9824
9824
  }), function (key) {
9825
9825
  return _c('div', {
9826
9826
  key: key,
9827
- staticClass: "bxt-aat-table-content-cell",
9827
+ class: {
9828
+ 'bxt-aat-table-content-cell': true,
9829
+ 'bxt-aat-table-content-cell__zero': !record[key],
9830
+ 'bxt-aat-table-content-cell__purpose': key === 'take'
9831
+ },
9828
9832
  on: {
9829
9833
  "click": function click($event) {
9830
9834
  return _vm.onClickToForm(key, record);
9831
9835
  }
9832
9836
  }
9833
- }, [_c('span', {
9834
- class: {
9835
- 'bxt-aat-table-content-cell__zero': !record[key]
9836
- }
9837
- }, [_vm._v("\n " + _vm._s(record[key]) + "\n ")]), key === 'take' && record.purpose ? _c('span', {
9838
- staticClass: "bxt-aat-table-content-cell__purpose"
9839
- }, [_vm._v("\n " + _vm._s(record.purpose) + "\n ")]) : _vm._e()]);
9837
+ }, [_c('span', [_vm._v("\n " + _vm._s(record[key]) + "\n ")]), key === 'take' && record.purpose ? _c('span', [_vm._v("\n " + _vm._s(record.purpose) + "\n ")]) : _vm._e()]);
9840
9838
  }), 0);
9841
9839
  }), 0)])]) : _vm._e(), _vm.subName === 'Form' ? _c('div', {
9842
9840
  staticClass: "bxt-aat-form"
@@ -9977,7 +9975,7 @@ var render = function render() {
9977
9975
 
9978
9976
  var staticRenderFns = [];
9979
9977
 
9980
- // CONCATENATED MODULE: ./packages/add-and-take/index.vue?vue&type=template&id=78b117e0&
9978
+ // CONCATENATED MODULE: ./packages/add-and-take/index.vue?vue&type=template&id=0b814651&
9981
9979
 
9982
9980
  // EXTERNAL MODULE: ./node_modules/tslib/tslib.es6.js
9983
9981
  var tslib_es6 = __webpack_require__(0);
@@ -10783,9 +10781,20 @@ function rebuildAccountData(values, accountData) {
10783
10781
  tempAdjust.push(item);
10784
10782
  tempValue = item[2];
10785
10783
  });
10786
- tempAddAndTake.adjustData = tempAdjust.filter(function (ad) {
10787
- return !!ad[2];
10788
- });
10784
+
10785
+ if (tempAddAndTake) {
10786
+ tempAddAndTake.adjustData = tempAdjust.filter(function (ad) {
10787
+ return !!ad[2];
10788
+ });
10789
+ } else {
10790
+ accountData.addAndTakeData.push({
10791
+ key: values.type,
10792
+ adjustData: tempAdjust.filter(function (ad) {
10793
+ return !!ad[2];
10794
+ })
10795
+ });
10796
+ }
10797
+
10789
10798
  return accountData;
10790
10799
  }
10791
10800
  function getEnsureCanTakeAmount(initialData) {
@@ -11128,6 +11137,13 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
11128
11137
  enumerable: false,
11129
11138
  configurable: true
11130
11139
  });
11140
+ Object.defineProperty(AddAndTake.prototype, "insuredAge", {
11141
+ get: function () {
11142
+ return (this.resultData && this.resultData.insuredAge) || (this.insurerInfo && this.insurerInfo.age) || 0;
11143
+ },
11144
+ enumerable: false,
11145
+ configurable: true
11146
+ });
11131
11147
  Object.defineProperty(AddAndTake.prototype, "groupData", {
11132
11148
  get: function () {
11133
11149
  var _this = this;
@@ -11154,7 +11170,7 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
11154
11170
  });
11155
11171
  Object.defineProperty(AddAndTake.prototype, "addAndTakeTable", {
11156
11172
  get: function () {
11157
- var _a = this, insurerInfo = _a.insurerInfo, initInterestData = _a.initInterestData, initAddAndTakeData = _a.initAddAndTakeData;
11173
+ var _a = this, insuredAge = _a.insuredAge, initInterestData = _a.initInterestData, initAddAndTakeData = _a.initAddAndTakeData;
11158
11174
  if (!initInterestData || !initAddAndTakeData) {
11159
11175
  return [];
11160
11176
  }
@@ -11164,7 +11180,7 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
11164
11180
  };
11165
11181
  initAddAndTakeData.forEach(function (d, i) {
11166
11182
  if (!['add', 'take'].includes(d.key)) {
11167
- d.key = d.key + "_" + i;
11183
+ d.uniKey = d.key + "_" + i;
11168
11184
  }
11169
11185
  tableHeaderData[d.key] = d.name;
11170
11186
  });
@@ -11174,7 +11190,7 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
11174
11190
  var _loop_1 = function (i) {
11175
11191
  var record = {
11176
11192
  year: i + startPolicyNo,
11177
- age: insurerInfo.age + startIndex + i + 1
11193
+ age: insuredAge + startIndex + i + 1
11178
11194
  };
11179
11195
  initAddAndTakeData.map(function (item) {
11180
11196
  if (item.values) {
@@ -11222,12 +11238,12 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
11222
11238
  this.$emit('update:submoduleName', val);
11223
11239
  };
11224
11240
  AddAndTake.prototype.created = function () {
11225
- var _a = this, resultUuid = _a.resultUuid, params = _a.params, submoduleName = _a.submoduleName, insuranceData = _a.insuranceData;
11241
+ var _a = this, resultData = _a.resultData, submoduleName = _a.submoduleName, insuranceData = _a.insuranceData;
11226
11242
  this.subName = submoduleName;
11227
11243
  var key = ['reduceBaof'].includes(this.type) ? 'reduceBaofData' : 'accountData';
11228
11244
  this.accountData = insuranceData && insuranceData[key];
11229
- if (resultUuid) {
11230
- this.accountData = params[key];
11245
+ if (resultData && resultData.uuid) {
11246
+ this.accountData = resultData.accountData;
11231
11247
  }
11232
11248
  if (!this.accountData) {
11233
11249
  this.$toast('缺少配置信息');
@@ -11238,19 +11254,19 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
11238
11254
  AddAndTake.prototype.getInitInterestData = function () {
11239
11255
  var _this = this;
11240
11256
  var _a;
11241
- var _b = this, resultUuid = _b.resultUuid, params = _b.params, personData = _b.personData, productData = _b.productData;
11257
+ var _b = this, resultData = _b.resultData, params = _b.params, personData = _b.personData, productData = _b.productData;
11242
11258
  var apis = {
11243
11259
  interest: '/interest/init',
11244
- interestPublic: '/public/interest/init'
11260
+ interestPublic: '/public/interest/product/init'
11245
11261
  };
11246
11262
  var api = apis['interest' + (params.publicPbUuid ? 'Public' : '')];
11247
11263
  var url = "https://app.winbaoxian." + (IS_PRODUCT_ENV ? 'com' : 'cn') + "/planBook" + api;
11248
11264
  var reqParams = {
11249
- uuid: resultUuid,
11265
+ uuid: resultData && resultData.uuid,
11250
11266
  pbData: '',
11251
11267
  productId: params.productKey
11252
11268
  };
11253
- if (!resultUuid) {
11269
+ if (!(resultData && resultData.uuid)) {
11254
11270
  var cloneProductData_1 = Object(product["b" /* convertProductData */])(cloneDeep_default()(productData));
11255
11271
  NONEED_PROD_KEYS.forEach(function (ele) {
11256
11272
  delete cloneProductData_1[ele];
@@ -11301,18 +11317,18 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
11301
11317
  var _this = this;
11302
11318
  var _b;
11303
11319
  if (values === void 0) { values = null; }
11304
- var _c = this, resultUuid = _c.resultUuid, params = _c.params, type = _c.type, personData = _c.personData, productData = _c.productData, interestFormData = _c.interestFormData, accountData = _c.accountData;
11320
+ var _c = this, resultData = _c.resultData, params = _c.params, type = _c.type, personData = _c.personData, productData = _c.productData, interestFormData = _c.interestFormData, accountData = _c.accountData;
11305
11321
  var caclAccountData = rebuildAccountData(values, cloneDeep_default()(accountData));
11306
11322
  var apis = {
11307
11323
  addAndTake: '/interest/addAndTake/detail',
11308
11324
  draw: '/interest/draw/detail',
11309
- addAndTakePublic: "/public/addAndTake/" + params.insuranceKey + "/" + interestFormData.bonus,
11310
- drawPublic: "/public/drawInsurance/" + interestFormData.bonus
11325
+ addAndTakePublic: '/public/interest/addAndTake/detail',
11326
+ drawPublic: '/public/interest/draw/detail'
11311
11327
  };
11312
11328
  var api = apis[(type === 'reduceBaof' ? 'draw' : 'addAndTake') + (params.publicPbUuid ? 'Public' : '')];
11313
11329
  var url = "https://app.winbaoxian." + (IS_PRODUCT_ENV ? 'com' : 'cn') + "/planBook" + api;
11314
11330
  var reqParams = (_a = {
11315
- uuid: resultUuid,
11331
+ uuid: resultData && resultData.uuid,
11316
11332
  pbData: '',
11317
11333
  productId: params.productKey,
11318
11334
  insuranceId: params.insuranceKey,
@@ -11323,9 +11339,9 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
11323
11339
  value: interestFormData.rate
11324
11340
  }
11325
11341
  },
11326
- _a[type === 'reduceBaof' ? 'drawData' : 'addAndTakeData'] = JSON.stringify(caclAccountData),
11342
+ _a[type === 'reduceBaof' ? 'drawData' : 'addAndTakeData'] = caclAccountData ? caclAccountData.addAndTakeData : null,
11327
11343
  _a);
11328
- if (!resultUuid) {
11344
+ if (!(resultData && resultData.uuid)) {
11329
11345
  var cloneProductData_2 = Object(product["b" /* convertProductData */])(cloneDeep_default()(productData));
11330
11346
  NONEED_PROD_KEYS.forEach(function (ele) {
11331
11347
  delete cloneProductData_2[ele];
@@ -11396,7 +11412,7 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
11396
11412
  if (!['add', 'take'].includes(key)) {
11397
11413
  return;
11398
11414
  }
11399
- var _a = this, insurerInfo = _a.insurerInfo, initInterestData = _a.initInterestData, initAddAndTakeData = _a.initAddAndTakeData, accountData = _a.accountData;
11415
+ var _a = this, insuredAge = _a.insuredAge, initInterestData = _a.initInterestData, initAddAndTakeData = _a.initAddAndTakeData, accountData = _a.accountData;
11400
11416
  var tempItem = accountData.addAndTakeData && accountData.addAndTakeData.find(function (a) { return a.key === _this.formData.type; });
11401
11417
  var purposeOption = PURPOSE_OPTIONS.find(function (o) { return o.val === item.purpose; });
11402
11418
  this.formData = {
@@ -11413,7 +11429,7 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
11413
11429
  data: initAddAndTakeData,
11414
11430
  startPolicyNo: startPolicyNo,
11415
11431
  startIndex: startIndex,
11416
- age: insurerInfo.age,
11432
+ age: insuredAge,
11417
11433
  adjustData: tempItem && tempItem.adjustData
11418
11434
  });
11419
11435
  this.subName = 'Form';
@@ -11499,10 +11515,10 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
11499
11515
  ], AddAndTake.prototype, "inputData", void 0);
11500
11516
  Object(tslib_es6["c" /* __decorate */])([
11501
11517
  Prop({
11502
- type: String
11518
+ type: Object
11503
11519
  }),
11504
11520
  Object(tslib_es6["f" /* __metadata */])("design:type", Object)
11505
- ], AddAndTake.prototype, "resultUuid", void 0);
11521
+ ], AddAndTake.prototype, "resultData", void 0);
11506
11522
  Object(tslib_es6["c" /* __decorate */])([
11507
11523
  Prop({
11508
11524
  type: Object,
@@ -11552,8 +11568,8 @@ var add_and_takevue_type_script_lang_ts_AddAndTake = (function (_super) {
11552
11568
 
11553
11569
  // CONCATENATED MODULE: ./packages/add-and-take/index.vue?vue&type=script&lang=ts&
11554
11570
  /* harmony default export */ var packages_add_and_takevue_type_script_lang_ts_ = (add_and_takevue_type_script_lang_ts_);
11555
- // EXTERNAL MODULE: ./packages/add-and-take/index.vue?vue&type=style&index=0&id=78b117e0&prod&lang=css&
11556
- var add_and_takevue_type_style_index_0_id_78b117e0_prod_lang_css_ = __webpack_require__(150);
11571
+ // EXTERNAL MODULE: ./packages/add-and-take/index.vue?vue&type=style&index=0&id=0b814651&prod&lang=css&
11572
+ var add_and_takevue_type_style_index_0_id_0b814651_prod_lang_css_ = __webpack_require__(150);
11557
11573
 
11558
11574
  // CONCATENATED MODULE: ./packages/add-and-take/index.vue
11559
11575
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "bxs-tools-ui",
3
- "version": "1.2.0-1",
3
+ "version": "1.2.0-3",
4
4
  "description": "微易前端业务组件",
5
5
  "main": "lib/index.js",
6
6
  "files": [
package/packages/add-and-take/handler.js CHANGED
@@ -97,7 +97,14 @@ export function rebuildAccountData(values, accountData) {
97
97
  tempAdjust.push(item);
98
98
  tempValue = item[2];
99
99
  });
100
- tempAddAndTake.adjustData = tempAdjust.filter(ad => !!ad[2]);
100
+ if (tempAddAndTake) {
101
+ tempAddAndTake.adjustData = tempAdjust.filter(ad => !!ad[2]);
102
+ } else {
103
+ accountData.addAndTakeData.push({
104
+ key: values.type,
105
+ adjustData: tempAdjust.filter(ad => !!ad[2])
106
+ });
107
+ }
101
108
  return accountData;
102
109
  }
103
110
 
package/packages/add-and-take/index.css CHANGED
@@ -75,6 +75,7 @@
75
75
  padding: 12px 2px;
76
76
  text-align: center;
77
77
  overflow: hidden;
78
+ white-space: nowrap;
78
79
  }
79
80
  }
80
81
 
@@ -86,9 +87,12 @@
86
87
 
87
88
  & .bxt-aat-table-content-record:nth-child(1) {
88
89
  & .bxt-aat-table-content-cell {
89
- padding: 6px 2px;
90
+ display: flex;
91
+ align-items: center;
92
+ justify-content: center;
90
93
  height: 33px;
91
- line-height: 33px;
94
+ padding: 6px 2px;
95
+ white-space: normal;
92
96
  background: rgba(229, 229, 229, 1);
93
97
  }
94
98
  }
@@ -109,21 +113,23 @@
109
113
  overflow: auto;
110
114
 
111
115
  & .bxt-aat-table-content-record {
112
- & .bxt-aat-table-content-cell {
113
- white-space: normal;
114
- }
115
-
116
116
  & .bxt-aat-table-content-cell__zero {
117
- color: #999;
117
+ & span:nth-child(1) {
118
+ color: #999;
119
+ }
118
120
  }
119
121
 
120
122
  & .bxt-aat-table-content-cell__purpose {
121
- display: inline-block;
122
- padding: 1px 3px;
123
- color: rgba(10, 100, 254, 1);
124
- background: rgba(10, 100, 254, 0.1);
125
- transform: scale(0.8334);
126
- transform-origin: left center;
123
+ min-width: 45%;
124
+
125
+ & span:nth-child(2) {
126
+ display: inline-block;
127
+ padding: 1px 3px;
128
+ color: rgba(10, 100, 254, 1);
129
+ background: rgba(10, 100, 254, 0.1);
130
+ transform: scale(0.8334);
131
+ transform-origin: left center;
132
+ }
127
133
  }
128
134
  }
129
135
 
package/packages/add-and-take/index.vue CHANGED
@@ -42,17 +42,17 @@
42
42
  <div
43
43
  v-for="key in Object.keys(record).filter(k => !['year', 'age', 'purpose'].includes(k))"
44
44
  :key="key"
45
- class="bxt-aat-table-content-cell"
45
+ :class="{
46
+ 'bxt-aat-table-content-cell': true,
47
+ 'bxt-aat-table-content-cell__zero': !record[key],
48
+ 'bxt-aat-table-content-cell__purpose': key === 'take'
49
+ }"
46
50
  @click="onClickToForm(key, record)"
47
51
  >
48
- <span
49
- :class="{
50
- 'bxt-aat-table-content-cell__zero': !record[key]
51
- }"
52
- >
52
+ <span>
53
53
  {{ record[key] }}
54
54
  </span>
55
- <span v-if="key === 'take' && record.purpose" class="bxt-aat-table-content-cell__purpose">
55
+ <span v-if="key === 'take' && record.purpose">
56
56
  {{ record.purpose }}
57
57
  </span>
58
58
  </div>
@@ -205,9 +205,9 @@ export default class AddAndTake extends Vue {
205
205
  inputData: any;
206
206
 
207
207
  @Prop({
208
- type: String
208
+ type: Object
209
209
  })
210
- resultUuid: any;
210
+ resultData: any;
211
211
 
212
212
  @Prop({
213
213
  type: Object,
@@ -236,6 +236,9 @@ export default class AddAndTake extends Vue {
236
236
  get insurerInfo() {
237
237
  return convertPersonData(this.personData, 'insuredInfo');
238
238
  }
239
+ get insuredAge() {
240
+ return (this.resultData && this.resultData.insuredAge) || (this.insurerInfo && this.insurerInfo.age) || 0;
241
+ }
239
242
  get groupData() {
240
243
  return this.inputData && this.inputData.productGroupList.find(g => g.key === this.params.groupKey);
241
244
  }
@@ -246,7 +249,7 @@ export default class AddAndTake extends Vue {
246
249
  return this.productData && this.productData.mulInsOrderList.find(ins => ins.key === this.params.insuranceKey);
247
250
  }
248
251
  get addAndTakeTable() {
249
- const { insurerInfo, initInterestData, initAddAndTakeData } = this;
252
+ const { insuredAge, initInterestData, initAddAndTakeData } = this;
250
253
  if (!initInterestData || !initAddAndTakeData) {
251
254
  return [];
252
255
  }
@@ -258,7 +261,7 @@ export default class AddAndTake extends Vue {
258
261
  initAddAndTakeData.forEach((d, i) => {
259
262
  // 为解决接口返回的数组中key相同的问题
260
263
  if (!['add', 'take'].includes(d.key)) {
261
- d.key = `${d.key}_${i}`;
264
+ d.uniKey = `${d.key}_${i}`;
262
265
  }
263
266
  tableHeaderData[d.key] = d.name;
264
267
  });
@@ -269,7 +272,7 @@ export default class AddAndTake extends Vue {
269
272
  for (let i = 0; i < maxlength; i++) {
270
273
  const record: any = {
271
274
  year: i + startPolicyNo, // 年度
272
- age: insurerInfo.age + startIndex + i + 1 // 年龄
275
+ age: insuredAge + startIndex + i + 1 // 年龄
273
276
  };
274
277
  initAddAndTakeData.map(item => {
275
278
  if (item.values) {
@@ -322,12 +325,12 @@ export default class AddAndTake extends Vue {
322
325
  PURPOSE_OPTIONS = PURPOSE_OPTIONS;
323
326
 
324
327
  created() {
325
- const { resultUuid, params, submoduleName, insuranceData } = this;
328
+ const { resultData, submoduleName, insuranceData } = this;
326
329
  this.subName = submoduleName;
327
330
  const key = ['reduceBaof'].includes(this.type) ? 'reduceBaofData' : 'accountData';
328
331
  this.accountData = insuranceData && insuranceData[key];
329
- if (resultUuid) {
330
- this.accountData = params[key];
332
+ if (resultData && resultData.uuid) {
333
+ this.accountData = resultData.accountData;
331
334
  }
332
335
  if (!this.accountData) {
333
336
  this.$toast('缺少配置信息');
@@ -337,19 +340,19 @@ export default class AddAndTake extends Vue {
337
340
  }
338
341
 
339
342
  getInitInterestData() {
340
- const { resultUuid, params, personData, productData } = this;
343
+ const { resultData, params, personData, productData } = this;
341
344
  const apis = {
342
345
  interest: '/interest/init',
343
- interestPublic: '/public/interest/init'
346
+ interestPublic: '/public/interest/product/init'
344
347
  };
345
348
  const api = apis['interest' + (params.publicPbUuid ? 'Public' : '')];
346
349
  const url = `https://app.winbaoxian.${IS_PRODUCT_ENV ? 'com' : 'cn'}/planBook${api}`;
347
350
  const reqParams: any = {
348
- uuid: resultUuid,
351
+ uuid: resultData && resultData.uuid,
349
352
  pbData: '',
350
353
  productId: params.productKey
351
354
  };
352
- if (!resultUuid) {
355
+ if (!(resultData && resultData.uuid)) {
353
356
  const cloneProductData = convertProductData(cloneDeep(productData));
354
357
  NONEED_PROD_KEYS.forEach(ele => {
355
358
  delete cloneProductData[ele];
@@ -398,18 +401,18 @@ export default class AddAndTake extends Vue {
398
401
  });
399
402
  }
400
403
  getAddAndTakeData(values = null) {
401
- const { resultUuid, params, type, personData, productData, interestFormData, accountData } = this;
404
+ const { resultData, params, type, personData, productData, interestFormData, accountData } = this;
402
405
  const caclAccountData = rebuildAccountData(values, cloneDeep(accountData));
403
406
  const apis = {
404
407
  addAndTake: '/interest/addAndTake/detail',
405
408
  draw: '/interest/draw/detail',
406
- addAndTakePublic: `/public/addAndTake/${params.insuranceKey}/${interestFormData.bonus}`,
407
- drawPublic: `/public/drawInsurance/${interestFormData.bonus}`
409
+ addAndTakePublic: '/public/interest/addAndTake/detail',
410
+ drawPublic: '/public/interest/draw/detail'
408
411
  };
409
412
  const api = apis[(type === 'reduceBaof' ? 'draw' : 'addAndTake') + (params.publicPbUuid ? 'Public' : '')];
410
413
  const url = `https://app.winbaoxian.${IS_PRODUCT_ENV ? 'com' : 'cn'}/planBook${api}`;
411
414
  const reqParams: any = {
412
- uuid: resultUuid,
415
+ uuid: resultData && resultData.uuid,
413
416
  pbData: '',
414
417
  productId: params.productKey,
415
418
  insuranceId: params.insuranceKey,
@@ -419,9 +422,9 @@ export default class AddAndTake extends Vue {
419
422
  rate: {
420
423
  value: interestFormData.rate
421
424
  },
422
- [type === 'reduceBaof' ? 'drawData' : 'addAndTakeData']: JSON.stringify(caclAccountData)
425
+ [type === 'reduceBaof' ? 'drawData' : 'addAndTakeData']: caclAccountData ? caclAccountData.addAndTakeData : null
423
426
  };
424
- if (!resultUuid) {
427
+ if (!(resultData && resultData.uuid)) {
425
428
  const cloneProductData = convertProductData(cloneDeep(productData));
426
429
  NONEED_PROD_KEYS.forEach(ele => {
427
430
  delete cloneProductData[ele];
@@ -494,7 +497,7 @@ export default class AddAndTake extends Vue {
494
497
  if (!['add', 'take'].includes(key)) {
495
498
  return;
496
499
  }
497
- const { insurerInfo, initInterestData, initAddAndTakeData, accountData } = this;
500
+ const { insuredAge, initInterestData, initAddAndTakeData, accountData } = this;
498
501
  const tempItem = accountData.addAndTakeData && accountData.addAndTakeData.find(a => a.key === this.formData.type);
499
502
  const purposeOption = PURPOSE_OPTIONS.find(o => o.val === item.purpose);
500
503
  this.formData = {
@@ -512,7 +515,7 @@ export default class AddAndTake extends Vue {
512
515
  data: initAddAndTakeData,
513
516
  startPolicyNo,
514
517
  startIndex,
515
- age: insurerInfo.age,
518
+ age: insuredAge,
516
519
  adjustData: tempItem && tempItem.adjustData
517
520
  });
518
521
  this.subName = 'Form';
package/packages/add-and-take/readme.md CHANGED
@@ -150,21 +150,47 @@ export default class AddAndTakeDemo extends Vue {
150
150
  ```
151
151
  ###
152
152
  ### Attributes
153
- | 参数| 说明 | 类型 | 默认值 | 备注 |
154
- | --- | --- | --- | --- | --- |
155
- | type | 可不传，有默认值。表示追加领取类型 | String | addAndTake | 可选值：addAndTake、add、take、reduceBaof |
156
- | inputData | 必传。计划书数据，需要符合计划书的数据结构 | Object | {} | - |
157
- | params | 必传。其他参数，参考下方 Params 对象 | Object | {} | - |
158
- | submoduleName | 可不传，只读属性。仅用于需要获取子模块名称的场景 | String | Table | 可选值：Table、Form |
159
- | footer | 可不传，有默认值。表示是否显示底部按钮 | Boolean | true | - |
153
+ | 参数| 说明 | 类型 | 默认值 | 备注 | 版本 |
154
+ | --- | --- | --- | --- | --- | --- |
155
+ | type | 可不传，有默认值。表示追加领取类型 | String | addAndTake | 可选值：addAndTake、add、take、reduceBaof | |
156
+ | inputData | 可选。计划书数据，需要符合计划书的数据结构 | Object | {} | - | |
157
+ | resultData | 可选。用于结果页。优先级高于 inputData | Object | {} | 见 ResultData 对象 | v1.2.0 |
158
+ | params | 必传。其他参数，参考下方 Params 对象 | Object | {} | - | |
159
+ | submoduleName | 可不传，只读属性。仅用于需要获取子模块名称的场景 | String | Table | 可选值：Table、Form | |
160
+ | footer | 可不传，有默认值。表示是否显示底部按钮 | Boolean | true | - | |
160
161
  ###
161
162
  ### Params 对象
163
+ | 参数| 说明 | 类型 | 备注 | 版本 |
164
+ | --- | --- | --- | --- | --- |
165
+ | planbookId | 计划书的 ID | Number | - | |
166
+ | groupKey | 组合产品的 Key | String、Number | - | |
167
+ | productKey | 产品的 Key | Number | - | |
168
+ | insuranceKey | 险种的 Key | Number | - | |
169
+ | bonus | 分红值 | Number | - | v1.2.0 |
170
+ | rate | 账户利率值 | Number | - | v1.2.0 |
171
+
172
+ ### ResultData 对象
162
173
  | 参数| 说明 | 类型 | 备注 |
163
- | --- | --- | --- | --- |
164
- | planbookId | 计划书的 ID | Number | - |
165
- | groupKey | 组合产品的 Key | String、Number | - |
166
- | productKey | 产品的 Key | Number | - |
167
- | insuranceKey | 险种的 Key | Number | - |
174
+ | --- | --- | --- | --- |
175
+ | uuid | 必传，结果页 uuid | String | - |
176
+ | insuredAge | 必传。被保人年龄 | Number | - |
177
+ | accountData | 必传。追加领取或减保领的默认数据 | Object | - |
178
+ accountData 示例：
179
+ ```javscript
180
+ accountData: {
181
+ accountName: '', // 可不传
182
+ addAndTakeData: [
183
+ {
184
+ adjustData: [
185
+ [1, 10, 1, 1, ''] // 年度、年度、追加、领取、用途
186
+ ],
187
+ key: '' // 追加-add 领取-take
188
+ }
189
+ ],
190
+ accountPart: '' // 追加领取-addAndTake 追加-add 领取-take 减保领取-reduceBaof
191
+ }
192
+ ```
193
+
168
194
  ###
169
195
  ### Methods
170
196
  | 方法名 | 说明 | 参数 | 备注 |
package/packages/planbook-input/components/product-table.vue CHANGED
@@ -153,26 +153,22 @@
153
153
  </div>
154
154
  </bxs-bottom-sheets>
155
155
  <bxs-bottom-sheets v-model="popupConf.AATVisible" :title="popupConf.title" height="middle">
156
- <!-- :input-data="inputData" -->
157
- <!-- resultUuid="02293b0ceb2f40d885cd97db10a5d41b" -->
158
156
  <AddAndTake
159
157
  v-if="popupConf.AATVisible"
160
158
  ref="AddAndTake"
161
159
  :type="popupConf.type"
162
160
  :input-data="inputData"
163
- :params="{
164
- planbookId: params.planbookId,
165
- publicPbUuid: params.publicPbUuid,
166
- groupKey: params.groupKey,
167
- productKey: params.productKey,
168
- insuranceKey: popupConf.data.insuranceKey,
161
+ :resultData="{
162
+ // uuid: '9098b439c0c54848b02f1bec49fe3358', // 追加领取 uuid（测试）
163
+ uuid: '21e110644eab4c9d845d613ced7d46a4', // 减保领取 uuid（测试）
164
+ insuredAge: 30,
169
165
  accountData: {
170
166
  accountName: '',
171
167
  addAndTakeData: [
172
- {
173
- adjustData: [[1, 10, 1222, null]],
174
- key: 'add'
175
- },
168
+ // {
169
+ // adjustData: [[1, 10, 1222, null]],
170
+ // key: 'add'
171
+ // },
176
172
  {
177
173
  adjustData: [[11, 21, 2333, '']],
178
174
  key: 'take'
@@ -181,6 +177,13 @@
181
177
  accountPart: 'addAndTake'
182
178
  }
183
179
  }"
180
+ :params="{
181
+ planbookId: params.planbookId,
182
+ publicPbUuid: params.publicPbUuid,
183
+ groupKey: params.groupKey,
184
+ productKey: params.productKey,
185
+ insuranceKey: popupConf.data.insuranceKey
186
+ }"
184
187
  @confirm="addAndTakeConfirm"
185
188
  />
186
189
  </bxs-bottom-sheets>