Merge branch 'func-eccs-2152' into test

src/api/apis_moudles/verification.js

-// 核销管理api
-export default {
-  queryEobList: "/backstage/auth/queryEobList",   //EOB列表查询
-  queryEobReceiptList: "/backstage/auth/queryEobReceiptList",   //EOB待核销账单查询
-  queryEobNeedReceiptList: "/backstage/auth/queryEobNeedReceiptList",   //EOB待确认账单列表查询
-  deleteEobReceiptInfo: "/backstage/auth/deleteEobReceiptInfo",   //删除EOB
-  saveEobReceiptInfo: "/backstage/auth/saveEobReceiptInfo",   //EOB新建
-
-  queryBackMoneyList: "/backstage/auth/queryBackMoneyList",   //回款列表
-  queryBackEobList: "/backstage/auth/queryBackEobList",   //回款关联EOB列表查询
-  queryEobInfoList: "/backstage/auth/queryEobInfoList",   //待回款EOB列表查询
-  saveBackMoney: "/backstage/auth/saveBackMoney",   //新建回款
-  deleteBackMoney: "/backstage/auth/deleteBackMoney",   //删除回款
-  eobReceipListExport: "/backstage/auth/eobReceipListExport",   //EOB关联账单导出
-  queryBackReceiptList: "/backstage/auth/queryBackReceiptList",   //回销关联账单列表查询
-  queryReceiptInfoList: "/backstage/auth/queryReceiptInfoList",   //回销账单列表查询
-
-};
+// 核销管理api
+export default {
+  queryEobList: "/backstage/auth/queryEobList",   //EOB列表查询
+  queryEobReceiptList: "/backstage/auth/queryEobReceiptList",   //EOB待核销账单查询
+  queryEobNeedReceiptList: "/backstage/auth/queryEobNeedReceiptList",   //EOB待确认账单列表查询
+  deleteEobReceiptInfo: "/backstage/auth/deleteEobReceiptInfo",   //删除EOB
+  saveEobReceiptInfo: "/backstage/auth/saveEobReceiptInfo",   //EOB新建
+
+  queryBackMoneyList: "/backstage/auth/queryBackMoneyList",   //回款列表
+  queryBackEobList: "/backstage/auth/queryBackEobList",   //回款关联EOB列表查询
+  queryEobInfoList: "/backstage/auth/queryEobInfoList",   //待回款EOB列表查询
+  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", // 删除已关联账单
+  exportBackMoneyReport: "/backstage/auth/backMoneyListExport", // 回款列表导出
+  exportBackReceiptList: "/backstage/auth/exportBackReceiptList", // 关联账单列表导出
+
+};

src/api/funcs_modules/verification.js

