Merge branch 'func-eccs-2045' into 'master'

eccs 2045 商保流程改造

See merge request !33

src/api/apis_moudles/verification.js

@@ -12,4 +12,8 @@ export default {
   saveBackMoney: "/backstage/auth/saveBackMoney",   //新建回款
   deleteBackMoney: "/backstage/auth/deleteBackMoney",   //删除回款
   eobReceipListExport: "/backstage/auth/eobReceipListExport",   //EOB关联账单导出
+  queryBackReceiptList: "/backstage/auth/queryBackReceiptList",   //回销关联账单列表查询
+  queryReceiptInfoList: "/backstage/auth/queryReceiptInfoList",   //回销账单列表查询
+  deleteReceiptRecord: "/backstage/auth/deleteBackReceipt", // 删除已关联账单
+
 };

src/api/funcs_modules/verification.js

@@ -53,6 +53,20 @@ const EOBRECEIPLISTEXPORT = (data={}) => {
   return req.post(apis.eobReceipListExport, data, { responseType: "blob" });
 };
 
+//回销关联账单列表查询
+const QUERYBACKRECEIPTLIST = (data) => {
+  return req.post(apis.queryBackReceiptList, data);
+};
+//回销账单列表查询
+const QUERYBACKRECEIPTINFOLIST = (data) => {
+  return req.post(apis.queryReceiptInfoList, data);
+};
+
+// 删除已关联账单
+const DELETERECEIPTRECORD = (data) => {
+  return req.post(apis.deleteReceiptRecord, data);
+};
+
 // 对象数组
 export default { 
   QUERYEOBLIST,
@@ -66,4 +80,7 @@ export default {
   SAVEBACKMONEY,
   DELETEBACKMONEY,
   EOBRECEIPLISTEXPORT,
+  QUERYBACKRECEIPTLIST,
+  QUERYBACKRECEIPTINFOLIST,
+  DELETERECEIPTRECORD
 };
\ No newline at end of file

src/router/modules/menu.js

@@ -14,38 +14,34 @@ export default [
         path: "/customer",
         title: "客户查询",
       },
-      {
-        path: "/customer/edit",
-        title: "新建客户",
-      },
-    ],
-  },
-  {
-    icon: "ssimanage_msg",
-    path: "2",
-    title: "福利信息管理",
-    children: [
-      {
-        path: "/welfare",
-        title: "福利查询",
-      }
-    ],
-  },
-  {
-    icon: "ssimanage",
-    path: "pre-auth",
-    title: "预授权信息管理",
-    children: [
-      {
-        path: "/pre-auth",
-        title: "预授权查询",
-      },
-      {
-        path: "/pre-auth/add",
-        title: "新建预授权",
-      },
     ],
   },
