dev

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(() => {

src/components/outpatient/ServiceItemsDetail.vue

@@ -5,7 +5,24 @@
           <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="name"> <el-popover
+                  width="485"
+                  @show="show(item)"
+              >
+                <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="code">{{ item.itemSocialCode }}</span>
               <span class="unit">{{item.selectedNum}}{{ item.selectedUnit }}</span>
               <span class="price">￥{{ item.selectedPrice }}元</span>

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})))