bxs-tools-ui 3.2.0 → 3.3.0

package/packages/planbook-input/index.less

@@ -0,0 +1,30 @@
+@import 'color.less';
+
+.bxt-planbook {
+  min-height: 100vh;
+  font-size: 14px;
+  box-sizing: border-box;
+  background: var(--bxt-bg-primary);
+
+  &::after {
+    display: block;
+    height: 52px;
+    content: '';
+    padding-bottom: constant(safe-area-inset-bottom);
+    padding-bottom: env(safe-area-inset-bottom);
+    box-sizing: content-box;
+  }
+
+  & .bxt-planbook-person {
+    padding: 9px;
+
+    & .bxt-person-container {
+      border-radius: 6px;
+      overflow: hidden;
+    }
+  }
+
+  & .bxt-planbook-product {
+    padding: 0 9px 9px;
+  }
+}

package/packages/planbook-input/index.vue

@@ -23,6 +23,7 @@
         <template v-for="(p, pi) in g.prodOrderList">
           <ProductTable
             v-if="!p.hide || pi < g.defNum"
+            :user="userInfo"
             :key="p.key"
             :result-uuid="URL_PARAM.uuid"
             :input-data="inputData"
@@ -45,29 +46,22 @@
   </div>
 </template>
 <script lang="ts">
-import Vue from 'vue';
-import { Component } from 'vue-property-decorator';
-import Vant, { Toast } from 'vant';
-import QS from 'qs';
-import { get as _get } from 'lodash';
-import { PLANBOOK_API_HOSTNAME, PBF_HOSTNAME } from '@src/js/variables.js';
-import { calcTotalBaof } from 'packages/bxs-utils/index';
-import { getPlanbookData } from './api';
-import {
-  initPageData,
-  setPageDataBaseOnResult,
-  calculateProductData,
-  doubleCalcProductData,
-  createPlanbookDataToMake,
-  setupUnderwriteRuleToInputData
-} from './helper.js';
-import { createMd5Token } from '@src/js/md5Token.js';
-import PersonInfo from '../person-info/index.vue';
-import ProductTable from './components/product-table.vue';
-import InputFooter from './components/footer.vue';
-import './index.css';
+import Vue from 'vue'
+import { Component } from 'vue-property-decorator'
+import Vant, { Toast } from 'vant'
+import QS from 'qs'
+import { get as _get } from 'lodash'
+import { PBF_HOSTNAME } from '../../src/js/variables.js'
+import { getCommonCurrentUser } from '../../src/api/user.js'
+import { getPlanbookData } from '../../src/api/planbook.js'
+import { calcTotalBaof } from 'packages/bxs-utils/index'
+import { initPageData, calcProductData, doubleCalcProductData, makePlanbook } from './helper.js'
+import PersonInfo from '../person-info/index.vue'
+import ProductTable from './components/product-table.vue'
+import InputFooter from './components/footer.vue'
+import './index.less'
 
