Merge branch 'ECCS-1820' into 'master'

EOB账单表格账单金额、折后金额显示修改

See merge request !16

src/views/verification/indexDetail.vue

@@ -133,25 +133,9 @@ import mixins from "@/mixins";
 
 export default {
   data() {
-    const columns = [
-        { title: "账单编号", dataIndex: "receiptNo", ellipsis: true, width: 100 },
-        { title: "客户姓名", dataIndex: "patientName", ellipsis: true, width: 85 },
-        { title: "保险公司", dataIndex: "payorName", ellipsis: true, width: 80 },
-        { 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 },
-        { title: "理赔金额", dataIndex: "eobPaidAmount", ellipsis: true, width: 85 },
-        { title: "回款金额", dataIndex: "paidAmountEob", ellipsis: true, width: 85 },
-        { title: "未清金额", dataIndex: "refuseAmountEob", ellipsis: true, width: 85 },
-        { title: "保险公司欠费", dataIndex: "payorNoPaidAmount", ellipsis: true, width: 110, },
-        { title: "个人欠费", dataIndex: "perNoPaidAmount", ellipsis: true, width: 85 },
-        { title: "备注", dataIndex: "sendRemark", ellipsis: true, width: 120 },
-    ];
     return {
       dialogShow: false,
       isEdit: false,
-      columns,
       ClaimsStatusOptions,
       EOBStatusOptions,
       eobNo: '', //eob编号
@@ -190,6 +174,32 @@ export default {
     Goback,
     BurtPagination,
   },
+  computed: {
+    columns() {
+        const base = [
+            { title: "账单编号", dataIndex: "receiptNo", ellipsis: true, width: 100 },
+            { title: "客户姓名", dataIndex: "patientName", ellipsis: true, width: 85 },
+            { title: "保险公司", dataIndex: "payorName", ellipsis: true, width: 80 },
+            { title: "就诊日期", dataIndex: "receiptDate", ellipsis: true, width: 110},
+            { title: "理赔状态", dataIndex: "claimsStatus", ellipsis: true, width: 90, scopedSlots: { customRender: "claimsStatus" } },
+            { title: "账单金额", dataIndex: "actualAmount", ellipsis: true, width: 85 },
+            { title: "折后金额", dataIndex: "chargeAmount", ellipsis: true, width: 85 },
+            { title: "自付金额", dataIndex: "selfpaidAmount", ellipsis: true, width: 85 },
+            { title: "理赔金额", dataIndex: "eobPaidAmount", ellipsis: true, width: 85 },
+            { title: "回款金额", dataIndex: "paidAmountEob", ellipsis: true, width: 85 },
+            { title: "未清金额", dataIndex: "refuseAmountEob", ellipsis: true, width: 85 },
+            { title: "保险公司欠费", dataIndex: "payorNoPaidAmount", ellipsis: true, width: 110, },
+            { title: "个人欠费", dataIndex: "perNoPaidAmount", ellipsis: true, width: 85 },
+            { title: "备注", dataIndex: "sendRemark", ellipsis: true, width: 120 },
+        ];
+        if(this.eobNo && !this.isEditNewEob){
+            return base.concat([
+                { title: "操作", dataIndex: "operation", scopedSlots: { customRender: "operation" }, fixed: "right", width: "170px", align: "center"},
+            ])
+        }
+        return base
+    }
+  },
   created(){
     const { eobNo, isEdit } = this.$route.query
     this.eobNo = eobNo;
@@ -213,11 +223,6 @@ export default {
       this.form = dataDetail;
       this.getData();
     }
-    if(isEdit) {
-      this.columns.push(
-        { title: "操作", dataIndex: "operation", scopedSlots: { customRender: "operation" }, fixed: "right", width: "170px", align: "center"},
-      )
-    }
   },
   methods: {
     moment,
@@ -358,14 +363,14 @@ export default {
     },
     //添加账单
     addNewBill(){
-      this.isEditNewEob = !this.isEditNewEob;
-      if(!this.isEditNewEob){ //保存
+      if(this.isEditNewEob){ //保存
         this.addNewEvt()
         .then(()=>{
           this.isEditNewEob = false;
         })
       }else{ //查询所有未加入的账单
         this.pagination.pageNum = 1;
+        this.isEditNewEob = true;
         this._getNewEOBList();
       }
     },