Merge branch 'yll-fix' of git.ssish.com:sunhailiang/bims into test

src/api/apis_moudles/verification.js

@@ -15,7 +15,7 @@ export default {
   queryBackReceiptList: "/backstage/auth/queryBackReceiptList",   //回销关联账单列表查询
   queryReceiptInfoList: "/backstage/auth/queryReceiptInfoList",   //回销账单列表查询
   deleteReceiptRecord: "/backstage/auth/deleteBackReceipt", // 删除已关联账单
-  exportBackMoneyReport: "/backstage/auth/backMoneyListExport", // 回款列表导出
+  backMoneyListExport: "/backstage/auth/backMoneyListExport", // 回款列表导出
   exportBackReceiptList: "/backstage/auth/exportBackReceiptList", // 关联账单列表导出
 
 };

src/api/funcs_modules/verification.js

@@ -69,7 +69,7 @@ const DELETERECEIPTRECORD = (data) => {
 
 // 回款列表导出
 const EXPORTBACKMONEYREPORT = (data) => {
-  return req.post(apis.exportBackMoneyReport, data, { responseType: "blob" });
+  return req.post(apis.backMoneyListExport, data, { responseType: "blob" });
 };
 
 // 关联账单导出

src/views/charge-query/index.vue

@@ -16,7 +16,8 @@
         </a-col>
         <a-col :xl="6" :lg="6" :sm="12">
           <a-form-model-item label="保险公司">
-            <a-select v-model="form.payorId" placeholder="请选择保险公司" allowClear>
+            <a-select v-model="form.payorId" placeholder="请选择保险公司" allowClear  show-search   mode="multiple"
+				:filterOption="filterCode">
               <a-select-option v-for="item in companyOptions" :key="item.corpCode" :value="item.id">
                 {{ item.longName }}
               </a-select-option>
@@ -150,6 +151,8 @@ export default {
       { title: "病历号", dataIndex: "mrnNo",width: 180},
       { title: "客户姓名",dataIndex: "patientName",width: 120,},
       { title: "保险公司", dataIndex: "payorName", width: 200 },
+      { title: "保险卡", dataIndex: "cardNo", width: 200 },
+      { title: "客户生日", dataIndex: "birthday", width: 200 },
       { title: "就诊医生", dataIndex: "doctorName", width: 150 },
       { title: "是否已关联寄送单", dataIndex: "isSend", width: 180,scopedSlots: { customRender: "isSend" } },
       { title: "是否已回款", dataIndex: "isEobBack", width: 180,scopedSlots: { customRender: "isEobBack" } },
@@ -163,6 +166,7 @@ export default {
       { title: "保险欠费", dataIndex: "insuranceArrearsAmount", width: 180 },
       { title: "个人欠费", dataIndex: "arrearsAmount", width: 180 },
       { title: "未清余额", dataIndex: "residueBackAmount", width: 180 },
+      { title: "账龄", dataIndex: "diffDay", width: 180 },
       { title: "操作", key: "operation", width: "175px",fixed: "right",scopedSlots: { customRender: "operation" }, align: "center"},
     ];
     return {
@@ -174,7 +178,7 @@ export default {
         patientName: "",
         mrnNo: "",
         paymentCode: "",
-        payorId: 0,
+        payorId: [],
         visitTimeEnd: "",
         visitTimeStart: "",
         receiptType: "",
@@ -230,6 +234,14 @@ export default {
   },
   methods: {
     moment,
+	// 选择框筛选
+	filterCode(input, option) {
+	  return (
+	    option.componentOptions.children[0].text
+	      .toLowerCase()
+	      .indexOf(input.toLowerCase()) >= 0
+	  );
+	},
     // 获取列表数据
     _getChargeList() {
       const data = {

src/views/report/returnedMoney.vue

@@ -6,8 +6,8 @@
       <a-row :gutter="30">
         <a-col :xl="4" :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="请选择" show-search allowClear :filterOption="filterCode">
+              <a-select-option v-for="item in companyOptions" :key="item.payorCode" :value="item.payorCode">
                 {{ item.longName }}
               </a-select-option>
             </a-select>
@@ -67,7 +67,7 @@
       :data-source="dataList" 
       :scroll="{ x: true }" 
       :pagination="false" 
-      :rowKey="'id'"
+      :rowKey="record => {record.id+record.backMoneyNo}"
     >
       <template slot="index" slot-scope="text, record, index">
         {{ index + 1 }}
@@ -89,14 +89,18 @@ export default {
       { title: "病历号", dataIndex: "mrnNo",width: 120},
       { title: "客户姓名",dataIndex: "patientName",width: 120,},
       { title: "保险公司", dataIndex: "payorName", width: 120 },
+      { title: "客户生日", dataIndex: "birthday", width: 120 },
+      { title: "保险卡号", dataIndex: "cardNo", width: 120 },
       { title: "账单编号", dataIndex: "receiptNo", width: 120 },
       { title: "账单日期", dataIndex: "receiptDate", width: 120 },
       { title: "收银", dataIndex: "receiptTellerName", width: 120 },
       { title: "账单金额", dataIndex: "actualAmount", width: 120 },
       { title: "回款金额", dataIndex: "paidAmountEob", width: 120 },
       { title: "回款日期", dataIndex: "eobBackDate", width: 120 },
+      { title: "回款编号", dataIndex: "backMoneyNo", width: 120 },
       { title: "EOB号", dataIndex: "eobNo", width: 120 },
-      { title: "EOB名称", dataIndex: "eobName", width: 120 },
+      { title: "EOB备注", dataIndex: "eobName", width: 120 },
+      { title: "账龄", dataIndex: "diffDay", width: 120 },
     ];
     return {
       columns,
@@ -118,8 +122,8 @@ export default {
       pagination: {
         pageNum: 1,
         pageSize: 10,
+        total: 0
       },
-      total: 0
     };
   },
   components: {
@@ -130,6 +134,14 @@ export default {
     this._getCompanyOptions();
   },
   methods: {
+	// 选择框筛选
+	filterCode(input, option) {
+	    return (
+	      option.componentOptions.children[0].text
+	        .toLowerCase()
+	        .indexOf(input.toLowerCase()) >= 0
+	    );
+	},
     // 获取列表数据
     getList() {
       const data = {
@@ -139,7 +151,8 @@ export default {
       this.$apis.backMoneyReport(data).then((res) => {
         let content = res.content || {};
         this.dataList = content.list || [];
-        this.total = content.total || 0;
+        
+        this.pagination.total = content.total || 0;
       });
     },
     // 获取保险公司下拉选项
@@ -161,6 +174,8 @@ export default {
     // 重置
     handlerReset() {
       this.form = {}
+      this.returnRange = null;
+      this.billRange = null;
     },
 
     // 搜索

src/views/verification/collection.vue

@@ -9,10 +9,12 @@
               v-model="form.payorCode"
               placeholder="请选择保险公司"
               allowClear
+			  show-search
+			  :filterOption="filterCode"
             >
               <a-select-option
                 v-for="item in companyOptions"
-                :key="item.id"
+                :key="item.payorCode"
                 :value="item.payorCode"
               >
                 {{ item.longName }}
@@ -62,6 +64,11 @@
             <a-input v-model="form.backMoneyNo" placeholder="回款编号" />
           </a-form-model-item>
         </a-col>
+        <a-col :lg="6" :sm="12">
+          <a-form-model-item label="账单编号">
+            <a-input v-model="form.receiptNo" 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">
@@ -156,9 +163,10 @@ export default {
         dateRange: [], //创建时间范围
         startDate: "",
         endDate: "",
-        backStatus: "",
+        backStatus: "0",
         backAmountCny: "", // 回款金额
         backMoneyNo: "", // 回款编号
+        receiptNo:"", // 账单编号
       },
       dataList: [],
       companyOptions: [], //保险公司
@@ -196,9 +204,18 @@ export default {
         dateRange: [], //创建时间范围
         startDate: "",
         endDate: "",
-        backStatus: ""
+        backStatus: "0",
+        receiptNo:"", // 账单编号
       };
     },
+	// 选择框筛选
+	filterCode(input, option) {
+	  return (
+	    option.componentOptions.children[0].text
+	      .toLowerCase()
+	      .indexOf(input.toLowerCase()) >= 0
+	  );
+	},
     // 获取保险公司下拉选项
     _getCompanyOptions() {
       this.$apis.GETCOMPANYOPTIONS().then((res) => {

src/views/verification/collectionDetail.vue

@@ -12,13 +12,15 @@
                   <a-select
                     v-model="form.payorCode"
                     placeholder="请选择保险公司"
-                    allow-clear
+                    allow-clear 
+					show-search
                     :disabled="!isEdit"
                     @change="changePayor"
+					:filterOption="filterCode"
                   >
                     <a-select-option
                       v-for="item in companyOptions"
-                      :key="item.id"
+                      :key="item.payorCode"
                       :value="item.payorCode"
                     >
                       {{ item.longName }}
@@ -132,6 +134,8 @@
                     v-model="form.payorCode"
                     placeholder="请选择保险公司"
                     allow-clear
+                    show-search
+                    :filter-option="filterOption"
                     :disabled="!isEdit"
                     @change="changePayor"
                   >
@@ -430,14 +434,16 @@ export default {
         width: 150,
         customRender: (val, row) => {
           return (
-            <a-input-number
+              <a-input-number
               v-model={row.backAmount}
-              allow-clear
+              allow-clear 
               disabled={!this.isEdit}
+              style={{"color": row.backAmount == row.currentReceiptAmount ? '' : 'red'}}
               onBlur={() => {
                 changeAmount(row);
               }}
             />
+           
           );
         },
       };
@@ -534,6 +540,14 @@ export default {
   },
   methods: {
     moment,
+	// 选择框筛选
+	filterCode(input, option) {
+	    return (
+	      option.componentOptions.children[0].text
+	        .toLowerCase()
+	        .indexOf(input.toLowerCase()) >= 0
+	    );
+	},
     paneChange() {
       this.panes.forEach((item) => {
         item.show = false;
@@ -541,11 +555,19 @@ export default {
       this.panes[Number(this.activeKey)].show = true;
     },
     changeAmount(row) {
+      let totalMoney = Number(this.form.backAmountCny || 0);
+      this.selectedRows.forEach((item) => {
+        totalMoney -= Number(item.backAmount);
+      });
+      if(totalMoney < 0){
+        this.$message.error('可核销余额不足')
+      }
       if (Number(row.actualAmount || 0) - Number(row.backAmount || 0) < 0) {
         this.$message.warning("录入账单回款金额大于账单金额");
       }
     },
     onSelectChange(selectedRow, selected) {
+      selectedRow['backAmount'] = this.residueBackAmount > selectedRow.currentReceiptAmount ? selectedRow.currentReceiptAmount: this.residueBackAmount;
       if (selected) {
         this.selectedRowKeys.push(selectedRow.id);
         this.selectedRows.push(selectedRow);
@@ -557,6 +579,7 @@ export default {
         this.selectedRows.splice(index, 1);
         this._confirmDelReceipt([selectedRow]);
       }
+      this.addNewEvt(0)
     },
     onSelectAll(selected, selectedRows, changeRows) {
       console.log(selected, selectedRows, changeRows);
@@ -818,6 +841,10 @@ export default {
 			this.$apis.EXPORTBACKRECEIPTLIST(filter).then(res => {
 					exportFile(res, '已关联账单.xls');
 			})
+    },
+    // 保险公司支持输入搜索
+    filterOption(input,option ) {
+      return option.componentOptions.children[0].text.indexOf(input) >= 0
     }
   },
 };
@@ -867,7 +894,7 @@ export default {
   }
 }
 .bill-content {
-  height: calc(100vh - 380px);
+  height: calc(100vh - 185px);
   overflow-y: auto;
   overflow-x: hidden;
   padding-right: 12px;