-Vue.use(Vant);
+Vue.use(Vant)
 @Component({
   name: 'BxtPlanbookInput',
   components: {
@@ -77,24 +71,31 @@ Vue.use(Vant);
   }
 })
 export default class BxtPlanbookInput extends Vue {
-  URL_PARAM: any = this.getUrlParam();
-  planbookData: IPlanbookData | null = null;
+  URL_PARAM: any = this.getUrlParam()
+  userInfo: any = null
+  planbookData: IPlanbookData | null = null
   get inputData(): IPbInput | null {
-    return _get(this, 'planbookData.initData.inputData');
+    return _get(this, 'planbookData.initData.inputData')
+  }
+  get exportData(): IPbInput | null {
+    return _get(this, 'planbookData.exportData')
   }
   get verifyData(): IPbInput | null {
-    return _get(this, 'planbookData.verifyData');
+    return _get(this, 'planbookData.verifyData')
   }
   async created() {
-    this.getPlanbookData();
+    await getCommonCurrentUser().then(data => {
+      this.userInfo = data
+    })
+    this.getPlanbookData()
   }
   getUrlParam() {
-    return QS.parse(`${location.href.split('?')[1]}`) || {};
+    return QS.parse(`${location.href.split('?')[1]}`) || {}
   }
   getPlanbookData() {
-    const self = this;
-    const { URL_PARAM } = self;
-    const { planbookId, publicPbUuid, uuid } = URL_PARAM;
+    const self = this
+    const { URL_PARAM, userInfo } = self
+    const { planbookId, publicPbUuid, uuid } = URL_PARAM
     return getPlanbookData({
       insuranceTypeId: planbookId || 13767,
       resultUuid: uuid,
@@ -102,48 +103,47 @@ export default class BxtPlanbookInput extends Vue {
       // publicPbUuid: '5d6499946bbb47bb8f6a286e9d4eee77'
     })
       .then(async (data: any) => {
-        if (data.initData && data.initData.inputData) {
-          const _inputData = await setupUnderwriteRuleToInputData(data.initData.inputData).catch(() => null);
-          data.initData.inputData = _inputData || data.initData.inputData;
-        }
-        await initPageData(data);
-        setPageDataBaseOnResult(data);
-        document.title = `DEMO：${data.title}`;
-        self.planbookData = data;
-        self.autoImportData();
+        await initPageData(data, {
+          user: userInfo
+        })
+        document.title = `DEMO：${data.title}`
+        self.planbookData = data
+        self.autoImportData()
       })
       .catch(error => {
-        Toast('请求错误');
-        console.log(error);
-      });
+        Toast('请求错误')
+        console.log(error)
+      })
   }
   autoImportData() {
-    const { URL_PARAM, verifyData, inputData } = this;
-    const { planbookId, publicPbUuid } = URL_PARAM;
+    const { URL_PARAM, userInfo, exportData, verifyData, inputData } = this
+    const { planbookId, publicPbUuid } = URL_PARAM
     if (inputData) {
       inputData.productGroupList
         .filter((g: IPbProductGroup) => g.prodOrderList)
         .forEach((g: IPbProductGroup) => {
           g.prodOrderList.forEach((p: IPbProduct) => {
             doubleCalcProductData(inputData, verifyData, {
+              user: userInfo,
               planbookId: Number(planbookId),
               publicPbUuid,
               groupKey: g.key,
               productKey: p.key,
+              executeSource: exportData ? 'import' : 'init',
               isIgnoreError: true
             }).catch(err => {
               if (err && err.message) {
-                Toast(err.message);
+                Toast(err.message)
               }
-              console.error(err);
-            });
-          });
-        });
+              console.error(err)
+            })
+          })
+        })
     }
   }
   changePersonInfo(person: IPbPerson, ele: any = {}) {
-    const { URL_PARAM, verifyData, inputData } = this;
-    const { planbookId, publicPbUuid } = URL_PARAM;
+    const { URL_PARAM, userInfo, exportData, verifyData, inputData } = this
+    const { planbookId, publicPbUuid } = URL_PARAM
     if (inputData) {
       inputData.productGroupList
         .filter((g: IPbProductGroup) => g.prodOrderList)
@@ -152,7 +152,9 @@ export default class BxtPlanbookInput extends Vue {
             .filter((p: IPbProduct) => p.hadChoice)
             .forEach((p: IPbProduct) => {
               doubleCalcProductData(inputData, verifyData, {
+                user: userInfo,
                 planbookId: Number(planbookId),
+                executeSource: exportData ? 'import' : 'init',
                 publicPbUuid,
                 groupKey: g.key,
                 productKey: p.key,
@@ -162,87 +164,68 @@ export default class BxtPlanbookInput extends Vue {
                   elementKey: ele.key
                 }
               }).catch(err => {
-                Toast(err.message);
-              });
-            });
-        });
+                Toast(err.message)
+              })
+            })
+        })
     }
   }
   changeProduct(product, options, inst) {
     if (options.type === 'change' && options.errorMsg) {
-      Toast(options.errorMsg);
+      Toast(options.errorMsg)
     }
   }
   confirmProduct(options: any, inst: any) {
-    const self = this;
-    const { URL_PARAM, inputData } = self;
-    const { planbookId, publicPbUuid } = URL_PARAM;
-    const { groupKey, productKey } = options;
+    const self = this
+    const { URL_PARAM, userInfo, inputData } = self
+    const { planbookId, publicPbUuid } = URL_PARAM
+    const { groupKey, productKey } = options
     inst.$refs.productInfo
       .validate()
       .then(() => {
-        return calculateProductData(inputData, {
+        return calcProductData(inputData, {
+          user: userInfo,
           planbookId: Number(planbookId),
           publicPbUuid,
           groupKey,
-          productKey
+          productKey,
+          executeSource: 'confirm'
         }).then(() => {
-          inst.close();
-        });
+          inst.close()
+        })
       })
       .catch(err => {
-        const errorMessage = _get(err, '[0].message') || _get(err, 'message') || err;
+        const errorMessage = _get(err, '[0].message') || _get(err, 'message') || err
         if (typeof errorMessage === 'string' && errorMessage.trim()) {
-          Toast(errorMessage);
+          Toast(errorMessage)
         }
-        console.log(err);
-      });
+        console.log(err)
+      })
   }
   createPlanbook(planbookData: IPlanbookData | null): any {
-    const { URL_PARAM, inputData } = this;
+    const { URL_PARAM, inputData } = this
     if (!planbookData || !inputData) {
-      Toast('数据不完整');
-      return Promise.reject();
+      Toast('数据不完整')
+      return Promise.reject()
     }
 
-    const { pbType, planbookId, publicPbUuid, userUuid } = URL_PARAM;
+    const { pbType, planbookId, publicPbUuid, userUuid } = URL_PARAM
     const options: any = {
       pbType,
       insuranceTypeId: Number(planbookId) || null,
       publicPbUuid,
       totalBaof: calcTotalBaof(inputData?.productGroupList),
       userUuid
-    };
-    const resultData: any = createPlanbookDataToMake(planbookData, options);
-    if (resultData) {
-      return fetch(`${PLANBOOK_API_HOSTNAME}/planBook/${URL_PARAM.publicPbUuid ? 'public/createPb' : 'V2/uploadResult'}`, {
-        method: 'POST',
-        credentials: 'include',
-        headers: {
-          Accept: 'application/json, text/plain, */*',
-          'Content-Type': 'application/x-www-form-urlencoded'
-        },
-        body: QS.stringify({
-          jd: JSON.stringify(resultData),
-          userUuid,
-          signature: createMd5Token(resultData, {
-            groupDataKey: resultData.productGroupList[0]?.key
-          })
-        })
-      })
-        .then(response => response.json())
-        .then(({ success, data }: any) => {
-          if (success && data) {
-            const urlParam = QS.stringify({
-              theme: inputData?.theme,
-              uuid: data
-            });
-            location.href = `${PBF_HOSTNAME}/planBook/planBookResult/pages/${publicPbUuid ? 'planbkPurely' : 'planbkTemplatev2'}.html?${urlParam}`;
-          }
-        });
     }
-    Toast('请选择险种');
-    return Promise.reject();
+    return makePlanbook(inputData, options).then((data: any) => {
+      if (data) {
+        const urlParam = QS.stringify({
+          theme: inputData?.theme,
+          uuid: data
+        })
+        location.href = `${PBF_HOSTNAME}/planBook/planBookResult/pages/${publicPbUuid ? 'planbkPurely' : 'planbkTemplatev2'}.html?${urlParam}`
+      }
+    })
   }
 }
 </script>

