Merge branch 'func_eccs_2264' into 'master'

Func eccs 2264【商保系统】-理赔件管理-寄送单关联账单查询及导出逻辑优化

See merge request !52

src/api/apis_moudles/charge-query.js

@@ -14,6 +14,7 @@ export default {
   queryCiReceipSendList:"/backstage/auth/queryCiReceipSendList",//理赔件账单寄送查询
   receiptSettlement:"/backstage/auth/receiptSettlement",//账单结算
   sendReceipListExport:"/backstage/auth/sendReceipListExport",//寄送关联账单导出
+  noSendReceipListExport:"/backstage/auth/noSendReceipListExport",//寄送未关联账单导出
   receiptPrint:"/backstage/auth/receiptPrint",//账单打印
 	rceiptListReport: '/backstage/auth/rceiptListReport', // 账单导出
 };

src/api/funcs_modules/charge-query.js

@@ -57,6 +57,10 @@ const RECEIPTSETTLEMENT= function (data) {
 const SENDRECEIPTLISTEXPORT= function (data) {
   return req.post(apis.sendReceipListExport, data, { responseType: "blob" });
 };
+// 寄送关联账单导出
+const NOSENDRECEIPTLISTEXPORT= function (data) {
+  return req.post(apis.noSendReceipListExport, data, { responseType: "blob" });
+};
 // 账单打印
 const RECEIPTPRINT= function (data) {
   return req.post(apis.receiptPrint, data);
@@ -84,4 +88,5 @@ export default {
   SENDRECEIPTLISTEXPORT,
   RECEIPTPRINT,
 	RceiptListReport,
+  NOSENDRECEIPTLISTEXPORT,
 };

src/views/charge-query/detail.vue

@@ -16,8 +16,8 @@
         </a-col>
         <a-col :xl="5" :lg="6" :sm="12">
           <a-form-model-item label="保险公司">
-            <a-select v-model="form.payorId" placeholder="请选择保险公司" allowClear disabled>
-              <a-select-option v-for="item in companyOptions" :key="item.corpCode" :value="item.id">
+            <a-select v-model="form.payorId" placeholder="请选择保险公司" allowClear showSearch disabled optionFilterProp="label">
+              <a-select-option v-for="item in companyOptions" :key="item.corpCode" :value="item.id" :label="item.longName">
                 {{ item.longName }}
               </a-select-option>
             </a-select>

src/views/charge-query/index.vue

@@ -17,8 +17,8 @@
         <a-col :xl="6" :lg="6" :sm="12">
           <a-form-model-item label="保险公司">
             <a-select v-model="form.payorIds" placeholder="请选择保险公司" allowClear  show-search   mode="multiple"
-				:filterOption="filterCode">
-              <a-select-option v-for="item in companyOptions" :key="item.corpCode" :value="item.id">
+				:filterOption="filterCode"  optionFilterProp="label">
+              <a-select-option v-for="item in companyOptions" :key="item.corpCode" :value="item.id" :label="item.longName">
                 {{ item.longName }}
               </a-select-option>
             </a-select>

src/views/charge-query/lpjManage.vue

@@ -11,8 +11,8 @@
         </a-col>
         <a-col :lg="8" :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="请选择保险公司" showSearch allowClear optionFilterProp="label">
+              <a-select-option v-for="item in companyOptions" :key="item.longName" :value="item.payorCode" :label="item.longName">
                 {{ item.longName }}
               </a-select-option>
             </a-select>
@@ -45,6 +45,11 @@
             <a-input v-model="form.sendBatchNo" placeholder="请输入寄送批号" allow-clear />
           </a-form-model-item>
         </a-col>
+        <a-col :lg="8" :sm="12">
+          <a-form-model-item label="账单编号">
+            <a-input v-model="form.receiptNo" placeholder="请输入账单编号" allow-clear />
+          </a-form-model-item>
+        </a-col>
         <a-col :sm="24" class="none-label">
           <div class="btn-div flex">
             <span></span>

src/views/charge-query/lpjManageDetail.vue

@@ -7,8 +7,8 @@
       <a-row :gutter="30">
         <a-col :lg="8" :sm="12">
           <a-form-model-item label="保险公司">
-            <a-select v-model="form.payorCode" placeholder="请选择保险公司" allow-clear :disabled="!isEdit">
-              <a-select-option v-for="item in companyOptions" :key="item.id" :value="item.payorCode">
+            <a-select v-model="form.payorCode" placeholder="请选择保险公司" allow-clear showSearch :disabled="!isEdit"  optionFilterProp="label">
+              <a-select-option v-for="item in companyOptions" :key="item.id" :value="item.payorCode" :label="item.longName">
                 {{ item.longName }}
               </a-select-option>
             </a-select>
@@ -256,19 +256,20 @@ export default {
   computed: {
     columns() {
         const base = [
-            { title: "账单日期", dataIndex: "receiptDate", width: 160,scopedSlots: { customRender: "receiptDate" } },
+            { title: "账单日期", dataIndex: "receiptDate", width: 160,fixed: "left",scopedSlots: { customRender: "receiptDate" } },
+            { title: "状态", dataIndex: "status", key:"status",align:'center',fixed: "left", width: 136,scopedSlots: { customRender: "status" } },
+            { title: "客户姓名", dataIndex: "patientName",fixed: "left", width: 160 },
             { title: "病历号", dataIndex: "mrnNo", key:"mrnNo",align:'center', width: 136},
-            { title: "客户姓名", dataIndex: "patientName", width: 160 },
+            { title: "保险公司", dataIndex: "payorName", ellipsis: true,  width: 250 },
             { title: "保险卡号", dataIndex: "memberCardNo", width: 180 },
             { title: "客户生日", dataIndex: "birthday", width: 160 },
-            { title: "账单编号", dataIndex: "receiptNo", key:"receiptNo",align:'center', width: 136},
-            { title: "状态", dataIndex: "status", key:"status",align:'center', width: 136,scopedSlots: { customRender: "status" } },
-            { title: "保险公司", dataIndex: "payorName", ellipsis: true,  width: 250 },
+            { title: "就诊医生", dataIndex: "doctorName", width: 100, align: 'center' },
             { title: "应收金额", dataIndex: "chargeAmount", width: 100, align: 'center' },
             { title: "折扣金额", dataIndex: "discountAmount", width: 100, align: 'center' },
             { title: "减免金额", dataIndex: "reduceAmount", width: 100, align: 'center' },
             { title: "客户自付", dataIndex: "selfpaidAmount", width: 100, align: 'center' },
             { title: "理赔金额", dataIndex: "actualAmount", width: 100, align: 'center' },
+            { title: "账单编号", dataIndex: "receiptNo", key:"receiptNo",align:'center', width: 136},
         ];
         if(this.sendBatchNo && ! this.isEditNewBill && this.isEdit){ // 编辑状态下已经保存的数据才可进行操作
             return base.concat([
@@ -442,8 +443,19 @@ export default {
     },
     //导出
     exportEvt(){
-      this.$apis.SENDRECEIPTLISTEXPORT({
-        sendBatchNo: this.sendBatchNo || undefined
+      let visitTimeStart = this.searchForm.visitTimeStart || []
+      let api = ''
+      
+      if(!this.isEditNewBill) { // 新增时添加了账单信息 那分页也应该是调账单信息接口
+        api = this.$apis.SENDRECEIPTLISTEXPORT
+      } else {
+        api = this.$apis.NOSENDRECEIPTLISTEXPORT
+      }
+      api({
+        sendBatchNo: this.sendBatchNo || undefined,
+        ...this.searchForm,
+        visitTimeEnd: visitTimeStart[1] ? visitTimeStart[1] + ' 23:59:59' : undefined,
+        visitTimeStart: visitTimeStart[0] ? visitTimeStart[0] + ' 00:00:00' : undefined,
       })
       .then(res => {
         let blob = new Blob([res.data], {
@@ -453,7 +465,7 @@ export default {
         let aLink=document.createElement("a");
         aLink.style.display="none";
         aLink.href=url;
-        aLink.setAttribute("download","寄送账单.xls");
+        aLink.setAttribute("download",!this.isEditNewBill?"寄送账单.xls":'未寄送账单.xls');
         document.body.appendChild(aLink);
         aLink.click();
         document.body.removeChild(aLink);