From 5c01c7a88f820da93bcb725c2a46cabc0090ec76 Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Fri, 16 May 2025 09:31:42 +0800
Subject: [PATCH] dev

---
 src/assets/scss/main.scss                     |   4 -
 src/components/SearchInput.vue                |  11 +-
 src/components/common/goods/GoodsDetail.vue   | 190 +++++++++---------
 .../common/service/ServiceDetail.vue          | 131 ++++++------
 .../inventory/purchase/AddOrder.vue           |   6 +-
 src/views/LayoutSocial.vue                    |  78 ++++---
 6 files changed, 228 insertions(+), 192 deletions(-)

diff --git a/src/assets/scss/main.scss b/src/assets/scss/main.scss
index dd9b46c..8c6e5a3 100644
--- a/src/assets/scss/main.scss
+++ b/src/assets/scss/main.scss
@@ -108,11 +108,7 @@ body {
 .clear-margin {
   margin: 0;
 }
-.el-popper.is-light.type-popper, .el-popper.is-light>.el-popper__arrow:before{
-  background:#F5FAFF;
-}
 .el-popper.is-light.type-popper{
-  background:#F5FAFF;
   padding: 0;
 }
 .el-popper.is-light.id-code-popper{
diff --git a/src/components/SearchInput.vue b/src/components/SearchInput.vue
index 21090ec..67605b9 100644
--- a/src/components/SearchInput.vue
+++ b/src/components/SearchInput.vue
@@ -1,5 +1,4 @@
 <template>
-
   <el-popover placement="bottom-start" :visible="isVisible" :width="props.width" ref="popoverRef"
               :trigger-keys="[]" style="height: 500px" popper-class="type-popper">
     <template #reference>
@@ -19,7 +18,7 @@
       />
     </template>
     <div class="container">
-      <el-scrollbar>
+      <el-scrollbar style="max-height: 260px;width: 100%">
         <table class="table" style="width: 100%; border-collapse: collapse;max-height: 50px">
           <!-- 表头 -->
           <thead>
@@ -33,7 +32,6 @@
             </th>
           </tr>
           </thead>
-
           <!-- 表体 -->
           <tbody>
           <tr class="table-body"
@@ -167,6 +165,7 @@ const handlerBlur = () => {
 
     th {
       text-align: left;
+
       &:nth-child(1) {
         width: 200px;
         text-align: left;
@@ -182,6 +181,7 @@ const handlerBlur = () => {
     font-size: 14px;
     color: #666666;
     font-style: normal;
+
     td {
       &:nth-child(1) {
         width: 200px;
@@ -194,7 +194,6 @@ const handlerBlur = () => {
     }
 
 
-
     &:last-child {
       border-radius: 0 0 8px 8px;
     }
@@ -205,4 +204,8 @@ const handlerBlur = () => {
     }
   }
 }
+
+table thead tr {
+  background: #F5FAFF;;
+}
 </style>
\ No newline at end of file
diff --git a/src/components/common/goods/GoodsDetail.vue b/src/components/common/goods/GoodsDetail.vue
index cf327ba..9bec84f 100644
--- a/src/components/common/goods/GoodsDetail.vue
+++ b/src/components/common/goods/GoodsDetail.vue
@@ -1,102 +1,104 @@
 <template>
   <panel title="药品耗材">
-    <el-table v-if="goodsDetail.length>0" :data="goodsDetail" max-height="300" style="width: 100%"
-              :header-cell-style="{ backgroundColor: '#F5FAFF' }">
-      <el-table-column prop="name" label="名称" width="400">
-        <template #default="scope">
-          <el-popover
-              placement="top-start"
-              trigger="hover"
-              width="500"
-              @show="getHilistInfo(scope.row)"
-              @hide="colosInfo"
+    <div class="panel-content" style="padding: 0 24px 24px">
+      <el-table v-if="goodsDetail.length>0" :data="goodsDetail" max-height="300" style="width: 100%"
+                :header-cell-style="{ backgroundColor: '#F5FAFF' }">
+        <el-table-column prop="name" label="名称" width="400">
+          <template #default="scope">
+            <el-popover
+                placement="top-start"
+                trigger="hover"
+                width="500"
+                @show="getHilistInfo(scope.row)"
+                @hide="colosInfo"
 
-          >
-            <template #reference>
-              {{ scope.row.name }}
-            </template>
-            <div class="detail">
-              <div style="display: flex;justify-content: space-between">
-                <div style="font-size: 18px;font-weight: 500;color: #000">{{
-                    hilistInfo.name
-                  }}[{{ hilistInfo.json?.category || '-' }}]
-                </div>
-                <div>￥{{ scope.row.selectedPrice }}/{{ scope.row.selectedUnit }}</div>
-              </div>
-              <div style="display: flex;justify-content: space-between">
-                <div>规格:{{ hilistInfo.json?.dosage_specifications || '-' }}</div>
-                <div>生产厂商:{{ hilistInfo.json?.producer || '-' }}</div>
-                <div>限价:{{ hilistInfo.json?.stock || '0' }}</div>
-              </div>
-              <div style="display: flex;justify-content: space-between">
-                <div>批准文号:{{ hilistInfo.json?.approval_number || '-' }}</div>
-                <div>本位码:{{ hilistInfo.json?.standard_code || '-' }}</div>
-              </div>
-              <div style="display: flex;justify-content: space-between">
-                <div>限价:{{ hilistInfo.hilistPricUplmtAmt ? hilistInfo.hilistPricUplmtAmt : '无' }}</div>
-                <div>限价类型:{{ hilistInfo.hilistLmtpricType ? hilistInfo.hilistLmtpricType : '无' }}</div>
-              </div>
-            </div>
-          </el-popover>
-        </template>
-      </el-table-column>
-      <el-table-column prop="selectedPrice" label="单价" width="200">
-        <template #default="scope">
-          ￥{{ scope.row.selectedPrice }}
-        </template>
-      </el-table-column>
-      <el-table-column prop="number" label="数量" width="250">
-        <template #default="scope">
-          <div v-if="props.status">
-            <el-input-number v-model="scope.row.selectedNum" :min="0" @change="handleNumChange(scope.row)"
-                             style="margin-right: 5px"></el-input-number>
-            <el-dropdown v-if="scope.row.trdnFlag == 1">
-              <span style="line-height: 30px;margin-left: 10px;cursor: pointer">{{ scope.row.selectedUnit }}</span>
-              <template #dropdown>
-                <el-dropdown-menu>
-                  <el-dropdown-item @click="selectUnit(scope.row,scope.row.packagingUnit)">{{ scope.row.packagingUnit }}
-                  </el-dropdown-item>
-                  <el-dropdown-item @click="selectUnit(scope.row,scope.row.minPackagingUnit)">
-                    {{ scope.row.minPackagingUnit }}
-                  </el-dropdown-item>
-                </el-dropdown-menu>
+            >
+              <template #reference>
+                {{ scope.row.name }}
               </template>
-            </el-dropdown>
-            <span v-else style="line-height: 30px;margin-left: 10px">{{ scope.row.selectedUnit }}</span>
-          </div>
-          <div v-else>
-            <div>{{ scope.row.selectedNum }} {{ scope.row.selectedUnit }}</div>
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column label="小计">
-        <template #default="scope">
-          ￥{{ Math.round(scope.row.selectedNum * scope.row.selectedPrice * 100) / 100  }}
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" v-if="props.status">
-        <template #default="scope">
-          <el-button type="danger" link @click="delGoods(scope.row)">
-            <el-icon style="margin-right: 3px"><Delete /></el-icon>
-            删除
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <div class="bottom" v-if="!statusDisabled">
-      <div class="search">
-        <SearchInput
-            style="height: 100%"
-            :request-api="goodsSearchApi"
-            :show-config="goodsShowConfig"
-            :placeholder="'请输入药名或者拼音码'"
-            @selectedCallBack="goodsSelect"
-            :disabled="!props.status"
-            @focus="focus"
-            :width="1000"
-        ></SearchInput>
+              <div class="detail">
+                <div style="display: flex;justify-content: space-between">
+                  <div style="font-size: 18px;font-weight: 500;color: #000">{{
+                      hilistInfo.name
+                    }}[{{ hilistInfo.json?.category || '-' }}]
+                  </div>
+                  <div>￥{{ scope.row.selectedPrice }}/{{ scope.row.selectedUnit }}</div>
+                </div>
+                <div style="display: flex;justify-content: space-between">
+                  <div>规格:{{ hilistInfo.json?.dosage_specifications || '-' }}</div>
+                  <div>生产厂商:{{ hilistInfo.json?.producer || '-' }}</div>
+                  <div>限价:{{ hilistInfo.json?.stock || '0' }}</div>
+                </div>
+                <div style="display: flex;justify-content: space-between">
+                  <div>批准文号:{{ hilistInfo.json?.approval_number || '-' }}</div>
+                  <div>本位码:{{ hilistInfo.json?.standard_code || '-' }}</div>
+                </div>
+                <div style="display: flex;justify-content: space-between">
+                  <div>限价:{{ hilistInfo.hilistPricUplmtAmt ? hilistInfo.hilistPricUplmtAmt : '无' }}</div>
+                  <div>限价类型:{{ hilistInfo.hilistLmtpricType ? hilistInfo.hilistLmtpricType : '无' }}</div>
+                </div>
+              </div>
+            </el-popover>
+          </template>
+        </el-table-column>
+        <el-table-column prop="selectedPrice" label="单价" width="200">
+          <template #default="scope">
+            ￥{{ scope.row.selectedPrice }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="number" label="数量" width="250">
+          <template #default="scope">
+            <div v-if="props.status">
+              <el-input-number v-model="scope.row.selectedNum" :min="0" @change="handleNumChange(scope.row)"
+                               style="margin-right: 5px"></el-input-number>
+              <el-dropdown v-if="scope.row.trdnFlag == 1">
+                <span style="line-height: 30px;margin-left: 10px;cursor: pointer">{{ scope.row.selectedUnit }}</span>
+                <template #dropdown>
+                  <el-dropdown-menu>
+                    <el-dropdown-item @click="selectUnit(scope.row,scope.row.packagingUnit)">{{ scope.row.packagingUnit }}
+                    </el-dropdown-item>
+                    <el-dropdown-item @click="selectUnit(scope.row,scope.row.minPackagingUnit)">
+                      {{ scope.row.minPackagingUnit }}
+                    </el-dropdown-item>
+                  </el-dropdown-menu>
+                </template>
+              </el-dropdown>
+              <span v-else style="line-height: 30px;margin-left: 10px">{{ scope.row.selectedUnit }}</span>
+            </div>
+            <div v-else>
+              <div>{{ scope.row.selectedNum }} {{ scope.row.selectedUnit }}</div>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="小计">
+          <template #default="scope">
+            ￥{{ Math.round(scope.row.selectedNum * scope.row.selectedPrice * 100) / 100  }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" v-if="props.status">
+          <template #default="scope">
+            <el-button type="danger" link @click="delGoods(scope.row)">
+              <el-icon style="margin-right: 3px"><Delete /></el-icon>
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="bottom" v-if="!statusDisabled">
+        <div class="search">
+          <SearchInput
+              style="height: 100%"
+              :request-api="goodsSearchApi"
+              :show-config="goodsShowConfig"
+              :placeholder="'请输入药名或者拼音码'"
+              @selectedCallBack="goodsSelect"
+              :disabled="!props.status"
+              @focus="focus"
+              :width="1000"
+          ></SearchInput>
+        </div>
+        <span v-if="status" style="padding: 10px">合计：￥{{ getTotalPrice() }}</span>
       </div>
-      <span v-if="status" style="padding: 10px">合计：￥{{ getTotalPrice() }}</span>
     </div>
   </panel>
 </template>
diff --git a/src/components/common/service/ServiceDetail.vue b/src/components/common/service/ServiceDetail.vue
index 3a914a2..779dfff 100644
--- a/src/components/common/service/ServiceDetail.vue
+++ b/src/components/common/service/ServiceDetail.vue
@@ -1,70 +1,75 @@
 <template>
   <Panel title="服务项目">
-    <el-table v-if="itemDetail.length>0" :data="itemDetail" max-height="300" :header-cell-style="{ backgroundColor: '#F5FAFF' }">
-      <el-table-column prop="itemName" label="项目名称" show-overflow-tooltip width="400">
-        <template #default="scope">
-          <el-popover
-              width="485"
-              @show="show(scope.row)"
-              @hide="hide"
-          >
-            <template #reference>
-              {{ scope.row.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 class="panel-content" style="padding: 0 24px 24px">
+      <el-table v-if="itemDetail.length>0" :data="itemDetail" max-height="300"
+                :header-cell-style="{ backgroundColor: '#F5FAFF' }">
+        <el-table-column prop="itemName" label="项目名称" show-overflow-tooltip width="400">
+          <template #default="scope">
+            <el-popover
+                width="485"
+                @show="show(scope.row)"
+                @hide="hide"
+            >
+              <template #reference>
+                {{ scope.row.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>￥{{ scope.row.unitPrice }}/{{ scope.row.unit }}</div>
+                </div>
+                <div style="display: flex;justify-content: space-between">
+                  <div>限制条件:{{ itemInfo.lmtUsedFlag == 0 ? '否' : itemInfo.lmtUsedFlag == 1 ? '是' : '-' }}</div>
+                  <div> 医保码:{{ scope.row.itemSocialCode || '-' }}</div>
                 </div>
-                <div>￥{{ scope.row.unitPrice }}/{{ scope.row.unit }}</div>
               </div>
-              <div style="display: flex;justify-content: space-between">
-                <div>限制条件:{{ itemInfo.lmtUsedFlag == 0 ? '否' : itemInfo.lmtUsedFlag == 1 ? '是' : '-' }}</div>
-                <div> 医保码:{{ scope.row.itemSocialCode || '-' }}</div>
-              </div>
-            </div>
-          </el-popover>
-        </template>
-      </el-table-column>
-      <el-table-column label="单价" width="200">
-        <template #default="scope">
-          ￥{{ scope.row.selectedPrice }}
-        </template>
-      </el-table-column>
-      <el-table-column label="数量" width="250">
-        <template #default="scope">
-          <el-input-number v-if="props.status" v-model="scope.row.selectedNum" :min="0"
-                           @change="handleNumChange" style="margin-right: 5px"></el-input-number>
-          <span v-else>{{ scope.row.selectedNum }}</span>
-          {{ scope.row.selectedUnit }}
-        </template>
-      </el-table-column>
-      <el-table-column label="小计">
-        <template #default="scope">
-          ￥{{ Math.round(scope.row.selectedNum * scope.row.selectedPrice * 100) / 100 }}
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" v-if="props.status">
-        <template #default="scope">
-          <el-button type="danger" link @click="delService(scope.row)">
-            <el-icon style="margin-right: 3px"><Delete /></el-icon>
-            删除
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <div class="bottom" v-if="!statusDisabled">
-      <div class="search">
-        <SearchInput
-            style="height: 100%"
-            @focus="focus"
-            :placeholder="'请输入药服务项目或拼音码'"
-            :request-api="serviceSearchApi"
-            :show-config="serviceShowConfig"
-            @selectedCallBack="serviceSelect" :disabled="!props.status"></SearchInput>
+            </el-popover>
+          </template>
+        </el-table-column>
+        <el-table-column label="单价" width="200">
+          <template #default="scope">
+            ￥{{ scope.row.selectedPrice }}
+          </template>
+        </el-table-column>
+        <el-table-column label="数量" width="250">
+          <template #default="scope">
+            <el-input-number v-if="props.status" v-model="scope.row.selectedNum" :min="0"
+                             @change="handleNumChange" style="margin-right: 5px"></el-input-number>
+            <span v-else>{{ scope.row.selectedNum }}</span>
+            {{ scope.row.selectedUnit }}
+          </template>
+        </el-table-column>
+        <el-table-column label="小计">
+          <template #default="scope">
+            ￥{{ Math.round(scope.row.selectedNum * scope.row.selectedPrice * 100) / 100 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" v-if="props.status">
+          <template #default="scope">
+            <el-button type="danger" link @click="delService(scope.row)">
+              <el-icon style="margin-right: 3px">
+                <Delete/>
+              </el-icon>
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="bottom" v-if="!statusDisabled">
+        <div class="search">
+          <SearchInput
+              style="height: 100%"
+              @focus="focus"
+              :placeholder="'请输入药服务项目或拼音码'"
+              :request-api="serviceSearchApi"
+              :show-config="serviceShowConfig"
+              @selectedCallBack="serviceSelect" :disabled="!props.status"></SearchInput>
+        </div>
+        <span v-if="status" style="padding: 10px">合计：￥{{ getTotalPrice() || 0 }}</span>
       </div>
-      <span v-if="status" style="padding: 10px">合计：￥{{ getTotalPrice() || 0 }}</span>
     </div>
   </Panel>
 </template>
@@ -141,7 +146,7 @@ const getTotalPrice = () => {
   if (itemDetail.value) {
     itemDetail.value.forEach((item: any) => {
       totalPrice += item.selectedNum * item.selectedPrice
-      totalPrice  = Math.round(totalPrice * 100) / 100
+      totalPrice = Math.round(totalPrice * 100) / 100
     })
   }
 
diff --git a/src/components/inventory/purchase/AddOrder.vue b/src/components/inventory/purchase/AddOrder.vue
index 61b28c3..9411037 100644
--- a/src/components/inventory/purchase/AddOrder.vue
+++ b/src/components/inventory/purchase/AddOrder.vue
@@ -62,7 +62,9 @@
                       :value="item.id"
                   />
                 </el-select>
-                <el-button type="primary" @click="addSupplier">添加供应商</el-button>
+                <div class="default-btn" style="height: 100%" @click="addSupplier">
+                  <el-icon><Plus /></el-icon>
+                </div>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -192,7 +194,7 @@ import {ElMessage} from "element-plus";
 import AddSupplier from "@/components/inventory/supplier/AddSupplier.vue";
 import GoodsSearch from "@/components/inventory/GoodsSearch.vue";
 import CheckoutDetail from "@/components/inventory/CheckoutDetail.vue";
-import {Search} from "@element-plus/icons-vue";
+import {Plus} from "@element-plus/icons-vue";
 
 const orderForm = ref()
 const checkoutDetailRef = ref<any>(false);
diff --git a/src/views/LayoutSocial.vue b/src/views/LayoutSocial.vue
index e2b3ad8..8cfbd81 100644
--- a/src/views/LayoutSocial.vue
+++ b/src/views/LayoutSocial.vue
@@ -1,55 +1,83 @@
 <template>
   <div class="layout-container">
-    <Header class="header" />
-    <header>
-      <div class="center-wrapper">
-        <div class="childMenu">
-          <router-link :to="item.path" class="child-item" v-for="(item,index) in childMenuList" :key="index">
-            {{ item.name }}
-          </router-link>
+    <Header class="header"/>
+    <div class="body">
+      <header style="height: 50px">
+        <div class="center-wrapper">
+          <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>
-      </div>
-    </header>
-    <div class="space"></div>
-    <main class="layout-main">
-      <router-view/>
-    </main>
-    <div class="space"></div>
-    <Footer class="footer" />
+      </header>
+      <main class="layout-main" style="margin-top: 24px">
+        <router-view/>
+      </main>
+    </div>
+    <Footer class="footer"/>
   </div>
-
 </template>
 
 <style scoped lang="scss">
+.body{
+  height: 100%;
+  padding: 24px;
+  display: flex;
+  flex-direction: column;
+}
 .childMenu {
   width: 100%;
-  height: 60px;
+  height: 50px;
   background: #fff;
   display: flex;
   align-items: center;
+  border-radius: 8px;
+
   .child-item {
+    width: 136px;
     display: inline-block;
     color: #151515;
     outline: none;
     text-decoration: none;
     font-size: 18px;
-    margin-left: 10px;
-    margin-right: 10px;
-    height: 35px;
+    height: 50px;
     position: relative;
+    line-height: 50px;
+    text-align: center;
+    &::before{
+      content: '';
+      position: absolute;
+      right: 0;
+      top:50%;
+      display: block;
+      width: 2px;
+      height: 16px;
+      background: #D8D8D8;
+      border-radius: 1px;
+      transform: translate(0 ,-50%);
+    }
+    &:last-child::before{
+      display: none;
+    }
   }
 
   .router-link-active:after {
     content: '';
     display: block;
-    width: 100%;
-    height: 2px;
-    background-color:  #151515; // 下划线颜色
+    width: 80px;
+    height: 4px;
+    background-color: #4D6DE4; // 下划线颜色
     position: absolute;
-    bottom: -5px; // 调整下划线与文字的距离
-    left: 0;
+    bottom: 0; // 调整下划线与文字的距离
+    left: 50%;
+    transform: translateX(-50%);
+    border-radius: 2px;
   }
 }
+a.router-link-active.router-link-exact-active.child-item{
+  color: #4D6DE4;
+}
 </style>