From 535bac0edfef57bfd1ad2ed74489e1fbe8aae9c1 Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Thu, 29 May 2025 11:24:06 +0800
Subject: [PATCH] dev

---
 src/components/settings/item/ItemSearch.vue   | 22 ++++++-------------
 .../settings/item/group/GroupAdd.vue          | 16 ++++++++++----
 .../settings/item/group/GroupList.vue         |  5 ++++-
 src/views/settings/log.vue                    | 16 +++++++++++---
 src/views/settings/section.vue                |  2 +-
 5 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/src/components/settings/item/ItemSearch.vue b/src/components/settings/item/ItemSearch.vue
index 8c16007..215f7a0 100644
--- a/src/components/settings/item/ItemSearch.vue
+++ b/src/components/settings/item/ItemSearch.vue
@@ -34,8 +34,8 @@
                          v-model:current-page="searchResult.pageNum" @current-change="changePage"/>
         </div>
         <div class="btn">
-          <span class="small-btn" @click="confirm">确认</span>
-          <span class="small-btn" @click="close">关闭</span>
+          <span class="default-btn default-close-btn" @click="close">关闭</span>
+          <span class="default-btn" @click="confirm">确认</span>
         </div>
       </div>
     </template>
@@ -53,7 +53,7 @@ const show = ref(false);
 
 const emit = defineEmits(["confirm"])
 
