会员项目

2021-08-26 20:29:15 +08:00
parent 0108b9d1c7
commit 9b3f0c3212
12 changed files with 492 additions and 444 deletions
@@ -0,0 +1,204 @@
+<template>
+  <j-modal
+      :title="title"
+      :width="width"
+      :visible="visible"
+      switchFullscreen
+      @cancel="handleCancel"
+      cancelText="关闭">
+    <!-- 基本信息begin-->
+    <section class="base-info">
+      <h3>基本信息</h3>
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <label>项目负责人:</label>
+          <span></span>
+        </a-col>
+        <a-col :span="12">
+          <label>应收金额:</label>
+          <span></span>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <label>备注:</label>
+          <span></span>
+        </a-col>
+      </a-row>
+    </section>
+    <!-- 基本信息end-->
+    <!-- 企业信息begin-->
+    <section class="enterprise-info">
+      <h3>企业信息</h3>
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <label>来款企业:</label>
+          <span></span>
+        </a-col>
+        <a-col :span="12">
+          <label>企业联系人:</label>
+          <span></span>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <label>企业联系人性别:</label>
+          <span></span>
+        </a-col>
+        <a-col :span="12">
+          <label>企业联系人职务:</label>
+          <span></span>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <label>企业联系人电话:</label>
+          <span></span>
+        </a-col>
+        <a-col :span="12">
+          <label>企业联系人邮箱:</label>
+          <span></span>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <label>企业联系人邮编:</label>
+          <span></span>
+        </a-col>
+        <a-col :span="12">
+          <label>企业联系人地址:</label>
+          <span></span>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <label>是否需要发票:</label>
+          <span></span>
+        </a-col>
+        <a-col :span="12">
+          <label>是否打包:</label>
+          <span></span>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <label>企业邮编:</label>
+          <span></span>
+        </a-col>
+        <a-col :span="12">
+          <label>企业地址:</label>
+          <span></span>
+        </a-col>
+      </a-row>
+    </section>
+    <!--企业信息end-->
+    <!--到账信息begin-->
+    <section class="payment-info">
+      <h3>到账信息</h3>
+      <a-row :gutter="24" v-for="item of paymentInfoList" :key="item.id">
+        <a-col>2021年到账200元</a-col>
+      </a-row>
+    </section>
+    <!--到账信息end-->
+    <!--开票邮寄信息begin-->
+    <section class="logistics-info">
+      <h3>开票邮寄信息</h3>
+      <a-row :gutter="24" v-for="item of logisticsInfoList" :key="item.id">
+        <a-col :span="24" v-text="createItemInfo(item)"></a-col>
+        <a-col :span="24"></a-col>
+      </a-row>
+    </section>
+    <!--开票邮寄信息end-->
+    <template slot="footer">
+      <a-button @click="handleCancel">关闭</a-button>
+    </template>
+  </j-modal>
+</template>
+
+<script>
+// import {getAction} from "@api/manage";
+const paymentInfoList = [
+  {
+    id: 1001,
+    year: '2021',
+    money: '200'
+  },
+  {
+    id: 1002,
+    year: '2021',
+    money: '200'
+  },
+  {
+    id: 1003,
+    year: '2021',
+    money: '200'
+  },
+]
+const logisticsInfoList = [
+  {
+    id: '01',
+    person: '张三',
+    time: '2021年10月21',
+    money: '200',
+    piaoNo: '123456',
+    projects: ['项目一', '项目二', '项目三'],
+    postPerson: '李四',
+    postTime: '2021年10月21',
+    emsOrSF: 'EMS',
+    postNo: "123456"
+  }
+]
+export default {
+  name: "ProjectDetailModal",
+  data() {
+    return {
+      description: "项目详情模态框",
+      width: 800,
+      visible: false,
+      title: "项目信息",
+      // 当前项目id
+      currentProjectId: '',
+      // 基本信息
+      basicInfo: {},
+      // 企业信息
+      enterpriseInfo: {},
+      // 到账信息
+      paymentInfoList,
+      // 开票邮寄信息
+      logisticsInfoList,
+    }
+  },
+  methods: {
+    open(record) {
+      // 记录当前项目id
+      this.currentProjectId = record.id
+      this.visible = true
+    },
+    handleCancel() {
+      this.visible = false
+    },
+    /*
+    * 生成每一个开票信息
+    * */
+    createItemInfo(item) {
+      let porjectItem = ''
+      if (item.projects.length > 0) {
+        item.projects.forEach((val, index) => {
+          if (index === item.projects.length - 1) {
+            porjectItem += val
+          } else {
+            porjectItem += val + '、'
+          }
+        })
+      }
+      return `${item.person}于${item.time}开票，金额为:${item.money}元,票号:${item.piaoNo},项目:${porjectItem}`
+    }
+  }
+}
+</script>
+
+<style scoped>
+.ant-row {
+  margin: 12px;
+}
+</style>
@@ -64,4 +64,4 @@ export default {
 a-input:hover {
  cursor: pointer;
 }
-</style>
+</style>
@@ -89,7 +89,7 @@
        }else{
          val = e
        }
-        console.log(val);
+
        if(this.triggerChange){
          this.$emit('change', val);
        }else{
@@ -107,4 +107,4 @@
 </script>

 <style scoped>
-</style>
+</style>
@@ -292,4 +292,4 @@
      }
    }
  }
-</style>
+</style>
@@ -102,6 +102,8 @@ export const JeroListMixin = {
          this.$message.warning(res.message)
        }
        this.loading = false;
+      }).finally(() => {
+        this.loading = false
      })
    },
    initDictConfig() {
@@ -379,6 +381,12 @@ export const JeroListMixin = {
        }
      }
    },
+    /*
+    * 打开项目详情模态框
+    * */
+    openDetailModal(record){
+      this.$refs.projectDetail.open(record)
+    },
    /* 图片预览 */
    getImgView(text) {
      if (text && text.indexOf(",") > 0) {
@@ -6,12 +6,12 @@
        <a-row :gutter="24">
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="会员项目名称">
-              <a-input placeholder="请输入会员项目名称" v-model="queryParam.tableName"></a-input>
+              <a-input placeholder="请输入会员项目名称" v-model="queryParam.projectName"></a-input>
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="运行年份">
-              <j-year-date  placeholder="请选择运行年份" v-model="queryParam.year"></j-year-date>
+              <j-year-date  placeholder="请选择运行年份" v-model="queryParam.particularYear"></j-year-date>
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -99,20 +99,21 @@ export default {
          }
        },
        {
-          title: '会员项目名称',
+          title: '会员项目',
          align: "center",
-          dataIndex: '',
+          dataIndex: 'projectName',
+          scopedSlots: {customRender: 'htmlSlot'}
        },
        {
          title: '收费标准',
          align: "center",
-          dataIndex: 'fieldName',
-          scopedSlots: {customRender: 'htmlSlot'}
+          dataIndex: 'chargStandard',
+
        },
        {
          title: '负责人',
          align: "center",
-          dataIndex: ''
+          dataIndex: 'directorName'
        },
        {
          title: '操作',
@@ -121,11 +122,11 @@ export default {
        },
      ],
      url: {
-        list: "/sys/confusion/page",
-        delete: "/sys/confusion/delete",
-        deleteBatch: "/sys/confusion/deleteBatch",
-        exportXlsUrl: "/sys/confusion/exportXls",
-        importExcelUrl: "/sys/confusion/importExcel",
+        list: "/jero/memberProject/page",
+        delete: "/jero/memberProject/delete",
+        deleteBatch: "/jero/memberProject/deleteBatch",
+        exportXlsUrl: "/jero/memberProject/exportXls",
+        importExcelUrl: "jero/memberProject/importExcel",
      },
    }
  },
