Merge branch 'update-0218' into test

src/views/customer/edit/index.vue

@@ -14,7 +14,7 @@
             <a-input allow-clear v-model="form.policyNo" placeholder="请输入保单号码"></a-input>
           </a-form-model-item>
           <a-form-model-item label="保单直付区域" prop="policyDircetArea">
-            <a-select v-model="form.policyDircetArea" placeholder="请选择保单直付区域" show-search allow-clear @filterOption="filterCode">
+            <a-select v-model="form.policyDircetArea" placeholder="请选择保单直付区域" show-search allow-clear :filterOption="filterCode">
               <a-select-option v-for="item in areaCode" :key="item.refcd" :value="item.refcd" :label="item.descCh">{{ item.descCh }}</a-select-option>
             </a-select>
           </a-form-model-item>
@@ -24,7 +24,7 @@
             <a-input v-model="form.patientName" allow-clear placeholder="请输入客户姓名"></a-input>
           </a-form-model-item>
           <a-form-model-item label="保险公司" prop="payorId">
-            <a-select v-model="form.payorId" placeholder="请选择保险公司" show-search allow-clear @filterOption="filterCode" @change="payorChange">
+            <a-select v-model="form.payorId" placeholder="请选择保险公司" show-search allow-clear :filterOption="filterCode" @change="payorChange">
               <a-select-option v-for="item in companyCode" :key="item.id" :value="item.id" :label="item.longName">{{ item.longName }}</a-select-option>
             </a-select>
           </a-form-model-item>
@@ -44,7 +44,7 @@
           </a-form-model-item>
           <a-form-model-item label="客户公司名称" prop="corpName">
             <a-select v-model="form.corpName" placeholder="请选择客户公司名称" show-search allow-clear
-              @filterOption="filterCode" @change="corpChange" @search="corpSearch">
+              :filterOption="filterCode" @change="corpChange" @search="corpSearch">
               <a-select-option v-for="item in comCorpCode" :key="item.id" :value="item.id + '$_' + item.longName">
                 {{ item.longName }}
               </a-select-option>
@@ -70,7 +70,7 @@
         </a-col>
         <a-col :xl="6" :lg="6" :sm="12">
           <a-form-model-item label="证件类型" prop="idType">
-            <a-select v-model="form.idType" placeholder="请选择证件类型" show-search allow-clear @filterOption="filterCode">
+            <a-select v-model="form.idType" placeholder="请选择证件类型" show-search allow-clear :filterOption="filterCode">
               <a-select-option v-for="item in typeCode" :key="item.refcd" :value="item.refcd" :label="item.descCh">{{ item.descCh }}</a-select-option>
             </a-select>
           </a-form-model-item>
@@ -87,9 +87,9 @@
         </a-col>
         <a-col :xl="6" :lg="6" :sm="12">
           <a-form-model-item label="保险计划" prop="planName">
-            <a-select v-model="form.planName" placeholder="请选择保险计划" show-search allow-clear @filterOption="filterCode" @search="codeSearch"
+            <a-select v-model="form.planName" placeholder="请选择保险计划" show-search allow-clear :filterOption="filterCode" @search="codeSearch"
             >
-              <a-select-option v-for="item in comPlanCode" :key="item.id + '_' + item.longName" :vlaue="item.longName">
+              <a-select-option v-for="item in comPlanCode" :key="item.id + '_' + item.longName" :value="item.longName">
                 {{ item.longName }}
               </a-select-option>
             </a-select>
@@ -101,7 +101,7 @@
           </a-form-model-item>
         </a-col>
       </a-row>
-      <a-row gutter="10">
+      <a-row :gutter="10">
         <a-col :xl="9" :sm="12" class="none-label">
           <a-form-model-item label="" prop="medCardCopeFiles">
             <div class="text-left mar-bottom10">