+  // {
+  //   icon: "ssimanage_msg",
+  //   path: "2",
+  //   title: "福利信息管理",
+  //   children: [
+  //     {
+  //       path: "/welfare",
+  //       title: "福利查询",
+  //     }
+  //   ],
+  // },
+  // {
+  //   icon: "ssimanage",
+  //   path: "pre-auth",
+  //   title: "预授权信息管理",
+  //   children: [
+  //     {
+  //       path: "/pre-auth",
+  //       title: "预授权查询",
+  //     },
+  //     // {
+  //     //   path: "/pre-auth/add",
+  //     //   title: "新建预授权",
+  //     // },
+  //   ],
+  // },
   {
     icon: "ssisearch",
     path: "charge-query",
@@ -66,10 +62,10 @@ export default [
     path: "verification",
     title: "核销管理",
     children: [
-      {
-        path: "/verification",
-        title: "EOB管理",
-      },
+      // {
+      //   path: "/verification",
+      //   title: "EOB管理",
+      // },
       {
         path: "/verification/collection",
         title: "回款管理",

src/views/charge-query/index.vue

@@ -150,8 +150,8 @@ export default {
       { title: "病历号", dataIndex: "mrnNo",width: 180},
       { title: "客户姓名",dataIndex: "patientName",width: 120,},
       { title: "客户类型", dataIndex: "patientType", width: 180 },
-      { title: "保险公司", dataIndex: "payorName", width: 180 },
-      { title: "就诊医生", dataIndex: "doctorName", width: 180 },
+      { title: "保险公司", dataIndex: "payorName", width: 200 },
+      { title: "就诊医生", dataIndex: "doctorName", width: 150 },
       { title: "是否已关联寄送单", dataIndex: "isSend", width: 180,scopedSlots: { customRender: "isSend" } },
       { title: "是否已关联EOB", dataIndex: "isEob", width: 180,scopedSlots: { customRender: "isEob" } },
       { title: "是否已回款", dataIndex: "isEobBack", width: 180,scopedSlots: { customRender: "isEobBack" } },
@@ -211,7 +211,6 @@ export default {
     })
   },
   created() {
-    this._getChargeList();
     this._getCompanyOptions();
     this._getDoctorListNoPage();//获取医生下拉选项
   },

src/views/charge-query/lpjManageDetail.vue

@@ -229,11 +229,13 @@ export default {
   computed: {
     columns() {
         const base = [
-            { title: "就诊日期", dataIndex: "receiptDate", width: 200,scopedSlots: { customRender: "receiptDate" } },
+            { title: "就诊日期", dataIndex: "receiptDate", width: 160,scopedSlots: { customRender: "receiptDate" } },
             { title: "病历号", dataIndex: "mrnNo", key:"mrnNo",align:'center', width: 136},
-            { title: "客户姓名", dataIndex: "patientName", width: 98 },
+            { title: "客户姓名", dataIndex: "patientName", width: 160 },
+            { title: "保险卡号", dataIndex: "memberCardNo", width: 180 },
+            { title: "客户生日", dataIndex: "birthday", width: 160 },
             { title: "账单编号", dataIndex: "receiptNo", key:"receiptNo",align:'center', width: 136},
-            { title: "保险公司", dataIndex: "payorName", width: 110 },
+            { title: "保险公司", dataIndex: "payorName", ellipsis: true,  width: 250 },
             { title: "应收金额", dataIndex: "chargeAmount", width: 100, align: 'center' },
             { title: "折扣金额", dataIndex: "discountAmount", width: 100, align: 'center' },
             { title: "减免金额", dataIndex: "discountAmount2", width: 100, align: 'center' },

src/views/customer/info/index.vue

@@ -32,7 +32,7 @@
         </a-col>
         <a-col :xl="18" :lg="18" :sm="12" class="none-label">
           <a-form-model-item label="button">
-            <a-button type="primary" @click="addNewCustom"><Icon name="ssiadd" :size="14" />新建客户</a-button>
+            <!-- <a-button type="primary" @click="addNewCustom"><Icon name="ssiadd" :size="14" />新建客户</a-button> -->
             <a-button class="mar-left10" type="primary" @click="handlerSearch">
               <Icon name="ssisearch_active" :size="14" />查询
             </a-button>
@@ -121,7 +121,6 @@ export default {
     BurtPagination,
   },
   created() {
-    this._getCustomerList();
     this._getPayorCode();
   },
   methods: {

src/views/pre-auth/index.vue

@@ -54,8 +54,8 @@
             <a-button class="mar-left5" type="primary" @click="reset">
               <Icon name="ssireset" :size="12" />重置
             </a-button>
-            <a-button class="mar-left5" type="primary" @click="addPreAuth">
-              <Icon name="ssiadd" :size="12" />新建预授权</a-button>
+            <!-- <a-button class="mar-left5" type="primary" @click="addPreAuth">
+              <Icon name="ssiadd" :size="12" />新建预授权</a-button> -->
             </a-form-model-item>
         </a-col>
       </a-row>