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

dev
2025-05-07 16:43:54 +08:00 · 2025-05-07 16:43:46 +08:00 · 2025-05-07 16:05:38 +08:00 · 2025-05-07 16:05:30 +08:00
8 changed files with 92 additions and 71 deletions
--- a/src/components/charge/ChargeQueue.vue
+++ b/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
-                    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 {
--- a/src/components/member/memberProfile/VipEdit.vue
+++ b/src/components/member/memberProfile/VipEdit.vue
@ -23,7 +23,7 @@
                        v-for="item in levelList"
                        :key="item.id"
                        :label="item.name"
-                        :value="item.id"
+                        :value="item.levelId"
                    />
                  </el-select>
                </el-form-item>
@ -161,6 +161,7 @@ import {post} from "@/utils/request.ts";
 import Mask from "@/components/common/Mask.vue";
 import psnCertTypes from "@/assets/config/directory/psnCertTypes.json"
 import antys from '@/assets/config/directory/antys.json'
+import {formatDate} from "@/utils/dateUtils.ts";


 const ruleFormRef = ref<FormInstance>()
@ -222,6 +223,7 @@ const submitForm = async () => {
  if (!formEl) return
  await formEl.validate((valid: any) => {
    if (valid) {
+      ruleForm.value.birthday=formatDate(ruleForm.value.birthday)
      if (ruleForm.value.id) {
        post("vip/vip/update", {vipInfo: ruleForm.value}).then(() => {
          close()
@ -285,6 +287,7 @@ const levelList = ref<any>([])
 const getLevelConfig = () => {
  post("vip/vipLevel/list").then((res: any) => {
    levelList.value = res
+    console.log('le',levelList.value)
  })
 }
 onMounted(() => {
--- a/src/components/outpatient/MedicalQueue.vue
+++ b/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', {
-    query: {
-      status: 1,
-    }
-  }).then((res: any) => {
-    statusList.value[0].num = res.total_count
+  post('statistics/getTipCount',{beginTime:data.value.start,endTime:data.value.end}).then((res:any)=>{
+    list.value[0].num=res.waitDiagnosisCount
+    list.value[1].num=res.diagnosingCount
+    list.value[2].num=res.completeDiaCount
  })
-  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
--- a/src/components/outpatient/ServiceItems.vue
+++ b/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>￥{{ item.unitPrice }}/{{item.unit }}</div>
+                    <div style="font-size: 18px;font-weight: 500;color: #000">{{
+                        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> 医保码:{{item.itemSocialCode||'-'}}</div>
+                    <div>限制条件:{{ itemInfo.lmtUsedFlag == 0 ? '否' : itemInfo.lmtUsedFlag == 1 ? '是' : '-' }}</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)=>{
-  emit('focus',e)
+const focus = (e: any) => {
+  emit('focus', e)
 }
 const itemInfo = ref<any>({});
-const show = (item:any) => {
-  post('social/directory/getItemByCode',{code:item.itemSocialCode}).then((res: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">
@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;
          }
        }
--- a/src/components/outpatient/ServiceItemsDetail.vue
+++ b/src/components/outpatient/ServiceItemsDetail.vue
@ -5,8 +5,26 @@
          <ul>
            <li class="item" v-for="(item, index) in list" :key="index">
              <span class="index">{{ index + 1 }}</span>
-              <span class="name">{{ item.itemName }}</span>
-              <span class="code">{{ item.itemSocialCode }}</span>
+              <span class="name"> <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>￥{{ item.unitPrice }}/{{item.unit }}</div>
+                  </div>
+                  <div style="display: flex;justify-content: space-between">
+                    <div>限制条件:{{ itemInfo.lmtUsedFlag == 0 ? '否' : itemInfo.lmtUsedFlag == 1 ? '是' : '-'}}</div>
+                    <div> 医保码:{{item.itemSocialCode||'-'}}</div>
+                  </div>
+                </div>
+              </el-popover>
+              </span>
              <span class="unit">{{item.selectedNum}}{{ item.selectedUnit }}</span>
              <span class="price">￥{{ item.selectedPrice }}元</span>
            </li>
@ -21,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">
--- a/src/components/settings/ItemEdit.vue
+++ b/src/components/settings/ItemEdit.vue
@ -157,10 +157,10 @@ const openCreateSearch = () => {
  });
 }
 const createConfirm = (data: any) => {
-  console.log(data, 'data')
-  form.value = data
+  form.value.unit = data.unit
  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: '单位必须为数字值'}
  ]
--- a/src/views/member/index.vue
+++ b/src/views/member/index.vue
@ -18,7 +18,7 @@
          </div>
          <div class="total">共{{ totalCount || 0 }}条</div>
          <ul class="content">
-            <el-scrollbar style="padding: 24px 24px;height: 100%">
+            <el-scrollbar style="height: 100%">
              <li v-for="(item,i) in list" :key="item.id" :class="index==i?'active':''" @click="btn(item,i)">
                <img class="image"
                     :src="'/static/images/member/' + (item.sex === 1 ? 'man' : 'women') + '.png'"
@ -77,7 +77,7 @@
              <el-descriptions-item label="证件号码">{{ listItem.certNo || "-" }}</el-descriptions-item>
              <el-descriptions-item label="积分"><span>{{ listItem.integralBalance }}</span>
              </el-descriptions-item>
-              <el-descriptions-item label="地址">{{ areaName}}{{ listItem.address || "-" }}</el-descriptions-item>
+              <el-descriptions-item label="地址">{{ areaName}}{{areaName?'/'+listItem.address : listItem.address || "-" }}</el-descriptions-item>
              <el-descriptions-item label="既往史" >{{ listItem.beforeMedicalHistory || "-" }}</el-descriptions-item>
              <el-descriptions-item label="过敏史">{{ listItem.allergyHistory || "-" }}</el-descriptions-item>
              <el-descriptions-item label="备注">{{ listItem.remark || "-" }}</el-descriptions-item>
@ -177,9 +177,6 @@ const isGrant = ref(false)
 const isExchange = ref(false)
 const isFlowingWater = ref(false)
 const input3 = ref('')
-const handleScroll = (e: any) => {
-  //console.log(e.scrollTop)
-}
 const listItem = ref<any>({
  id: '',
  realName: "",//姓名
@ -255,7 +252,7 @@ const findAreaName = (code: string | null): string => {
        if (city.area && Array.isArray(city.area)) {
          const area = city.area.find((d: any) => d.code === code);
          if (area) {
-            return `${province.name}/ ${city.name} /${area.name}/`;
+            return `${province.name}/ ${city.name} /${area.name}`;
          }
        }
      }
@ -265,13 +262,13 @@ const findAreaName = (code: string | null): string => {
    if (province.city && Array.isArray(province.city)) {
      const city = province.city.find((c: any) => c.code === code);
      if (city) {
-        return `${province.name} /${city.name}/`;
+        return `${province.name} /${city.name}`;
      }
    }
  }
  const province = area.find((item: any) => item.code === code);
  if (province) {
-    return province.name +'/';
+    return province.name;
  }

  // 如果都没找到，返回原始 code
@ -294,7 +291,6 @@ const btn = (item: any, i: number) => {
    areaData = null; // 或默认值
  }
  areaName.value=findAreaName(areaData[areaData?.length-1])
-  console.log(areaName.value,'findAreaName')
  getChargeList(listItem.value.id)
 }
 //点击发放
@ -369,11 +365,6 @@ const handleCurrentChange = (val: number) => {
  getChargeList(listItem.value.id)
 };
 const levelEditRef = ref();
-const openLevelEdit = (vip: any) => {
-  nextTick(() => {
-    levelEditRef.value?.init(vip);
-  });
-}
 const antysList = ref<any>(Object.entries(antys).map(([id, name]) => ({id, name})))
 const certTypeList=ref<any>(Object.entries(psnCertTypes).map(([id,name])=>({id,name})))

--- a/src/views/settings/item.vue
+++ b/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);
Author	SHA1	Message	Date
ChenQiuYu	fadd3101b0	Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web	2025-05-07 16:43:54 +08:00
ChenQiuYu	39eaabc902	dev	2025-05-07 16:43:46 +08:00
ChenQiuYu	e53f73aab5	Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web	2025-05-07 16:05:38 +08:00
ChenQiuYu	28ce5fb6df	dev	2025-05-07 16:05:30 +08:00