@@ -276,18 +276,18 @@ export default {
     
     getCustomerDetail(params) {
       // this.queryForm = this.$lodash.cloneDeep(this.form);
-      const { id, patientPolicyId } = params;
+      const { id, patientPolicyId, type } = params;
       const data = {
         id: id && id * 1,
         patientPolicyId: patientPolicyId * 1,
       };
       this.$apis.GETCUSTOMERDETAIL(data).then((res) => {
         if (res.returnCode === "0000") {
-          this.form = res.content || {};
-          this._getCorporateCode(this.form.payorId);
-          this._getPlanCode(this.form.corpId);
-          const medCardCopeFiles = this.form.medCardCopeFiles || [];
-          const idCardCopeFiles = this.form.idCardCopeFiles || [];
+          let data = res.content || {};
+          this._getCorporateCode(data.payorId);
+          this._getPlanCode(data.corpId);
+          const medCardCopeFiles = data.medCardCopeFiles || [];
+          const idCardCopeFiles = data.idCardCopeFiles || [];
           medCardCopeFiles.forEach((item) => {
             this.medCardCopeFiles.push({
               url: item.fileUrl,
@@ -302,6 +302,20 @@ export default {
               name: item.fileName,
             })
           })
+          // type === '2'说明是新增保单,需要把客户信息清空
+          if(type === '2') {
+            data = {
+              ...data,
+              mrnNo: undefined,
+              idNo: undefined,
+              patientName: undefined,
+              birthday: undefined,
+              sex: undefined,
+              idType: undefined,
+              id: undefined
+            }
+          }
+          this.form = data;
         }
         // this.dataList = (res.content && res.content.list) || [];
         // this.total = (res.content && res.content.total) || 0;

src/views/customer/info/index.vue

@@ -53,6 +53,7 @@
       <template slot="operation" slot-scope="record">
         <a-button type="link" @click.stop="changeDataStatus(record)">修改</a-button>
         <a-button type="link" @click.stop="printClaimPdf(record)">打印理赔申请书</a-button>
+        <a-button type="link" @click.stop="changeDataStatus(record, '2')">新增保单</a-button>
         <!-- <a-button type="link" class="success">新增</a-button> -->
         <!-- <a-popconfirm title="你确定要删除吗？" ok-text="确定" cancel-text="取消" @confirm="deleteData(record)">
           <a-button type="link" class="danger" @click.stop>删除</a-button>
@@ -78,7 +79,15 @@ export default {
       { title: "病历号", dataIndex: "mrnNo", width: 180, },
       { title: "客户姓名", dataIndex: "patientName", width: 120,},
       { title: "出生日期", dataIndex: "birthday", width: 170, customRender: dateFormat},
-      { title: "性别", dataIndex: "sex", width: 80 },
+      { title: "性别", dataIndex: "sex", width: 80, customRender: (val) => {
+        if (val === 'M') {
+          return '男'
+        }
+        if (val === 'F') {
+          return '女'
+        }
+        return val
+      } },
       { title: "保险公司", dataIndex: "payorName", width: 180 },
       { title: "保单号码", dataIndex: "policyNo", width: 190 },
       { title: "保险生效日期", dataIndex: "startDate", width: 170, customRender: dateFormat },
@@ -126,11 +135,11 @@ export default {
       };
     },
     // 修改按钮
-    changeDataStatus(record) {
+    changeDataStatus(record, type) {
       const { id, patientPolicyId } = record;
       this.$router.push({
         name: "customerEdit",
-        query: { id, patientPolicyId },
+        query: { id, patientPolicyId, type },
       });
     },
     saveChange(record) {

src/views/info/components/companyDiscount.vue

@@ -62,7 +62,7 @@ import BurtPagination from "@/components/CUSTOMER/pagation";
 const columns = [
   { title: "序号", dataIndex: "id", width: 205},
   { title: "项目",dataIndex: "benefits", ellipsis: true, scopedSlots: { customRender: "benefits" },width: 310, },
-  { title: "折扣比例", dataIndex: "ratio", ellipsis: true, scopedSlots: { customRender: "ratio" },width: 190,},
+  { title: "折扣比例%", dataIndex: "ratio", ellipsis: true, scopedSlots: { customRender: "ratio" },width: 190,},
   { title: "备注", dataIndex: "remark", scopedSlots: { customRender: "remark" }, width: 180,},
   { title: "操作", dataIndex: "operation", scopedSlots: { customRender: "operation" },fixed: "right", width: "170px", align: "center" },
 ];

src/views/welfare/edit/components/benefits/index.vue

@@ -53,8 +53,8 @@
           </a-col>
           <a-col :md="12">
             <a-form-model-item label="福利项目" prop="benefitCode">
-              <a-select v-model="editForm.benefitCode" show-search allow-clear @filterOption="filterCode">
-                <a-select-option v-for="item in benefitCode" :key="item.benefitCode + item.description" :vlaue="item.benefitCode">
+              <a-select v-model="editForm.benefitCode" show-search allow-clear :filterOption="filterCode">
+                <a-select-option v-for="item in benefitCode" :key="item.benefitCode + item.description" :value="item.benefitCode">
                   {{ item.description }}
                 </a-select-option>
               </a-select>
@@ -101,12 +101,12 @@
                 v-model="editForm.status"
                 show-search
                 allow-clear
-                @filterOption="filterCode"
+                :filterOption="filterCode"
               >
                 <a-select-option
                   v-for="item in statusCode"
                   :key="item.code"
-                  :vlaue="item.code"
+                  :value="item.code"
                 >
                   {{ item.name }}
                 </a-select-option>

src/views/welfare/edit/components/condition/index.vue

@@ -31,34 +31,37 @@
       @cancel="cancel"
     >
       <a-form-model ref="editForm" layout="vertical" :model="editForm" :rules="editRule">
-        <a-form-model-item label="限额" prop="frequencyCode">
-          <a-select v-model="editForm.frequencyCode" show-search allow-clear @filterOption="filterCode">
-            <a-select-option v-for="item in frequencyCode" :key="item.frequencyCode + item.frequencyDesc" :vlaue="item.frequencyCode">
+        <a-form-model-item label="保障限制" prop="frequencyCode">
+          <a-select v-model="editForm.frequencyCode" show-search allow-clear :filterOption="filterCode">
+            <a-select-option v-for="item in frequencyCode" :key="item.frequencyCode + item.frequencyDesc" :value="item.frequencyCode">
               {{ item.frequencyDesc }}
             </a-select-option>
           </a-select>
         </a-form-model-item>
         <a-form-model-item label="保障福利" prop="limitCode">
-          <a-select v-model="editForm.limitCode" show-search allow-clear @filterOption="limitCode">
-            <a-select-option v-for="item in limitCode" :key="item.limitCode + item.limitDesc" :vlaue="item.limitCode">
+          <a-select v-model="editForm.limitCode" show-search allow-clear :filterOption="filterCode">
+            <a-select-option v-for="item in limitCode" :key="item.limitCode + item.limitDesc" :value="item.limitCode">
               {{ item.limitDesc }}
             </a-select-option>
           </a-select>
         </a-form-model-item>
+        <a-form-model-item label="福利限制">
+          <a-input-number v-model="editForm.maxValue"> </a-input-number>
+        </a-form-model-item>
         <!-- <a-form-model-item label="开始时间" prop="startDate">
           <a-date-picker v-model="editForm.startDate" placeholder="请选择开始时间" value-format="YYYY-MM-DD 00:00:00"></a-date-picker>
         </a-form-model-item>
         <a-form-model-item label="结束时间" prop="endDate">
           <a-date-picker v-model="editForm.endDate" placeholder="请选择结束时间" value-format="YYYY-MM-DD 00:00:00"></a-date-picker>
         </a-form-model-item> -->
-        <a-row :gutter="10">
+        <!-- <a-row :gutter="10">
           <a-col :span="8">
             <a-form-model-item label="年限额">
               <a-input-number v-model="editForm.minValue"> </a-input-number>
             </a-form-model-item>
           </a-col>
           <a-col :span="8">
-            <a-form-model-item label="次限额">
+            <a-form-model-item label="最大值">
               <a-input-number v-model="editForm.maxValue"> </a-input-number>
             </a-form-model-item>
           </a-col>
@@ -68,10 +71,10 @@
               </a-input-number>
             </a-form-model-item>
           </a-col>
-        </a-row>
+        </a-row> -->
         <a-form-model-item label="币种">
-          <a-select v-model="editForm.currency" show-search allow-clear @filterOption="filterCode">
-            <a-select-option v-for="item in currencyCode" :key="item.code + item.name" :vlaue="item.code">
+          <a-select v-model="editForm.currency" show-search allow-clear :filterOption="filterCode">
+            <a-select-option v-for="item in currencyCode" :key="item.code + item.name" :value="item.code">
               {{ item.name }}
             </a-select-option>
           </a-select>
@@ -81,12 +84,12 @@
             v-model="editForm.status"
             show-search
             allow-clear
-            @filterOption="filterCode"
+            :filterOption="filterCode"
           >
             <a-select-option
               v-for="item in statusCode"
               :key="item.code"
-              :vlaue="item.code"
+              :value="item.code"
             >
               {{ item.name }}
             </a-select-option>
@@ -128,7 +131,12 @@ export default {
         return val;
       } },
       // { title: "限额或限次", dataIndex: "index" },
-      { title: "最大值", dataIndex: "maxValue" },
+      { title: "最大值", dataIndex: "maxValue", customRender: (val, row) => {
+        if (row.limitCode.indexOf('07') === 0) {
+          return val + '%'
+        }
+        return val
+      } },
       { title: "备注", dataIndex: "remark" },
       {
         title: "操作",
@@ -165,11 +173,7 @@ export default {
   methods: {
     // 选择框筛选
     filterCode(input, option) {
-      return (
-        option.componentOptions.children[0].text
-          .toLowerCase()
-          .indexOf(input.toLowerCase()) >= 0
-      );
+      return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0;
     },
     editConditionData(data) {
       const { planCode, payorCode, coverageCode, corpCode, benefitCode, conditionType } = this.formData;

src/views/welfare/edit/components/coverages/index.vue

@@ -42,8 +42,8 @@
               <a-input disabled v-model="editForm.corpCode"> </a-input>
             </a-form-model-item>
             <a-form-model-item label="保险责任" prop="coverageCode">
-              <a-select v-model="editForm.coverageCode" show-search allow-clear @filterOption="filterCode">
-                <a-select-option v-for="item in coverageCode" :key="item.coverageCode" :vlaue="item.coverageCode">
+              <a-select v-model="editForm.coverageCode" show-search allow-clear :filterOption="filterCode">
+                <a-select-option v-for="item in coverageCode" :key="item.coverageCode" :value="item.coverageCode">
                   {{ item.coverageDesc }}
                 </a-select-option>
               </a-select>
@@ -70,7 +70,7 @@
               <a-input v-model="editForm.loaDesc"> </a-input>
             </a-form-model-item>
             <a-form-model-item label="状态" prop="isEffective">
-              <a-select v-model="editForm.isEffective" placeholder="请选择计划状态" show-search allow-clear @filterOption="filterCode">
+              <a-select v-model="editForm.isEffective" placeholder="请选择计划状态" show-search allow-clear :filterOption="filterCode">
                 <a-select-option v-for="item in statusCode" :key="item.code" :value="item.code" :label="item.name">{{ item.name }}</a-select-option>
               </a-select>
             </a-form-model-item>

src/views/welfare/edit/index.vue

@@ -5,7 +5,7 @@
       <a-row :gutter="30">
         <a-col :xl="5" :lg="6" :sm="12">
           <a-form-model-item label="保险公司" prop="payorCode">
-            <a-select v-model="form.payorCode" placeholder="请选择保险公司" show-search allow-clear @change="payorChange" @filterOption="filterCode">
+            <a-select v-model="form.payorCode" placeholder="请选择保险公司" show-search allow-clear @change="payorChange" :filterOption="filterCode">
               <a-select-option v-for="item in companyCode" :key="item.payorCode" :value="item.payorCode">
                 {{ item.longName }}
               </a-select-option>
@@ -14,7 +14,7 @@
         </a-col>
         <a-col :xl="5" :lg="6" :sm="12">
           <a-form-model-item label="客户公司名称" prop="corpCode">
-            <a-select v-model="form.corpCode" placeholder="请选择客户公司名称" show-search allow-clear @filterOption="filterCode" @change="corpChange">
+            <a-select v-model="form.corpCode" placeholder="请选择客户公司名称" show-search allow-clear :filterOption="filterCode" @change="corpChange">
               <a-select-option v-for="item in corpCode" :key="item.corpCode" :value="item.corpCode">
                 {{ item.longName }}
               </a-select-option>
@@ -23,8 +23,8 @@
         </a-col>
         <a-col :xl="5" :lg="6" :sm="12">
           <a-form-model-item label="保险计划" prop="planCode">
-            <a-select v-model="form.planCode" placeholder="请选择保险计划" show-search allow-clear @filterOption="filterCode">
-              <a-select-option v-for="item in planCode" :key="item.planCode" :vlaue="item.planCode">
+            <a-select v-model="form.planCode" placeholder="请选择保险计划" show-search allow-clear :filterOption="filterCode">
+              <a-select-option v-for="item in planCode" :key="item.planCode" :value="item.planCode">
                 {{ item.longName }}
               </a-select-option>
             </a-select>
@@ -101,7 +101,7 @@
               <a-date-picker v-model="editForm.effectiveDate" placeholder="请选择生效日期" value-format="YYYY-MM-DD 00:00:00"></a-date-picker>
             </a-form-model-item> -->
             <a-form-model-item label="地区限制" prop="regionalRestrictions">
-              <a-select v-model="editForm.regionalRestrictions" placeholder="请选择地区限制" show-search allow-clear @filterOption="filterCode">
+              <a-select v-model="editForm.regionalRestrictions" placeholder="请选择地区限制" show-search allow-clear :filterOption="filterCode">
                 <a-select-option v-for="item in areaCode" :key="item.refcd" :value="item.refcd" :label="item.descCh">{{ item.descCh }}</a-select-option>
               </a-select>
             </a-form-model-item>
@@ -128,7 +128,7 @@
               <a-date-picker v-model="editForm.terminationDate" placeholder="请选择失效日期" value-format="YYYY-MM-DD 00:00:00"></a-date-picker>
             </a-form-model-item> -->
             <a-form-model-item label="医院限制" prop="hospitalRestrictions">
-              <a-select v-model="editForm.hospitalRestrictions" placeholder="请选择医院限制" show-search allow-clear @filterOption="filterCode">
+              <a-select v-model="editForm.hospitalRestrictions" placeholder="请选择医院限制" show-search allow-clear :filterOption="filterCode">
                 <a-select-option v-for="item in hosCode" :key="item.refcd" :value="item.refcd" :label="item.descCh">{{ item.descCh }}</a-select-option>
               </a-select>
             </a-form-model-item>

src/views/welfare/info/components/PolicyInfo.vue

@@ -10,9 +10,9 @@
           <a-col :span="6">首次入保日期：{{dateFormat(policyData.firstEnrollmentTime)}}</a-col>
           <a-col :span="6">保单生效日期：{{dateFormat(policyData.startDate)}}</a-col>
           <a-col :span="6">保单终止日期：{{dateFormat(policyData.endDate)}}</a-col>
-          <a-col :span="6">是否承担既往症：{{policyData.isUndertakeAnamnesis}}</a-col>
-          <a-col :span="6">保单直付区域：{{policyData.policyDircetArea}}</a-col>
-          <a-col :span="6" v-if="policyData.waitingPeriod === 'Y'">剩余等待期天数{{policyData.waitingPeriodTime}}</a-col>
+          <a-col :span="6">是否承担既往症：{{policyData.isUndertakeAnamnesis | yesFilters }}</a-col>
+          <a-col :span="6">保单直付区域：{{areaFilter(policyData.policyDircetArea)}}</a-col>
+          <a-col :span="6">是否等待期: {{policyData.waitingPeriod  | yesFilters}}</a-col>
           <a-col :span="6">其他备注：{{policyData.remark}}</a-col>
         </a-row>
       </a-collapse-panel>
@@ -32,12 +32,55 @@ export default {
   data() {
     return {
       activeKeys: "1",
+      areaCode: []
     };
   },
+  filters: {
+    yesFilters(value) {
+      const data = {
+        Y: '是',
+        N: '否'
+      };
+      return data[value];
+    }
+  },
+  created() {
+    this.initCodeData();
+  },
   methods: {
+    areaFilter(value) {
+      if (! value) {
+          return '';
+      }
+      for (let i = 0; i < this.areaCode.length; i ++) {
+        if (this.areaCode[i].refcd === value) {
+          return this.areaCode[i].descCh
+        }
+      }
+      return value
+    },
     dateFormat(val) {
       return val && moment(val).format('YYYY-MM-DD')
+    },
+    initCodeData() {
+      const params = {
+        areaCode: {
+          modid: "CI",
+          refgrp: "POLICY_DIRECT_AREA"
+        },
+      }
+      for (let i in params) {
+        this._getRefcdByRefgrp(params[i], i)
       }
+    },
+    _getRefcdByRefgrp(data, prop) {
+      if (this[prop] && this[prop].length) {
+        return true
+      }
+      this.$apis.GETREFCDBYREFGRP(data).then((res) => {
+        this[prop] = res.content || [];
+      });
+    },
   }
 };
 </script>

src/views/welfare/info/components/condition/index.vue

@@ -6,7 +6,7 @@
       :columns="columns"
       :locale="{ emptyText: 'No Data' }"
       :data-source="conditionList"
-      row-key="mrnNo"
+      row-key="id"
       :pagination="false"
     ></a-table>
   </div>
@@ -23,16 +23,14 @@ export default {
     const columns = [
       { title: "条件类型", dataIndex: "frequencyDesc" },
       { title: "条件内容", dataIndex: "limitDesc" },
-      { title: "最小值", dataIndex: "minValue" },
-      { title: "最大值", dataIndex: "maxValue" },
-      { title: "家庭最大值", dataIndex: "familyMaxValue" },
-      {
-        title: "操作",
-        key: "operation",
-        width: "175px",
-        fixed: "right",
-        scopedSlots: { customRender: "operation" },
-      },
+      // { title: "最小值", dataIndex: "minValue" },
+      { title: "最大值", dataIndex: "maxValue", customRender: (val, row) => {
+        if (row.limitCode.indexOf('07') === 0) {
+          return val + '%'
+        }
+        return val
+      }},
+      { title: "剩余金额", dataIndex: "leftValue" }
     ];
     return {
       columns,

src/views/welfare/info/components/coverages/index.vue

@@ -22,8 +22,8 @@
       <a-collapse-panel v-for="item in coverageData" :key="item.coverageCode" :header="item.coverageDesc">
         <div>
           <a-row class="policy_line" :gutter="10">
-            <a-col :span="6">是否开放直付：{{ item.isDirect }}</a-col>
-            <a-col :span="6">直付刷卡上限：</a-col>
+            <a-col :span="6">是否开放直付：{{ item.isDirect | yesFilters }}</a-col>
+            <!-- <a-col :span="6">直付刷卡上限：</a-col> -->
             <a-col :span="6">事先授权：</a-col>
             <a-col :span="6">等待期：{{ item.waitingPeriod }}</a-col>
             <a-col :span="6">赔付比例：</a-col>
@@ -66,6 +66,15 @@ export default {
       coverageCode: [],
     };
   },
+  filters: {
+    yesFilters(value) {
+      const data = {
+        Y: '是',
+        N: '否'
+      };
+      return data[value];
+    },
+  },
   watch: {
     formData: {
       immediate: true,

src/views/welfare/info/index.vue

@@ -33,7 +33,7 @@
         </a-col>
         <a-col :xl="6" :lg="6" :sm="12">
           <a-form-model-item label="保险公司" prop="payorId">
-            <a-select v-model="form.payorId" placeholder="请选择保险公司" show-search allow-clear @change="payorChange" @filterOption="filterCode">
+            <a-select v-model="form.payorId" placeholder="请选择保险公司" show-search allow-clear @change="payorChange" :filterOption="filterCode">
               <a-select-option v-for="item in companyCode" :key="item.id" :value="item.id">
                 {{ item.longName }}
               </a-select-option>