Merge branch 'func_1213' of git.ssish.com:sunhailiang/bims into yanglilong

src/api/apis_moudles/charge-query.js

 // 收费查询api
-export default {};
+export default {
+  getChargeList: "/backstage/auth/receiptList",
+  getCompanyOptions: "/backstage/auth/payorListNopage", 
+  getDoctorListNoPage:"/backstage/auth/doctorListNoPage",//医生列表
+  getChargeListDetail:"/backstage/auth/receiptDetailList",//账单明细
+  getReceiptPaymentDetail:"/backstage/auth/receiptPaymentDetail",//账单明细
+};

src/api/funcs_modules/charge-query.js

 // 收费查询函数库
-// import apis from "../apis_moudles/index";
-// import req from "../request";
+import apis from "../apis_moudles/";
+import req from "../request";
+// get charge list
+const GETCHARGELIST = function (data) {
+  return req.post(apis.getChargeList, data);
+};
+//获取保险公司数据
+const GETCOMPANYOPTIONS = function (data) {
+  return req.post(apis.getCompanyOptions, data);
+};
+// 获取医生列表
+const GETDOCTORlISTNOPAGE= function (data) {
+  return req.post(apis.getDoctorListNoPage, data);
+};
+// get charge detail list
+const GETCHARGELISTDETAIL = function (data) {
+  return req.post(apis.getChargeListDetail, data);
+};
+// 获取费用支付明细
+const GETRECEIPTPAYMENTDETAIL= function (data) {
+  return req.post(apis.getReceiptPaymentDetail, data);
+};
 // 对象数组
-export default {};
+export default {
+  GETCHARGELIST,
+  GETCOMPANYOPTIONS,
+  GETDOCTORlISTNOPAGE,
+  GETCHARGELISTDETAIL,
+  GETRECEIPTPAYMENTDETAIL
+};

src/router/modules/charge-query.js

 // 收费查询路由表,分包名称:charge-query
+import Layout from '@/layout'
 export default {
   path: "/charge-query",
-  name: "ChargeQuery",
-  component: () => {
-    return import(/* webpackChunkName: "chargeQuery" */ "@/views/charge-query");
-  },
+  name: "chargeQuery",
+  component: Layout,
+  children: [
+    {
+      path:'',
+      name: "chargeQueryIndex",
+      component: () => import(/* webpackChunkName: "chargeQuery" */"@/views/charge-query/index.vue")
+    },
+    {
+      path: "detail",
+      name: "chargeQueryDetail",
+      component: () => import(/* webpackChunkName: "chargeQuery" */"@/views/charge-query/detail.vue")
+    }
+  ]
 };

src/router/modules/menu.js

@@ -37,9 +37,14 @@ export default [
   },
   {
     icon: "ssisearch",
-    path: "/charge-query",
+    path: "charge-query",
     title: "收费查询",
-    children: [],
+    children: [
+      {
+        path: "/charge-query",
+        title: "账单查询",
+      },
+    ],
   },
   {
     icon: "ssiorder",

yarn.lock

@@ -5939,7 +5939,7 @@ mkdirp@^1.0.3, mkdirp@^1.0.4:
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
 
-moment@^2.21.0:
+moment@^2.21.0, moment@^2.29.1:
   version "2.29.1"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
   integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==