Merge branch 'yanglilong' of git.ssish.com:sunhailiang/bims into test

src/mixins/index.js

 import bus from "../utils/bus";
-import {} from '@/utils/utilsdictOptions.js'
+import {sexOptions} from '@/utils/utilsdictOptions.js'
 
 // 全局混入将会影响每个单文件组件，请慎重思考是否要混入
 export default {
@@ -9,6 +9,14 @@ export default {
     };
   },
   filters: {
-	  
+	  formatSex(val){
+			if (!val) {
+			  return;
+			}
+			const item = sexOptions.find((item) => {
+			  return item.value == val;
+			});
+			return item? item.name: "";
+		},
   }
 };

src/views/verification/index.vue

@@ -35,7 +35,7 @@
     </a-form-model>
     <!-- table -->
     <a-table :columns="columns" :data-source="dataList" :scroll="{ x: true }" :pagination="false">
-      <template slot="eobSts" slot-scope="record, text">
+      <template slot="eobSts" slot-scope="text">
         <span>{{text==1?'未回款':'已回款'}}</span>
       </template>
       <template slot="operation" slot-scope="text, record, index">

src/views/welfare/info/index.vue

@@ -40,14 +40,7 @@
             </a-select>
           </a-form-model-item>
         </a-col>
-        <a-col :xl="4" :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-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>
-        </a-col>
-        <a-col :xl="14" :lg="12" :sm="24" class="none-label">
+        <a-col :xl="18" :lg="12" :sm="24" class="none-label">
           <a-form-model-item label="button">
             <a-button type="primary" class="text-r" @click="handlerReset">
               <Icon name="ssireset" :size="14" />重置
@@ -66,10 +59,21 @@
         row-key="mrnNo"
         :scroll="{ x: true }"
         :pagination="false"
-        :customRow="handlerRowClick"
-      ></a-table>
-      <BurtPagination :pagination="{ ...cusPager, total: cusTotal }" @pageChange="onCustomChange"
-      />
+        :customRow="handlerRowClick">
+        <template slot="sex" slot-scope="text">
+          <span>{{text | formatSex}}</span>
+        </template>
+        <template slot="birthday" slot-scope="text">
+          <span>{{text?moment(text).format('YYYY-MM-DD'):''}}</span>
+        </template>
+        <template slot="startDate" slot-scope="text">
+          <span>{{text?moment(text).format('YYYY-MM-DD'):''}}</span>
+        </template>
+        <template slot="endDate" slot-scope="text">
+          <span>{{text?moment(text).format('YYYY-MM-DD'):''}}</span>
+        </template>
+      </a-table>
+      <BurtPagination :pagination="{ ...cusPager, total: cusTotal }" @pageChange="onCustomChange" />
     </div>
     <div v-if="isShowCoverageData">
       <PolicyInfo :policyData="coverageForm" />
@@ -82,6 +86,8 @@
 import BurtPagination from "@/components/CUSTOMER/pagation";
 import coverages from "./components/coverages";
 import PolicyInfo from "./components/PolicyInfo";
+import moment from "moment";
+import mixins from "@/mixins";
 export default {
   beforeRouteUpdate(to, from, next) {
     this.handlerReset();
@@ -92,16 +98,17 @@ export default {
     coverages,
     PolicyInfo,
   },
+  mixins: [mixins],
   data() {
     const customColumns = [
       { title: "病历号", dataIndex: "mrnNo", width: 180 },
       { title: "客户姓名", dataIndex: "patientName", width: 120 },
-      { title: "出生日期", dataIndex: "birthday", width: 180 },
-      { title: "性别", dataIndex: "sex", width: 80 },
+      { title: "出生日期", dataIndex: "birthday", width: 180, scopedSlots: { customRender: "birthday" } },
+      { title: "性别", dataIndex: "sex", width: 80, scopedSlots: { customRender: "sex"  } },
       { title: "保险公司", dataIndex: "payorName", width: 180 },
       { title: "保单号码", dataIndex: "policyNo", width: 190 },
-      { title: "保险有效日期", dataIndex: "startDate", width: 180 },
-      { title: "保险终止日期", dataIndex: "endDate", width: 180 },
+      { title: "保险有效日期", dataIndex: "startDate", scopedSlots: { customRender: "startDate" }, width: 180 },
+      { title: "保险终止日期", dataIndex: "endDate", scopedSlots: { customRender: "endDate" }, width: 180 },
     ];
     return {
       isShowCoverageData: false,
@@ -113,7 +120,6 @@ export default {
         sex: undefined,
         idNo: undefined,
         payorId: undefined,
-        idType: undefined
       },
       detailForm: {},
       coverageForm: {},
@@ -137,6 +143,7 @@ export default {
     this._getPayorCode();
   },
   methods: {
+    moment,
     onCustomChange(pager) {
       const { pageNum } = pager;
       // console.log(pager);