@@ -143,6 +144,7 @@ export default {
      this.$router.push({
        path: '/incomePayments/memberManage/SafeguardMemberList',
        query: {
+          record
        }
      })
    }
@@ -3,7 +3,7 @@
    <!-- 会员项目基本信息-->
    <div class="project-base-info">
      <section><--</section>
-<!--      <section class="project-base-info-title"></section>-->
+      <!--      <section class="project-base-info-title"></section>-->
      <h3>会员项目信息</h3>
      <section class="project-base-info-content">
        <a-row :gutter="24">
@@ -33,13 +33,13 @@
      <a-form layout="inline" @keyup.enter.native="searchQuery">
        <a-row :gutter="24">
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="会员项目名称">
-              <a-input placeholder="请输入会员项目名称" v-model="queryParam.tableName"></a-input>
+            <a-form-item label="会员单位">
+              <a-input placeholder="请输入会员单位" v-model="queryParam.tableName"></a-input>
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="运行年份">
-              <j-year-date style="width:100%"  placeholder="请选择运行年份" v-model="queryParam.year"></j-year-date>
+            <a-form-item label="来款年份">
+              <j-year-date style="width:100%" placeholder="请选择来款年份" v-model="queryParam.year"></j-year-date>
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -60,8 +60,8 @@
                @change="handleImportExcel">
        <a-button type="primary" icon="import">导入</a-button>
      </a-upload>
-      <a-button type="primary" icon="download" @click="downTemplate('模板文件')">下载模板</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('混淆表')">导出</a-button>
+      <a-button type="primary" icon="download" @click="downTemplate('会员项目成员模板文件')">下载模板</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('会员项目成员')">导出</a-button>
      <a-button type="danger" icon="delete" @click="batchDel">批量删除</a-button>

    </div>
@@ -86,6 +86,9 @@
          <j-ellipsis v-if="text" :value="text" :length="20"></j-ellipsis>
          <span v-else></span>
        </template>
+        <template slot="member" slot-scope="text,record">
+          <div @click="openDetail(record)" class="color_blue">123</div>
+        </template>
        <span slot="action" slot-scope="text, record" class="action-span-cell">
          <a @click="handleEdit(record)">编辑</a>
          <a @click="handleDelete(record.id)">删除</a>
@@ -94,6 +97,8 @@
      </a-table>
    </div>
    <safeguard-member-modal ref="modalForm" @ok="modalFormOk"></safeguard-member-modal>
+    <!--项目详情模态框-->
+    <project-detail-modal ref="projectDetail"></project-detail-modal>
  </a-card>
 </template>

@@ -102,17 +107,20 @@ import {mixinDevice} from '@/utils/mixin'
 import {JeroListMixin} from '@/mixins/JeroListMixin'
 import JYearDate from "@comp/jero/JYearDate";
 import SafeguardMemberModal from "@views/incomePayments/memberManage/modules/SafeguardMemberModal";
