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/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 },