Merge branch 'func-eccs-2045' into 'master'

eccs 2045 商保流程改造

See merge request !33

src/api/apis_moudles/verification.js

@@ -12,4 +12,8 @@ export default {
   saveBackMoney: "/backstage/auth/saveBackMoney",   //新建回款
   deleteBackMoney: "/backstage/auth/deleteBackMoney",   //删除回款
   eobReceipListExport: "/backstage/auth/eobReceipListExport",   //EOB关联账单导出
+  queryBackReceiptList: "/backstage/auth/queryBackReceiptList",   //回销关联账单列表查询
+  queryReceiptInfoList: "/backstage/auth/queryReceiptInfoList",   //回销账单列表查询
+  deleteReceiptRecord: "/backstage/auth/deleteBackReceipt", // 删除已关联账单
+
 };

src/api/funcs_modules/verification.js

@@ -53,6 +53,20 @@ const EOBRECEIPLISTEXPORT = (data={}) => {
   return req.post(apis.eobReceipListExport, data, { responseType: "blob" });
 };
 
+//回销关联账单列表查询
+const QUERYBACKRECEIPTLIST = (data) => {
+  return req.post(apis.queryBackReceiptList, data);
+};
+//回销账单列表查询
+const QUERYBACKRECEIPTINFOLIST = (data) => {
+  return req.post(apis.queryReceiptInfoList, data);
+};
+
+// 删除已关联账单
+const DELETERECEIPTRECORD = (data) => {
+  return req.post(apis.deleteReceiptRecord, data);
+};
+
 // 对象数组
 export default { 
   QUERYEOBLIST,
@@ -66,4 +80,7 @@ export default {
   SAVEBACKMONEY,
   DELETEBACKMONEY,
   EOBRECEIPLISTEXPORT,
+  QUERYBACKRECEIPTLIST,
+  QUERYBACKRECEIPTINFOLIST,
+  DELETERECEIPTRECORD
 };
\ No newline at end of file

src/router/modules/menu.js

@@ -14,38 +14,34 @@ export default [
         path: "/customer",
         title: "客户查询",
       },
-      {
-        path: "/customer/edit",
-        title: "新建客户",
-      },
-    ],
-  },
-  {
-    icon: "ssimanage_msg",
-    path: "2",
-    title: "福利信息管理",
-    children: [
-      {
-        path: "/welfare",
-        title: "福利查询",
-      }
-    ],
-  },
-  {
-    icon: "ssimanage",
-    path: "pre-auth",
-    title: "预授权信息管理",
-    children: [
-      {
-        path: "/pre-auth",
-        title: "预授权查询",
-      },
-      {
-        path: "/pre-auth/add",
-        title: "新建预授权",
-      },
     ],
   },
