From 51f7c91735f1a334f1e7341779264228a6fd4d5a Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Wed, 28 May 2025 16:07:32 +0800
Subject: [PATCH] dev

---
 src/components/common/goods/GoodsDetail.vue   | 16 +----
 .../common/goods/goodsDetail/Usage.vue        | 62 +++++++++++++------
 src/views/doc.vue                             | 19 +++++-
 3 files changed, 61 insertions(+), 36 deletions(-)

diff --git a/src/components/common/goods/GoodsDetail.vue b/src/components/common/goods/GoodsDetail.vue
index 7619c69..c718343 100644
--- a/src/components/common/goods/GoodsDetail.vue
+++ b/src/components/common/goods/GoodsDetail.vue
@@ -45,17 +45,7 @@
         </el-table-column>
         <el-table-column label="使用方法" width="200">
           <template #default="scope">
-            <el-popover
-                placement="bottom"
-                title=""
-                :width="200"
-                trigger="click"
-            >
-              <template #reference>
-                <el-input v-model="usage" placeholder="使用方法" style="width: 100px"></el-input>
-              </template>
-              <Usage :usageObj="usageObj" @clickItem="clickItem"></Usage>
-            </el-popover>
+              <Usage v-model="usage"></Usage>
           </template>
         </el-table-column>
         <el-table-column prop="selectedPrice" label="单价" width="200">
@@ -132,7 +122,6 @@ import {post} from "@/utils/request.ts";
 import {ElMessage} from "element-plus";
 import {Delete} from "@element-plus/icons-vue";
 import Usage from "./goodsDetail/Usage.vue"
-import usageObj from "@/assets/config/directory/drugMedcWayCode.json"
 import {API} from "@/assets/config/API.ts";
 
 const props = defineProps({
@@ -259,9 +248,6 @@ const colosInfo = () => {
   getTotalPrice()
   emit('totalPriceChange')
 }
-const clickItem = (value: any) => {
-  usage.value = value
-}
 </script>
 <style scoped lang="scss">
 :deep(.el-table__cell) {
diff --git a/src/components/common/goods/goodsDetail/Usage.vue b/src/components/common/goods/goodsDetail/Usage.vue
index 2aceb5c..405bc06 100644
--- a/src/components/common/goods/goodsDetail/Usage.vue
+++ b/src/components/common/goods/goodsDetail/Usage.vue
@@ -1,32 +1,49 @@
 <script setup lang="ts">
-import {defineProps, onMounted} from "vue";
+import {defineModel, ref} from "vue";
+import usageObj from "@/assets/config/directory/drugMedcWayCode.json"
 
-const props = defineProps({
-  usageObj: {
-    type: Object,
-    default: () => []
-  }
-});
+const isVisible = ref<any>(false)
+const usage = defineModel()
 const emit = defineEmits(['clickItem'])
-const clickItem=(item:any)=>{
-  console.log(item)
-  emit("clickItem",item[0])
+const clickItem = (item: any) => {
+  usage.value = item[1]
+
+}
+const focus = () => {
+  isVisible.value = true
+}
+const handlerBlur = () => {
+  isVisible.value = false
 }
 </script>
 
 <template>
-  <div class="box">
-    <ul class="item-list">
-      <div class="item" v-for="(item, index) in Object.entries(props.usageObj)" :key="index" @click="clickItem(item)">{{ item[1] }}</div>
-    </ul>
-  </div>
+  <el-popover
+      :visible="isVisible"
+      placement="bottom"
+      title=""
+      :width="200"
+      trigger="click"
+  >
+    <template #reference>
+      <el-input v-model="usage" placeholder="使用方法" @focus="focus" @blur="handlerBlur"></el-input>
+    </template>
+    <div class="box">
+      <div class="item-list">
+        <div class="item" v-for="(item, index) in Object.entries(usageObj)" :key="index" @click="clickItem(item)">
+          {{ item[1] }}
+        </div>
+      </div>
+    </div>
+  </el-popover>
+
 </template>
 
 <style scoped lang="scss">
-.box{
+.box {
   margin: 0;
   padding: 0;
-  position:absolute;
+  position: absolute;
   background: #fff;
   top: 0;
   left: 0;
@@ -35,11 +52,13 @@ const clickItem=(item:any)=>{
   border: 1px solid #ddd;
   z-index: 999;
 }
+
 .item-list {
   display: flex;
   flex-wrap: wrap;
 }
-.item{
+
+.item {
   display: flex;
   width: 160px;
   height: 36px;
@@ -48,16 +67,19 @@ const clickItem=(item:any)=>{
   border: 1px solid #ededed;
   align-items: center;
   justify-content: center;
-  &:hover{
+
+  &:hover {
     color: #fff;
     background: #4d6de4;
   }
+
   &.last-item {
     margin-right: 0; /* 最后一个元素不加右边距 */
   }
 
 }
-.active{
+
+.active {
   background: #4d6de4 !important;
   color: #fff !important;
 }
diff --git a/src/views/doc.vue b/src/views/doc.vue
index f4d52b4..bb8ee80 100644
--- a/src/views/doc.vue
+++ b/src/views/doc.vue
@@ -16,7 +16,7 @@ function convertToTreeData(data: any, parentPath: string = '') {
 
     if (item.path && item.comment) {
       treeData.push({
-        label: `${item.comment} (${item.path})`,
+        label: `${item.comment}`,
         path: item.path,
       });
     } else {
@@ -131,7 +131,24 @@ const apiInfo:any=ref(null);
   background-color: #ffffff;
   border-right: 1px solid #e4e7ed;
   overflow-y: auto;
+  // 新增二级导航缩进样式
+  :deep(.el-tree-node__children) {
+    padding-left: 20px; // 调整这个值可以控制缩进量
+    position: relative;
 
+    &::before {
+      content: "";
+      position: absolute;
+      left: 10px;
+      top: 0;
+      bottom: 0;
+      width: 1px;
+      background-color: #e4e7ed;
+    }
+    .el-tree-node__content {
+      padding-left: 10px !important; // 确保子节点也有适当缩进
+    }
+  }
   :deep(.el-tree-node__content) {
     height: 40px;
     line-height: 40px;