-// 核销管理函数库
-import apis from "../apis_moudles/verification.js";
-import req from "../request";
-
-//EOB列表查询
-const QUERYEOBLIST = (data) => {
-  return req.post(apis.queryEobList, data);
-};
-//EOB待核销账单查询
-const QUERYEOBRECEIPTLIST = (data) => {
-  return req.post(apis.queryEobReceiptList, data);
-};
-//EOB待确认账单列表查询
-const QUERYEOBNEEDRECEIPTLIST = (data) => {
-  return req.post(apis.queryEobNeedReceiptList, data);
-};
-
-//EOB新建
-const SAVEEOBRECEIPTINFO = (data) => {
-  return req.post(apis.saveEobReceiptInfo, data);
-};
-
-//删除EOB
-const DELEOBRECEIPTINFO = (data) => {
-  return req.post(apis.deleteEobReceiptInfo, data);
-};
-
-//回款列表
-const QUERYBACKMONEYLIST = (data) => {
-  return req.post(apis.queryBackMoneyList, data);
-};
-//回款关联EOB列表查询
-const QUERYBACKEOBLIST = (data) => {
-  return req.post(apis.queryBackEobList, data);
-};
-//待回款EOB列表查询
-const QUERYEOBINFOLIST = (data) => {
-  return req.post(apis.queryEobInfoList, data);
-};
-
-//新建回款
-const SAVEBACKMONEY = (data) => {
-  return req.post(apis.saveBackMoney, data);
-};
-
-//删除回款
-const DELETEBACKMONEY = (data) => {
-  return req.post(apis.deleteBackMoney, data);
-};
-
-//EOB关联账单导出
-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);
-};
-
-// 对象数组
-export default { 
-  QUERYEOBLIST,
-  QUERYEOBRECEIPTLIST,
-  QUERYEOBNEEDRECEIPTLIST,
-  SAVEEOBRECEIPTINFO,
-  DELEOBRECEIPTINFO,
-  QUERYBACKMONEYLIST,
-  QUERYBACKEOBLIST,
-  QUERYEOBINFOLIST,
-  SAVEBACKMONEY,
-  DELETEBACKMONEY,
-  EOBRECEIPLISTEXPORT,
-  QUERYBACKRECEIPTLIST,
-  QUERYBACKRECEIPTINFOLIST
+// 核销管理函数库
+import apis from "../apis_moudles/verification.js";
+import req from "../request";
+
+//EOB列表查询
+const QUERYEOBLIST = (data) => {
+  return req.post(apis.queryEobList, data);
+};
+//EOB待核销账单查询
+const QUERYEOBRECEIPTLIST = (data) => {
+  return req.post(apis.queryEobReceiptList, data);
+};
+//EOB待确认账单列表查询
+const QUERYEOBNEEDRECEIPTLIST = (data) => {
+  return req.post(apis.queryEobNeedReceiptList, data);
+};
+
+//EOB新建
+const SAVEEOBRECEIPTINFO = (data) => {
+  return req.post(apis.saveEobReceiptInfo, data);
+};
+
+//删除EOB
+const DELEOBRECEIPTINFO = (data) => {
+  return req.post(apis.deleteEobReceiptInfo, data);
+};
+
+//回款列表
+const QUERYBACKMONEYLIST = (data) => {
+  return req.post(apis.queryBackMoneyList, data);
+};
+//回款关联EOB列表查询
+const QUERYBACKEOBLIST = (data) => {
+  return req.post(apis.queryBackEobList, data);
+};
+//待回款EOB列表查询
+const QUERYEOBINFOLIST = (data) => {
+  return req.post(apis.queryEobInfoList, data);
+};
+
+//新建回款
+const SAVEBACKMONEY = (data) => {
+  return req.post(apis.saveBackMoney, data);
+};
+
+//删除回款
+const DELETEBACKMONEY = (data) => {
+  return req.post(apis.deleteBackMoney, data);
+};
+
+//EOB关联账单导出
+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);
+};
+
+// 回款列表导出
+const EXPORTBACKMONEYREPORT = (data) => {
+  return req.post(apis.exportBackMoneyReport, data, { responseType: "blob" });
+};
+
+// 关联账单导出
+const EXPORTBACKRECEIPTLIST = (data) => {
+  return req.post(apis.exportBackReceiptList, data, { responseType: "blob" });
+};
+
+// 对象数组
+export default { 
+  QUERYEOBLIST,
+  QUERYEOBRECEIPTLIST,
+  QUERYEOBNEEDRECEIPTLIST,
+  SAVEEOBRECEIPTINFO,
+  DELEOBRECEIPTINFO,
+  QUERYBACKMONEYLIST,
+  QUERYBACKEOBLIST,
+  QUERYEOBINFOLIST,
+  SAVEBACKMONEY,
+  DELETEBACKMONEY,
+  EOBRECEIPLISTEXPORT,
+  QUERYBACKRECEIPTLIST,
+  QUERYBACKRECEIPTINFOLIST,
+  DELETERECEIPTRECORD,
+  EXPORTBACKMONEYREPORT,
+  EXPORTBACKRECEIPTLIST
 };
\ No newline at end of file

src/utils/utilsdictOptions.js

