From e9a3464f62543116707f5065a8a69a55902d7cec Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Mon, 26 May 2025 14:11:44 +0800
Subject: [PATCH] dev

---
 src/components/inventory/apply/AddApply.vue   |  15 ++-
 .../inventory/supplier/AddSupplier.vue        |   4 +-
 src/views/charge/index.vue                    |  14 +--
 src/views/inventory/apply.vue                 | 104 +++++++++---------
 src/views/inventory/check.vue                 |  13 ++-
 src/views/inventory/inventory.vue             |   4 +-
 src/views/inventory/supplier.vue              |  12 +-
 7 files changed, 85 insertions(+), 81 deletions(-)

diff --git a/src/components/inventory/apply/AddApply.vue b/src/components/inventory/apply/AddApply.vue
index c90e8cb..5fcd669 100644
--- a/src/components/inventory/apply/AddApply.vue
+++ b/src/components/inventory/apply/AddApply.vue
@@ -27,6 +27,10 @@
           <span>领用药品</span>
           <div class="search">
             <GoodsSearch @selectCallBack="goodsSelectCallBack"></GoodsSearch>
+            <span class="default-btn" @click="goodsSelectCallBack">
+              <span class="iconfont icon-RectangleCopy"></span>
+              搜索
+            </span>
           </div>
         </div>
         <table class="simple-table" style="margin-top: 15px;width: 100% ;height:300px ;max-height:550px">
@@ -127,8 +131,8 @@
     </div>
     <template #footer>
       <div class="bottom">
-        <el-button type="primary" @click="save">保存</el-button>
-        <el-button type="primary" @click="exit">关闭</el-button>
+        <span  class="small-btn" @click="exit">关闭</span>
+        <span class="small-btn" @click="save">保存</span>
       </div>
     </template>
   </Mask>