+  // {
+  //   icon: "ssimanage_msg",
+  //   path: "2",
+  //   title: "福利信息管理",
+  //   children: [
+  //     {
+  //       path: "/welfare",
+  //       title: "福利查询",
+  //     }
+  //   ],
+  // },
+  // {
+  //   icon: "ssimanage",
+  //   path: "pre-auth",
+  //   title: "预授权信息管理",
+  //   children: [
+  //     {
+  //       path: "/pre-auth",
+  //       title: "预授权查询",
+  //     },
+  //     // {
+  //     //   path: "/pre-auth/add",
+  //     //   title: "新建预授权",
+  //     // },
+  //   ],
+  // },
   {
     icon: "ssisearch",
     path: "charge-query",
@@ -66,10 +62,10 @@ export default [
     path: "verification",
     title: "核销管理",
     children: [
-      {
-        path: "/verification",
-        title: "EOB管理",
-      },
+      // {
+      //   path: "/verification",
+      //   title: "EOB管理",
+      // },
       {
         path: "/verification/collection",
         title: "回款管理",

src/views/charge-query/index.vue

@@ -150,8 +150,8 @@ export default {
       { title: "病历号", dataIndex: "mrnNo",width: 180},
       { title: "客户姓名",dataIndex: "patientName",width: 120,},
       { title: "客户类型", dataIndex: "patientType", width: 180 },
-      { title: "保险公司", dataIndex: "payorName", width: 180 },
-      { title: "就诊医生", dataIndex: "doctorName", width: 180 },
+      { title: "保险公司", dataIndex: "payorName", width: 200 },
+      { title: "就诊医生", dataIndex: "doctorName", width: 150 },
       { title: "是否已关联寄送单", dataIndex: "isSend", width: 180,scopedSlots: { customRender: "isSend" } },
       { title: "是否已关联EOB", dataIndex: "isEob", width: 180,scopedSlots: { customRender: "isEob" } },
       { title: "是否已回款", dataIndex: "isEobBack", width: 180,scopedSlots: { customRender: "isEobBack" } },
@@ -211,7 +211,6 @@ export default {
     })
   },
   created() {
-    this._getChargeList();
     this._getCompanyOptions();
     this._getDoctorListNoPage();//获取医生下拉选项
   },

src/views/charge-query/lpjManageDetail.vue

@@ -229,11 +229,13 @@ export default {
   computed: {
     columns() {
         const base = [
-            { title: "就诊日期", dataIndex: "receiptDate", width: 200,scopedSlots: { customRender: "receiptDate" } },
+            { title: "就诊日期", dataIndex: "receiptDate", width: 160,scopedSlots: { customRender: "receiptDate" } },
             { title: "病历号", dataIndex: "mrnNo", key:"mrnNo",align:'center', width: 136},
-            { title: "客户姓名", dataIndex: "patientName", width: 98 },
+            { title: "客户姓名", dataIndex: "patientName", width: 160 },
+            { title: "保险卡号", dataIndex: "memberCardNo", width: 180 },
+            { title: "客户生日", dataIndex: "birthday", width: 160 },
             { title: "账单编号", dataIndex: "receiptNo", key:"receiptNo",align:'center', width: 136},
-            { title: "保险公司", dataIndex: "payorName", width: 110 },
+            { title: "保险公司", dataIndex: "payorName", ellipsis: true,  width: 250 },
             { title: "应收金额", dataIndex: "chargeAmount", width: 100, align: 'center' },
             { title: "折扣金额", dataIndex: "discountAmount", width: 100, align: 'center' },
             { title: "减免金额", dataIndex: "discountAmount2", width: 100, align: 'center' },

src/views/customer/info/index.vue

@@ -32,7 +32,7 @@
         </a-col>
         <a-col :xl="18" :lg="18" :sm="12" class="none-label">
           <a-form-model-item label="button">
-            <a-button type="primary" @click="addNewCustom"><Icon name="ssiadd" :size="14" />新建客户</a-button>
+            <!-- <a-button type="primary" @click="addNewCustom"><Icon name="ssiadd" :size="14" />新建客户</a-button> -->
             <a-button class="mar-left10" type="primary" @click="handlerSearch">
               <Icon name="ssisearch_active" :size="14" />查询
             </a-button>
@@ -121,7 +121,6 @@ export default {
     BurtPagination,
   },
   created() {
-    this._getCustomerList();
     this._getPayorCode();
   },
   methods: {

src/views/pre-auth/index.vue

@@ -54,8 +54,8 @@
             <a-button class="mar-left5" type="primary" @click="reset">
               <Icon name="ssireset" :size="12" />重置
             </a-button>
-            <a-button class="mar-left5" type="primary" @click="addPreAuth">
-              <Icon name="ssiadd" :size="12" />新建预授权</a-button>
+            <!-- <a-button class="mar-left5" type="primary" @click="addPreAuth">
+              <Icon name="ssiadd" :size="12" />新建预授权</a-button> -->
             </a-form-model-item>
         </a-col>
       </a-row>

src/views/verification/collection.vue

@@ -5,8 +5,16 @@
       <a-row :gutter="30">
         <a-col :lg="6" :sm="12">
           <a-form-model-item label="保险公司">
-            <a-select v-model="form.payorCode" placeholder="请选择保险公司" allowClear>
-              <a-select-option v-for="item in companyOptions" :key="item.id" :value="item.payorCode">
+            <a-select
+              v-model="form.payorCode"
+              placeholder="请选择保险公司"
+              allowClear
+            >
+              <a-select-option
+                v-for="item in companyOptions"
+                :key="item.id"
+                :value="item.payorCode"
+              >
                 {{ item.longName }}
               </a-select-option>
             </a-select>
@@ -14,15 +22,51 @@
         </a-col>
         <a-col :lg="6" :sm="12">
           <a-form-model-item label="EOB编号">
-            <a-input v-model="form.eobNo"  placeholder="EOB编号"/>
+            <a-input v-model="form.eobNo" placeholder="EOB编号" />
           </a-form-model-item>
         </a-col>
-        <a-col :md="12" class="none-label">
+        <a-col :lg="6" :sm="12">
+          <a-form-model-item label="创建时间">
+            <a-range-picker
+              format="YYYY-MM-DD"
+              v-model="form.dateRange"
+              :placeholder="['开始时间', '结束时间']"
+              @change="onSelectVisitTime"
+            />
+          </a-form-model-item>
+        </a-col>
+        <a-col :lg="6" :sm="12">
+          <a-form-model-item label="状态">
+            <a-select
+              v-model="form.backStatus"
+              placeholder="请选择状态"
+              allowClear
+            >
+              <a-select-option
+                v-for="item in backStatusOptions"
+                :key="item.value"
+                :value="item.value"
+              >
+                {{ item.name }}
+              </a-select-option>
+            </a-select>
+          </a-form-model-item>
+        </a-col>
+        <a-col :lg="6" :sm="12">
+          <a-form-model-item label="回款金额">
+            <a-input v-model="form.backAmountCny" placeholder="回款金额" />
+          </a-form-model-item>
+        </a-col>
+        <a-col :md="24" class="none-label">
           <a-form-model-item label="button">
             <a-button class="mar-left10" type="primary" @click="handlerSearch">
               <Icon name="ssisearch_active" :size="14" />查询
             </a-button>
-            <a-button class="mar-left10" type="primary" @click.stop="handlerReset">
+            <a-button
+              class="mar-left10"
+              type="primary"
+              @click.stop="handlerReset"
+            >
               <Icon name="ssireset" :size="14" />重置
             </a-button>
             <a-button class="mar-left10" type="primary" @click="addNewEvt">
@@ -33,14 +77,29 @@
       </a-row>
     </a-form-model>
     <!-- table -->
-    <a-table :columns="columns" :data-source="dataList" :scroll="{ x: true }" :pagination="false" >
+    <a-table
+      :columns="columns"
+      :data-source="dataList"
+      :scroll="{ x: true }"
+      :pagination="false"
+    >
       <template slot="eobSts" slot-scope="text">
-        {{text==1?'待回款':'已回款'}}
+        {{ text == 1 ? "待回款" : "已回款" }}
       </template>
       <template slot="operation" slot-scope="text, record, index">
-        <a-button type="link" @click.stop="editEvt(record, true)">修改</a-button>
-        <a-button type="link" class="success" @click.stop="editEvt(record)">查看</a-button>
-        <a-button v-if="record.backMoneyNo" type="link" class="danger" @click.stop="delRecord(index)">删除</a-button>
+        <a-button type="link" @click.stop="editEvt(record, true)"
+          >修改</a-button
+        >
+        <a-button type="link" class="success" @click.stop="editEvt(record)"
+          >查看</a-button
+        >
+        <a-button
+          v-if="record.backMoneyNo"
+          type="link"
+          class="danger"
+          @click.stop="delRecord(index)"
+          >删除</a-button
+        >
       </template>
     </a-table>
     <BurtPagination :pagination="pagination" @pageChange="getData" />
@@ -52,20 +111,44 @@ import BurtPagination from "@/components/CUSTOMER/pagation";
 import moment from "moment";
 const columns = [
   { title: "回款编号", dataIndex: "backMoneyNo", ellipsis: true, width: 150 },
+  { title: "EOB编号", dataIndex: "eobNos", ellipsis: true, width: 140 },
   { title: "保险公司", dataIndex: "payorName", ellipsis: true, width: 110 },
-  { title: "回款金额(人民币)", dataIndex: "backAmountCny", ellipsis: true, width: 190,},
-  { title: "回款金额(美元)", dataIndex: "backAmountUsd", ellipsis: true, width: 190,},
-  { title: "汇率差", dataIndex: "backExchangeRate", ellipsis: true, width: 110 },
+  {
+    title: "回款金额(人民币)",
+    dataIndex: "backAmountCny",
+    ellipsis: true,
+    width: 190,
+  },
+  {
+    title: "未核销余额",
+    dataIndex: "residueBackAmount",
+    ellipsis: true,
+    width: 130,
+  },
+  { title: "EOB备注", dataIndex: "eobRemark", ellipsis: true, width: 140 },
   { title: "创建时间", dataIndex: "createDate", ellipsis: true, width: 110 },
-  { title: "操作", dataIndex: "operation", scopedSlots: { customRender: "operation" },fixed: "right", width: "200px", align: "center"},
+  { title: "状态", dataIndex: "backStatusStr", ellipsis: true, width: 90 },
+  {
+    title: "操作",
+    dataIndex: "operation",
+    scopedSlots: { customRender: "operation" },
+    fixed: "right",
+    width: "200px",
+    align: "center",
+  },
 ];
 export default {
   data() {
     return {
       columns,
       form: {
-        payorCode: '',
-        eobNo: '',
+        payorCode: "",
+        eobNo: "",
+        dateRange: [], //创建时间范围
+        startDate: "",
+        endDate: "",
+        backStatus: "",
+        backAmountCny: "", // 回款金额
       },
       dataList: [],
       companyOptions: [], //保险公司
@@ -74,12 +157,17 @@ export default {
         pageSize: 10,
         total: 0,
       },
+      backStatusOptions: [
+        { name: '全部', value: '' },
+        { name: '已结案', value: '1' },
+        { name: '暂存', value: '0' }
+      ]
     };
   },
   components: {
     BurtPagination,
   },
-  created(){
+  created() {
     this.getData();
     this._getCompanyOptions();
   },
@@ -93,9 +181,13 @@ export default {
     // 重置
     handlerReset() {
       this.form = {
-        payorCode: '',
-        eobNo: '',
-      }
+        payorCode: "",
+        eobNo: "",
+        dateRange: [], //创建时间范围
+        startDate: "",
+        endDate: "",
+        backStatus: ""
+      };
     },
     // 获取保险公司下拉选项
     _getCompanyOptions() {
@@ -103,13 +195,20 @@ export default {
         this.companyOptions = res.content || [];
       });
     },
+    // 选中就诊时间
+    onSelectVisitTime(date, dateString) {
+      this.form.startDate = dateString[0] + "";
+      this.form.endDate = dateString[1] + "";
+    },
     handlerSearch() {
       this.pagination.pageNum = 1;
       this.getData();
     },
     getData() {
-      this.$apis.QUERYBACKMONEYLIST({
+      this.$apis
+        .QUERYBACKMONEYLIST({
           ...this.form,
+          dateRange: undefined,
           pageNum: this.pagination.pageNum,
           pageSize: this.pagination.pageSize,
         })
@@ -117,42 +216,71 @@ export default {
           if (res.returnCode == "0000") {
             let content = res.content || {};
             this.pagination.total = content.total || 0;
-          this.dataList = content.list || [];
+            this.dataList = content.list.map(item => {
+              item.backStatusStr = item.backStatus === '0' ? '暂存' : '已结案'
+              return item
+            }) || [];
           } else {
             this.$message.error(res.returnMsg);
           }
         });
     },
     //新建回款
-    addNewEvt(){
+    addNewEvt() {
       this.$router.push({
-        path: '/verification/collectionDetail',
+        path: "/verification/collectionDetail",
         query: {
-            isEdit: true
-        }
-      })
+          isEdit: true,
+        },
+      });
     },
     //编辑回款
-    editEvt(record, isEdit){
+    editEvt(record, isEdit) {
       const { backMoneyNo } = record;
-      localStorage.setItem('backMoneyDataDetail', JSON.stringify(record));
+      localStorage.setItem("backMoneyDataDetail", JSON.stringify(record));
+      console.log(isEdit, record.backStatus)
+      // 已结案状态，二次确认
+      if (isEdit && record.backStatus === "1") {
+        this.$modal.confirm({
+          title: "修改",
+          content: "处于已结案状态，是否确定修改该条记录？",
+          okText: "确认",
+          cancelText: "取消",
+          onOk: () => {
             this.$router.push({
-        path: '/verification/collectionDetail',
+              path: "/verification/collectionDetail",
               query: {
                 backMoneyNo,
-          isEdit
+                isEdit,
+              },
+            });
+          },
+          onCancel: () => {},
+        });
+        return;
       }
-      })
+      this.$router.push({
+        path: "/verification/collectionDetail",
+        query: {
+          backMoneyNo,
+          isEdit,
+        },
+      });
     },
     //删除记录
     delRecord(index) {
+      let content = "确定删除该条记录？"
+      if(this.dataList[index].backStatus === "1") {
+        content = "处于已结案状态，确定删除该条记录？"
+      }
       this.$modal.confirm({
         title: "删除",
-        content: "确定删除该条记录？",
+        content,
         okText: "确认",
         cancelText: "取消",
         onOk: () => {
-          this.$apis.DELETEBACKMONEY({
+          this.$apis
+            .DELETEBACKMONEY({
               backMoneyNo: this.dataList[index].backMoneyNo,
             })
             .then((res) => {
@@ -166,7 +294,7 @@ export default {
         },
         onCancel: () => {},
       });
-    }
+    },
   },
 };
 </script>

src/views/verification/collectionDetail.vue

@@ -6,7 +6,7 @@
       <a-row :gutter="30">
         <a-col :lg="6" :sm="12">
           <a-form-model-item label="保险公司">
-            <a-select v-model="form.payorCode" placeholder="请选择保险公司" allow-clear :disabled="!isEdit">
+            <a-select v-model="form.payorCode" placeholder="请选择保险公司" allow-clear :disabled="!isEdit" @change="changePayor">
               <a-select-option v-for="item in companyOptions" :key="item.id" :value="item.payorCode">
                 {{ item.longName }}
               </a-select-option>
@@ -23,6 +23,11 @@
             <a-input type="number" v-model="form.backAmountCny"  placeholder="请输入金额" allow-clear :disabled="!isEdit" />
           </a-form-model-item>
         </a-col>
+        <a-col :lg="5" :sm="12">
+          <a-form-model-item label="可核销余额">
+            <a-input v-model="residueBackAmount" disabled />
+          </a-form-model-item>
+        </a-col>
         <a-col :lg="5" :sm="12">
           <a-form-model-item label="回款金额(美元)">
             <a-input type="number" v-model="form.backAmountUsd" placeholder="请输入金额" allow-clear :disabled="!isEdit" />
@@ -33,8 +38,18 @@
             <a-input v-model="form.backExchangeRate" placeholder="请输入金额" allow-clear :disabled="!isEdit" />
           </a-form-model-item>
         </a-col>
-        <a-col :lg="6" :sm="12">
-          <a-form-model-item label="上传银行付款凭证">
+        <a-col :lg="5" :sm="12">
+          <a-form-model-item label="EOB编号">
+            <a-input v-model="form.eobNos" placeholder="请输入EOB编号" allow-clear :disabled="!isEdit" />
+          </a-form-model-item>
+        </a-col>
+        <a-col :lg="5" :sm="12">
+          <a-form-model-item label="EOB备注">
+            <a-input v-model="form.eobRemark" placeholder="请输入EOB备注" allow-clear :disabled="!isEdit" />
+          </a-form-model-item>
+        </a-col>
+        <a-col :lg="5" :sm="12">
+          <a-form-model-item label="上传附件">
             <a-upload name="file" :multiple="false" :showUploadList="true" :disabled="!isEdit"
               :fileList="fileList"
               :customRequest="(file)=>uploadFile(file)"
@@ -44,74 +59,65 @@
             </a-upload>
           </a-form-model-item>
         </a-col>
-        <a-col :md="24" :lg="12" class="none-label" v-if="isEdit">
+        <a-col :md="24" :lg="24" class="none-label" v-if="isEdit">
           <a-form-model-item label="button">
-            <a-button class="mar-left10" type="primary" @click="addNewEvt">
-              <Icon :name="backMoneyNo?'ssibaocun':'ssiadd'" :size="14" />{{backMoneyNo?'保存回款':'新建回款'}}
+            <a-button class="mar-left10" type="primary" @click="addNewEvt(0)">
+              <Icon :name="backMoneyNo?'ssibaocun':'ssiadd'" :size="14" />暂存
             </a-button>
-          </a-form-model-item>
-        </a-col>
-        <a-col :md="24" class="none-label" v-if="isEdit">
-          <a-form-model-item label="button">
-            <!-- <a-button class="mar-left10" type="primary" @click="handlerSearch">
-              <Icon name="ssisearch_active" :size="14" />查询
-            </a-button> -->
-            <a-button class="mar-left10" type="primary" @click="addNewEOB">
-              <Icon :name="isEditNewEOB?'ssibaocun':'ssiadd'" :size="14" />{{isEditNewEOB? '保存EOB': '添加EOB'}}
+            <a-button class="mar-left10" type="primary" @click="addNewEvt(1)">
+              <Icon :name="backMoneyNo?'ssibaocun':'ssiadd'" :size="14" />结案
             </a-button>
           </a-form-model-item>
         </a-col>
       </a-row>
     </a-form-model>
-    <!-- table -->
-    <a-table :columns="columns" :data-source="dataList" :scroll="{ x: true }" :pagination="false"
-      :row-selection="isEditNewEOB? { selectedRowKeys: selectedRowKeys, onChange: onSelectChange }: null">
-      <template slot="eobNo" slot-scope="text,record">
-        <a @click="toEOBDetail(record)">{{text}}</a>
-      </template>
-      <template slot="eobSts" slot-scope="text">
-        {{text | formatEOBStatus}}
-      </template>
-      <template slot="eobBackDate" slot-scope="text">
-        {{text?moment(text).format('YYYY-MM-DD'):''}}
-      </template>
-      <template slot="operation" slot-scope="text, record">
-        <a-button type="link" @click.stop="editEvt(record)">修改</a-button>
-        <!-- <a-button v-if="record.backMoneyNo" type="link" class="danger" @click.stop="delRecord(index)">删除</a-button> -->
+    <div class="bill-content">
+      <!-- 已关联账单 -->
+      <template v-if="selectedRows.length > 0">
+        <div class="table-title">已关联账单</div>
+        <a-table class="table-content" :columns="selectedColumns" :data-source="selectedRows" :scroll="{ x: true, y: 200 }" :pagination="false">
+          <template slot="operation" slot-scope="text, record, index">
+            <a-button type="link" class="danger" @click.stop="delRecord(record, index)">删除</a-button>
           </template>
         </a-table>
-    <BurtPagination :pagination="pagination" @pageChange="pageChange" />
-
-    <a-modal title="编辑" :visible="dialogShow" width="700px" :maskClosable="false"
-      okText="确定" cancelText="取消"
-      @ok="handleEditOK" @cancel="dialogShow = false">
-      <a-form-model ref="editForm" :model="editFormObj" :rules="editRules">
+      </template>
+      <!-- table -->
+      <template v-if="isEdit">
+        <a-row class="search-form">
+          <a-form-model ref="searchForm" layout="vertical" :model="searchForm">
             <a-row :gutter="30">
-          <a-col :lg="12" :sm="24">
-            <a-form-model-item label="EOB状态" prop="eobSts">
-              <a-select v-model="editFormObj.eobSts" placeholder="请选择状态" allow-clear>
-                <a-select-option v-for="(item,i) in EOBStatusOptions" :key="i" :value="item.value">{{item.name}}</a-select-option>
-              </a-select>
+              <a-col :lg="6" :sm="12">
+                <a-form-model-item label="账单日期">
+                  <a-range-picker format="YYYY-MM-DD" value-format="YYYY-MM-DD" v-model="searchForm.billDate" :placeholder="['开始时间','结束时间']"/>
                 </a-form-model-item>
               </a-col>
-          <a-col :lg="12" :sm="24">
-            <a-form-model-item label="EOB核销时间" prop="eobBackDate">
-              <a-date-picker format="YYYY年MM月DD日" v-model="editFormObj.eobBackDate" placeholder="选择日期" />
+              <a-col :lg="5" :sm="12">
+                <a-form-model-item label="病历号">
+                  <a-input v-model="searchForm.mrnNo" placeholder="请输入病历号" allow-clear :disabled="!isEdit"/>
                 </a-form-model-item>
               </a-col>
-          <a-col :lg="12" :xs="24">
-            <a-form-model-item label="EOB回款(人民币)" prop="eobBackMoneyCny">
-              <a-input v-model.trim="editFormObj.eobBackMoneyCny" placeholder="EOB回款(人民币)" />
+              <a-col :lg="5" :sm="12">
+                <a-form-model-item label="客户名称">
+                  <a-input v-model="searchForm.patientName" placeholder="请输入客户名称" allow-clear :disabled="!isEdit"/>
                 </a-form-model-item>
               </a-col>
-          <a-col :lg="12" :xs="24">
-            <a-form-model-item label="EOB回款(美元)" prop="eobBackMoneyUsd">
-              <a-input v-model.trim="editFormObj.eobBackMoneyUsd" placeholder="EOB回款(美元)" />
-            </a-form-model-item>
+              <a-col :lg="5" :sm="12">
+                <div class="btn-div mar-bottom10 none-label">
+                  <a-button type="primary" @click="_getNewEOBList">
+                      <Icon name="ssisearch_active" :size="14" />查询
+                  </a-button>
+                </div>
               </a-col>
             </a-row>
           </a-form-model>
-    </a-modal>
+        </a-row>
+        <div class="table-title">账单列表</div>
+        <a-table :columns="columns" :data-source="dataList" :scroll="{ x: true, y: 200 }" :pagination="false" :rowKey="'id'"
+          :row-selection="{ selectedRowKeys: selectedRowKeys, onSelect: onSelectChange, onSelectAll: onSelectAll }">
+        </a-table>
+        <BurtPagination :pagination="pagination" @pageChange="pageChange" />
+      </template>
+    </div>
   </div>
 </template>
 
@@ -132,32 +138,34 @@ export default {
         backDate: null,
         backAmountCny: '',
         backAmountUsd: '',
-        backExchangeRate: ''
+        backExchangeRate: '',
+        eobNos: '', // EOB编号
+        eobRemark: '' // EOB备注
       },
       fileList: [], // 上传文件列表
       dataList: [],
-      backEobList: [], // eob回款列表
       isEditNewEOB: false, //是否在新建回款
       companyOptions: [], //保险公司
       pagination: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 5,
         total: 0,
       },
       selectedRowKeys: [], // Check here to configure the default column
+      selectedRows: [], // Check here to configure the default column
       backMoneyNo: '',
-      editFormObj: {
-        id: '',
-        eobNo: '',
-        eobSts: '',
-        eobBackDate: null,
-        eobBackMoneyCny: '',
-        eobBackMoneyUsd: '',
-      },
       editRules: {
         backAmountUsd: [{ required: true, message: "请输入", trigger: "blur" }],
         backAmount: [{ required: true, message: "请输入", trigger: "blur" }],
       },
+
+      searchForm: {
+        billDate: [],
+        mrnNo: '', // 病历号
+        patientName: '', // 客户名字
+      },
+      savedStatus: false, //是否已保存
+      relatedList: []
     };
   },
   mixins: [mixins],
@@ -168,23 +176,41 @@ export default {
   computed: {
     columns() {
         const base = [
-            { title: "EOB编号", dataIndex: "eobNo", scopedSlots: { customRender: 'eobNo' }, ellipsis: true, width: 150 },
-            { title: "EOB名称", dataIndex: "eobName", ellipsis: true, width: 195 },
-            { title: "核销时间", dataIndex: "eobBackDate", ellipsis: true, width: 110, scopedSlots: { customRender: "eobBackDate" }, },
-            { title: "保险公司", dataIndex: "payorName", ellipsis: true, width: 110 },
-            { title: "EOB状态", dataIndex: "eobSts", ellipsis: true, width: 110, scopedSlots: { customRender: "eobSts" } },
-            { title: "EOB赔付金额(人民币)", dataIndex: "eobAmountCny", ellipsis: true, width: 190,},
-            { title: "EOB赔付金额(美元)", dataIndex: "eobAmountUsd", ellipsis: true, width: 190,},
-            { title: "EOB回款金额(人民币)", dataIndex: "eobBackMoneyCny", ellipsis: true, width: 190,},
-            { title: "EOB回款金额(美元)", dataIndex: "eobBackMoneyUsd", ellipsis: true, width: 190,},
-            { title: "汇率差", dataIndex: "backExchangeRate", ellipsis: true, width: 110 },
+            { title: "账单编号", dataIndex: "receiptNo", ellipsis: true, width: 150 },
+            { title: "病历号", dataIndex: "mrnNo", ellipsis: true, width: 195 },
+            { title: "客户姓名",dataIndex: "patientName", ellipsis: true, width: 160 },
+            // { title: "保险公司", dataIndex: "payorName", ellipsis: true, width: 160 },
+            { title: "账单日期", dataIndex: "receiptDate", ellipsis: true, width: 150 },
+            { title: "收银", dataIndex: "receiptTellerName", ellipsis: true, width: 120,},
+            { title: "账单金额", dataIndex: "actualAmount", ellipsis: true, width: 150,},
+            { title: "回款金额", dataIndex: "writeOffAmount", ellipsis: true, width: 150},
+            { title: "未清余额", dataIndex: "residueBackAmount", ellipsis: true, width: 150,},
         ];
-        if(this.backMoneyNo && !this.isEditNewEOB && this.isEdit){ // 编辑状态下已经保存的数据才可进行操作
-            return base.concat([
-                { title: "操作", dataIndex: "operation", scopedSlots: { customRender: "operation" },fixed: "right", width: "170px", align: "center"},
-            ])
+        return base
+    },
+    selectedColumns() {
+      const base = JSON.parse(JSON.stringify(this.columns))
+      const changeAmount = this.changeAmount
+      base[6] = { title: "回款金额", dataIndex: "backAmount", ellipsis: true, width: 150, customRender: (val, row) => {
+        return <a-input-number v-model={row.backAmount} allow-clear disabled={!this.isEdit} onBlur={() => {changeAmount(row)}} />
+      } }
+      base[7] = { title: "未清余额", dataIndex: "residueBackAmount", ellipsis: true, width: 150, customRender: (val, row) => {
+        return Number(row.currentReceiptAmount || 0) - Number(row.backAmount || 0)
+      } }
+      base.splice(6, 0, { title: "余末金额", dataIndex: "currentReceiptAmount", ellipsis: true, width: 150,})
+      base.push({ title: "回款日期", dataIndex: "backDate", ellipsis: true, width: 150,})
+      if(this.isEdit) {
+        base.push({ title: "操作", dataIndex: "operation", fixed: 'right', width: 100, scopedSlots: { customRender: "operation" }})
       }
       return base
+    },
+    // 可核销余额
+    residueBackAmount() {
+      let totalMoney = Number(this.form.backAmountCny || 0)
+      this.selectedRows.forEach(item => {
+        totalMoney -= Number(item.backAmount)
+      })
+      return totalMoney
     }
   },
   created(){
@@ -209,50 +235,98 @@ export default {
           return file
         })
       }
-      
       this.getData();
     }
+    this._getNewEOBList();
   },
   methods: {
     moment,
-    // 查看的超链点击时链接已经生成好了，所以要点击的时候才set值才是对应的，不然存的都是最后一条数据
-    setData(record){
-      localStorage.setItem('EobDataDetail', JSON.stringify(record));
+    changeAmount(row) {
+      if((Number(row.actualAmount || 0) - Number(row.backAmount || 0)) < 0) {
+        this.$message.warning("录入账单回款金额大于账单金额");
+      }
     },
-    // EOB添加去查看的超链
-    toEOBDetail(record){
-      const { eobNo } = record;
-      localStorage.setItem('EobDataDetail', JSON.stringify(record));
-      this.$router.push({
-        path: '/verification/detail',
-        query: {
-          eobNo
+    onSelectChange(selectedRow, selected) {
+      if(selected) {
+        this.selectedRowKeys.push(selectedRow.id)
+        this.selectedRows.push(selectedRow)
+      } else {
+        const index = this.selectedRowKeys.findIndex(item => item === selectedRow.id)
+        this.selectedRowKeys.splice(index, 1)
+        this.selectedRows.splice(index, 1)
+        this._confirmDelReceipt([selectedRow])
       }
+    },
+    onSelectAll(selected, selectedRows, changeRows) {
+      console.log(selected, selectedRows, changeRows)
+      if(selected) {
+        this.selectedRowKeys = this.selectedRowKeys.concat(changeRows.map(item => item.id))
+        this.selectedRows = this.selectedRows.concat(changeRows)
+      } else {
+        changeRows.forEach(item => {
+          const findIndex =  this.selectedRowKeys.findIndex(rowId => rowId === item.id)
+          this.selectedRowKeys.splice(findIndex, 1)
+          this.selectedRows.splice(findIndex, 1)
         })
+        this._confirmDelReceipt(changeRows)
+      }
     },
-    onSelectChange(selectedRowKeys) {
-      let arr = [];
-      for(let i=0; i<selectedRowKeys.length; i++){
-        let idx = selectedRowKeys[i];
-        if(this.dataList[idx].backMoneyNo){
-          this.$msg.destroy();
-          this.$message.warning('回款编号已存在')
-        }else{
-          arr.push(idx);
+    delRecord(record, index) {
+      this.selectedRowKeys.splice(index, 1)
+      this.selectedRows.splice(index, 1)
+      if(record.relationed) {
+        // 已经关联的调用接口删除
+        this._confirmDelReceipt([record])
       }
+    },
+    _confirmDelReceipt(records) {
+      console.log(records)
+      if(!this.backMoneyNo) return;
+      const receiptVoList = records.filter(item => {
+        const findIndex =  this.relatedList.findIndex(rowId => rowId === item.id)
+        return (findIndex > -1)
+      }).map(item => {
+        return {
+          id: item.id
         }
-      this.selectedRowKeys = arr;
+      })
+      console.log(receiptVoList)
+      if(receiptVoList.length === 0) return;
+      this.$apis.DELETERECEIPTRECORD({
+        backMoneyNo: this.backMoneyNo,
+        receiptVoList
+       })
+      .then((res) => {
+        if (res.returnCode == "0000") {
+          this._getNewEOBList()
+        } else {
+          this.$message.error(res.returnMsg);
+        }
+      });
+    },
+    // 修改保险公司
+    changePayor() {
+      if(this.selectedRowKeys.length > 0 && (this.form.id || this.savedStatus)) {
+        this.$modal.confirm({
+          title: "提示",
+          content: "是否解除已关联账单",
+          okText: "确认",
+          cancelText: "取消",
+          onOk: () => {
+            this.selectedRowKeys = []
+            this.selectedRows = []
+          },
+          onCancel: () => {},
+        });
+      }
+      this._getNewEOBList()
     },
     pageChange(pager) {
       this.pagination = {
         ...this.pagination,
-        ...pager
+        ...pager,
       }
-      if(this.isEditNewEOB) { // 点击添加EOB之后 分页数据查询就应该调EOB数据
       this._getNewEOBList()
-        return true;
-      }
-      this.getData();
     },
     // 获取保险公司下拉选项
     _getCompanyOptions() {
@@ -260,48 +334,42 @@ export default {
         this.companyOptions = res.content || [];
       });
     },
-    handlerSearch() {
-      this.pagination.pageNum = 1;
-      this.getData();
-    },
+    // 获取已关联的账单
     getData() {
-      this.$apis.QUERYBACKEOBLIST({
-        pageNum: this.pagination.pageNum,
-        pageSize: this.pagination.pageSize,
-        backMoneyNo: this.backMoneyNo
+      this.$apis.QUERYBACKRECEIPTLIST({
+        pageNum: 1,
+        pageSize: 999,
+        backMoneyNo: this.backMoneyNo,
+        payorCode: this.form.payorCode
        })
       .then((res) => {
         if (res.returnCode == "0000") {
-          let content = res.content || {};
-          this.pagination.total = content.total || 0;
-          this.dataList = content.list || [];
-          this.backEobList = this.dataList.map(d => d)
+          const list = res.content.list || [];
+          this.selectedRowKeys = list.map(d => d.id)
+          this.selectedRows = list.map(item => {
+            item.relationed = true
+            return item
+          })
+          this.relatedList = list.map(d => d.id)
         } else {
           this.$message.error(res.returnMsg);
         }
       });
     },
-    //添加EOB
-    addNewEOB(){
-      this.isEditNewEOB = !this.isEditNewEOB;
-      if(!this.isEditNewEOB){ //保存
-        this.addNewEvt()
-        .then(()=>{
-          this.isEditNewEOB = false;
-        })
-      }else{ //查询所有未加入的账单
-        this.pagination.pageNum = 1;
-        this._getNewEOBList()
-      }
-    },
+    // 获取所有账单
     _getNewEOBList(){
-        this.$apis.QUERYEOBINFOLIST({
+        let billDate = this.searchForm.billDate || []
+        this.$apis.QUERYBACKRECEIPTINFOLIST({
           pageNum: this.pagination.pageNum,
-          pageSize: this.pagination.pageSize
+          pageSize: this.pagination.pageSize,
+          backMoneyNo: this.backMoneyNo,
+          payorCode: this.form.payorCode,
+          ...this.searchForm,
+          receiptEndDate: billDate[1] ? billDate[1] + ' 23:59:59' : undefined,
+          receiptStartDate: billDate[0] ? billDate[0] + ' 00:00:00' : undefined,
         })
         .then((res) => {
           if (res.returnCode == "0000") {
-            this.selectedRowKeys = [];
             let content = res.content || {};
             this.pagination.total = content.total || 0;
             this.dataList = content.list || [];
@@ -311,37 +379,45 @@ export default {
         });
     },
      //新建/保存回款
-    addNewEvt(){
+    addNewEvt(backStatus){
       return new Promise((resolve,reject)=>{
+        console.log(this.selectedRows)
+        if(!this.form.payorCode){
+            this.$message.warning("请选择保险公司");
+            reject();
+            return;
+        }
+        if(!this.form.backDate){
+            this.$message.warning("请选择回款日期");
+            reject();
+            return;
+        }
         if(!this.form.backAmountCny){
             this.$message.warning("请输入回款金额");
             reject();
             return;
         }
-
-        let backMoneyEobList = [];
-        if(!this.isEditNewEOB) {
-          backMoneyEobList = this.backEobList
-        } else {
-          this.dataList.forEach((item,index)=>{
-            if(this.selectedRowKeys.indexOf(index)!=-1){
-                backMoneyEobList.push({
+        let receiptVoList = this.selectedRows.map(item => {
+          return {
             id: item.id,
-                    eobNo: item.eobNo,
-                    eobSts: item.eobSts,
-                    eobBackDate: item.eobBackDate?moment(item.eobBackDate).format('YYYY-MM-DD 00:00:00'):'',
-                    eobBackMoneyCny: item.eobBackMoneyCny,
-                    eobBackMoneyUsd: item.eobBackMoneyUsd,
-                })
+            backAmount: item.backAmount,
           }
         })
+        const valid = receiptVoList.some(item => {
+          return !item.backAmount
+        })
+        if(valid) {
+          this.$message.warning("存在关联账单未输入回款金额");
+            reject();
+            return;
         }
         
         const formData = {
             ...this.form,
-            backMoneyEobList: backMoneyEobList,
-            backDate: this.form.backDate? moment(this.form.backDate).format('YYYY-MM-DD 00:00:00'):'',
+            receiptVoList,
+            backDate: this.form.backDate? moment(this.form.backDate).format('YYYY-MM-DD HH:mm:ss'):'',
             backMoneyNo: this.backMoneyNo, //回款编号
+            backStatus // 0暂存 1结案
         }
 
         // 上传附件格式转换
@@ -357,9 +433,11 @@ export default {
         .then((res) => {
           if (res.returnCode == "0000") {
             this.backMoneyNo = res.content;
+            this.savedStatus = true;
             this.$message.success("成功");
             this.selectedRowKeys = [];
             this.getData();
+            this._getNewEOBList();
   
             // this.$router.go(-1);
             resolve();
@@ -370,66 +448,6 @@ export default {
         });
       })
     },
-    //删除记录
-    delRecord(index) {
-      this.$modal.confirm({
-        title: "删除",
-        content: "确定删除该条记录？",
-        okText: "确认",
-        cancelText: "取消",
-        onOk: () => {
-          this.$apis.DELETEBACKMONEY({
-            backMoneyNo: this.dataList[index].backMoneyNo,
-          })
-          .then((res) => {
-            if (res.returnCode == "0000") {
-              this.$message.success("删除成功");
-              this.dataList.splice(index, 1);
-            } else {
-              this.$message.error(res.returnMsg);
-            }
-          });
-        },
-        onCancel: () => {},
-      });
-    },
-    editEvt(record) {
-      this.editFormObj = {
-        id: record.id,
-        eobNo: record.eobNo || "",
-        eobSts: record.eobSts || "",
-        eobBackDate: record.eobBackDate?moment(record.eobBackDate).format('YYYY-MM-DD 00:00:00'):"",
-        eobBackMoneyCny: record.eobBackMoneyCny || "",
-        eobBackMoneyUsd: record.eobBackMoneyUsd || "",
-      };
-      this.dialogShow = true;
-    },
-    //编辑保存
-    handleEditOK() {
-      this.$refs.editForm.validate((valid) => {
-        if (valid) {
-          let editFormObj = {
-            ...this.editFormObj,
-            eobBackDate: this.editFormObj.eobBackDate?moment(this.editFormObj.eobBackDate).format('YYYY-MM-DD 00:00:00'):"",
-          }
-          this.$apis.SAVEBACKMONEY({
-            ...this.form,
-            backMoneyEobList: [editFormObj],
-            backDate: this.form.backDate? moment(this.form.backDate).format('YYYY-MM-DD 00:00:00'):'',
-            backMoneyNo: this.backMoneyNo, //回款编号
-          })
-          .then((res) => {
-            if (res.returnCode == "0000") {
-              this.$message.success("编辑成功");
-              this.dialogShow = false;
-              this.getData();
-            } else {
-              this.$message.error(res.returnMsg);
-            }
-          });
-        }
-      });
-    },
 
     /* ======== 上传区域 ======== */
     // 上传之前
@@ -469,7 +487,9 @@ export default {
 
         this.$forceUpdate();
       })
-    }
+    },
+    // 导出账单列表
+    exportEvt() {}
   },
 };
 </script>
@@ -481,6 +501,19 @@ export default {
     opacity: 0;
   }
 }
+.table-title {
+  font-size: 15px;
+  margin: 6px 0;
+}
+.table-content {
+  margin-bottom: 8px;
+}
+.search-form {
+  margin-top: 24px;
+  .ant-form .ant-form-item {
+    margin-bottom: 4px;
+  }
+}
 .ant-btn .icon-class {
   .mg-r(10);
 }
@@ -490,4 +523,16 @@ export default {
 .danger.ant-btn-link {
   color: #ff3b30;
 }
+.burt-container {
+  display: flex;
+  flex-direction: column;
+  height: calc(100vh - 110px);
+  .bill-content {
+    flex: 1;
+    min-height: 0;
+    overflow-y: auto;
+    overflow-x: hidden;
+    padding-right: 12px;
+  }
+}
 </style>