dev

src/components/charge/ChargeQueue.vue

@@ -17,7 +17,8 @@
         <div class="list">
           <el-scrollbar>
             <ul>
-              <li class="list-item" :class="curItem.id == item.id ? 'active' : ''" v-for="(item, index) in ChargeQueueList"
+              <li class="list-item" :class="curItem.id == item.id ? 'active' : ''"
+                  v-for="(item, index) in ChargeQueueList"
                   :key="index" @click="clickItem(item)">
                 <span>
                   <img v-if="item.patientGender=='1'" class="avatar"
@@ -28,16 +29,9 @@
                        alt="头像"/>
                 </span>
                 <span class="item_name">{{ item.patientName }}</span>
-                <el-tooltip
+                <span class="item_time">
-                    class="box-item"
-                    effect="dark"
-                    :content="formatListTime(item.createTime)||'-'"
-                    placement="bottom-start"
-                >
-              <span class="item_time">
                 {{ formatListTime(item.createTime) || '-' }}
               </span>
-                </el-tooltip>
                 <span :class="[item.status == 0 ?'status-active':'']">{{ item.status == 0 ? '未收' : '已收' }}</span>
               </li>
             </ul>
@@ -53,7 +47,7 @@
 import {onMounted, ref} from "vue";
 import {post} from "@/utils/request.ts";
 import Panel from "@/components/common/Panel.vue";
-import {formatListTime} from "@/utils/dateUtils.ts";
+import {formatListTime, getToday} from "@/utils/dateUtils.ts";
 
 const curItem = ref<any>({});
 const emit = defineEmits(['clickItem'])
@@ -61,13 +55,15 @@ const clickItem = (item: any) => {
   curItem.value = item
   emit('clickItem', item, query.value.status);
 }
