Merge branch 'ECCS-1820' into 'master'

ECCS-1820 ECCS-1826处理完成，应产品要求，直接发布生产环境

See merge request !15

src/api/apis_moudles/charge-query.js

@@ -2,6 +2,7 @@
 export default {
   querySendInfoList: "/backstage/auth/querySendInfoList", //查询寄送列表
   deleteReceiptSendInfo:"/backstage/auth/deleteReceiptSendInfo",//删除寄送信息
+  deleteSendReceipt: "/backstage/auth/deleteSendReceipt", //删除寄送信息下的账单信息
   saveReceipSendInfo:"/backstage/auth/saveReceipSendInfo",//保存理赔件账单寄送信息
   querySendReceipList:"/backstage/auth/querySendReceipList",//查询寄送包含账单列表
   queryNoSendReceipList:"/backstage/auth/queryNoSendReceipList",//待寄送账单查询

src/api/funcs_modules/charge-query.js

@@ -9,6 +9,10 @@ const QUERYSENDINFOLIST = function (data) {
 const DELETERECEIPTSENDINFO= function (data) {
   return req.post(apis.deleteReceiptSendInfo, data);
 };
+// 删除寄送信息下的账单信息
+const DELETESENDRECEIPT= function (data) {
+    return req.post(apis.deleteSendReceipt, data);
+  };
 // 保存理赔件账单寄送信息
 const SAVERECEIPSENDINFO= function (data) {
   return req.post(apis.saveReceipSendInfo, data);
@@ -63,6 +67,7 @@ const RECEIPTPRINT= function (data) {
 export default {
   QUERYSENDINFOLIST,
   DELETERECEIPTSENDINFO,
+  DELETESENDRECEIPT,
   SAVERECEIPSENDINFO,
   QUERYSENDRECEIPLIST,
   QUERYNOSENDRECEIPLIST,

src/components/CUSTOMER/goback/index.vue

@@ -15,7 +15,7 @@ export default{
     }
   },
   data(){
-
+    return {}
   },
   methods: {
     back(){

src/views/charge-query/index.vue

@@ -195,7 +195,9 @@ export default {
     },
     // 选中就诊时间
     onSelectVisitTime(date, dateString) {
-      console.log(date, dateString);
+        this.form.visitTimeStart = dateString[0] + ' 00:00:00'
+        this.form.visitTimeEnd = dateString[1] + ' 23:59:59'
+        console.log(date, dateString);
     },
     // 重置
     handlerReset() {
@@ -237,7 +239,7 @@ export default {
           return false;
         }
         this.pagination.pageNum = 1;
-        this.pageForm = this.$lodash.cloneDeep(this.form);
+        this.pageForm = this.$lodash.cloneDeep({...this.form, dateRange: undefined});
         this._getChargeList();
       });
     },

src/views/charge-query/lpjManageDetail.vue

@@ -72,15 +72,34 @@
           </div>
         </a-col>
       </a-row>
+    </a-form-model>
+    <a-form-model ref="form" layout="vertical" :model="searchForm">
+        <a-row :gutter="30">
+            <a-col :lg="8" :sm="12">
+                <a-form-model-item label="就诊日期">
+                    <a-range-picker format="YYYY-MM-DD" value-format="YYYY-MM-DD" v-model="searchForm.visitTimeStart" :placeholder="['选择就诊开始日期', '选择就诊结束日期']" />
+                </a-form-model-item>
+            </a-col>
+            <a-col :lg="8" :sm="12">
+                <a-form-model-item label="病历号">
+                    <a-input v-model="searchForm.mrnNo" placeholder="请输入病历号" allow-clear />
+                </a-form-model-item>
+            </a-col>
+            <a-col :lg="8" :sm="12">
+                <a-form-model-item label="客户名称">
+                    <a-input v-model="searchForm.patientName" placeholder="请输入客户名称" allow-clear />
+                </a-form-model-item>
+            </a-col>
+        </a-row>
       <a-row :gutter="30">
         <a-col :sm="24" class="none-label">
           <div class="btn-div flex">
             <span></span>
             <a-form-model-item label="button">
-              <!-- <a-button class="mar-left10" type="primary" @click="handlerSearch">
+              <a-button type="primary" @click="handlerSearch">
                 <Icon name="ssisearch_active" :size="14" />查询
-              </a-button> -->
-              <a-button type="primary" @click="exportEvt">
+              </a-button>
+              <a-button class="mar-left10" type="primary" @click="exportEvt">
                 <Icon name="ssidaochu" :size="14" />导出 
               </a-button>
               <a-button class="mar-left10" type="primary" @click="addNewBill" v-if="isEdit">
@@ -100,9 +119,9 @@
       <template slot="sendSts" slot-scope="text">
         {{ text==1?'已寄送':'未寄送' }}
       </template>
-      <template slot="operation" slot-scope="text, record, index">
-        <a-button type="link" @click.stop="editEvt(record)">修改</a-button>
-        <a-button type="link" class="danger" @click.stop="delRecord(index)">删除</a-button>
+      <template slot="operation" slot-scope="text, record">
+        <!-- <a-button type="link" @click.stop="editEvt(record)">修改</a-button> -->
+        <a-button type="link" class="danger" @click.stop="delRecord(record)">删除</a-button>
       </template>
     </a-table>
     <!--分页-->
@@ -159,24 +178,10 @@ import BurtPagination from "@/components/CUSTOMER/pagation";
 import moment from 'moment'
 export default {
   data() {
-    const columns = [
-      { title: "就诊日期", dataIndex: "receiptDate", width: 200,scopedSlots: { customRender: "receiptDate" } },
-      { title: "病历号", dataIndex: "patientNo", key:"patientNo",align:'center', width: 136},
-      { title: "客户姓名", dataIndex: "patientName", width: 98 },
-      { title: "账单编号", dataIndex: "receiptNo", key:"receiptNo",align:'center', width: 136},
-      { title: "保险公司", dataIndex: "payorName", width: 110 },
-      { title: "应收金额", dataIndex: "chargeAmount", width: 100, align: 'center' },
-      { title: "折扣金额", dataIndex: "discountAmount", width: 100, align: 'center' },
-      { title: "减免金额", dataIndex: "discountAmount2", width: 100, align: 'center' },
-      { title: "客户自付", dataIndex: "paidAmount", width: 100, align: 'center' },
-      { title: "理赔金额", dataIndex: "paidamount", width: 100, align: 'center' },
-      // { title: "操作", key: "operation", width: "175px",fixed: "right",scopedSlots: { customRender: "operation" }},
-    ];
     return {
       loading: false,
       dialogShow: false,
       isEdit: false,
-      columns,
       sendBatchNo: '', //寄送批号
       form: {
         payorCode: '',
@@ -189,6 +194,8 @@ export default {
         sendEmail: '',
         sendRemark: ''
       },
+      searchForm: {},
+      searchData: {},
       companyOptions: [], //保险公司
       expressList: [], //快递列表
       selectedRowKeys: [], // Check here to configure the default column
@@ -216,9 +223,32 @@ export default {
     Goback,
     BurtPagination,
   },
+  computed: {
+    columns() {
+        const base = [
+            { title: "就诊日期", dataIndex: "receiptDate", width: 200,scopedSlots: { customRender: "receiptDate" } },
+            { title: "病历号", dataIndex: "mrnNo", key:"mrnNo",align:'center', width: 136},
+            { title: "客户姓名", dataIndex: "patientName", width: 98 },
+            { title: "账单编号", dataIndex: "receiptNo", key:"receiptNo",align:'center', width: 136},
+            { title: "保险公司", dataIndex: "payorName", width: 110 },
+            { title: "应收金额", dataIndex: "chargeAmount", width: 100, align: 'center' },
+            { title: "折扣金额", dataIndex: "discountAmount", width: 100, align: 'center' },
+            { title: "减免金额", dataIndex: "discountAmount2", width: 100, align: 'center' },
+            { title: "客户自付", dataIndex: "paidAmount", width: 100, align: 'center' },
+            { title: "理赔金额", dataIndex: "paidamount", width: 100, align: 'center' },
+        ];
+        if(! this.isEditNewBill){
+            return base.concat([
+                { title: "操作", key: "operation", width: "100px",fixed: "right",scopedSlots: { customRender: "operation" }},
+            ]);
+        }
+        return base
+
+    }
+  },
   created() {
     const { sendBatchNo, isEdit } = this.$route.query;
-    this.sendBatchNo = !!sendBatchNo;
+    this.sendBatchNo = sendBatchNo;
     this.isEdit = isEdit;
     this._getCompanyOptions();
     this.getRefcdByRefgrp();
@@ -263,7 +293,8 @@ export default {
       let filter = {
         pageNum: this.pagination.pageNum,
         pageSize: this.pagination.pageSize,
-        sendBatchNo: this.sendBatchNo,
+        sendBatchNo: this.sendBatchNo || undefined,
+        ...this.searchData
       }
       this.$apis.QUERYSENDRECEIPLIST(filter)
       .then((res) => {
@@ -337,24 +368,37 @@ export default {
     },
     handlerSearch() {
       this.pagination.pageNum = 1;
-      this.isEditNewBill = false;
-      this.getData();
+      let visitTimeStart = this.searchForm.visitTimeStart || []
+      this.searchData = this.$lodash.cloneDeep({
+        ...this.searchForm,
+        visitTimeEnd: visitTimeStart[1] ? visitTimeStart[1] + ' 23:59:59' : undefined,
+        visitTimeStart: visitTimeStart[0] ? visitTimeStart[0] + ' 00:00:00' : undefined,
+      });
+      if(this.isEditNewBill) { // 新增时添加了账单信息 那分页也应该是调账单信息接口
+        this._getNewBillList()
+      } else {
+        this.getData()
+      }
     },
     //删除
-    delRecord(index) {
+    delRecord(data) {
       this.$modal.confirm({
         title: "删除",
         content: "确定删除该条记录？",
         okText: "确定",
         cancelText: "取消",
         onOk: () => {
-          this.$apis.DELETERECEIPTSENDINFO({
-              sendBatchNo: this.dataList[index].sendBatchNo,
+          this.$apis.DELETESENDRECEIPT({
+              ciReceiptSendVos: [
+                {receiptNo: data.receiptNo}
+              ],
+              sendBatchNo: this.sendBatchNo,
             })
             .then((res) => {
               if (res.returnCode == "0000") {
                 this.$message.success("删除成功");
-                this.dataList.splice(index, 1);
+                this.getData()
+                // this.dataList.splice(index, 1);
               } else {
                 this.$message.error(res.returnMsg);
               }
@@ -365,7 +409,7 @@ export default {
     //导出
     exportEvt(){
       this.$apis.SENDRECEIPTLISTEXPORT({
-        sendBatchNo: this.sendBatchNo
+        sendBatchNo: this.sendBatchNo || undefined
       })
       .then(res => {
         let blob = new Blob([res.data], {
@@ -384,14 +428,15 @@ export default {
     },
     //添加账单
     addNewBill(){
-      this.isEditNewBill = !this.isEditNewBill;
-      if(!this.isEditNewBill){ //保存
+    //   this.isEditNewBill = !this.isEditNewBill;
+      if(this.isEditNewBill){ //保存
         this.addNewCharge()
         .then(()=>{
           this.isEditNewBill = false;
         })
       }else{ //查询所有未加入的账单
         this.pagination.pageNum = 1;
+        this.isEditNewBill = true;
         this._getNewBillList()
       }
     },
@@ -399,7 +444,8 @@ export default {
         this.$apis.QUERYNOSENDRECEIPLIST({
           pageNum: this.pagination.pageNum,
           pageSize: this.pagination.pageSize,
-          payorCode: this.form.payorCode
+          payorCode: this.form.payorCode,
+          ...this.searchData
         })
         .then((res) => {
           if (res.returnCode == "0000") {
@@ -414,30 +460,32 @@ export default {
     },
     //新建/保存寄送
     addNewCharge(){
-      if(!this.form.trackingNo){
-        this.$message.warning("请输入快递单号");
-        return;
-      }
-      if(!this.form.sendDate){
-        this.$message.warning("请选择寄送日期");
-        return;
-      }
-      let ciReceiptSendVos = [];
-      this.dataList.forEach((item,index)=>{
-        if(this.selectedRowKeys.indexOf(index)!=-1){
-          ciReceiptSendVos.push({
-            id: item.id,
-            receiptNo: item.receiptNo,
-          })
-        }
-      })
-      let formData = {
-        ...this.form,
-        ciReceiptSendVos: ciReceiptSendVos,
-        sendDate: moment(this.form.sendDate).format('YYYY-MM-DD 00:00:00'),
-        sendBatchNo: this.sendBatchNo
-      }
       return new Promise((resolve,reject)=>{
+        if(!this.form.trackingNo){
+            this.$message.warning("请输入快递单号");
+            reject();
+            return;
+        }
+        if(!this.form.sendDate){
+            this.$message.warning("请选择寄送日期");
+            reject();
+            return;
+        }
+        let ciReceiptSendVos = [];
+        this.dataList.forEach((item,index)=>{
+            if(this.selectedRowKeys.indexOf(index)!=-1){
+            ciReceiptSendVos.push({
+                id: item.id,
+                receiptNo: item.receiptNo,
+            })
+            }
+        })
+        let formData = {
+            ...this.form,
+            ciReceiptSendVos: ciReceiptSendVos,
+            sendDate: moment(this.form.sendDate).format('YYYY-MM-DD 00:00:00'),
+            sendBatchNo: this.sendBatchNo || undefined
+        }
         this.$apis.SAVERECEIPSENDINFO(formData)
         .then((res) => {
           if (res.returnCode == "0000") {

src/views/pre-auth/components/feeDetail.vue

@@ -83,7 +83,7 @@ export default{
         totalAmount: '',
       },
       editRules: {
-        itemCode: [{ required: true, message: "请输入", trigger: "blur" }],
+        itemCode: [{ required: true, message: "请输入", trigger: "change" }],
         salePrice: [{ required: true, message: "请输入", trigger: "blur" }],
         times: [{ required: true, message: "请输入", trigger: "blur" }],
       },

src/views/verification/collectionDetail.vue

@@ -107,20 +107,20 @@ import BurtPagination from "@/components/CUSTOMER/pagation";
 import {EOBStatusOptions} from '@/utils/utilsdictOptions.js'
 import moment from "moment";
 import mixins from "@/mixins";
-const columns = [
-  { title: "EOB编号", dataIndex: "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 },
-];
 export default {
   data() {
+    const columns = [
+        { title: "EOB编号", dataIndex: "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 },
+    ];
     return {
       isEdit: false,
       columns,
@@ -281,6 +281,16 @@ export default {
         backMoneyNo: this.backMoneyNo, //回款编号
       }
       return new Promise((resolve,reject)=>{
+        let isData = false;
+        if(this.selectedRowKeys && this.selectedRowKeys.length){
+            isData = true;
+        }
+        if(! isData){
+            for(let i in this.form){
+                if(this.form[i]){ isData = true; return true; }
+            }
+        }
+        if(!isData){resolve(); return true;} // 没有数据不调接口保存直接修改显示状态就好了
         this.$apis.SAVEBACKMONEY(formData)
         .then((res) => {
           if (res.returnCode == "0000") {

src/views/verification/indexDetail.vue

@@ -81,10 +81,6 @@
     <!-- table -->
     <a-table :columns="columns" :data-source="dataList" :scroll="{ x: true }" :pagination="false"
       :row-selection="isEditNewEob?{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }:null">
-      <template slot="visitTimeStart" slot-scope="text, record">
-        <span>{{record.visitTimeStart? moment(record.visitTimeStart).format('YYYY-MM-DD'):''}}</span> ~ 
-        <span>{{record.visitTimeEnd? moment(record.visitTimeEnd).format('YYYY-MM-DD'):''}}</span>
-      </template>
       <template slot="claimsStatus" slot-scope="text">
         <span>{{text | formatClaimsStatus}}</span>
       </template>
@@ -141,7 +137,7 @@ export default {
         { title: "账单编号", dataIndex: "receiptNo", ellipsis: true, width: 100 },
         { title: "客户姓名", dataIndex: "patientName", ellipsis: true, width: 85 },
         { title: "保险公司", dataIndex: "payorName", ellipsis: true, width: 80 },
-        { title: "就诊日期", dataIndex: "visitTimeStart", ellipsis: true, width: 110, scopedSlots: { customRender: "visitTimeStart" } },
+        { title: "就诊日期", dataIndex: "receiptDate", ellipsis: true, width: 110},
         { title: "理赔状态", dataIndex: "claimsStatus", ellipsis: true, width: 90, scopedSlots: { customRender: "claimsStatus" } },
         { title: "账单金额", dataIndex: "receiptAmount", ellipsis: true, width: 85 },
         { title: "自付金额", dataIndex: "selfpaidAmount", ellipsis: true, width: 85 },