-
-//性别
-const sexOptions =  [{
-	name: '男',
-	value: 'M'
-}, {
-	name: '女',
-	value: 'F'
-}];
-
-//寄送状态
-const SendStatusOptions =  [
-	{ name: '未寄送', value: '1'}, 
-	{ name: '寄送', value: '2'},
-	{ name: '待寄送', value: '3'},
-];
-
-//理赔状态
-const ClaimsStatusOptions =  [
-	{ name: '赔付', value: '01'}, 
-	{ name: '部分赔付', value: '02'},
-	{ name: '拒赔', value: '03'},
-	{ name: '补充材料', value: '04'},
-];
-
-//EOB状态
-const EOBStatusOptions =  [
-	{ name: '待回款', value: '1'}, 
-	{ name: '已回款', value: '2'},
-	{ name: '未回款', value: '3'}
-];
-
-//申请状态
-const ApplyStatusOptions =  [
-	{ name: '申请中', value: '01'}, 
-	{ name: '预授权批准', value: '02'},
-	{ name: '预授权拒绝', value: '03'},
-	{ name: '预授权调查', value: '04'},
-];
-
-//审批结果
-const ApproveStatusOptions =  [
-	{ name: '未通过', value: '1'}, 
-	{ name: '已通过', value: '2'}
-];
-
-//monetUnit
-const MoneyUnitOptions =  [
-	{ name: '元', value: '01'}, 
-	{ name: '美元', value: '02'},
-	{ name: '英镑', value: '03'},
-	{ name: '欧元', value: '04'},
-];
-
-
-
-module.exports = {
-	sexOptions,
-	SendStatusOptions,
-	ClaimsStatusOptions,
-	EOBStatusOptions,
-	ApplyStatusOptions,
-	ApproveStatusOptions,
-	MoneyUnitOptions,
+
+//性别
+const sexOptions =  [{
+	name: '男',
+	value: 'M'
+}, {
+	name: '女',
+	value: 'F'
+}];
+
+//寄送状态
+const SendStatusOptions =  [
+	{ name: '未寄送', value: '1'}, 
+	{ name: '寄送', value: '2'},
+	{ name: '待寄送', value: '3'},
+];
+
+//理赔状态
+const ClaimsStatusOptions =  [
+	{ name: '赔付', value: '01'}, 
+	{ name: '部分赔付', value: '02'},
+	{ name: '拒赔', value: '03'},
+	{ name: '补充材料', value: '04'},
+];
+
+//EOB状态
+const EOBStatusOptions =  [
+	{ name: '待回款', value: '1'}, 
+	{ name: '已回款', value: '2'},
+	{ name: '未回款', value: '3'}
+];
+
+//申请状态
+const ApplyStatusOptions =  [
+	{ name: '申请中', value: '01'}, 
+	{ name: '预授权批准', value: '02'},
+	{ name: '预授权拒绝', value: '03'},
+	{ name: '预授权调查', value: '04'},
+];
+
+//审批结果
+const ApproveStatusOptions =  [
+	{ name: '未通过', value: '1'}, 
+	{ name: '已通过', value: '2'}
+];
+
+//monetUnit
+const MoneyUnitOptions =  [
+	{ name: '元', value: '01'}, 
+	{ name: '美元', value: '02'},
+	{ name: '英镑', value: '03'},
+	{ name: '欧元', value: '04'},
+];
+
+// 账单类型
+const receiptTypeOptions =  [
+	{ name: '收费', value: '1'}, 
+	{ name: '退费', value: '2'},
+];
+
+
+module.exports = {
+	sexOptions,
+	SendStatusOptions,
+	ClaimsStatusOptions,
+	EOBStatusOptions,
+	ApplyStatusOptions,
+	ApproveStatusOptions,
+	MoneyUnitOptions,
+	receiptTypeOptions
 }
\ No newline at end of file

src/views/customer/edit/index.vue

@@ -42,14 +42,14 @@
           <a-form-model-item label="出生日期" prop="birthday">
             <a-date-picker v-model="form.birthday" allow-clear placeholder="请选择出生日期" value-format="YYYY-MM-DD 00:00:00"></a-date-picker>
           </a-form-model-item>
-          <a-form-model-item label="客户公司名称" prop="corpName">
+          <!-- <a-form-model-item label="客户公司名称" prop="corpName">
             <a-select v-model="form.corpName" placeholder="请选择客户公司名称" show-search allow-clear
               :filterOption="filterCode" @change="corpChange" @search="corpSearch">
               <a-select-option v-for="item in comCorpCode" :key="item.id" :value="item.id + '$_' + item.longName">
                 {{ item.longName }}
               </a-select-option>
             </a-select>
-          </a-form-model-item>
+          </a-form-model-item> -->
           <a-form-model-item label="保单生效日期" prop="startDate">
             <a-date-picker allow-clear v-model="form.startDate" placeholder="请选择保单生效日期" value-format="YYYY-MM-DD 00:00:00" @change="startDateChange"></a-date-picker>
           </a-form-model-item>
@@ -85,7 +85,7 @@
             <a-date-picker allow-clear v-model="form.endDate" placeholder="请选择保单终止日期" value-format="YYYY-MM-DD 00:00:00"></a-date-picker>
           </a-form-model-item>
         </a-col>
-        <a-col :xl="6" :lg="6" :sm="12">
+        <!-- <a-col :xl="6" :lg="6" :sm="12">
           <a-form-model-item label="保险计划" prop="planName">
             <a-select v-model="form.planName" placeholder="请选择保险计划" show-search allow-clear :filterOption="filterCode" @search="codeSearch"
             >
@@ -94,7 +94,7 @@
               </a-select-option>
             </a-select>
           </a-form-model-item>
-        </a-col>
+        </a-col> -->
         <a-col :xl="6" :lg="6" :sm="12">
           <a-form-model-item label="其他备注" prop="remark">
             <a-input allow-clear v-model="form.remark" placeholder="请输入备注信息"></a-input>

src/views/home/index.vue

-<template>
-  <div class="white_bg burt-container">
-    <img src="../../assets/image/home_bg.jpg" alt="">
-  </div>
-</template>
-
-<script>
-export default{
-  data(){
-    return{
-
-    }
-  }
-}
-</script>
-
-<style lang="less" scoped>
-.burt-container{
-  height: calc(100vh - 116px);
-  padding: 0;
-  img{
-    width: 100%;
-    height: 100%;
-    object-fit: contain;
-  }
-}
+<template>
+  <div class="white_bg burt-container">
+    <img src="../../assets/image/home_bg.jpg" alt="">
+  </div>
+</template>
+
+<script>
+export default{
+  data(){
+    return{
+
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.burt-container{
+  height: calc(100vh - 86px);
+  padding: 0;
+  img{
+    width: 100%;
+    height: 100%;
+    object-fit: contain;
+  }
+}
 </style>
\ No newline at end of file

src/views/layout/components/menu/subMenu.vue

-<template>
-  <div class="sub-menu">
-    <router-link
-      tag="button"
-      :class="{ btn: true, 'btn-active': isVisit(item.path) }"
-      v-for="(item, index) in menuStack"
-      :key="item.path"
-      :to="item.path"
-    >
-      {{ item.title }}
-      <Icon v-if="menuStack.length>1"
-        @click="(e)=>closeMenu(e, index)"
-        :name="isVisit(item.path) ? 'ssiclose_active' : 'ssiclose'"
-        :size="16"
-      />
-    </router-link>
-    <slot name="tips" />
-  </div>
-</template>
-
-<script>
-import { mapState } from "vuex";
-export default {
-  computed: {
-    ...mapState({
-      menuStack: (state) => state.common.menuStack,
-    }),
-  },
-  methods: {
-    isVisit(val) {
-      const path = this.$route.path;
-      return path === val;
-    },
-    closeMenu(e, index) {
-      e.stopPropagation();
-      const menuStack = JSON.parse(JSON.stringify(this.menuStack));
-      const isVisit = this.isVisit(menuStack[index].path);
-      menuStack.splice(index, 1);
-      this.$store.commit("common/setMenuStack", menuStack);
-      if (isVisit) {
-        // 关闭的是当前正在查看的
-        const i = Math.max(0, index - 1);
-        this.$router.push(menuStack[i].path || "/");
-      }
-    },
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.sub-menu {
-  width: 100%;
-  overflow-x: auto;
-  white-space: nowrap;
-  .mg-b(16);
-  .btn {
-    .fs(14);
-    .lh(20);
-    .pa(8, 13, 8, 13);
-    .mg-r(40);
-    color: #252631;
-    font-weight: bold;
-    border: none;
-    background-color: #fff;
-    border-radius: 5px;
-    cursor: pointer;
-  }
-  .btn-active {
-    color: #fff;
-    background-color: #2b63ff;
-  }
-}
-</style>

src/views/layout/index.vue

-<template>
-  <div class="menu-layout">
-    <Header></Header>
-    <div class="container">
-      <Menu></Menu>
-      <Loading />
-      <div class="content">
-        <SubMenu></SubMenu>
-        <router-view />
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import Header from "./components/Header.vue";
-import Menu from "./components/menu";
-import SubMenu from "./components/menu/subMenu.vue";
-import Loading from "@/components/Loading/Loading.vue";
-
-export default {
-  components: {
-    Header,
-    Menu,
-    SubMenu,
-    Loading
-  },
-  data() {
-    return {};
-  },
-
-  created() {},
-  mounted() {},
-  methods: {},
-};
-</script>
-
-<style>
- .icon-class.arrow{
-  position: absolute;
-  right: 0;
-  top: 50%;
-  transform: translateY(-50%);
-}
-</style>
-<style lang="less" scoped>
-.menu-layout {
-  background-color: #f8fafb;
-  font-family: "Helvetica" "Microsoft YaHei" "微软雅黑";
-  .container {
-    display: flex;
-    position: relative;
-    .pt(68);
-    // min-height: calc(100vh - 50px);
-    .content {
-      position: relative;
-      flex: 1;
-      .mg-l(242);
-      .pa(14, 40, 0, 40);
-      min-height: calc(100vh - 68px);
-      overflow-x: hidden;
-    }
-  }
-  .menu {
-    position: fixed;
-    .w(242);
-    height: calc(100vh - 68px);
-    overflow: auto;
-    background-color: #fff;
-    li{
-      position: relative;
-    }
-  }
-}
-</style>
+<template>
+  <div class="menu-layout">
+    <Header></Header>
+    <div class="container">
+      <Menu></Menu>
+      <Loading />
+      <div class="content">
+        <router-view />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import Header from "./components/Header.vue";
+import Menu from "./components/menu";
+import Loading from "@/components/Loading/Loading.vue";
+
+export default {
+  components: {
+    Header,
+    Menu,
+    Loading
+  },
+  data() {
+    return {};
+  },
+
+  created() {},
+  mounted() {},
+  methods: {},
+};
+</script>
+
+<style>
+ .icon-class.arrow{
+  position: absolute;
+  right: 0;
+  top: 50%;
+  transform: translateY(-50%);
+}
+</style>
+<style lang="less" scoped>
+.menu-layout {
+  background-color: #f8fafb;
+  font-family: "Helvetica" "Microsoft YaHei" "微软雅黑";
+  .container {
+    display: flex;
+    position: relative;
+    .pt(68);
+    // min-height: calc(100vh - 50px);
+    .content {
+      position: relative;
+      flex: 1;
+      .mg-l(242);
+      .pa(14, 40, 0, 40);
+      min-height: calc(100vh - 68px);
+      overflow-x: hidden;
+    }
+  }
+  .menu {
+    position: fixed;
+    .w(242);
+    height: calc(100vh - 68px);
+    overflow: auto;
+    background-color: #fff;
+    li{
+      position: relative;
+    }
+  }
+}
+</style>