Merge branch 'update-0218' into test

src/api/apis_moudles/welfare.js

@@ -2,6 +2,7 @@
 export default {
   benefitType: "/backstage/auth/benefitMasterList",
   planList: "/backstage/auth/planListPage",
+  addPlan: "/backstage/auth/planCreate",
   editPlan: "/backstage/auth/planEdit",
   coverageCode: "/backstage/auth/coverageMasterList",
   coverageList: "/backstage/auth/coverageList",

src/api/funcs_modules/welfare.js

@@ -10,7 +10,11 @@ const GETPLANLIST = (data) => {
   return req.post(apis.planList, data);
 };
 
-const EDITPLANDATE = (data) => {
+const ADDTPLANDATA = (data) => {
+  return req.post(apis.addPlan, data);
+};
+
+const EDITPLANDATA = (data) => {
   return req.post(apis.editPlan, data);
 };
 
@@ -66,7 +70,8 @@ const GETLIMITCODE = (data) => {
 export default {
   GETBENEGITTYPE,
   GETPLANLIST,
-  EDITPLANDATE,
+  ADDTPLANDATA,
+  EDITPLANDATA,
   GETCOVERAGELIST,
   GETCONDITIONLIST,
   ADDCONDITIONDATA,

src/assets/style/reset.less

@@ -244,9 +244,9 @@ select {
 }
 // .ant-table,
 .ant-table {
-    thead th{
+    .ant-table-thead th{
         font-weight: bold;
-        background-color: #F8FAFB;
+        background-color: #F8FAFB !important;
     }
     .ant-btn {
         //   .fs(21);

src/views/customer/edit/index.vue

@@ -186,7 +186,7 @@
 
 <script>
 export default {
- beforeRouteUpdate(to, from, next) {
+  beforeRouteUpdate(to, from, next) {
     this.$refs.form.resetFields();
     next();
   },
@@ -288,8 +288,8 @@ export default {
       this.$apis.GETCUSTOMERDETAIL(data).then((res) => {
         if (res.returnCode === "0000") {
           this.form = res.content || {};
-          this._getCorporateCode(this.form.payorCode);
-          this._getPlanCode(this.form.corpCode);
+          this._getCorporateCode(this.form.payorId);
+          this._getPlanCode(this.form.corpId);
           const medCardCopeFiles = this.form.medCardCopeFiles || [];
           const idCardCopeFiles = this.form.idCardCopeFiles || [];
           medCardCopeFiles.forEach((item) => {
@@ -384,8 +384,8 @@ export default {
     handleMedRemove(file) {
       for (let i = 0; i < this.medCardCopeFiles.length; i++) {
         if (this.medCardCopeFiles[i].url === file.url) {
-          this.medCardCopeFiles[i].splice(i, 1);
-          this.form.medCardCopeFiles[i].splice(i, 1);
+          this.medCardCopeFiles.splice(i, 1);
+          this.form.medCardCopeFiles.splice(i, 1);
           return true;
         }
       }
@@ -393,8 +393,8 @@ export default {
     handleIDRemove(file) {
       for (let i = 0; i < this.idCardCopeFiles.length; i++) {
         if (this.idCardCopeFiles[i].url === file.url) {
-          this.idCardCopeFiles[i].splice(i, 1);
-          this.form.idCardCopeFiles[i].splice(i, 1);
+          this.idCardCopeFiles.splice(i, 1);
+          this.form.idCardCopeFiles.splice(i, 1);
           return true;
         }
       }

src/views/customer/info/index.vue

@@ -54,9 +54,9 @@
         <a-button type="link" @click.stop="changeDataStatus(record)">修改</a-button>
         <a-button type="link" @click.stop="printClaimPdf(record)">打印理赔申请书</a-button>
         <!-- <a-button type="link" class="success">新增</a-button> -->
-        <a-popconfirm title="你确定要删除吗？" ok-text="确定" cancel-text="取消" @confirm="deleteData(record)">
+        <!-- <a-popconfirm title="你确定要删除吗？" ok-text="确定" cancel-text="取消" @confirm="deleteData(record)">
           <a-button type="link" class="danger" @click.stop>删除</a-button>
-        </a-popconfirm>
+        </a-popconfirm> -->
       </template>
     </a-table>
     <!--分页-->

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

@@ -31,7 +31,7 @@
       title="福利管理"
       v-model="isBenefitEditShow"
       :footer="null"
-      width="500px"
+      width="50%"
       @cancel="isBenefitEditShow = false"
     >
       <a-form-model ref="editForm" layout="vertical" :model="editForm" :rules="editRule">
@@ -127,6 +127,7 @@
 
 <script>
 import condition from "../condition";
+import moment from 'moment'
 
 export default {
   props: {
@@ -139,13 +140,16 @@ export default {
     condition,
   },
   data() {
+    const dateFormat = (val) => {
+      return val && moment(val).format('YYYY-MM-DD')
+    }
     const columns = [
-      { title: "责任项目明细", dataIndex: "benefitCode" },
+      { title: "责任项目明细", dataIndex: "benefitDesc" },
       // { title: "预授权申请", dataIndex: "index" },
-      { title: "更新日期", dataIndex: "modifierDate" },
-      { title: "开始日期", dataIndex: "startDate" },
-      { title: "结束日期", dataIndex: "endDate" },
-      { title: "备注", dataIndex: "remark" },
+      { title: "更新日期", dataIndex: "modifierDate", width: 180 },
+      { title: "开始日期", dataIndex: "startDate", customRender: dateFormat },
+      { title: "结束日期", dataIndex: "endDate", customRender: dateFormat },
+      { title: "备注", dataIndex: "remark", width: 180 },
       {
         title: "操作",
         key: "operation",

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

@@ -107,6 +107,8 @@
 </template>
 
 <script>
+import moment from 'moment'
+
 export default {
   props: {
     formData: {
@@ -115,12 +117,22 @@ export default {
     },
   },
   data() {
+    const dateFormat = (val) => {
+      return val && moment(val).format('YYYY-MM-DD')
+    }
     const columns = [
-      { title: "频率", dataIndex: "frequencyCode" },
-      { title: "条件", dataIndex: "limitCode" },
-      { title: "开始时间", dataIndex: "startDate" },
-      { title: "结束时间", dataIndex: "endDate" },
-      { title: "有效", dataIndex: "status" },
+      { title: "条件类型", dataIndex: "frequencyDesc" },
+      { title: "条件内容", dataIndex: "limitDesc" },
+      { title: "开始时间", dataIndex: "startDate", customRender: dateFormat },
+      { title: "结束时间", dataIndex: "endDate", customRender: dateFormat },
+      { title: "状态", dataIndex: "status", customRender: (val) => {
+        for(let i = 0; i < this.statusCode.length; i ++) {
+          if (val === this.statusCode[i].code) {
+            return this.statusCode[i].name
+          }
+        }
+        return val;
+      } },
       // { title: "限额或限次", dataIndex: "index" },
       { title: "最大值", dataIndex: "maxValue" },
       {

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

@@ -32,7 +32,7 @@
       title="责任管理"
       v-model="isCoverageEditShow"
       :footer="null"
-      width="500px"
+      width="50%"
       @cancel="isCoverageEditShow = false"
     >
       <a-form-model ref="editForm" layout="vertical" :model="editForm" :rules="editRule">
@@ -41,13 +41,6 @@
             <a-form-model-item label="客户公司名称" prop="corpCode">
               <a-input disabled v-model="editForm.corpCode"> </a-input>
             </a-form-model-item>
-          </a-col>
-          <a-col :md="12">
-            <a-form-model-item label="保险计划" prop="planCode">
-              <a-input disabled v-model="editForm.planCode"> </a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :md="12">
             <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">
@@ -55,23 +48,9 @@
                 </a-select-option>
               </a-select>
             </a-form-model-item>
-          </a-col>
-          <a-col :md="12">
-            <a-form-model-item label="等待期">
-              <a-input-number v-model="editForm.waitingPeriod"></a-input-number>
-            </a-form-model-item>
-          </a-col>
-          <a-col :md="12">
             <a-form-model-item label="英文描述">
               <a-input v-model="editForm.englishDesc"></a-input>
             </a-form-model-item>
-          </a-col>
-          <a-col :md="12">
-            <a-form-model-item label="描述">
-              <a-input v-model="editForm.loaDesc"> </a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :md="12">
             <a-form-model-item label="是否直付">
               <a-radio-group v-model="editForm.isDirect" :default-value="editForm.isDirect" button-style="solid"
               >
@@ -80,24 +59,22 @@
               </a-radio-group>
             </a-form-model-item>
           </a-col>
-          <!-- <a-col :md="12">
-            <a-form-model-item label="状态">
-              <a-select
-                v-model="editForm.status"
-                show-search
-                allow-clear
-                @filterOption="filterCode"
-              >
-                <a-select-option
-                  v-for="item in statusCode"
-                  :key="item.code"
-                  :vlaue="item.code"
-                >
-                  {{ item.name }}
-                </a-select-option>
+          <a-col :md="12">
+            <a-form-model-item label="保险计划" prop="planCode">
+              <a-input disabled v-model="editForm.planCode"> </a-input>
+            </a-form-model-item>
+            <a-form-model-item label="等待期">
+              <a-input-number v-model="editForm.waitingPeriod"></a-input-number>
+            </a-form-model-item>
+            <a-form-model-item label="描述">
+              <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-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>
-          </a-col> -->
+          </a-col>
         </a-row>
         <!-- <a-form-model-item label="保险公司" prop="payorCode">
           <a-input disabled v-model="editForm.payorCode"> </a-input>
@@ -134,12 +111,21 @@ export default {
   },
   data() {
     const columns = [
-      { title: "门诊责任", dataIndex: "coverageCode", width: 150 },
-      { title: "是否直付", dataIndex: "isDirect", width: 120 },
+      { title: "门诊责任", dataIndex: "coverageDesc", width: 200 },
+      { title: "是否直付", dataIndex: "isDirect", width: 120, customRender: (val) => {
+        return val === 'Y' ? '是' : '否'
+      } },
       { title: "等待期", dataIndex: "waitingPeriod", width: 120 },
       // { title: "预授权", dataIndex: "sex", width: 80 },
       // { title: "预授权期限", dataIndex: "payorName", width: 180 },
-      { title: "状态", dataIndex: "status", width: 180 },
+      { title: "状态", dataIndex: "isEffective", width: 180, customRender: (val) => {
+        for(let i = 0; i < this.statusCode.length; i ++) {
+          if (val === this.statusCode[i].code) {
+            return this.statusCode[i].name
+          }
+        }
+        return val;
+      } },
       { title: "备注", dataIndex: "remark" },
       {
         title: "操作",
@@ -156,11 +142,12 @@ export default {
       editForm: {},
       coverageCode: [],
       statusCode: [
-        { code: "1", name: "有效" },
-        { code: "2", name: "无效" },
+        { code: "Y", name: "有效" },
+        { code: "N", name: "无效" },
       ],
       editRule: {
         coverageCode: [{ required: true, message: "请选择保险责任" }],
+        isEffective: [{ required: true, message: "请选择计划状态" }],
       },
     };
   },

src/views/welfare/edit/index.vue

@@ -53,6 +53,7 @@
         :pagination="false"
       >
         <template slot="operation" slot-scope="record">
+          <a-button type="link" @click.stop="editPlanData(null)">新增</a-button>
           <a-button type="link" @click.stop="editPlanData(record)">修改</a-button>
           <!-- <a-popconfirm
             title="你确定要删除吗？"
@@ -90,64 +91,39 @@
             <a-form-model-item label="保险计划" prop="planCode">
               <a-input v-model="editForm.planCode"></a-input>
             </a-form-model-item>
-          </a-col>
-          <a-col :md="12">
-            <a-form-model-item label="英文名称" prop="englishName">
-              <a-input v-model="editForm.englishName"></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :md="12">
             <a-form-model-item label="计划全称" prop="longName">
               <a-input v-model="editForm.longName"></a-input>
             </a-form-model-item>
-          </a-col>
-          <a-col :md="12">
-            <a-form-model-item label="计划简称" prop="shortName">
-              <a-input v-model="editForm.shortName"></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :md="12">
             <a-form-model-item label="公司名称" prop="corpName">
               <a-input v-model="editForm.corpName"></a-input>
             </a-form-model-item>
-          </a-col>
-          <a-col :md="12">
             <a-form-model-item label="生效日期" prop="effectiveDate">
               <a-date-picker v-model="editForm.effectiveDate" placeholder="请选择生效日期" value-format="YYYY-MM-DD 00:00:00"></a-date-picker>
             </a-form-model-item>
-          </a-col>
-          <a-col :md="12">
-            <a-form-model-item label="失效日期" prop="terminationDate">
-              <a-date-picker v-model="editForm.terminationDate" placeholder="请选择失效日期" value-format="YYYY-MM-DD 00:00:00"></a-date-picker>
+            <a-form-model-item label="地区限制" prop="regionalRestrictions">
+              <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>
           </a-col>
           <a-col :md="12">
+            <a-form-model-item label="英文名称" prop="englishName">
+              <a-input v-model="editForm.englishName"></a-input>
+            </a-form-model-item>
+            <a-form-model-item label="计划简称" prop="shortName">
+              <a-input v-model="editForm.shortName"></a-input>
+            </a-form-model-item>
             <a-form-model-item label="等待期(天)" prop="waitingPeriod">
               <a-input-number v-model="editForm.waitingPeriod"></a-input-number>
             </a-form-model-item>
-          </a-col>
-          <!-- <a-col :md="12">
-            <a-form-model-item label="地区限制" prop="idType">
-              <a-select v-model="form.idType" placeholder="请选择地区限制" show-search allow-clear @filterOption="filterCode">
-                <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 label="失效日期" prop="terminationDate">
+              <a-date-picker v-model="editForm.terminationDate" placeholder="请选择失效日期" value-format="YYYY-MM-DD 00:00:00"></a-date-picker>
             </a-form-model-item>
-          </a-col>
-          <a-col :md="12">
-            <a-form-model-item label="医院限制" prop="idType">
-              <a-select v-model="form.idType" placeholder="请选择医院限制" show-search allow-clear @filterOption="filterCode">
-                <a-select-option v-for="item in companyCode" :key="item.id" :value="item.id" :label="item.longName">{{ item.longName }}</a-select-option>
+            <a-form-model-item label="医院限制" prop="hospitalRestrictions">
+              <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>
-          </a-col> -->
-          <a-col :md="12">
-            <a-form-model-item label="状态" prop="idType">
-              <a-select v-model="form.idType" 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>
-          </a-col>
-          <a-col :md="12">
             <a-form-model-item label="备注" prop="remarks">
               <a-textarea v-model="editForm.remarks" :autoSize="{ minRows: 2, maxRows: 5 }"></a-textarea>
             </a-form-model-item>
@@ -170,6 +146,11 @@ import condition from "./components/condition";
 import coverages from "./components/coverages";
 import moment from 'moment'
 export default {
+  beforeRouteUpdate(to, from, next) {
+    this.$refs.form.resetFields();
+    this.planData = [];
+    next();
+  },
   components: {
     BurtPagination,
     condition,
@@ -182,27 +163,27 @@ export default {
     const columns = [
       // { title: "计划责任", dataIndex: "planCode", width: 180 },
       { title: "计划全称", dataIndex: "longName", width: 180},
-      { title: "简称", dataIndex: "shortName", width: 180 },
-      { title: "起始日期", dataIndex: "effectiveDate", width: 180, customRender: dateFormat },
-      { title: "终止日期", dataIndex: "terminationDate", width: 180, customRender: dateFormat },
-      { title: "计划状态", dataIndex: "status", width: 180, customRender: (val) => {
-        for(let i = 0; i < this.statusCode.length; i ++) {
-          if (val === this.statusCode[i].code) {
-            return this.statusCode[i].name
+      { title: "简称", dataIndex: "shortName", width: 130, ellipsis: true },
+      { title: "起始日期", dataIndex: "effectiveDate", width: 130, customRender: dateFormat },
+      { title: "终止日期", dataIndex: "terminationDate", width: 130, customRender: dateFormat },
+      { title: "医院限制", dataIndex: "hospitalRestrictions", width: 130, customRender: (val) => {
+        for(let i = 0; i < this.hosCode.length; i ++) {
+          if (val === this.hosCode[i].refcd) {
+            return this.hosCode[i].descCh
           }
         }
         return val;
-      } },
+      }},
       // { title: "医院限制", dataIndex: "status", width: 180 },
       // { title: "计划限额", dataIndex: "status", width: 180 },
       // { title: "限额消耗", dataIndex: "waitingPeriod" },
       { title: "等待期", dataIndex: "waitingPeriod", width: 120 },
       { title: "更新日期", dataIndex: "modifierDate",  width: 180},
-      { title: "备注", dataIndex: "remarks", width: 180 },
+      { title: "备注", dataIndex: "remarks" },
       {
         title: "操作",
         key: "operation",
-        width: "120px",
+        width: "150px",
         fixed: "right",
         scopedSlots: { customRender: "operation" },
       },
@@ -219,16 +200,16 @@ export default {
         planCode: undefined,
       },
       searchForm: {},
-      detailForm: {},
-      editForm: {},
+      editForm: {
+        isEffective: '',
+        hospitalRestrictions: ''
+      },
       planData: [],
       companyCode: [],
       corpCode: [],
       planCode: [],
-      statusCode: [
-        {code: "1", name: "有效"},
-        {code: "2", name: "无效"}
-      ],
+      areaCode: [],
+      hosCode: [],
       queryForm: {},
       pager: {
         pageNum: 1,
@@ -246,14 +227,17 @@ export default {
         // shortName: [{ required: true, message: "请输入保险计划简称" }],
         effectiveDate: [{ required: true, message: "请选择生效日期" }],
         terminationDate: [{ required: true, message: "请选择失效日期" }],
+        hospitalRestrictions: [{ required: true, message: "请选择医院限制" }]
       },
     };
   },
   mounted() {
-    if (this.$route.query && this.$route.query.id) {
-      this.detailForm = this.$route.query;
+    if (this.$route.query && this.$route.query.planCode) {
+      this.form = this.$route.query;
+      this.$nextTick(this.handlerSearch)
     }
     this._getPayorCode();
+    this.initCodeData();
   },
   methods: {
     handlerSearch() {
@@ -326,8 +310,24 @@ export default {
         this._editPlanData(this.editForm);
       });
     },
+    initCodeData() {
+      const params = {
+        areaCode: {
+          modid: "CI",
+          refgrp: "POLICY_DIRECT_AREA"
+        },
+        hosCode: {
+          modid: "CI",
+          refgrp: "HOSPITAL_RESTRICTIONS"
+        },
+      }
+      for (let i in params) {
+        this._getRefcdByRefgrp(params[i], i)
+      }
+    },
     _editPlanData(data) {
-      this.$apis.EDITPLANDATE(data).then((res) => {
+      const fn = data.id ? 'EDITPLANDATA' : 'ADDTPLANDATA' 
+      this.$apis[fn](data).then((res) => {
         if (res.returnCode === "0000") {
           this._getPlanList();
           this.$message.success(res.returnMsg || "操作成功");
@@ -368,6 +368,14 @@ export default {
         this.total = (res.content && res.content.total) || 0;
       });
     },
+    _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/PolicyInfo.vue

@@ -3,17 +3,17 @@
     <a-collapse v-model="activeKeys" expand-icon-position="right" :bordered="false">
       <a-collapse-panel key="1" header="保单信息">
         <a-row class="policy_line" :gutter="10">
-          <a-col :span="6">保险卡号：</a-col>
-          <a-col :span="6">保单号码：</a-col>
-          <a-col :span="6">保险计划：</a-col>
-          <a-col :span="6">客户公司名称：</a-col>
-          <a-col :span="6">首次入保日期：</a-col>
-          <a-col :span="6">保单生效日期：</a-col>
-          <a-col :span="6">保单终止日期：</a-col>
-          <a-col :span="6">是否承担既往症：</a-col>
-          <a-col :span="6">保单直付区域：</a-col>
-          <a-col :span="6">剩余等待期天数</a-col>
-          <a-col :span="6">其他备注</a-col>
+          <a-col :span="6">保险卡号：{{policyData.cardNo}}</a-col>
+          <a-col :span="6">保单号码：{{policyData.policyNo}}</a-col>
+          <a-col :span="6">保险计划：{{policyData.planName}}</a-col>
+          <a-col :span="6">客户公司名称：{{policyData.corpName}}</a-col>
+          <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.remark}}</a-col>
         </a-row>
       </a-collapse-panel>
     </a-collapse>
@@ -21,6 +21,8 @@
 </template>
 
 <script>
+import moment from 'moment'
+
 export default {
   props: {
     policyData: {
@@ -32,6 +34,11 @@ export default {
       activeKeys: "1",
     };
   },
+  methods: {
+    dateFormat(val) {
+      return val && moment(val).format('YYYY-MM-DD')
+    }
+  }
 };
 </script>
 

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

@@ -26,13 +26,13 @@
       </div>
     </div> -->
     <a-collapse v-model="activeKeys" expand-icon-position="right" :bordered="false">
-      <a-collapse-panel v-for="item in benefitData" :key="item.benefitCode" :header="item.benefitCode">
+      <a-collapse-panel v-for="item in benefitData" :key="item.benefitCode" :header="item.benefitCode + ' ' +item.benefitDesc">
         <div>
           <a-row class="policy_line" :gutter="10">
             <a-col :span="6">事先授权：</a-col>
             <a-col :span="6">等待期：{{ item.waitingPeriod }}</a-col>
-            <a-col :span="6">年限额：</a-col>
-            <a-col :span="6">赔付比例：</a-col>
+            <!-- <a-col :span="6">年限额：</a-col>
+            <a-col :span="6">赔付比例：</a-col> -->
           </a-row>
         </div>
         <condition :formData="{ ...item, conditionType: '01' }" />

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

@@ -2,6 +2,7 @@
   <div>
     <a-table
       class="mar-bottom10"
+      size="small"
       :columns="columns"
       :locale="{ emptyText: 'No Data' }"
       :data-source="conditionList"
@@ -20,8 +21,8 @@ export default {
   },
   data() {
     const columns = [
-      { title: "频率", dataIndex: "frequencyCode" },
-      { title: "条件", dataIndex: "limitCode" },
+      { title: "条件类型", dataIndex: "frequencyDesc" },
+      { title: "条件内容", dataIndex: "limitDesc" },
       { title: "最小值", dataIndex: "minValue" },
       { title: "最大值", dataIndex: "maxValue" },
       { title: "家庭最大值", dataIndex: "familyMaxValue" },

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

@@ -12,24 +12,20 @@
         <!-- <a-button type="primary" @click="addNew">
           <Icon name="ssiadd" :size="14" />新增
         </a-button> -->
-        <a-button type="primary">
+        <!-- <a-button type="primary">
           <Icon name="ssidownload" :size="14" />保存
-        </a-button>
+        </a-button> -->
+        <a-button type="primary" @click="totEditWelfare">编辑福利信息</a-button>
       </div>
     </div>
     <a-collapse v-model="activeKeys" expand-icon-position="right" :bordered="false">
-      <a-collapse-panel v-for="item in coverageData" :key="item.coverageCode" :header="item.coverageCode">
+      <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">事先授权：</a-col>
             <a-col :span="6">等待期：{{ item.waitingPeriod }}</a-col>
-          </a-row>
-          <a-row class="policy_line" :gutter="10">
-            <a-col :span="6">年限额：</a-col>
-            <a-col :span="6">限次：</a-col>
-            <a-col :span="6">免赔额：</a-col>
             <a-col :span="6">赔付比例：</a-col>
           </a-row>
         </div>
@@ -122,6 +118,17 @@ export default {
           .indexOf(input.toLowerCase()) >= 0
       );
     },
+    // 编辑福利信息
+    totEditWelfare() {
+      this.$router.push({
+        name: 'welfareEdit',
+        query: {
+          payorCode: this.formData.payorCode,
+          corpCode: this.formData.corpCode,
+          planCode: this.formData.planCode,
+        }
+      })
+    },
     _getSpecialtyCode() {
       this.$apis.GETSPECIALTYLIST().then((res) => {
         this.welfareType = res.content || [];
@@ -157,9 +164,9 @@ export default {
 .policy_line {
   .pa(0, 30, 0, 30);
   line-height: 60px;
-  //   &:not(:last-child) {
-  border-bottom: 1px solid #f8fafb;
-  //   }
+  .ant-col{
+    border-bottom: 1px solid #f8fafb;
+  }
 }
 .classify {
   .pa(10, 20, 10, 20);

src/views/welfare/info/index.vue

@@ -119,8 +119,8 @@ export default {
       coverageForm: {},
       customList: [],
       companyCode: [],
-      corpCode: [],
-      planCode: [],
+      // corpCode: [],
+      // planCode: [],
       queryForm: {},
       cusPager: {
         pageNum: 1,
@@ -179,8 +179,8 @@ export default {
           this.customList = [];
           this.coverageForm = res.content || {};
           this.isShowCoverageData = true;
-          this._getCorporateCode(this.coverageForm.payorId);
-          this._getPlanCode(this.coverageForm.corpId);
+          // this._getCorporateCode(this.coverageForm.payorId);
+          // this._getPlanCode(this.coverageForm.corpId);
         }
         // this.dataList = (res.content && res.content.list) || [];
         // this.total = (res.content && res.content.total) || 0;