@@ -187,9 +191,7 @@ const findIndexForTableList = (goodId: any) => {
   return tableList.value.findIndex((item: any) => item.goodId === goodId);
 }
 const goodsSelectCallBack = (inventory: any) => {
-  if (findIndexForTableList(inventory.goodId) != -1) {
-    return
-  }
+  if (findIndexForTableList(inventory.goodId) != -1) return
   post("inventory/goods/getByGoodsId", {goodsId: inventory.goodId,isZero:false}).then((res: any) => {
     inventory.batchList = res.inventoryGoodsList
     inventory.minPackagingUnit = res.minPackagingUnit
@@ -398,7 +400,8 @@ defineExpose({init})
       font-style: normal;
 
       .search {
-        width: 50%;
+        display: flex;
+        align-items: center;
       }
     }
 
diff --git a/src/components/inventory/supplier/AddSupplier.vue b/src/components/inventory/supplier/AddSupplier.vue
index 8845713..ea177ff 100644
--- a/src/components/inventory/supplier/AddSupplier.vue
+++ b/src/components/inventory/supplier/AddSupplier.vue
@@ -48,8 +48,8 @@
     </div>
     <template #footer>
       <div class="bottom">
-        <span class="default-btn" @click="save">确定</span>
-        <span class="default-btn" @click="close" style="margin-left: 24px">取消</span>
+        <span class="small-btn" @click="close">取消</span>
+        <span class="small-btn" @click="save">确定</span>
       </div>
     </template>
   </Mask>
diff --git a/src/views/charge/index.vue b/src/views/charge/index.vue
index c151658..d507790 100644
--- a/src/views/charge/index.vue
+++ b/src/views/charge/index.vue
@@ -1,4 +1,4 @@
-<template xmlns="http://www.w3.org/1999/html">
+<template>
   <div class="container">
     <div class="left">
       <chargeQueue @clickItem="clickItem" @getStatus="getStatus" ref="chargeQueueRef"></ChargeQueue>
@@ -338,13 +338,11 @@ const list = () => {
 }
 const getStatus = (status: any) => {
   statusDisabled.value = status
-  formData.value = {
-    patientInfo: {},
-    diagnosisMedicalRecord: {},
-    goodsDetail: [],
-    itemDetail: [],
-    patientRegistration: {}
-  }
+  initFormData()
+  nextTick(() => {
+    patientCardRef.value?.clear()
+    recordsConsumptionRef.value?.clearList();
+  })
 }
 //退费
 const refund = async () => {
diff --git a/src/views/inventory/apply.vue b/src/views/inventory/apply.vue
index 43770ca..018ba6e 100644
--- a/src/views/inventory/apply.vue
+++ b/src/views/inventory/apply.vue
@@ -21,7 +21,7 @@
             <span class="iconfont icon-RectangleCopy1"></span>
             重置
           </div>
-          <div class="default-btn" @click="getList" style="margin-left: 24px">
+          <div class="default-btn" @click="getList">
             <span class="iconfont icon-RectangleCopy"></span>
             搜索
           </div>
@@ -91,12 +91,10 @@
   </div>
 </template>
 <script setup lang="ts">
-import Mask from "@/components/common/Mask.vue";
 import AddApply from "@/components/inventory/apply/AddApply.vue";
 import {nextTick, onMounted, ref} from "vue";
 import {post} from "@/utils/request.ts";
 import DetailApply from "@/components/inventory/apply/DetailApply.vue";
-import {Refresh,Search} from "@element-plus/icons-vue";
 import {formatDateArray, getEndOfDay} from "@/utils/dateUtils.ts";
 
 const is_add = ref(false)
@@ -175,16 +173,64 @@ const resetSearch=  () => {
 @use "@/assets/scss/base.scss";
 .container-wrapper {
   box-sizing: border-box;
-  padding: 24px;
+  padding: 24px 24px 0;
   overflow: hidden;
   display: flex;
   flex-direction: column;
-  height: 100%;
+  border-radius: 8px;
+  .top {
+    background: #fff;
+    display: flex;
+    flex-direction: column;
+    margin-bottom: 24px;
+
+    .search {
+      display: flex;
+      justify-content: space-between;
+      .left {
+        flex: 1;
+        display: flex;
+        justify-content: space-between;
+        margin-right: 24px;
+        .el-form-item {
+          margin-right: 5px;
+        }
+      }
+      .right {
+        display: flex;
+        .btn {
+          width: 120px;
+          height: 42px;
+          background: #FFFFFF;
+          border-radius: 6px;
+          border: 1px solid #979797;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          margin-left: 24px;
+          cursor: pointer;
+          &:hover {
+            background: #4D6DE4;
+            color: #fff;
+            border: none;
+          }
+        }
+      }
+
+    }
+
+    .addBtn {
+      span {
+       &:first-child{
+         margin-left: 0;
+       }
+      }
+    }
+  }
   .content {
     width: 100%;
     flex: 1;
     overflow: hidden;
-    margin-top: base.$margin-base;
   }
   .bottom {
     width: 100%;
@@ -200,53 +246,7 @@ const resetSearch=  () => {
   }
 }
 
-.top {
-  height: 110px;
-  background: #fff;
-  display: flex;
-  flex-direction: column;
 
-  .search {
-    display: flex;
-    justify-content: space-between;
-    .left {
-      flex: 1;
-      display: flex;
-      justify-content: space-between;
-      margin-right: 24px;
-      .el-form-item {
-        margin-right: 5px;
-      }
-    }
-    .right {
-      display: flex;
-      .btn {
-        width: 120px;
-        height: 42px;
-        background: #FFFFFF;
-        border-radius: 6px;
-        border: 1px solid #979797;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        margin-left: 24px;
-        cursor: pointer;
-        &:hover {
-          background: #4D6DE4;
-          color: #fff;
-          border: none;
-        }
-      }
-    }
-
-  }
-
-  .addBtn {
-    span {
-      display: inline-block;
-    }
-  }
-}
 :deep(.el-input__wrapper){
   height: 42px;
 }
diff --git a/src/views/inventory/check.vue b/src/views/inventory/check.vue
index a09b573..d7fc204 100644
--- a/src/views/inventory/check.vue
+++ b/src/views/inventory/check.vue
@@ -21,7 +21,7 @@
             <span class="iconfont icon-RectangleCopy1"></span>
             重置
           </div>
-          <div class="default-btn" @click="getCheck" style="margin-left: 24px">
+          <div class="default-btn" @click="getCheck">
             <span class="iconfont icon-RectangleCopy"></span>
             搜索
           </div>
@@ -175,11 +175,11 @@ const resetSearch = () => {
   display: flex;
   flex-direction: column;
   height: 100%;
-  padding: 24px;
+  padding: 24px 24px 0;
+  border-radius: 8px;
 
   .content_list {
     flex: 1;
-    margin-top: base.$margin-base;
     min-height: 0;
   }
 
@@ -197,10 +197,10 @@ const resetSearch = () => {
 }
 
 .top {
-  height: 110px;
   background: #fff;
   display: flex;
   flex-direction: column;
+  margin-bottom: 24px;
 
   .search {
     display: flex;
@@ -244,8 +244,9 @@ const resetSearch = () => {
 
   .addBtn {
     span {
-      display: inline-block;
-      margin-right: 24px;
+      &:first-child{
+        margin-left: 0;
+      }
     }
   }
 }
diff --git a/src/views/inventory/inventory.vue b/src/views/inventory/inventory.vue
index 7d5c9aa..eb01287 100644
--- a/src/views/inventory/inventory.vue
+++ b/src/views/inventory/inventory.vue
@@ -66,7 +66,7 @@
             <span class="iconfont icon-RectangleCopy1"></span>
             重置
           </div>
-          <div class="default-btn" @click="init" style="margin-left: 24px">
+          <div class="default-btn" @click="init">
             <span class="iconfont icon-RectangleCopy"></span>
             搜索
           </div>
@@ -290,6 +290,7 @@ const initAddOrderData = (initData: any) => {
     background: #fff;
     display: flex;
     flex-direction: column;
+    margin-bottom: 24px;
 
     .search {
       display: flex;
@@ -325,7 +326,6 @@ const initAddOrderData = (initData: any) => {
     width: 100%;
     flex: 1;
     overflow: hidden;
-    margin-top: base.$margin-base;
   }
 
   .bottom {
diff --git a/src/views/inventory/supplier.vue b/src/views/inventory/supplier.vue
index d7e1245..20a913c 100644
--- a/src/views/inventory/supplier.vue
+++ b/src/views/inventory/supplier.vue
@@ -21,7 +21,7 @@
             <span class="iconfont icon-RectangleCopy1"></span>
             重置
           </div>
-          <div class="default-btn" @click="getSupplier" style="margin-left: 24px">
+          <div class="default-btn" @click="getSupplier">
             <span class="iconfont icon-RectangleCopy"></span>
             搜索
           </div>
@@ -122,15 +122,15 @@ const resetSearch = () => {
 @use "@/assets/scss/base.scss";
 .container-wrapper {
   box-sizing: border-box;
-  padding: 24px;
+  padding: 24px 24px 0;
   overflow: hidden;
   display: flex;
   flex-direction: column;
   height: 100%;
+  border-radius: 8px;
   .content {
     width: 100%;
     flex: 1;
-    margin-top: base.$margin-base;
   }
   .bottom {
     width: 100%;
@@ -147,10 +147,10 @@ const resetSearch = () => {
 }
 
 .top {
-  height: 110px;
   background: #fff;
   display: flex;
   flex-direction: column;
+  margin-bottom: 24px;
 
   .search {
     display: flex;
@@ -189,7 +189,9 @@ const resetSearch = () => {
 
   .addBtn {
     span {
-      display: inline-block;
+      &:first-child{
+        margin-left: 0;
+      }
     }
   }
 }