+import ProjectDetailModal from "@comp/ProjectDetailModal";
+
 export default {
  name: "SafeguardMemberList",
  mixins: [JeroListMixin, mixinDevice],
-  components:{
+  components: {
    JYearDate,
-    SafeguardMemberModal
+    SafeguardMemberModal,
+    ProjectDetailModal
  },
-  data(){
+  data() {
    return {
      description: '会员项目成员维护页面',
-      columns:[
+      columns: [
        {
          title: '序号',
          dataIndex: '',
@@ -126,55 +134,57 @@ export default {
        {
          title: '会员单位',
          align: "center",
-          dataIndex: '',
+          dataIndex: 'companyName',
+          scopedSlots: {customRender: 'member'}
        },
        {
          title: '企业联系人',
          align: "center",
-          dataIndex: '',
+          dataIndex: 'companyContactName',
        },
        {
          title: '应收金额',
          align: "center",
-          dataIndex: '',
+          dataIndex: 'amountReceivable',
        },
        {
          title: '实收金额',
          align: "center",
-          dataIndex: '',
+          dataIndex: 'paidAmount',
        },
        {
          title: '打包',
          align: "center",
-          dataIndex: '',
+          dataIndex: 'pack',
        },
        {
          title: '需要发票',
          align: "center",
-          dataIndex: '',
+          dataIndex: 'needInvoice',
        },
        {
          title: '到账',
          align: "center",
-          dataIndex: '',
+          dataIndex: 'inAccount',
        },
        {
          title: '开票',
          align: "center",
-          dataIndex: '',
+          dataIndex: 'makeInvoice',
        },
        {
          title: '邮寄',
          align: "center",
-          dataIndex: '',
+          dataIndex: 'mail',
        },
        {
          title: '操作',
          align: "center",
          dataIndex: '',
-          scopedSlots:{customRender:'action'}
+          scopedSlots: {customRender: 'action'}
        },
      ],
+      currentInfo: {},
      url: {
        list: "/sys/confusion/page",
        delete: "/sys/confusion/delete",
@@ -189,6 +199,19 @@ export default {
      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
    },
  },
+  created() {
+  },
+  destroyed() {
+    sessionStorage.removeItem('currentInfo', this.$route.query.record)
+  },
+  methods: {
+    /*
+    *  打开项目详情模态框
+    * */
+    openDetail(record) {
+      this.$refs.projectDetail.open(record)
+    }
+  }
 }
 </script>

@@ -197,8 +220,14 @@ export default {
 /* 会员基本信息 */
 .project-base-info {
  margin-bottom: 20px;
+
  .ant-row {
    line-height: 2;
  }
 }
+
+.color_blue {
+  color: dodgerblue;
+  cursor: pointer;
+}
 </style>
@@ -51,6 +51,10 @@
          <div class="color_blue" @click="handleSafeguardMember(record)" v-html="text"></div>
        </template>

+        <template slot="detail" slot-scope="text,record">
+          <div @click="openDetailModal(record)" class="">企业名称</div>
+        </template>
+
        <template slot="text" slot-scope="text">
          <j-ellipsis v-if="text" :value="text" :length="20"></j-ellipsis>
          <span v-else></span>
@@ -62,16 +66,21 @@

      </a-table>
    </div>
+    <project-detail-modal ref="projectDetail"></project-detail-modal>
  </a-card>
 </template>

 <script>
 import {mixinDevice} from '@/utils/mixin'
 import {JeroListMixin} from '@/mixins/JeroListMixin'
+import ProjectDetailModal from "@comp/ProjectDetailModal";

 export default {
  name: "SafeguardStardsMemberList",
  mixins: [JeroListMixin, mixinDevice],
+  components:{
+    ProjectDetailModal,
+  },
  data() {
    return {
      columns: [
@@ -94,7 +103,7 @@ export default {
          title: '企业名称',
          align: "center",
          dataIndex: ' ',
-          scopedSlots: {customRender: 'htmlSlot'}
+          scopedSlots: {customRender: 'detail'}
        },
        {
          title: '会员类型',
@@ -12,9 +12,9 @@
      <a-form :form="form">
        <a-row :gutter="24">
          <a-col :xl="24" :sm="24">
-            <a-form-item label="会员项目名称" :labelCol=" {xs: {span: 24},sm: {span: 4}}" :wrapperCol="{ xs: {span: 24},sm: {span: 20}}">
-              <a-input placeholder="请输入会员项目名称"
-                       v-decorator="['businessName',validatorRules.businessName]"
+            <a-form-item label="会员项目" :labelCol=" {xs: {span: 24},sm: {span: 3}}" :wrapperCol="{ xs: {span: 24},sm: {span: 21}}">
+              <a-input placeholder="请输入会员项目"
+                       v-decorator="['projectName',validatorRules.projectName]"
                       :maxLength='50'
                       @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
            </a-form-item>
@@ -24,22 +24,12 @@
          <a-col :xl="12" :sm="24">
            <a-form-item label="运行年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <j-year-date style="width:100%" placeholder="请选择运行年份"
-                           v-decorator="['year',validatorRules.postcode]"></j-year-date>
+                           v-decorator="['particularYear',validatorRules.particularYear]"></j-year-date>
            </a-form-item>
          </a-col>
          <a-col :xl="12" :sm="24">
-            <a-form-item label="负责人" :labelCol="labelCol" :wrapperCol="wrapperCol" class="form-item-postcode">
-              <a-select
-                  style="width: 100%"
-                  placeholder="请选择负责人"
-                  optionFilterProp="children"
-                  v-decorator="['fuzeren',validatorRules.postcode]"
-                  :getPopupContainer="(target) => target.parentNode">
-                <a-select-option v-for="(role,roleindex) in chargePersonList" :key="roleindex.toString()"
-                                 :value="role.id">
-                  {{ role.roleName }}
-                </a-select-option>
-              </a-select>
+            <a-form-item label="负责人" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <select-principal placeholder="请选择负责人"  v-decorator="['directorId',validatorRules.directorId]"></select-principal>
            </a-form-item>
          </a-col>
        </a-row>
@@ -48,8 +38,8 @@
            <a-form-item label="收费标准" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-input placeholder="请输入收费标准"
                       :maxLength='50'
-                       v-decorator="[ 'name', validatorRules.name]"
-                       @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
+                       v-decorator="[ 'chargStandard']"
+                       @change="(e) => {e.target.value = e.target.value.replace(/[^0-9.]/g,'')}"></a-input>
              <span class="yuan">元</span>
            </a-form-item>
          </a-col>
@@ -57,7 +47,7 @@
            <a-form-item label="收费通知号" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-input placeholder="请输入收费通知号"
                       :maxLength='50'
-                       v-decorator="[ 'name', validatorRules.name]"
+                       v-decorator="[ 'chargeNoticeNo']"
                       @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
            </a-form-item>
          </a-col>
@@ -66,7 +56,7 @@
          <a-col :span="12">
            <a-form-item label="收费通知" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <j-upload file-type="pdf" file-type-error-message="请上传收费通知" :multiple="false" :number="1"
-                        bizPath="payment" v-decorator="['paymentRecord',validatorRules.paymentRecord]"
+                        bizPath="payment" v-decorator="['chargeNoticeFileId']"
                        :trigger-change="true"></j-upload>
            </a-form-item>
          </a-col>
@@ -78,6 +68,7 @@
                  placeholder="请输入备注"
                  :auto-size="{ minRows: 3, maxRows: 6 }"
                  :maxLength='200'
+                  v-decorator="['remark']"
                  @change="e => {e.target.value = (e.target.value + '').trim()}"/>
            </a-form-item>
          </a-col>
@@ -92,12 +83,14 @@ import pick from "lodash.pick";
 import {httpAction} from "@api/manage";
 import JYearDate from "@comp/jero/JYearDate";
 import JUpload from "@comp/jero/JUpload";
+import SelectPrincipal from "@comp/company/SelectPrincipal";

 export default {
  name: "MemberProjectModal",
  components: {
    JYearDate,
-    JUpload
+    JUpload,
+    SelectPrincipal
  },
  data() {
    return {
@@ -126,17 +119,22 @@ export default {
        sm: {span: 21}
      },
      validatorRules: {
-        businessName: {
-          rules: [{required: true, message: '请输入企业名称'}],
+        projectName: {
+          rules: [{required: true, message: '请输入会员项目'}],
          validateTrigger: 'blur'
        },
-        postcode: {
-          rules: [{validator: this.checkPostcode}]
+        particularYear: {
+          rules: [{required: true, message: '请选择年份'}],
+          validateTrigger: ['change','blur']
+        },
+        directorId: {
+          rules: [{required: true, message: '请选择负责人'}],
+          validateTrigger: ['change','blur']
        }
      },
      url: {
-        add: '',
-        edit: ''
+        add: "/jero/memberProject/add",
+        edit: "/jero/memberProject/edit",
      }
    }
  },
@@ -149,7 +147,7 @@ export default {
      this.model = Object.assign({}, record)
      this.visible = true
      this.$nextTick(() => {
-        this.form.setFieldsValue(pick(this.model, 'approvalDocumentNumber', 'dateYear', 'chargeNoticeName', 'chargeNoticeFileId'))
+        this.form.setFieldsValue(pick(this.model, 'projectName', 'particularYear', 'chargeNoticeNo', 'chargeNoticeFileId','chargStandard','remark'))
      })
    },
    close() {
@@ -13,57 +13,105 @@
        <a-row :gutter="24">
          <a-col :xl="12" :sm="24">
            <a-form-item label="会员单位" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input placeholder="请输入会员单位"
-                       v-decorator="['businessName',validatorRules.businessName]"></a-input>
+              <company-select placeholder="请选择会员单位"
+                              v-decorator="['companyId',validatorRules.companyId]"
+                              @change="companyChange"
+                              :maxLength='50'>
+              </company-select>
            </a-form-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :xl="12" :sm="24">
            <a-form-item label="企业联系人" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input placeholder="请选择企业联系人"
-                       v-decorator="['businessName',validatorRules.businessName]"></a-input>
+              <a-row :gutter="20">
+                <a-col :span="20">
+                  <a-select placeholder="请选择企业联系人"
+                            v-decorator="['companyContactId',validatorRules.companyContactId]"
+                  >
+                    <a-select-option v-for="item in userList" :key="item.id" :value="item.id">{{
+                        item.name
+                      }}
+                    </a-select-option>
+                  </a-select>
+                </a-col>
+                <a-col :span="4" class="form-btn">
+                  <a-button icon="plus" @click="addContacts"></a-button>
+                </a-col>
+              </a-row>
            </a-form-item>
          </a-col>
          <a-col :xl="12" :sm="24">
            <a-form-item label="邮寄联系人" :labelCol="labelCol" :wrapperCol="wrapperCol" class="form-item-postcode">
-              <a-input placeholder="请选择邮寄联系人"
-                       v-decorator="['businessName',validatorRules.businessName]"></a-input>
+              <a-row :gutter="20">
+                <a-col :span="20">
+                  <a-select placeholder="请选择企业联系人"
+                            v-decorator="['postContactId',validatorRules.postContactId]"
+                  >
+                    <a-select-option v-for="item in userList" :key="item.id" :value="item.id">{{
+                        item.name
+                      }}
+                    </a-select-option>
+                  </a-select>
+                </a-col>
+                <a-col :span="4" class="form-btn">
+                  <a-button icon="plus" @click="addContacts"></a-button>
+                </a-col>
+              </a-row>
            </a-form-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :xl="12" :sm="24">
            <a-form-item label="应收金额" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input placeholder="请输入收费标准"
+              <a-input placeholder="请输入应收金额"
                       :maxLength='50'
-                       v-decorator="[ 'name', validatorRules.name]"
-                       @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
+                       v-decorator="[ 'amountReceivable', validatorRules.amountReceivable]"
+                       @change="(e) => {e.target.value = e.target.value.replace(/[^0-9.]/g,'')}"></a-input>
              <span class="yuan">元</span>
            </a-form-item>
          </a-col>
          <a-col :xl="12" :sm="24">
            <a-form-item label="需要发票" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input placeholder="请输入收费通知号"
-                       :maxLength='50'
-                       v-decorator="[ 'name', validatorRules.name]"
-                       @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
+              <j-dict-select-tag v-decorator="['needInvoice', validatorRules.needInvoice]" :triggerChange="true"
+                                 placeholder="请输入发票类型"
+                                 dictCode="invoice_type"/>
            </a-form-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
+          <a-col :xl="12" :sm="24">
+            <a-form-item label="来款方式" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-radio-group v-decorator="['paymentMethod',validatorRules.paymentMethod]" @change="changePaymentMethod">
+                <a-radio :value="1">合同</a-radio>
+                <a-radio :value="2">收费通知</a-radio>
+              </a-radio-group>
+            </a-form-item>
+          </a-col>
+          <!--  incomePaysType 1 是合同·-->
+          <a-col :xl="12" :sm="24" v-if="incomePaysType === '1'">
+            <a-form-item label="合同号" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input placeholder="请输入合同号"
+                       :maxLength='50'
+                       v-decorator="[ 'contractNo', validatorRules.contractNo]"
+                       @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <!--  incomePaysType 2  是收费通知·-->
+        <a-row :gutter="24" v-if="incomePaysType === '2' ">
          <a-col :xl="12" :sm="24">
            <a-form-item label="收费通知号" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-input placeholder="请输入收费通知号"
                       :maxLength='50'
-                       v-decorator="[ 'name', validatorRules.name]"
+                       v-decorator="[ 'chargeNoticeNo', validatorRules.chargeNoticeNo]"
                       @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
            </a-form-item>
          </a-col>
          <a-col :span="12">
            <a-form-item label="收费通知" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <j-upload file-type="pdf" file-type-error-message="请上传收费通知" :multiple="false" :number="1"
-                        bizPath="payment" v-decorator="['paymentRecord',validatorRules.paymentRecord]"
+                        bizPath="payment" v-decorator="['chargeNoticeFileId']"
                        :trigger-change="true"></j-upload>
            </a-form-item>
          </a-col>
@@ -75,24 +123,31 @@
                  placeholder="请输入备注"
                  :auto-size="{ minRows: 3, maxRows: 6 }"
                  :maxLength='200'
+                  v-decorator="['remark']"
                  @change="e => {e.target.value = (e.target.value + '').trim()}"/>
            </a-form-item>
          </a-col>
        </a-row>
      </a-form>
    </a-spin>
+    <contact-management-module ref="contactForm" is-company-disabled :selected-company="selectedCompany"
+                               @ok="getContactPersonList(selectedCompany)"></contact-management-module>
  </j-modal>
 </template>

 <script>
 import pick from "lodash.pick";
-import {httpAction} from "@api/manage";
+import {httpAction, getAction} from "@api/manage";
 import JUpload from "@comp/jero/JUpload";
+import CompanySelect from "@comp/company/CompanySelect";
+import ContactManagementModule from "@views/businessManagement/modules/ContactManagementModule";

 export default {
  name: "SafeguardMemberModal",
  components: {
-    JUpload
+    JUpload,
+    CompanySelect,
+    ContactManagementModule
  },
  data() {
    return {
@@ -101,8 +156,8 @@ export default {
      visible: false,
      confirmLoading: false,
      form: this.$form.createForm(this),
-      // 负责人
-      chargePersonList: [],
+      // 联系人
+      userList: [],
      model: {},
      labelCol: {
        xs: {span: 24},
@@ -121,14 +176,45 @@ export default {
        sm: {span: 21}
      },
      validatorRules: {
-        businessName: {
-          rules: [{required: true, message: '请输入企业名称'}],
+        companyId: {
+          rules: [{required: true, message: '请选择会员单位'}],
          validateTrigger: 'blur'
        },
-        postcode: {
-          rules: [{validator: this.checkPostcode}]
-        }
+        contractNo: {
+          rules: [{required: true, message: '请输入合同号'}],
+          validateTrigger: 'blur'
+        },
+        companyContactId: {
+          rules: [{required: true, message: '请选择企业联系人'}],
+          validateTrigger: 'blur'
+        },
+        postContactId: {
+          rules: [{required: true, message: '请选择邮寄联系人'}],
+          validateTrigger: 'blur'
+        },
+        paymentMethod: {
+          rules: [{required: true, message: '请选择来款方式'}],
+          validateTrigger: ['blur', 'change']
+        },
+        amountReceivable: {
+          rules: [{required: true, message: '请输入应收金额'}],
+          validateTrigger: 'blur'
+        },
+        chargeNoticeNo: {
+          rules: [{required: true, message: '请输入收费通知号'}],
+          validateTrigger: 'blur'
+        },
+        needInvoice: {
+          rules: [{required: true, message: '请选择发票类型'}],
+          validateTrigger: ['change', 'blur'],
+          initialValue: 0
+        },
+
      },
+      // 来款方式
+      incomePaysType: '',
+      // 选中的会员单位
+      selectedCompany: {},
      url: {
        add: '',
        edit: ''
@@ -181,22 +267,58 @@ export default {
        }
      })
    },
+    /*
+    *  来款方式
+    * */
+    changePaymentMethod(e) {
+      this.incomePaysType = e.target.value + ''
+    },
+    /*
+    *  选择会员单位
+    * */
+    companyChange(val) {
+      this.selectedCompany = Object.assign({}, val)
+      this.getContactPersonList(val)
+    },
+    /*
+    * 根据企业获取联系人数据
+    * */
+    getContactPersonList(val) {
+      const param = {
+        companyName: val.companyName
+      }
+      let url = `company/payContactsManagement/list`
+      getAction(url, param).then(res => {
+        if (res.success) {
+          this.userList = res.result.records
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
+    /*
+    * 新增联系人后回显值
+    * */
+    // setValue(){
+    //   console.log(1)
+    // },
+    /*
+    *  增加联系人模态框
+    * */
+    addContacts() {
+      if (this.selectedCompany.id) {
+        debugger
+        this.$refs.contactForm.add()
+        this.$refs.contactForm.title = "新增";
+        this.$refs.contactForm.disableSubmit = false;
+        return
+      }
+      this.$message.warn('请先选择来款企业再为该企业新建联系人')
+    },
    handleCancel() {
+      this.selectedCompany = {}
      this.close()
    },
-    /**
-     * 邮编校验
-     * @param rules
-     * @param value
-     * @param callback
-     */
-    checkPostcode(rules, value, callback) {
-      if (postcode(value)) {
-        callback()
-      } else {
-        callback('请输入正确格式的邮编')
-      }
-    }
  }
 }
 </script>
@@ -87,7 +87,8 @@ module.exports = {
        }
      },*/
      '/jero-boot': {
-        target: 'http://localhost:8080', //请求本地 jero-boot后台项目
+        // ''
+        target: 'http://10.0.1.17:8080', //请求本地 jero-boot后台项目
        ws: false,
        changeOrigin: true
      },
@@ -22,106 +22,6 @@
  resolved "https://registry.yarnpkg.com/@ant-design/icons/-/icons-2.1.1.tgz#7b9c08dffd4f5d41db667d9dbe5e0107d0bd9a4a"
  integrity sha512-jCH+k2Vjlno4YWl6g535nHR09PwCEmTBKAG6VqF+rhkrSPRLfgpU2maagwbZPLjaHuU5Jd1DFQ2KJpQuI6uG8w==

-"@antv/adjust@~0.1.0":
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/@antv/adjust/-/adjust-0.1.1.tgz#e263ab0e1a1941a648842fc086cf65a7e3b75e98"
-  integrity sha512-9FaMOyBlM4AgoRL0b5o0VhEKAYkexBNUrxV8XmpHU/9NBPJONBOB/NZUlQDqxtLItrt91tCfbAuMQmF529UX2Q==
-  dependencies:
-    "@antv/util" "~1.3.1"
-
-"@antv/attr@~0.1.2":
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/@antv/attr/-/attr-0.1.2.tgz#2eeb122fcaaf851a2d8749abc7c60519d3f77e37"
-  integrity sha512-QXjP+T2I+pJQcwZx1oCA4tipG43vgeCeKcGGKahlcxb71OBAzjJZm1QbF4frKXcnOqRkxVXtCr70X9TRair3Ew==
-  dependencies:
-    "@antv/util" "~1.3.1"
-
-"@antv/component@~0.3.3":
-  version "0.3.9"
-  resolved "https://registry.yarnpkg.com/@antv/component/-/component-0.3.9.tgz#ed561c639b7738ce03ff63a866f59e251de82a17"
-  integrity sha512-Knh/Nq0S8UkTfZj4SL7XizagTfXYqjFAYIqFtOmUaKpRMgccUi7p1oA7fJdNPGktkndljy6fUmCWocEeBXRS2g==
-  dependencies:
-    "@antv/attr" "~0.1.2"
-    "@antv/g" "~3.3.5"
-    "@antv/util" "~1.3.1"
-    wolfy87-eventemitter "~5.1.0"
-
-"@antv/coord@~0.1.0":
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/@antv/coord/-/coord-0.1.0.tgz#48a80ae36d07552f96657e7f8095227c63f0c0a9"
-  integrity sha512-W1R8h3Jfb3AfMBVfCreFPMVetgEYuwHBIGn0+d3EgYXe2ckOF8XWjkpGF1fZhOMHREMr+Gt27NGiQh8yBdLUgg==
-  dependencies:
-    "@antv/util" "~1.3.1"
-
-"@antv/g2-brush@^0.0.2":
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/@antv/g2-brush/-/g2-brush-0.0.2.tgz#0b65f3ebbf82690202913d0b6759ab2900faa841"
-  integrity sha512-7O9szwem19nmEgReXhFB8kVLRaz8J5MHvrzDSDY36YaBOaHSWRGHnvYt2KkkPqgWtHtLY1srssk4X/UmP5govA==
-
-"@antv/g2-plugin-slider@^2.1.0":
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/@antv/g2-plugin-slider/-/g2-plugin-slider-2.1.1.tgz#c20c5f1cf085bea478f8ab1fc84837e45c46a065"
-  integrity sha512-nB678VEGG3FkrvkDDFADAKjLQIeXzITEYqey5oeOpbf0vT5jOa55lQDyJDZ79cK8PmU/Hz6VPeSb3CNQBA+/FQ==
-
-"@antv/g2@~3.5.3":
-  version "3.5.17"
-  resolved "https://registry.yarnpkg.com/@antv/g2/-/g2-3.5.17.tgz#02c8bac610d21d28b4e23600bc76c48e7f59c919"
-  integrity sha512-gOjfA6pwXYEC5mrLbvg1kA3jZI5J5T2kQeGse+iBBsNc1Vje7zs9G+BleUaI4MLXSnqwhsj/ohfkP7d+h4ArNg==
-  dependencies:
-    "@antv/adjust" "~0.1.0"
-    "@antv/attr" "~0.1.2"
-    "@antv/component" "~0.3.3"
-    "@antv/coord" "~0.1.0"
-    "@antv/g" "~3.4.10"
-    "@antv/scale" "~0.1.1"
-    "@antv/util" "~1.3.1"
-    venn.js "~0.2.20"
-    wolfy87-eventemitter "~5.1.0"
-
-"@antv/g@~3.3.5":
-  version "3.3.6"
-  resolved "https://registry.yarnpkg.com/@antv/g/-/g-3.3.6.tgz#11fed9ddc9ed4e5a2aa244b7c8abb982a003f201"
-  integrity sha512-2GtyTz++s0BbN6s0ZL2/nrqGYCkd52pVoNH92YkrTdTOvpO6Z4DNoo6jGVgZdPX6Nzwli6yduC8MinVAhE8X6g==
-  dependencies:
-    "@antv/gl-matrix" "~2.7.1"
-    "@antv/util" "~1.3.1"
-    d3-ease "~1.0.3"
-    d3-interpolate "~1.1.5"
-    d3-timer "~1.0.6"
-    wolfy87-eventemitter "~5.1.0"
-
-"@antv/g@~3.4.10":
-  version "3.4.10"
-  resolved "https://registry.yarnpkg.com/@antv/g/-/g-3.4.10.tgz#e7b616aa21b17ac51850d033332a5af8de8fe015"
-  integrity sha512-pKy/L1SyRBsXuujdkggqrdBA0/ciAgHiArYBdIJsxHRxCneUP01wGwHdGfDayh2+S0gcSBHynjhoEahsaZaLkw==
-  dependencies:
-    "@antv/gl-matrix" "~2.7.1"
-    "@antv/util" "~1.3.1"
-    d3-ease "~1.0.3"
-    d3-interpolate "~1.1.5"
-    d3-timer "~1.0.6"
-    detect-browser "^5.1.0"
-
-"@antv/gl-matrix@^2.7.1", "@antv/gl-matrix@~2.7.1":
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/@antv/gl-matrix/-/gl-matrix-2.7.1.tgz#acb8e37f7ab3df01345aba4372d7942be42eba14"
-  integrity sha512-oOWcVNlpELIKi9x+Mm1Vwbz8pXfkbJKykoCIOJ/dNK79hSIANbpXJ5d3Rra9/wZqK6MC961B7sybFhPlLraT3Q==
-
-"@antv/scale@~0.1.1":
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/@antv/scale/-/scale-0.1.5.tgz#243266e8b9047cf64b2fdfc40f9834cf0846496e"
-  integrity sha512-7RAu4iH5+Hk21h6+aBMiDTfmLf4IibK2SWjx/+E4f4AXRpqucO+8u7IbZdFkakAWxvqhJtN3oePJuTKqOMcmlg==
-  dependencies:
-    "@antv/util" "~1.3.1"
-    fecha "~2.3.3"
-
-"@antv/util@~1.3.1":
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/@antv/util/-/util-1.3.1.tgz#30a34b201ff9126ec0d58c72c8166a9c3e644ccd"
-  integrity sha512-cbUta0hIJrKEaW3eKoGarz3Ita+9qUPF2YzTj8A6wds/nNiy20G26ztIWHU+5ThLc13B1n5Ik52LbaCaeg9enA==
-  dependencies:
-    "@antv/gl-matrix" "^2.7.1"
-
 "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.14.5":
  version "7.14.5"
  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz#23b08d740e83f49c5e59945fbf1b43e80bbf4edb"
@@ -1123,11 +1023,6 @@
  dependencies:
    "@types/node" "*"

-"@types/d3-format@*":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@types/d3-format/-/d3-format-3.0.1.tgz#194f1317a499edd7e58766f96735bdc0216bb89d"
-  integrity sha512-5KY70ifCCzorkLuIkDe0Z9YTf9RR2CjBX1iaJG+rgM/cPP+sO+q9YdQ9WdhQcgPj1EQiJ2/0+yUkkziTG6Lubg==
-
 "@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.18":
  version "4.17.24"
  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.24.tgz#ea41f93bf7e0d59cd5a76665068ed6aab6815c07"
@@ -1167,11 +1062,6 @@
  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d"
  integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==

-"@types/lodash@*":
-  version "4.14.172"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.172.tgz#aad774c28e7bfd7a67de25408e03ee5a8c3d028a"
-  integrity sha512-/BHF5HAx3em7/KkzVKm3LrsD6HZAXuXO1AJZQ3cRRBZj4oHZDviWPYu0aEplAqDFNHZPW6d3G7KN+ONcCCC7pw==
-
 "@types/mime@^1":
  version "1.3.2"
  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"
@@ -1192,11 +1082,6 @@
  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.4.12.tgz#961e3091f263e6345d2d84afab4e047a60b4b11b"
  integrity sha512-zxrTNFl9Z8boMJXs6ieqZP0wAhvkdzmHSxTlJabM16cf5G9xBc1uPRH5Bbv2omEDDiM8MzTfqTJXBf0Ba4xFWA==

-"@types/node@^8.0.53":
-  version "8.10.66"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.66.tgz#dd035d409df322acc83dff62a602f12a5783bbb3"
-  integrity sha512-tktOkFUA4kXx2hhhrB8bIFb5TbwzS4uOhKEmwiD+NoiL0qtP2OQ9mFldbgD4dV1djrlBYP6eBuQZiWjuHUpqFw==
-
 "@types/normalize-package-data@^2.4.0":
  version "2.4.1"
  resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301"
@@ -1821,11 +1706,6 @@ alphanum-sort@^1.0.0, alphanum-sort@^1.0.1, alphanum-sort@^1.0.2:
  resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
  integrity sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=

-amdefine@>=0.0.4:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
-  integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
-
 ansi-colors@^3.0.0:
  version "3.2.4"
  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf"
@@ -3069,7 +2949,7 @@ cache-loader@^4.1.0:
    neo-async "^2.6.1"
    schema-utils "^2.0.0"

-call-bind@^1.0.0, call-bind@^1.0.2, call-bind@~1.0.2:
+call-bind@^1.0.0, call-bind@^1.0.2:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
  integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
@@ -3200,7 +3080,7 @@ center-align@^0.1.1:
    align-text "^0.1.3"
    lazy-cache "^1.0.3"

-chalk@^1.1.1, chalk@^1.1.3:
+chalk@^1.1.3:
  version "1.1.3"
  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
  integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
@@ -3661,11 +3541,6 @@ content-type@~1.0.4:
  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
  integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==

-contour_plot@^0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/contour_plot/-/contour_plot-0.0.1.tgz#475870f032b8e338412aa5fc507880f0bf495c77"
-  integrity sha1-R1hw8DK44zhBKqX8UHiA8L9JXHc=
-
 convert-source-map@^0.3.3:
  version "0.3.5"
  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-0.3.5.tgz#f1d802950af7dd2631a1febe0596550c86ab3190"
@@ -4120,62 +3995,6 @@ cyclist@^1.0.1:
  resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
  integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=

-d3-color@1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-1.4.1.tgz#c52002bf8846ada4424d55d97982fef26eb3bc8a"
-  integrity sha512-p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q==
-
-d3-dispatch@1:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/d3-dispatch/-/d3-dispatch-1.0.6.tgz#00d37bcee4dd8cd97729dd893a0ac29caaba5d58"
-  integrity sha512-fVjoElzjhCEy+Hbn8KygnmMS7Or0a9sI2UzGwoB7cCtvI1XpVN9GpoYlnb3xt2YV66oXYb1fLJ8GMvP4hdU1RA==
-
-d3-ease@1, d3-ease@~1.0.3:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/d3-ease/-/d3-ease-1.0.7.tgz#9a834890ef8b8ae8c558b2fe55bd57f5993b85e2"
-  integrity sha512-lx14ZPYkhNx0s/2HX5sLFUI3mbasHjSSpwO/KaaNACweVwxUruKyWVcb293wMv1RqTPZyZ8kSZ2NogUZNcLOFQ==
-
-d3-format@^1.3.0:
-  version "1.4.5"
-  resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-1.4.5.tgz#374f2ba1320e3717eb74a9356c67daee17a7edb4"
-  integrity sha512-J0piedu6Z8iB6TbIGfZgDzfXxUFN3qQRMofy2oPdXzQibYGqPB/9iMcxr/TGalU+2RsyDO+U4f33id8tbnSRMQ==
-
-d3-interpolate@1:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-1.4.0.tgz#526e79e2d80daa383f9e0c1c1c7dcc0f0583e987"
-  integrity sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA==
-  dependencies:
-    d3-color "1"
-
-d3-interpolate@~1.1.5:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-1.1.6.tgz#2cf395ae2381804df08aa1bf766b7f97b5f68fb6"
-  integrity sha512-mOnv5a+pZzkNIHtw/V6I+w9Lqm9L5bG3OTXPM5A+QO0yyVMQ4W1uZhR+VOJmazaOZXri2ppbiZ5BUNWT0pFM9A==
-  dependencies:
-    d3-color "1"
-
-d3-selection@^1.0.2, d3-selection@^1.1.0:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.4.2.tgz#dcaa49522c0dbf32d6c1858afc26b6094555bc5c"
-  integrity sha512-SJ0BqYihzOjDnnlfyeHT0e30k0K1+5sR3d5fNueCNeuhZTnGw4M4o8mqJchSwgKMXCNFo+e2VTChiSJ0vYtXkg==
-
-d3-timer@1, d3-timer@~1.0.6:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/d3-timer/-/d3-timer-1.0.10.tgz#dfe76b8a91748831b13b6d9c793ffbd508dd9de5"
-  integrity sha512-B1JDm0XDaQC+uvo4DT79H0XmBskgS3l6Ve+1SBCfxgmtIb1AVrPIoqd+nPSv+loMX8szQ0sVUhGngL7D5QPiXw==
-
-d3-transition@^1.0.1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/d3-transition/-/d3-transition-1.3.2.tgz#a98ef2151be8d8600543434c1ca80140ae23b398"
-  integrity sha512-sc0gRU4PFqZ47lPVHloMn9tlPcv8jxgOQg+0zjhfZXMQuvppjG6YuwdMBE0TuqCZjeJkLecku/l9R0JPcRhaDA==
-  dependencies:
-    d3-color "1"
-    d3-dispatch "1"
-    d3-ease "1"
-    d3-interpolate "1"
-    d3-selection "^1.1.0"
-    d3-timer "1"
-
 d@1, d@^1.0.1:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/d/-/d-1.0.1.tgz#8698095372d58dbee346ffd0c7093f99f8f9eb5a"
@@ -4232,7 +4051,7 @@ decode-uri-component@^0.2.0:
  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=

-deep-equal@^1.0.1, deep-equal@~1.1.1:
+deep-equal@^1.0.1:
  version "1.1.1"
  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a"
  integrity sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==
@@ -4305,7 +4124,7 @@ define-property@^2.0.2:
    is-descriptor "^1.0.2"
    isobject "^3.0.1"

-defined@^1.0.0, defined@~1.0.0:
+defined@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
  integrity sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=
@@ -4358,11 +4177,6 @@ destroy@~1.0.4:
  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
  integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=

-detect-browser@^5.1.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/detect-browser/-/detect-browser-5.2.0.tgz#c9cd5afa96a6a19fda0bbe9e9be48a6b6e1e9c97"
-  integrity sha512-tr7XntDAu50BVENgQfajMLzacmSe34D+qZc4zjnniz0ZVuw/TZcLcyxHQjYpJTM36sGEkZZlYLnIM1hH7alTMA==
-
 detect-indent@^4.0.0:
  version "4.0.0"
  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208"
@@ -4520,13 +4334,6 @@ dotenv@^8.2.0:
  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz#061af664d19f7f4d8fc6e4ff9b584ce237adcb8b"
  integrity sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==

-dotignore@~0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/dotignore/-/dotignore-0.1.2.tgz#f942f2200d28c3a76fbdd6f0ee9f3257c8a2e905"
-  integrity sha512-UGGGWfSauusaVJC+8fgV+NVvBXkCTmVv7sk6nojDZZvuOUNGUy0Zk4UpHQD6EDjS0jpBwcACvH4eofvyzBcRDw==
-  dependencies:
-    minimatch "^3.0.4"
-
 duplexer@^0.1.1:
  version "0.1.2"
  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
@@ -5222,11 +5029,6 @@ faye-websocket@^0.11.3, faye-websocket@~0.11.0:
  dependencies:
    websocket-driver ">=0.5.1"

-fecha@~2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/fecha/-/fecha-2.3.3.tgz#948e74157df1a32fd1b12c3a3c3cdcb6ec9d96cd"
-  integrity sha512-lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg==
-
 figgy-pudding@^3.5.1:
  version "3.5.2"
  resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e"
@@ -5395,29 +5197,11 @@ flush-write-stream@^1.0.0:
    inherits "^2.0.3"
    readable-stream "^2.3.6"

-fmin@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/fmin/-/fmin-0.0.2.tgz#59bbb40d43ffdc1c94cd00a568c41f95f1973017"
-  integrity sha1-Wbu0DUP/3ByUzQClaMQflfGXMBc=
-  dependencies:
-    contour_plot "^0.0.1"
-    json2module "^0.0.3"
-    rollup "^0.25.8"
-    tape "^4.5.1"
-    uglify-js "^2.6.2"
-
 follow-redirects@^1.0.0, follow-redirects@^1.10.0:
  version "1.14.1"
  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.1.tgz#d9114ded0a1cfdd334e164e6662ad02bfd91ff43"
  integrity sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==

-for-each@~0.3.3:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e"
-  integrity sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==
-  dependencies:
-    is-callable "^1.1.3"
-
 for-in@^1.0.2:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
@@ -5594,7 +5378,7 @@ glob-to-regexp@^0.3.0:
  resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
  integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=

-glob@^7.0.3, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@~7.1.7:
+glob@^7.0.3, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
  version "7.1.7"
  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90"
  integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
@@ -5759,7 +5543,7 @@ has-values@^1.0.0:
    is-number "^3.0.0"
    kind-of "^4.0.0"

-has@^1.0.0, has@^1.0.1, has@^1.0.3, has@~1.0.3:
+has@^1.0.0, has@^1.0.1, has@^1.0.3:
  version "1.0.3"
  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
@@ -6139,7 +5923,7 @@ inflight@^1.0.4:
    once "^1.3.0"
    wrappy "1"

-inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3, inherits@~2.0.4:
+inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3:
  version "2.0.4"
  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -6306,7 +6090,7 @@ is-buffer@^1.1.5:
  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==

-is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.3:
+is-callable@^1.1.4, is-callable@^1.2.3:
  version "1.2.3"
  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.3.tgz#8b1e0500b73a1d76c70487636f368e519de8db8e"
  integrity sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==
@@ -6524,7 +6308,7 @@ is-plain-object@^2.0.3, is-plain-object@^2.0.4:
  dependencies:
    isobject "^3.0.1"

-is-regex@^1.0.4, is-regex@^1.1.3, is-regex@~1.1.3:
+is-regex@^1.0.4, is-regex@^1.1.3:
  version "1.1.3"
  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.3.tgz#d029f9aff6448b93ebbe3f33dac71511fdcbef9f"
  integrity sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==
@@ -6743,13 +6527,6 @@ json-stringify-safe@~5.0.1:
  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=

-json2module@^0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/json2module/-/json2module-0.0.3.tgz#00fb5f4a9b7adfc3f0647c29cb17bcd1979be9b2"
-  integrity sha1-APtfSpt638PwZHwpyxe80Zeb6bI=
-  dependencies:
-    rw "^1.3.2"
-
 json2mq@^0.2.0:
  version "0.2.0"
  resolved "https://registry.yarnpkg.com/json2mq/-/json2mq-0.2.0.tgz#b637bd3ba9eabe122c83e9720483aeb10d2c904a"
@@ -7400,7 +7177,7 @@ minimatch@^3.0.4:
  dependencies:
    brace-expansion "^1.1.7"

-minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5, minimist@~1.2.5:
+minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5:
  version "1.2.5"
  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
@@ -7745,7 +7522,7 @@ object-hash@^1.1.4:
  resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-1.3.1.tgz#fde452098a951cb145f039bb7d455449ddc126df"
  integrity sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA==

-object-inspect@^1.11.0, object-inspect@^1.9.0, object-inspect@~1.11.0:
+object-inspect@^1.11.0, object-inspect@^1.9.0:
  version "1.11.0"
  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1"
  integrity sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==
@@ -9482,7 +9259,7 @@ resolve-url@^0.2.1:
  resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
  integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=

-resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.4.0, resolve@~1.20.0:
+resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.4.0:
  version "1.20.0"
  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
  integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
@@ -9506,13 +9283,6 @@ restore-cursor@^3.1.0:
    onetime "^5.1.0"
    signal-exit "^3.0.2"

-resumer@~0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/resumer/-/resumer-0.0.0.tgz#f1e8f461e4064ba39e82af3cdc2a8c893d076759"
-  integrity sha1-8ej0YeQGS6Oegq883CqMiT0HZ1k=
-  dependencies:
-    through "~2.3.4"
-
 ret@~0.1.10:
  version "0.1.15"
  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
@@ -9575,15 +9345,6 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
    hash-base "^3.0.0"
    inherits "^2.0.1"

-rollup@^0.25.8:
-  version "0.25.8"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.25.8.tgz#bf6ce83b87510d163446eeaa577ed6a6fc5835e0"
-  integrity sha1-v2zoO4dRDRY0Ru6qV37WpvxYNeA=
-  dependencies:
-    chalk "^1.1.1"
-    minimist "^1.2.0"
-    source-map-support "^0.3.2"
-
 run-async@^2.4.0:
  version "2.4.1"
  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
@@ -9596,11 +9357,6 @@ run-queue@^1.0.0, run-queue@^1.0.3:
  dependencies:
    aproba "^1.1.1"

-rw@^1.3.2:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4"
-  integrity sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q=
-
 rxjs@^6.6.0:
  version "6.6.7"
  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
@@ -9976,13 +9732,6 @@ source-map-resolve@^0.5.0, source-map-resolve@^0.5.2:
    source-map-url "^0.4.0"
    urix "^0.1.0"

-source-map-support@^0.3.2:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.3.3.tgz#34900977d5ba3f07c7757ee72e73bb1a9b53754f"
-  integrity sha1-NJAJd9W6PwfHdX7nLnO7GptTdU8=
-  dependencies:
-    source-map "0.1.32"
-
 source-map-support@^0.4.15:
  version "0.4.18"
  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
@@ -10003,13 +9752,6 @@ source-map-url@^0.4.0:
  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56"
  integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==

-source-map@0.1.32:
-  version "0.1.32"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.32.tgz#c8b6c167797ba4740a8ea33252162ff08591b266"
-  integrity sha1-yLbBZ3l7pHQKjqMyUhYv8IWRsmY=
-  dependencies:
-    amdefine ">=0.0.4"
-
 source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1:
  version "0.5.7"
  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
@@ -10215,15 +9957,6 @@ string-width@^4.1.0, string-width@^4.2.0:
    is-fullwidth-code-point "^3.0.0"
    strip-ansi "^6.0.0"

-string.prototype.trim@~1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.4.tgz#6014689baf5efaf106ad031a5fa45157666ed1bd"
-  integrity sha512-hWCk/iqf7lp0/AgTF7/ddO1IWtSNPASjlzCicV5irAVdE1grjsneK26YG6xACMBEdCvO8fUST0UzDMh/2Qy+9Q==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.18.0-next.2"
-
 string.prototype.trimend@^1.0.4:
  version "1.0.4"
  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80"
@@ -10435,27 +10168,6 @@ tapable@^1.0.0, tapable@^1.1.3:
  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
  integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==

-tape@^4.5.1:
-  version "4.14.0"
-  resolved "https://registry.yarnpkg.com/tape/-/tape-4.14.0.tgz#e4d46097e129817175b90925f2385f6b1bcfa826"
-  integrity sha512-z0+WrUUJuG6wIdWrl4W3rTte2CR26G6qcPOj3w1hfRdcmhF3kHBhOBW9VHsPVAkz08ZmGzp7phVpDupbLzrYKQ==
-  dependencies:
-    call-bind "~1.0.2"
-    deep-equal "~1.1.1"
-    defined "~1.0.0"
-    dotignore "~0.1.2"
-    for-each "~0.3.3"
-    glob "~7.1.7"
-    has "~1.0.3"
-    inherits "~2.0.4"
-    is-regex "~1.1.3"
-    minimist "~1.2.5"
-    object-inspect "~1.11.0"
-    resolve "~1.20.0"
-    resumer "~0.0.0"
-    string.prototype.trim "~1.2.4"
-    through "~2.3.8"
-
 terser-webpack-plugin@^1.4.3, terser-webpack-plugin@^1.4.4:
  version "1.4.5"
  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz#a217aefaea330e734ffacb6120ec1fa312d6040b"
@@ -10516,7 +10228,7 @@ through2@^2.0.0:
    readable-stream "~2.3.6"
    xtend "~4.0.1"

-through@^2.3.6, through@~2.3.4, through@~2.3.8:
+through@^2.3.6:
  version "2.3.8"
  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
  integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
@@ -10715,7 +10427,7 @@ uglify-js@3.4.x:
    commander "~2.19.0"
    source-map "~0.6.1"

-uglify-js@^2.6.2, uglify-js@^2.8.29:
+uglify-js@^2.8.29:
  version "2.8.29"
  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
  integrity sha1-KcVzMUgFe7Th913zW3qcty5qWd0=
@@ -10956,15 +10668,6 @@ vendors@^1.0.0:
  resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz#e2b800a53e7a29b93506c3cf41100d16c4c4ad8e"
  integrity sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w==

-venn.js@~0.2.20:
-  version "0.2.20"
-  resolved "https://registry.yarnpkg.com/venn.js/-/venn.js-0.2.20.tgz#3f0e50cc75cba1f58692a8a32f67bd7aaf1aa6fa"
-  integrity sha512-bb5SYq/wamY9fvcuErb9a0FJkgIFHJjkLZWonQ+DoKKuDX3WPH2B4ouI1ce4K2iejBklQy6r1ly8nOGIyOCO6w==
-  dependencies:
-    d3-selection "^1.0.2"
-    d3-transition "^1.0.1"
-    fmin "0.0.2"
-
 verror@1.10.0:
  version "1.10.0"
  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
@@ -10974,29 +10677,6 @@ verror@1.10.0:
    core-util-is "1.0.2"
    extsprintf "^1.2.0"

-viser-vue@^2.4.8:
-  version "2.4.8"
-  resolved "https://registry.yarnpkg.com/viser-vue/-/viser-vue-2.4.8.tgz#3fdb058445cba59c1ccee9cc9c2024bec29926d4"
-  integrity sha512-ERAREN+6k/ywrwT+swcMo4CDIAq6dBjnB0+lhmsSfaip06BGHSBfNKg6yl7/4GJ9Nk2kioUw3llNhEboJuIKmQ==
-  dependencies:
-    "@types/node" "*"
-    viser "^2.0.0"
-    vue "^2.5.3"
-
-viser@^2.0.0:
-  version "2.4.9"
-  resolved "https://registry.yarnpkg.com/viser/-/viser-2.4.9.tgz#57f4c70f5702fb80e38843f29025cea575cbc60a"
-  integrity sha512-DKsqtMa3TZYQHEZ7jp4kpNp1Iqomda7d+3IkkIjIdKQvfL8OeksXfy/ECZUY1hTrGoOe7cq85+6PMS+MPn4mgQ==
-  dependencies:
-    "@antv/g2" "~3.5.3"
-    "@antv/g2-brush" "^0.0.2"
-    "@antv/g2-plugin-slider" "^2.1.0"
-    "@types/d3-format" "*"
-    "@types/lodash" "*"
-    "@types/node" "^8.0.53"
-    d3-format "^1.3.0"
-    lodash "^4.17.4"
-
 vm-browserify@^1.0.1:
  version "1.1.2"
  resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
@@ -11134,7 +10814,7 @@ vue-template-es2015-compiler@^1.6.0, vue-template-es2015-compiler@^1.9.0:
  resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825"
  integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==

-vue@^2.4.4, vue@^2.5.3, vue@^2.6.11:
+vue@^2.4.4, vue@^2.6.11:
  version "2.6.14"
  resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.14.tgz#e51aa5250250d569a3fbad3a8a5a687d6036e235"
  integrity sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ==
@@ -11450,11 +11130,6 @@ window-size@0.1.0:
  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
  integrity sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=

-wolfy87-eventemitter@~5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/wolfy87-eventemitter/-/wolfy87-eventemitter-5.1.0.tgz#35c1ac0dd1ac0c15e35d981508fc22084a13a011"
-  integrity sha1-NcGsDdGsDBXjXZgVCPwiCEoToBE=
-
 word-wrap@~1.2.3:
  version "1.2.3"
  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"