Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web

# Conflicts:
#	src/views/outpatient/index.vue

src/assets/config/apiConfig.ts

@@ -21,4 +21,10 @@ export enum apiConfig{
     "OrganizationSectionAllList"="organization/section/allList",//获取所有科室列表
     "OrganizationSectionListByMemberId"="organization/section/listByMemberId",//获取当前成员所属科室列表
     "OrganizationMemberListBySectionId"="organization/member/listBySectionId",//获取当前科室的所有医生列表
+
+    /**
+     * 收费接口
+     */
+
+    "ChargeListChargeLog"="charge/listChargeLog"//查询收费记录
 }

src/components/outpatient/MedicalQueue.vue

@@ -129,9 +129,9 @@ const initStatusList = () => {
     statusList.value[2].num = res.completeDiaCount
   })
 }
-const clickLi = (item: any) => {
+const clickLi = (item: any,showBox:any = true) => {
   curItem.value = item
-  if (item.status == 1) {
+  if (item.status == 1 && showBox) {
     ElMessageBox.confirm(`您将要接诊${item.name}`, "提示", {
       confirmButtonText: '确定',
       cancelButtonText: '取消',
@@ -145,15 +145,18 @@ const clickLi = (item: any) => {
             curStatus.value = 2
             curItem.value = res
             initStatusList()
+            emit('clickItem', curItem.value)
           })
         }
       },
     })
-  }
+  }else {
     emit('clickItem', curItem.value)
   }