-let searchResult = ref({
+let searchResult = ref<any>({
   totalPage: 0,
   list: [],
   pageNum: 1,
@@ -95,8 +95,6 @@ function initSearchData() {
 let confirm = () => {
   emit('confirm', curItem)
   close()
-
-
 }
 let isloading = ref(false);
 let searchSocialItem = () => {
@@ -113,6 +111,9 @@ let searchSocialItem = () => {
 }
 const close = () => {
   show.value = false;
+  keyword.value = ''
+  curItem = null;
+  searchResult.value = {}
 }
 </script>
 <style scoped lang="scss">
@@ -137,6 +138,7 @@ const close = () => {
   width: 100%;
   display: flex;
   margin-bottom: 24px;
+  align-items: center;
 
   .input {
     display: block;
@@ -183,14 +185,4 @@ const close = () => {
 :deep(.el-input__wrapper) {
   width: 100%;
 }
-
-.btn {
-  .default-btn {
-    margin-right: 24px;
-
-    &:last-child {
-      margin-right: 0;
-    }
-  }
-}
 </style>
diff --git a/src/components/settings/item/group/GroupAdd.vue b/src/components/settings/item/group/GroupAdd.vue
index 3fdb922..bf84420 100644
--- a/src/components/settings/item/group/GroupAdd.vue
+++ b/src/components/settings/item/group/GroupAdd.vue
@@ -29,7 +29,7 @@
             </el-descriptions-item>
             <el-descriptions-item label="原价">
               <el-form-item>
-                <el-input v-model="form.purchaseUnitPrice" readonly>
+                <el-input v-model="form.purchaseUnitPrice" readonly disabled>
                   <template #prefix>
                     ￥
                   </template>
@@ -38,7 +38,7 @@
             </el-descriptions-item>
             <el-descriptions-item label="售价">
               <el-form-item prop="unitPrice">
-                <el-input v-model="form.unitPrice" readonly>
+                <el-input v-model="form.unitPrice" readonly disabled>
                   <template #prefix>￥</template>
                 </el-input>
               </el-form-item>
@@ -89,7 +89,10 @@
           <el-pagination background layout="prev, pager, next" v-model:page-count="pageNum"
                          :page-size="pageSize" :total="total" @current-change="changePage"/>
         </div>
-        <span class="default-btn" @click="save">保存</span>
+       <div>
+         <span class="default-btn default-close-btn" @click="close">取消</span>
+         <span class="default-btn" @click="save">保存</span>
+       </div>
       </div>
     </template>
   </Mask>
@@ -225,5 +228,10 @@ defineExpose({init})
   align-items: center;
   padding: 0 24px;
 }
-
+.default-btn{
+  margin-left: 0;
+}
+.default-close-btn{
+  margin-right: 10px;
+}
 </style>
\ No newline at end of file
diff --git a/src/components/settings/item/group/GroupList.vue b/src/components/settings/item/group/GroupList.vue
index 14164e6..3807ae8 100644
--- a/src/components/settings/item/group/GroupList.vue
+++ b/src/components/settings/item/group/GroupList.vue
@@ -11,7 +11,7 @@
         <div class="content">
           <el-table border style="height: 100%" :data="tableList" :header-cell-style="{ backgroundColor: '#F1F5FB' }">
             <el-table-column
-                prop="itemName"
+                prop="name"
                 label="组套名称">
             </el-table-column>
             <el-table-column
@@ -204,4 +204,7 @@ const handleCurrentChange = (val: any) => {
   cursor: pointer;
   color: #ff0000;
 }
+.default-btn{
+  margin-left: 0;
+}
 </style>
diff --git a/src/views/settings/log.vue b/src/views/settings/log.vue
index ce1121b..eaed571 100644
--- a/src/views/settings/log.vue
+++ b/src/views/settings/log.vue
@@ -11,8 +11,12 @@
             end-placeholder="结束时间"
             unlink-panels
         />
-        <el-input placeholder="请输入内容" v-model="searchModel.managerName" style="width: 180px;"></el-input>
-        <el-input placeholder="请输入内容" v-model="searchModel.message" style="width: 180px;"></el-input>
+        <el-input placeholder="姓名" v-model="searchModel.managerName" style="width: 180px;"></el-input>
+        <el-input placeholder="操作" v-model="searchModel.message" style="width: 180px;"></el-input>
+        <span class="default-btn default-close-btn" @click="colse">
+          <span class="iconfont icon-RectangleCopy1"></span>
+          重置
+        </span>
         <span class="default-btn" @click="getData">
           <span class="iconfont icon-RectangleCopy"></span>
           查询
@@ -26,7 +30,7 @@
           :header-cell-style="{backgroundColor: '#F1F5FB'}"
 
       >
-        <el-table-column prop="managerName" label="用户名" width="150" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="managerName" label="姓名" width="150" show-overflow-tooltip></el-table-column>
         <el-table-column prop="managerUsername" label="用户名" width="150" show-overflow-tooltip></el-table-column>
         <el-table-column prop="message" label="操作" width="200" show-overflow-tooltip></el-table-column>
         <el-table-column prop="createDatetime" label="时间" width="200" show-overflow-tooltip></el-table-column>
@@ -99,12 +103,18 @@ const handleDateChange = (date: any[]) => {
     selectedDate.value = formatDateArray(date)
     selectedDate.value[1] = getEndOfDay(selectedDate.value[1]); // 输出今天 23:59
   }
+  getData()
 }
 
 const copy = (text: any) => {
   ElMessage.success('复制成功')
   navigator.clipboard.writeText(text)
 }
+const colse=() => {
+  selectedDate.value = []
+  searchModel.value = {}
+  getData()
+}
 </script>
 <style scoped lang="scss">
 .container-wrapper {
diff --git a/src/views/settings/section.vue b/src/views/settings/section.vue
index b559da7..679ee4a 100644
--- a/src/views/settings/section.vue
+++ b/src/views/settings/section.vue
@@ -12,7 +12,7 @@
             <el-input v-model="search.resperName" placeholder="负责人姓名" style="width: 200px"></el-input>
           </el-form-item>
           <el-form-item>
-            <el-cascader :props="{ checkStrictly: true }" v-model="search.caty" :options="options"
+            <el-cascader :props="{ emitPath: false }" :show-all-levels="false" v-model="search.caty" :options="options"
                          placeholder="科室类别"/>
           </el-form-item>
         </el-form>