-
+const data = ref<any>(getToday())
 const ChargeQueueList = ref<any>([]);
 const query = ref({
   pageSize: 20,
   pageNum: 1,
   keyword: "",
-  status: 0
+  status: 0,
+  beginTime: data.value.start,
+  endTime: data.value.end
 })
 const addChargeOrder = () => {
   const newOrder = {
@@ -99,6 +95,7 @@ const delDraft = () => {
 defineExpose({delDraft, getOrderList})
 onMounted(() => {
   getOrderList()
+  init()
 })
 const statusList = ref([
   {
@@ -116,6 +113,12 @@ const tab = (item: any) => {
   query.value.status = item.value
   getOrderList()
 }
+const init = () => {
+  post('statistics/getTipCount', {beginTime: data.value.start, endTime: data.value.end}).then((res: any) => {
+    statusList.value[0].num = res.unchargedCount
+    statusList.value[1].num = res.chargedCount
+  })
+}
 </script>
 <style scoped lang="scss">
 .container {

src/components/outpatient/MedicalQueue.vue

@@ -34,7 +34,7 @@
 import {nextTick, onMounted, ref, watch} from "vue";
 import Panel from "@/components/common/Panel.vue";
 import {post} from "@/utils/request.ts";
-import {formatListTime} from "@/utils/dateUtils.ts";
+import {formatListTime, getToday} from "@/utils/dateUtils.ts";
 import {apiConfig} from "@/assets/config/apiConfig.ts";
 import {ElMessageBox} from "element-plus";
 
@@ -95,29 +95,13 @@ const init = () => {
     list.value = res.list
   })
 }
+const data=ref<any>(getToday())
 const initStatusList = () => {
-  post('registration/getListByType', {
+  post('statistics/getTipCount',{beginTime:data.value.start,endTime:data.value.end}).then((res:any)=>{
-    query: {
+    list.value[0].num=res.waitDiagnosisCount
-      status: 1,
+    list.value[1].num=res.diagnosingCount
-    }
+    list.value[2].num=res.completeDiaCount
-  }).then((res: any) => {
-    statusList.value[0].num = res.total_count
   })
-  post('registration/getListByType', {
-    query: {
-      status: 2,
-    }
-  }).then((res: any) => {
-    statusList.value[1].num = res.total_count
-  })
-  post('registration/getListByType', {
-    query: {
-      status: 3,
-    }
-  }).then((res: any) => {
-    statusList.value[2].num = res.total_count
-  })
-
 }
 const clickLi = (item: any) => {
   curItem.value = item

src/components/outpatient/ServiceItems.vue

@@ -9,18 +9,22 @@
               <el-popover
                   width="485"
                   @show="show(item)"
+                  @hide="hide"
               >
                 <template #reference>
                   {{ item.itemName }}
                 </template>
                 <div class="detail">
                   <div style="display: flex;justify-content: space-between">
-                    <div style="font-size: 18px;font-weight: 500;color: #000">{{ itemInfo.name }}[{{ chrgitm_lv[itemInfo.chrgitmLv as keyof typeof chrgitm_lv || '-'] || '-' }}]</div>
+                    <div style="font-size: 18px;font-weight: 500;color: #000">{{
-                    <div>￥{{ item.unitPrice }}/{{item.unit }}</div>
+                        itemInfo.name
+                      }}[{{ chrgitm_lv[itemInfo.chrgitmLv as keyof typeof chrgitm_lv || '-'] || '-' }}]
+                    </div>
+                    <div>￥{{ item.unitPrice }}/{{ item.unit }}</div>
                   </div>
                   <div style="display: flex;justify-content: space-between">
-                    <div>限制条件:{{ itemInfo.lmtUsedFlag == 0 ? '否' : itemInfo.lmtUsedFlag == 1 ? '是' : '-'}}</div>
+                    <div>限制条件:{{ itemInfo.lmtUsedFlag == 0 ? '否' : itemInfo.lmtUsedFlag == 1 ? '是' : '-' }}</div>
-                    <div> 医保码:{{item.itemSocialCode||'-'}}</div>
+                    <div> 医保码:{{ item.itemSocialCode || '-' }}</div>
                   </div>
                 </div>
               </el-popover>
@@ -32,11 +36,11 @@
                 <span style="margin-left: 10px; line-height: 30px;">{{ item.unit }}</span>
               </div>
             </div>
-            <div class="sub-price">￥{{ item.unitPrice*item.selectedNum }}</div>
+            <div class="sub-price">￥{{ item.unitPrice * item.selectedNum }}</div>
             <div class="delete">
               <div @click="deleteItem(item.id)" class="delete-btn">
                 <el-icon>
-                  <Close />
+                  <Close/>
                 </el-icon>
               </div>
             </div>
@@ -62,7 +66,7 @@
   </Panel>
 </template>
 <script setup lang="ts">
-import {defineModel, computed,defineEmits,ref} from "vue";
+import {defineModel, computed, defineEmits, ref} from "vue";
 import Panel from "@/components/common/Panel.vue";
 import {Close} from '@element-plus/icons-vue'
 import SearchInput from "@/components/SearchInput.vue";
@@ -105,19 +109,23 @@ const deleteItem = (id: any) => {
   list.value = list.value.filter((item) => item.id !== id);
 };
 const emit = defineEmits(['focus'])
-const focus=(e:any)=>{
+const focus = (e: any) => {
-  emit('focus',e)
+  emit('focus', e)
 }
 const itemInfo = ref<any>({});
-const show = (item:any) => {
+const show = (item: any) => {
-  post('social/directory/getItemByCode',{code:item.itemSocialCode}).then((res:any)=>{
+  post('social/directory/getItemByCode', {code: item.itemSocialCode}).then((res: any) => {
     itemInfo.value = res
   })
 }
+const hide = () => {
+  itemInfo.value = {}
+}
 </script>
 
 <style scoped lang="scss">
 @use "@/assets/scss/base";
+
 .content {
   display: flex;
   flex-direction: column;
@@ -171,7 +179,8 @@ const show = (item:any) => {
         margin-left: 10px;
         line-height: 30px;
       }
-      .sub-price{
+
+      .sub-price {
         height: 100%;
         line-height: 30px;
       }
@@ -181,9 +190,11 @@ const show = (item:any) => {
         width: 100px;
         text-align: center;
         line-height: 30px;
-        .delete-btn{
+
+        .delete-btn {
           cursor: pointer;
-          &:hover{
+
+          &:hover {
             color: base.$primary-color;
           }
         }

src/components/outpatient/ServiceItemsDetail.vue

@@ -8,6 +8,7 @@
               <span class="name"> <el-popover
                   width="485"
                   @show="show(item)"
+                  @hide="hide"
               >
                 <template #reference>
                   {{ item.itemName }}
@@ -22,8 +23,8 @@
                     <div> 医保码:{{item.itemSocialCode||'-'}}</div>
                   </div>
                 </div>
-              </el-popover></span>
+              </el-popover>
-              <span class="code">{{ item.itemSocialCode }}</span>
+              </span>
               <span class="unit">{{item.selectedNum}}{{ item.selectedUnit }}</span>
               <span class="price">￥{{ item.selectedPrice }}元</span>
             </li>
@@ -38,9 +39,20 @@
 </template>
 <script setup lang="ts">
 import Panel from "@/components/common/Panel.vue";
-import {onMounted} from "vue";
+import {ref} from "vue";
+import {post} from "@/utils/request.ts";
+import chrgitm_lv from "@/assets/config/directory/chrgitmLv.json"
 
 const list = defineModel<any[]>({default: () => []});
+const itemInfo = ref<any>({});
+const show = (item:any) => {
+  post('social/directory/getItemByCode',{code:item.itemSocialCode}).then((res:any)=>{
+    itemInfo.value = res
+  })
+}
+const hide = () => {
+  itemInfo.value = {}
+}
 </script>
 
 <style scoped lang="scss">

src/components/settings/ItemEdit.vue

@@ -157,10 +157,10 @@ const openCreateSearch = () => {
   });
 }
 const createConfirm = (data: any) => {
-  console.log(data, 'data')
+  form.value.unit = data.unit
-  form.value = data
   form.value.itemName = data.name
   form.value.itemSocialCode = data.code
+
 }
 const deleteDetail = () => {
   post("item/delete", {id: props.id}).then((res: any) => {
@@ -189,7 +189,7 @@ const formRules = {
     {required: true, message: '请输入单位', trigger: 'blur'},
 
   ],
-  unitPrice:[
+  unitPrice: [
     {required: true, message: '请输入售价', trigger: 'blur'},
     {type: 'number', message: '单位必须为数字值'}
   ]

src/views/settings/item.vue

@@ -107,7 +107,6 @@ const handleSelect = (item: any) => {
     (selectRef.value as HTMLElement).blur();
   }
   emit('selectCallBack', inventory);
-  console.log("inventory", inventory)
   state.value = []
 
 }
@@ -121,7 +120,7 @@ const rowClick = ((row: any) => {
 
 const tableData = ref<any>([])
 const initData = () => {
-  post('item/list', {page: page.value, size: pageSize.value, ...search.value}).then((res: any) => {
+  post('item/list', {pageNum: page.value, pageSize: pageSize.value, ...search.value}).then((res: any) => {
     tableData.value = res.list
     total.value = res.total_count
   })
@@ -139,6 +138,7 @@ const openSetMenu = () => {
 }
 const changePage = (val: any) => {
   page.value = val
+  initData()
 };
 const pageSize = ref(20);
 const page = ref(1);