+
+}
 const changeCurItemOrStatus = (item:any, status:any) => {
-    curItem.value = item
+    clickLi(item,false)
   if (curStatus != null){
     curStatus.value = status
   }

src/components/registration/CardDefault.vue

@@ -110,7 +110,7 @@ onUnmounted(() => {
   emit('changeLoading',false)
 })
 const close = () => {
-  socialCard.value.data = null
+  socialCard.value = null
 }
 defineExpose({close})
 </script>

src/components/registration/Edit.vue

@@ -232,17 +232,18 @@ const close = () => {
 }
 const form = ref()
 const save = () => {
+  debugger
   let data = {
     ...edit_data.value,
-    psnNo: socialCard.value.data?.baseinfo.psn_no,
+    psnNo: socialCard.value?.data?.baseinfo.psn_no,
-    insutype: socialCard.value.data?.insuinfo[0].insutype
+    insutype: socialCard.value?.data?.insuinfo[0].insutype
   }
   form.value.validate((v: any) => {
     if (v) {
       if (edit_data.value.id) {
         post('registration/edit', {
-          data: data, mdtrtCertNo: socialCard.value.mdtrtCertNo,
+          data: data, mdtrtCertNo: socialCard.value?.mdtrtCertNo,
-          mdtrtCertType: socialCard.value.mdtrtCertType
+          mdtrtCertType: socialCard.value?.mdtrtCertType
         }).then(() => {
           ElMessage.success('修改成功')
           close()
@@ -251,8 +252,8 @@ const save = () => {
         console.log(socialCard.value)
         post('registration/add', {
           data: data,
-          mdtrtCertNo: socialCard.value.mdtrtCertNo,
+          mdtrtCertNo: socialCard.value?.mdtrtCertNo,
-          mdtrtCertType: socialCard.value.mdtrtCertType
+          mdtrtCertType: socialCard.value?.mdtrtCertType
         }).then(() => {
           ElMessage.success('挂号成功')
           close()

src/components/social/inventoryUp/List_3501.vue

@@ -110,7 +110,7 @@ const formatDate = (isoStr:any) => {
 </template>
 
 <style scoped lang="scss">
-@use "@/assets/base.scss";
+@use "@/assets/scss/base.scss";
 .container-wrapper {
   display: flex;
   flex-direction: column;
@@ -128,7 +128,7 @@ const formatDate = (isoStr:any) => {
     height: 60px;
     display: flex;
     align-items: center;
-    background: base.$background-color-panel;
+    background: base.$background-color-base;
   }
 }
 </style>

src/components/social/inventoryUp/List_3502.vue

@@ -197,7 +197,7 @@ const formatDate = (isoStr: any) => {
 
 
 <style scoped lang="scss">
-@use "@/assets/base.scss";
+@use "@/assets/scss/base.scss";
 .container {
   display: flex;
   flex-direction: column;
@@ -218,7 +218,7 @@ const formatDate = (isoStr: any) => {
     height: 60px;
     display: flex;
     align-items: center;
-    background: base.$background-color-panel;
+    background: base.$background-color-base;
 
   }
 }

src/components/social/inventoryUp/List_3503.vue

@@ -163,7 +163,7 @@ const formatDate = (isoStr:any) => {
 </script>
 
 <style scoped lang="scss">
-@use "@/assets/base.scss";
+@use "@/assets/scss/base.scss";
 .container {
   height: 100%;
   display: flex;
@@ -180,7 +180,7 @@ const formatDate = (isoStr:any) => {
     height: 60px;
     display: flex;
     align-items: center;
-    background: base.$background-color-panel;
+    background: base.$background-color-base;
 
   }
 }

src/components/social/inventoryUp/List_3505.vue

@@ -92,7 +92,7 @@ let change_search = ()=>{
 </template>
 
 <style scoped lang="scss">
-@use "@/assets/base.scss";
+@use "@/assets/scss/base.scss";
 .container {
   display: flex;
   flex-direction: column;
@@ -108,7 +108,7 @@ let change_search = ()=>{
     height: 60px;
     display: flex;
     align-items: center;
-    background: base.$background-color-panel;
+    background: base.$background-color-base;
   }
 }
 </style>

src/router/index.ts

@@ -133,16 +133,33 @@ const router = createRouter({
         },
         {
             path: '/social',
-            component: () => import('../views/Layout.vue'),
+            component: () => import('../views/LayoutSocial.vue'),
             children: [
                 {
                     path: "",
-                    redirect: "/social/index",
+                    redirect: "/social/directory",
                 },
                 {
-                    path: "index",
+                    path: "directory",
-                    component: () => import('../views/social/directory.vue'),
+                    component: () => import('@/views/social/directory.vue'),
-                }
+                },
+                {
+                    path: "update",
+                    component: () => import('@/views/social/update.vue'),
+                },
+                {
+                    path: "inventoryUp",
+                    component: () => import('@/views/social/inventoryUp.vue'),
+                },
+                {
+                    path: "costRecord",
+                    component: () => import('@/views/social/costRecord.vue'),
+                },
+                {
+                    path: "accountRecord",
+                    component: () => import('@/views/social/accountRecords.vue'),
+                },
+
             ]
         },
         {

src/views/LayoutSocial.vue

@@ -0,0 +1,79 @@
+<template>
+  <div class="layout-container">
+    <Header class="header" />
+    <div class="childMenu">
+      <router-link :to="item.path" class="child-item" v-for="(item,index) in childMenuList" :key="index">
+        {{ item.name }}
+      </router-link>
+    </div>
+    <div class="space"></div>
+    <main class="layout-main">
+      <router-view/>
+    </main>
+    <div class="space"></div>
+    <Footer class="footer" />
+  </div>
+
+</template>
+
+<style scoped lang="scss">
+.childMenu {
+  width: 100%;
+  height: 60px;
+  background: #fff;
+  display: flex;
+  align-items: center;
+  .child-item {
+    display: inline-block;
+    color: #151515;
+    outline: none;
+    text-decoration: none;
+    font-size: 18px;
+    margin-left: 10px;
+    margin-right: 10px;
+    height: 35px;
+    position: relative;
+  }
+
+  .router-link-active:after {
+    content: '';
+    display: block;
+    width: 100%;
+    height: 2px;
+    background-color:  #151515; // 下划线颜色
+    position: absolute;
+    bottom: -5px; // 调整下划线与文字的距离
+    left: 0;
+  }
+}
+</style>
+
+
+<script setup lang="ts">
+import "@/assets/scss/layout.scss"
+import Header from "@/components/common/Header.vue";
+import Footer from "@/components/common/Footer.vue";
+import {ref} from "vue";
+const childMenuList = ref([
+  {
+    name: '医保目录',
+    path: '/social/directory',
+  },
+  {
+    name: '目录更新',
+    path: '/social/update',
+  },
+  {
+    name: '进销存上报',
+    path: '/social/inventoryUp',
+  },
+  {
+    name: '收费记录',
+    path: '/social/costRecord',
+  },
+  {
+    name: '对账',
+    path: '/social/accountRecord',
+  }
+])
+</script>

src/views/outpatient/index.vue

@@ -95,14 +95,14 @@ const save = () => {
   const data = {
     registrationId: registerId.value,
     patientId: patientId.value,
-    itemList: itemDetail.value,
+    itemList: formData.value.itemDetail,
-    goodsList: goodsList.value,
+    goodsList: formData.value.goodsDetail,
     diagnosisMedicalRecord: medicalRecord,
 
   }
-  post('medical/record/save', {data: data}).then(() => {
+  post('medical/record/save', {data: data}).then((res:any) => {
     ElMessage.success("保存成功")
-    medicalQueueRef.value?.changeCurItemOrStatus(null,3);
+    medicalQueueRef.value?.changeCurItemOrStatus(null,2);
 
 
   })

src/views/social/costRecord.vue

@@ -40,6 +40,7 @@
 import {onMounted, ref} from "vue";
 import {post} from "@/utils/request.ts";
 import {getToday, formatDateArray} from "@/utils/dateUtils.ts";
+import {apiConfig} from "@/assets/config/apiConfig.ts";
 
 const tableData = ref([])
 const date = ref()
@@ -50,7 +51,7 @@ const dateChangeHandler = () => {
 
 
 const getTableData = () => {
-  post("retail/reconciliation/getChargeList", {beginTime: date.value[0], endTime: date.value[1]}).then((res: any) => {
+  post(apiConfig.ChargeListChargeLog, {beginTime: date.value[0], endTime: date.value[1]}).then((res: any) => {
     tableData.value = res
   })
 }