package/packages/planbook-input/readme.md

@@ -38,13 +38,7 @@ export default {
     <div class="bxt-planbook-person">
       <div class="bxt-person-container" v-if="inputData.personData">
         <template v-for="person in inputData.personData.personOrderList">
-          <PersonInfo
-            :key="person.key"
-            :input-data="inputData"
-            :verify-data="planbookData.verifyData"
-            :person-data="person"
-            @change="changePersonInfo"
-          />
+          <PersonInfo :key="person.key" :input-data="inputData" :verify-data="planbookData.verifyData" :person-data="person" @change="changePersonInfo" />
         </template>
       </div>
     </div>
@@ -68,56 +62,56 @@ export default {
 </template>
 
 <script>
-import { PersonInfo } from 'bxs-tools-ui';
-import { initPersonData, personDataHandler, initProductData, productDataHandler } from 'bxs-utils';
-
-export default {
-  components: { PersonInfo },
-  methods: {
-    async initPageData(data) {
-      const inputData = data && data.initData && data.initData.inputData;
-      if (inputData) {
-        initPersonData(inputData, data.verifyData);
-        personDataHandler(inputData.personData);
-        const productGroupList = inputData.productGroupList || [];
-        productGroupList
-          .filter(g => g.prodOrderList)
-          .forEach(g => {
+  import { PersonInfo } from 'bxs-tools-ui';
+  import { initPersonData, personDataHandler, initProductData, productDataHandler } from 'bxs-utils';
+
+  export default {
+    components: { PersonInfo },
+    methods: {
+      async initPageData(data) {
+        const inputData = data && data.initData && data.initData.inputData;
+        if (inputData) {
+          initPersonData(inputData, data.verifyData);
+          personDataHandler(inputData.personData);
+          const productGroupList = inputData.productGroupList || [];
+          productGroupList
+            .filter(g => g.prodOrderList)
+            .forEach(g => {
+              g.prodOrderList.forEach(p => {
+                initProductData(p);
+                productDataHandler(p, data.verifyData[p.key], inputData.personData);
+              });
+            });
+        }
+        return data;
+      },
+      changePersonInfo(person, ele) {
+        this.inputData.productGroupList.forEach(g => {
+          g.prodOrderList &&
             g.prodOrderList.forEach(p => {
-              initProductData(p);
-              productDataHandler(p, data.verifyData[p.key], inputData.personData);
+              if (p.hadChoice) {
+                this.doubleCalcProductData(this.inputData, {
+                  planbookId: this.URL_PARAM.planbookId * 1,
+                  groupKey: g.key,
+                  productKey: p.key,
+                  isIgnoreError: true
+                });
+              }
             });
+        });
+      },
+      confirmProduct(options, inst) {
+        inst.$refs.productInfo
+          .validate()
+          .then(valid => {
+            // 校验通过，执行投保逻辑
+          })
+          .catch(err => {
+            console.log(err);
           });
       }
-      return data;
-    },
-    changePersonInfo(person, ele) {
-      this.inputData.productGroupList.forEach(g => {
-        g.prodOrderList &&
-          g.prodOrderList.forEach(p => {
-            if (p.hadChoice) {
-              this.doubleCalcProductData(this.inputData, {
-                planbookId: this.URL_PARAM.planbookId * 1,
-                groupKey: g.key,
-                productKey: p.key,
-                isIgnoreError: true
-              });
-            }
-          });
-      });
-    },
-    confirmProduct(options, inst) {
-      inst.$refs.productInfo
-        .validate()
-        .then(valid => {
-          // 校验通过，执行投保逻辑
-        })
-        .catch(err => {
-          console.log(err);
-        });
     }
-  }
-};
+  };
 </script>
 ```
 
@@ -126,39 +120,27 @@ export default {
 ```html
 <template>
   <div :class="['bxt-product-show', `bxt-product-id-${productData.key}`]" v-if="productData">
-    <bxs-bottom-sheets
-      v-model="isShowProductSheet"
-      :title="productData.titleName"
-      height="middle"
-      @overlayClose="overlayClose"
-    >
-      <ProductInfo
-        ref="productInfo"
-        :input-data="inputData"
-        :verify-data="verifyData"
-        :group-key="groupKey"
-        :product-key="productKey"
-        @change="cgProduct"
-      />
+    <bxs-bottom-sheets v-model="isShowProductSheet" :title="productData.titleName" height="middle" @overlayClose="overlayClose">
+      <ProductInfo ref="productInfo" :input-data="inputData" :verify-data="verifyData" :group-key="groupKey" :product-key="productKey" @change="cgProduct" />
     </bxs-bottom-sheets>
   </div>
 </template>
 
 <script>
-import { ProductInfo } from 'bxs-tools-ui';
-
-export default {
-  components: { ProductInfo },
-  methods: {
-    cgProduct(product, options) {
-      if (options.type === 'change' && options.errorMsg) {
-        this.$nextTick(() => {
-          this.$toast(options.errorMsg);
-        });
+  import { ProductInfo } from 'bxs-tools-ui';
+
+  export default {
+    components: { ProductInfo },
+    methods: {
+      cgProduct(product, options) {
+        if (options.type === 'change' && options.errorMsg) {
+          this.$nextTick(() => {
+            this.$toast(options.errorMsg);
+          });
+        }
       }
     }
-  }
-};
+  };
 </script>
 ```
 
@@ -182,20 +164,20 @@ export default {
 import {
   initPageData,
   setPageDataBaseOnResult,
-  calculateProductData,
+  calcProductData,
   doubleCalcProductData,
-  createPlanbookDataToMake,
+  makePlanbook,
   setupUnderwriteRuleToInputData
 } from 'packages/planbook-input/helper.js';
 ```
 
-| 函数名 | 说明 | 入参 | 出参 |
-| --- | --- | --- | --- |
-| `initPageData(data)` | 初始化计划书数据，依次处理人员数据和所有产品数据 | `data`：接口返回的原始数据 | Promise\<data\> |
-| `setPageDataBaseOnResult(data)` | 将已生成结果中的导出数据（`exportData`）回填到初始化数据中，用于「编辑已有计划书」场景 | `data`：同上 | data |
-| `calculateProductData(inputData, options)` | 对指定产品发起一次试算请求，并将结果写回 `inputData` | `inputData`；`options`：`{ planbookId, publicPbUuid, groupKey, productKey, isIgnoreError }` | Promise |
-| `doubleCalcProductData(inputData, verifyData, options)` | 先执行 `productDataHandler` 再执行 `calculateProductData`，对存在 `revalidateFlag` 的产品自动执行二次试算 | 同上，额外需要 `verifyData` | Promise |
-| `createPlanbookDataToMake(planbookData, options)` | 将投保页数据转换为提交计划书所需的 JSON 结构 | `planbookData`；`options`：`{ pbType, insuranceTypeId, publicPbUuid, totalBaof, userUuid }` | Object / null |
-| `setupUnderwriteRuleToInputData(inputData)` | 将核保规则（underwrite rule）应用到 inputData，返回处理后的 inputData | `inputData` | Promise\<inputData\> |
-| `createdProductDataToCalc(inputData, options)` | 生成试算接口的请求参数（jd + signature） | `inputData`；`options`：`{ planbookId, publicPbUuid, groupKey, productKey }` | Promise\<{ errorMsg, jd, signature }\> |
-| `receiveProductData(inputData, rProductData, options)` | 将试算接口返回的产品数据写回 `inputData` | `inputData`；`rProductData`：接口返回的产品数据；`options` | productData |
+| 函数名                                                  | 说明                                                                                                      | 入参                                                                                        | 出参                                   |
+| ------------------------------------------------------- | --------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------- | -------------------------------------- |
+| `initPageData(data)`                                    | 初始化计划书数据，依次处理人员数据和所有产品数据                                                          | `data`：接口返回的原始数据                                                                  | Promise\<data\>                        |
+| `setPageDataBaseOnResult(data)`                         | 将已生成结果中的导出数据（`exportData`）回填到初始化数据中，用于「编辑已有计划书」场景                    | `data`：同上                                                                                | data                                   |
+| `calcProductData(inputData, options)`              | 对指定产品发起一次试算请求，并将结果写回 `inputData`                                                      | `inputData`；`options`：`{ planbookId, publicPbUuid, groupKey, productKey, isIgnoreError }` | Promise                                |
+| `doubleCalcProductData(inputData, verifyData, options)` | 先执行 `productDataHandler` 再执行 `calcProductData`，对存在 `revalidateFlag` 的产品自动执行二次试算 | 同上，额外需要 `verifyData`                                                                 | Promise                                |
+| `makePlanbook(inputData, options)`       | 生成计划书                                                              | `inputData`；`options`：`{ pbType, insuranceTypeId, publicPbUuid, totalBaof, userUuid }` | Object / null                          |
+| `setupUnderwriteRuleToInputData(inputData)`             | 将核保规则（underwrite rule）应用到 inputData，返回处理后的 inputData                                     | `inputData`                                                                                 | Promise\<inputData\>                   |
+| `createdProductDataToCalc(inputData, options)`          | 生成试算接口的请求参数（jd + signature）                                                                  | `inputData`；`options`：`{ planbookId, publicPbUuid, groupKey, productKey }`                | Promise\<{ errorMsg, jd, signature }\> |
+| `receiveProductData(inputData, rProductData, options)`  | 将试算接口返回的产品数据写回 `inputData`                                                                  | `inputData`；`rProductData`：接口返回的产品数据；`options`                                  | productData                            |

package/packages/product-info/demo/constant.js

@@ -990,4 +990,4 @@ export const PLANBOOK_DATA = {
   interactionSwitchOn: null,
   interestProductList: [3263],
   compareType: null
-};
+}

package/packages/product-info/demo/index.vue

@@ -4,13 +4,13 @@
   </div>
 </template>
 <script lang="ts">
-import Vue from 'vue';
-import { Component } from 'vue-property-decorator';
-import QS from 'qs';
-import { PLANBOOK_API_HOSTNAME } from '@src/js/variables.js';
-import { get as _get } from 'lodash';
-import { initPageData } from '../../planbook-input/helper';
-import ProductInfo from '../index.vue';
+import Vue from 'vue'
+import { Component } from 'vue-property-decorator'
+import QS from 'qs'
+import { getPlanbookData } from '../../../src/api/planbook.js'
+import { get as _get } from 'lodash'
+import { initPageData } from '../../planbook-input/helper'
+import ProductInfo from '../index.vue'
 
 @Component({
   components: {
@@ -18,59 +18,47 @@ import ProductInfo from '../index.vue';
   }
 })
 export default class ProductInfoDemo extends Vue {
-  URL_PARAM: any = this.getUrlParam();
-  inputData = null;
-  verifyData = null;
-  groupKey = null;
-  productKey = null;
+  URL_PARAM: any = this.getUrlParam()
+  inputData = null
+  verifyData = null
+  groupKey = null
+  productKey = null
   created() {
     if (!this.URL_PARAM.publicPbUuid) {
-      this.URL_PARAM.publicPbUuid = '5d6499946bbb47bb8f6a286e9d4eee77';
+      this.URL_PARAM.publicPbUuid = '5d6499946bbb47bb8f6a286e9d4eee77'
     }
-    document.body.style.backgroundColor = '#f2f2f2';
-    this.getPlanbookData();
+    document.body.style.backgroundColor = '#f2f2f2'
+    this.getPlanbookData()
   }
   getUrlParam() {
-    return QS.parse(`${location.href.split('?')[1]}`) || {};
+    return QS.parse(`${location.href.split('?')[1]}`) || {}
   }
   getPlanbookData() {
-    fetch(`${PLANBOOK_API_HOSTNAME}/planBook/public/init`, {
-      method: 'POST',
-      credentials: 'include',
-      headers: {
-        Accept: 'application/json, text/plain, */*',
-        'Content-Type': 'application/x-www-form-urlencoded'
-      },
-      body: QS.stringify({
-        publicPbUuid: this.URL_PARAM.publicPbUuid
-      })
+    getPlanbookData({
+      publicPbUuid: this.URL_PARAM.publicPbUuid
     })
-      .then(response => response.json())
-      .then(async ({ success, data }: any) => {
-        if (!success || !data) {
-          return;
-        }
-        await initPageData(data);
-        this.inputData = data.initData.inputData;
-        this.verifyData = data.verifyData;
+      .then(async (data: any) => {
+        await initPageData(data)
+        this.inputData = data.initData.inputData
+        this.verifyData = data.verifyData
         data.initData.inputData.productGroupList.map(g => {
           if (!g.prodOrderList) {
-            return;
+            return
           }
-          this.groupKey = g.key;
+          this.groupKey = g.key
           g.prodOrderList.map(p => {
-            this.productKey = p.key;
-          });
-        });
-        document.title = `DEMO（产品）：${data.title}`;
+            this.productKey = p.key
+          })
+        })
+        document.title = `DEMO（产品）：${data.title}`
       })
       .catch(error => {
-        console.log(error);
-      });
+        console.log(error)
+      })
   }
   cgProduct(product, obj, inst) {
     if (obj.type === 'change') {
-      this.$toast(`${_get(obj, 'insData.eleOrderList[0].labelName')} -> ${_get(obj, 'eleData.labelName')}: ${_get(obj, 'eleData.value')}`);
+      this.$toast(`${_get(obj, 'insData.eleOrderList[0].labelName')} -> ${_get(obj, 'eleData.labelName')}: ${_get(obj, 'eleData.value')}`)
     }
   }
 }