bxs-tools-ui 1.2.6 → 1.2.7

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

@@ -6142,8 +6142,8 @@ module.exports = baseIsSet;
 /***/ (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_ace3efa8_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(166);
-/* 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_ace3efa8_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_ace3efa8_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_60c2a1fa_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(166);
+/* 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_60c2a1fa_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_60c2a1fa_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__);
 /* unused harmony reexport * */
 
 
@@ -6179,14 +6179,14 @@ __webpack_require__.r(__webpack_exports__);
 var defineProperty = __webpack_require__(89);
 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=ace3efa8&
+// 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=60c2a1fa&
 
 
 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; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { defineProperty_default()(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
-var add_and_takevue_type_template_id_ace3efa8_render = function render() {
+var add_and_takevue_type_template_id_60c2a1fa_render = function render() {
   var _vm = this,
       _c = _vm._self._c,
       _setup = _vm._self._setupProxy;
@@ -6485,7 +6485,7 @@ var add_and_takevue_type_template_id_ace3efa8_render = function render() {
 
 var staticRenderFns = [];
 
-// CONCATENATED MODULE: ./packages/add-and-take/index.vue?vue&type=template&id=ace3efa8&
+// CONCATENATED MODULE: ./packages/add-and-take/index.vue?vue&type=template&id=60c2a1fa&
 
 // EXTERNAL MODULE: ./node_modules/tslib/tslib.es6.js
 var tslib_es6 = __webpack_require__(0);
@@ -6999,18 +6999,47 @@ 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, submoduleName = _a.submoduleName, insuranceData = _a.insuranceData;
-        this.subName = submoduleName;
-        var key = ['reduceBaof'].includes(this.type) ? 'reduceBaofData' : 'accountData';
-        this.accountData = insuranceData && insuranceData[key];
+        var _this = this;
+        this.subName = this.submoduleName;
+        this.initAccountData()
+            .then(function (data) {
+            _this.accountData = data;
+            _this.getInitInterestData();
+        })
+            .catch(function () {
+            _this.$toast('缺少配置信息');
+        });
+    };
+    AddAndTake.prototype.initAccountData = function () {
+        var _a = this, type = _a.type, resultData = _a.resultData, insuranceData = _a.insuranceData;
+        var acountKey = ['reduceBaof'].includes(type) ? 'reduceBaofData' : 'accountData';
+        var accountData = insuranceData && insuranceData[acountKey];
         if (resultData && resultData.uuid) {
-            this.accountData = resultData.accountData;
+            accountData = resultData.accountData;
         }
-        if (!this.accountData) {
-            this.$toast('缺少配置信息');
-            return;
+        if (!(accountData && accountData.addAndTakeData && accountData.addAndTakeData.length)) {
+            accountData = {
+                accountPart: type,
+                accountName: accountData && accountData.accountName ? accountData.accountName : '',
+                addAndTakeData: []
+            };
+            if (['addAndTake', 'add'].includes(accountData.accountPart)) {
+                accountData.addAndTakeData.push({
+                    key: 'add',
+                    adjustData: []
+                });
+            }
+            if (['addAndTake', 'take', 'reduceBaof'].includes(accountData.accountPart)) {
+                accountData.addAndTakeData.push({
+                    key: 'take',
+                    adjustData: []
+                });
+            }
+        }
+        if (!accountData.addAndTakeData.length) {
+            return Promise.reject();
         }
-        this.getInitInterestData();
+        return Promise.resolve(cloneDeep_default()(accountData));
     };
     AddAndTake.prototype.getInitInterestData = function () {
         var _this = this;
@@ -7380,8 +7409,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=ace3efa8&prod&lang=css&
-var add_and_takevue_type_style_index_0_id_ace3efa8_prod_lang_css_ = __webpack_require__(177);
+// EXTERNAL MODULE: ./packages/add-and-take/index.vue?vue&type=style&index=0&id=60c2a1fa&prod&lang=css&
+var add_and_takevue_type_style_index_0_id_60c2a1fa_prod_lang_css_ = __webpack_require__(177);
 
 // EXTERNAL MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(7);
@@ -7397,7 +7426,7 @@ var componentNormalizer = __webpack_require__(7);
 
 var component = Object(componentNormalizer["a" /* default */])(
   packages_add_and_takevue_type_script_lang_ts_,
-  add_and_takevue_type_template_id_ace3efa8_render,
+  add_and_takevue_type_template_id_60c2a1fa_render,
   staticRenderFns,
   false,
   null,

package/lib/index.js

@@ -6831,8 +6831,8 @@ module.exports = baseIsSet;
 /***/ (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_ace3efa8_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(56);
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_ace3efa8_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_ace3efa8_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_60c2a1fa_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(56);
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_60c2a1fa_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_60c2a1fa_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__);
 /* unused harmony reexport * */
 
 
@@ -9757,14 +9757,14 @@ __webpack_require__.d(__webpack_exports__, "ProductInfo", function() { return /*
 var defineProperty = __webpack_require__(13);
 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=ace3efa8&
+// 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=60c2a1fa&
 
 
 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; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { defineProperty_default()(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
-var add_and_takevue_type_template_id_ace3efa8_render = function render() {
+var add_and_takevue_type_template_id_60c2a1fa_render = function render() {
   var _vm = this,
       _c = _vm._self._c,
       _setup = _vm._self._setupProxy;
@@ -10063,7 +10063,7 @@ var add_and_takevue_type_template_id_ace3efa8_render = function render() {
 
 var staticRenderFns = [];
 
-// CONCATENATED MODULE: ./packages/add-and-take/index.vue?vue&type=template&id=ace3efa8&
+// CONCATENATED MODULE: ./packages/add-and-take/index.vue?vue&type=template&id=60c2a1fa&
 
 // EXTERNAL MODULE: ./node_modules/tslib/tslib.es6.js
 var tslib_es6 = __webpack_require__(0);
@@ -11448,18 +11448,47 @@ 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, submoduleName = _a.submoduleName, insuranceData = _a.insuranceData;
-        this.subName = submoduleName;
-        var key = ['reduceBaof'].includes(this.type) ? 'reduceBaofData' : 'accountData';
-        this.accountData = insuranceData && insuranceData[key];
+        var _this = this;
+        this.subName = this.submoduleName;
+        this.initAccountData()
+            .then(function (data) {
+            _this.accountData = data;
+            _this.getInitInterestData();
+        })
+            .catch(function () {
+            _this.$toast('缺少配置信息');
+        });
+    };
+    AddAndTake.prototype.initAccountData = function () {
+        var _a = this, type = _a.type, resultData = _a.resultData, insuranceData = _a.insuranceData;
+        var acountKey = ['reduceBaof'].includes(type) ? 'reduceBaofData' : 'accountData';
+        var accountData = insuranceData && insuranceData[acountKey];
         if (resultData && resultData.uuid) {
-            this.accountData = resultData.accountData;
+            accountData = resultData.accountData;
         }
-        if (!this.accountData) {
-            this.$toast('缺少配置信息');
-            return;
+        if (!(accountData && accountData.addAndTakeData && accountData.addAndTakeData.length)) {
+            accountData = {
+                accountPart: type,
+                accountName: accountData && accountData.accountName ? accountData.accountName : '',
+                addAndTakeData: []
+            };
+            if (['addAndTake', 'add'].includes(accountData.accountPart)) {
+                accountData.addAndTakeData.push({
+                    key: 'add',
+                    adjustData: []
+                });
+            }
+            if (['addAndTake', 'take', 'reduceBaof'].includes(accountData.accountPart)) {
+                accountData.addAndTakeData.push({
+                    key: 'take',
+                    adjustData: []
+                });
+            }
+        }
+        if (!accountData.addAndTakeData.length) {
+            return Promise.reject();
         }
-        this.getInitInterestData();
+        return Promise.resolve(cloneDeep_default()(accountData));
     };
     AddAndTake.prototype.getInitInterestData = function () {
         var _this = this;
@@ -11829,8 +11858,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=ace3efa8&prod&lang=css&
-var add_and_takevue_type_style_index_0_id_ace3efa8_prod_lang_css_ = __webpack_require__(150);
+// EXTERNAL MODULE: ./packages/add-and-take/index.vue?vue&type=style&index=0&id=60c2a1fa&prod&lang=css&
+var add_and_takevue_type_style_index_0_id_60c2a1fa_prod_lang_css_ = __webpack_require__(150);
 
 // CONCATENATED MODULE: ./packages/add-and-take/index.vue
 
@@ -11843,7 +11872,7 @@ var add_and_takevue_type_style_index_0_id_ace3efa8_prod_lang_css_ = __webpack_re
 
 var add_and_take_component = normalizeComponent(
   packages_add_and_takevue_type_script_lang_ts_,
-  add_and_takevue_type_template_id_ace3efa8_render,
+  add_and_takevue_type_template_id_60c2a1fa_render,
   staticRenderFns,
   false,
   null,

package/package.json

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

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

@@ -479,18 +479,50 @@ export default class AddAndTake extends Vue {
   PURPOSE_OPTIONS = PURPOSE_OPTIONS;
 
   created() {
-    const { resultData, submoduleName, insuranceData } = this;
-    this.subName = submoduleName;
-    const key = ['reduceBaof'].includes(this.type) ? 'reduceBaofData' : 'accountData';
-    this.accountData = insuranceData && insuranceData[key];
+    this.subName = this.submoduleName;
+    this.initAccountData()
+      .then(data => {
+        this.accountData = data;
+        this.getInitInterestData();
+      })
+      .catch(() => {
+        this.$toast('缺少配置信息');
+      });
+  }
+
+  initAccountData() {
+    const { type, resultData, insuranceData } = this;
+    const acountKey = ['reduceBaof'].includes(type) ? 'reduceBaofData' : 'accountData';
+    let accountData = insuranceData && insuranceData[acountKey];
+    // 结果页数据优先
     if (resultData && resultData.uuid) {
-      this.accountData = resultData.accountData;
+      accountData = resultData.accountData;
     }
-    if (!this.accountData) {
-      this.$toast('缺少配置信息');
-      return;
+
+    // 设备默认追加领取、减额领取数据
+    if (!(accountData && accountData.addAndTakeData && accountData.addAndTakeData.length)) {
+      accountData = {
+        accountPart: type,
+        accountName: accountData && accountData.accountName ? accountData.accountName : '',
+        addAndTakeData: []
+      };
+      if (['addAndTake', 'add'].includes(accountData.accountPart)) {
+        accountData.addAndTakeData.push({
+          key: 'add',
+          adjustData: []
+        });
+      }
+      if (['addAndTake', 'take', 'reduceBaof'].includes(accountData.accountPart)) {
+        accountData.addAndTakeData.push({
+          key: 'take',
+          adjustData: []
+        });
+      }
+    }
+    if (!accountData.addAndTakeData.length) {
+      return Promise.reject();
     }
-    this.getInitInterestData();
+    return Promise.resolve(cloneDeep(accountData));
   }
 
   getInitInterestData() {