diff --git a/src/components/charge/ChargeQueue.vue b/src/components/charge/ChargeQueue.vue
index fbb91ca..86c9d70 100644
--- a/src/components/charge/ChargeQueue.vue
+++ b/src/components/charge/ChargeQueue.vue
@@ -18,27 +18,27 @@
       />
     </template>
     <template #default>
-      <div class="container">
+      <div class="container" style="display: flex;flex-direction: column;height: 100%">
         <div class="tabs">
           <span v-for="(item,index) in statusList " :key="index" :class="query.status == item.value ? 'tabs-item' : ''"
                 @click="tab(item)">{{ item.label }}&nbsp;({{ item.num }})
           </span>
         </div>
         <div class="search">
-         <div class="search-input">
-           <el-input
-               v-model="query.keyword"
-               style="height: 100%;width: 100%"
-               placeholder="根据姓名搜索"
-               @input="searchInput"
-           >
-             <template #prefix>
-               <el-icon>
-                 <Search/>
-               </el-icon>
-             </template>
-           </el-input>
-         </div>
+          <div class="search-input">
+            <el-input
+                v-model="query.keyword"
+                style="height: 100%;width: 100%"
+                placeholder="根据姓名搜索"
+                @input="searchInput"
+            >
+              <template #prefix>
+                <el-icon>
+                  <Search/>
+                </el-icon>
+              </template>
+            </el-input>
+          </div>
           <div class="add" @click="addChargeOrder" @mousemove="selected=true" @mouseleave="selected=false">
             <el-icon style="margin-right: 7px">
               <template #default>
@@ -50,8 +50,8 @@
           <!--         <el-button type="success" @click="addChargeOrder" size="small">+收费</el-button>-->
         </div>
         <div class="list" v-loading="loading">
-          <el-scrollbar>
-            <ul>
+          <ul style="height: 100%">
+            <el-scrollbar style="height: 100%">
               <li class="list-item" :class="curItem.id == item.id ? 'active' : ''"
                   v-for="(item, index) in ChargeQueueList"
                   :key="index" @click="clickItem(item)">
@@ -69,8 +69,9 @@
               </span>
                 <span :class="[item.status == 0 ?'status-active':'']">{{ item.status == 0 ? '未收' :item.status ==1?'已收':item.status ==2? '已退':'' }}</span>
               </li>
-            </ul>
-          </el-scrollbar>
+            </el-scrollbar>
+          </ul>
+
         </div>
       </div>
     </template>
@@ -82,7 +83,7 @@ import {nextTick, onMounted, ref, watch} from "vue";
 import {post} from "@/utils/request.ts";
 import Panel from "@/components/common/Panel.vue";
 import {formatListTime, getCurrentDate, getEndOfDay, getToday} from "@/utils/dateUtils.ts";
-import { Search,Calendar} from "@element-plus/icons-vue";
+import {Search, Calendar} from "@element-plus/icons-vue";
 import {apiConfig} from "@/assets/config/apiConfig.ts";
 import Edit from "@/components/registration/Edit.vue";
 
@@ -134,7 +135,7 @@ const delDraft = () => {
 defineExpose({delDraft, init})
 onMounted(() => {
   let today = getToday()
-  selectedDate.value =[today.start,getEndOfDay(today.end)]
+  selectedDate.value = [today.start, getEndOfDay(today.end)]
   init()
 })
 const statusList = ref([
@@ -177,7 +178,7 @@ const setDate = function () {
     datePickerRef.value.handleOpen()
   }
 }
-const dateChangeHandler =(seDate:any)=>{
+const dateChangeHandler = (seDate: any) => {
   let date = formatListTime(seDate);
   query.value.beginTime = date[0]
   query.value.endTime = getEndOfDay(seDate)
@@ -187,7 +188,7 @@ const searchInput = (v: any) => {
   query.value.keyword = v
   init()
 }
-const selected= ref(false)
+const selected = ref(false)
 </script>
 <style scoped lang="scss">
 .container {
@@ -200,11 +201,13 @@ const selected= ref(false)
     height: 74px;
     width: 100%;
     display: flex;
+
     .search-input {
       flex: 1;
       min-width: 0;
     }
-    .add{
+
+    .add {
       width: 128px;
       height: 42px;
       display: flex;
@@ -215,8 +218,9 @@ const selected= ref(false)
       margin-left: 16px;
       cursor: pointer;
       color: #fff;
+
       &:hover {
-        background: rgba(#4D6DE4,0.5);
+        background: rgba(#4D6DE4, 0.5);
       }
     }
   }
@@ -323,7 +327,6 @@ const selected= ref(false)
   padding: 0 18px;
 
   span {
-    width: 66px;
     cursor: pointer;
     text-align: center;
   }
@@ -334,6 +337,7 @@ const selected= ref(false)
     padding-bottom: 10px;
   }
 }
+
 .date-btn {
   width: 98px;
   height: 32px;
diff --git a/src/components/common/Mask.vue b/src/components/common/Mask.vue
index 88d7034..ea63717 100644
--- a/src/components/common/Mask.vue
+++ b/src/components/common/Mask.vue
@@ -7,6 +7,8 @@ let _height = ref(0);
 let _isShow = ref(false);
 let _close = ref(true);
 let _showFooter = ref(false);
+const width_rem=ref<any>();
+const height_rem=ref<any>();
 const {
   width,
   height,
@@ -32,15 +34,15 @@ const closeBtn = () => {
 watch(
     () => height,
     (newVal) => {
+      console.log(1111)
       _height.value = newVal == null ? 800 : Number(newVal);
-    }
+      height_rem.value =(_height.value/16).toFixed(2);
+    },{deep:true}
 );
-let width_rem=(_width.value/16).toFixed(2);
-let height_rem=(_height.value/16).toFixed(2);
-
+width_rem.value=(_width.value/16).toFixed(2);
+height_rem.value=(_height.value/16).toFixed(2);
 
 </script>
-
 <template>
   <teleport to="body">
     <transition name="el-fade-in">
diff --git a/src/components/registration/Edit.vue b/src/components/registration/Edit.vue
index 321b84f..bce930b 100644
--- a/src/components/registration/Edit.vue
+++ b/src/components/registration/Edit.vue
@@ -2,7 +2,7 @@
   <Mask :is-show="isShow" width="800" :height="height" title="挂号" @close="close"
         :show-footer="true">
     <template #default>
-      <div style="padding:0 24px">
+      <div style="padding:0 24px;height: 100%;display: flex;flex-direction: column">
         <el-form
             v-loading="loading"
             :model="edit_data"
@@ -128,9 +128,8 @@
         <h5 v-if="!isShowCard" style="margin:24px 0;font-size: 16px">险种列表</h5>
         <el-table
             :data="tableData"
-            style="width: 100%;"
+            style="width: 100%;flex: 1"
             v-if="!isShowCard"
-            height="160"
         >
           <el-table-column label="险种类型" prop="insutype">
             <template #default="scope">
@@ -311,6 +310,7 @@ const isShowCard = ref<any>(true)
 const tableData = ref<any>([])
 const socialCardUpdate = (e: any) => {
   isShowCard.value = false
+  console.log(e)
   if (e) {
     isShowCard.value = false
     edit_data.value.gender = Number(e.data.baseinfo.gend)
@@ -337,13 +337,12 @@ const socialCardUpdate = (e: any) => {
   }
   nextTick(() => {
     if (tableData.value.length > 0) {
+      console.log(tableData.value)
       height.value = 700
-
     } else {
       height.value = 470
     }
   })
-
   loading.value = false
 }
 const cardDefaultRef = ref<any>("")
diff --git a/src/components/social/inventoryUp/List_3501.vue b/src/components/social/inventoryUp/List_3501.vue
index 6526671..4843a56 100644
--- a/src/components/social/inventoryUp/List_3501.vue
+++ b/src/components/social/inventoryUp/List_3501.vue
@@ -30,7 +30,7 @@ const filteredData = computed(() => {
 
 // 分页相关
 const currentPage = ref(1)
-const pageSize = ref(10)
+const pageSize = ref(20)
 const total = ref(0)
 // 搜索条件
 const code = ref('')
@@ -39,12 +39,13 @@ onMounted(() => {
 })
 let init = () => {
   const query = {
-    page: 1,
-    pageSize: 20,
+    pageNum: currentPage.value,
+    pageSize: pageSize.value,
     code: code.value
   }
   post("social/upload/get3501List", {query: query}).then((res: any) => {
     tableData.value = res.list
+    total.value = res.total_count
   })
 }
 let changePage = (value: number) => {
diff --git a/src/components/social/inventoryUp/List_3502.vue b/src/components/social/inventoryUp/List_3502.vue
index ed4d9a3..1a6a0ed 100644
--- a/src/components/social/inventoryUp/List_3502.vue
+++ b/src/components/social/inventoryUp/List_3502.vue
@@ -135,7 +135,7 @@ const value1 = ref([])
 
 // 分页相关
 const currentPage = ref(1)// 当前页码
-const pageSize = ref(10)// 每页显示的记录数
+const pageSize = ref(20)// 每页显示的记录数
 const total = ref(0)
 
 // 定义 type 与 typeName
@@ -182,8 +182,8 @@ onMounted(() => {
 
 let init = () => {
   const query = {
-    page: 1,
-    pageSize: 20,
+    pageNum: currentPage.value,
+    pageSize: pageSize.value,
     socialType: Number(searchInfo.value.socialType) || null,
     uploadStatus: searchStatus.value.uploadStatus || null,
     createTimeBefore: value1.value ? formatDate(value1.value[0]) : null,
@@ -191,6 +191,7 @@ let init = () => {
   }
   post("social/upload/get3502List", {query: query}).then((res: any) => {
     tableData.value = res.list
+    total.value = res.total_count
   })
 }
 
@@ -240,6 +241,7 @@ const formatDate = (isoStr: any) => {
     height: 60px;
     display: flex;
     align-items: center;
+    justify-content: flex-end;
   }
 }
 
diff --git a/src/components/social/inventoryUp/List_3503.vue b/src/components/social/inventoryUp/List_3503.vue
index fac4b06..d086af2 100644
--- a/src/components/social/inventoryUp/List_3503.vue
+++ b/src/components/social/inventoryUp/List_3503.vue
@@ -33,11 +33,15 @@
         <el-table-column prop="name" label="商品名称"/>
         <el-table-column prop="number" label="进货，退货数量" show-overflow-tooltip>
           <template #default="{row}">
-            <el-icon v-if="row.number<0" style="font-size: 9px"><Minus /></el-icon>
-            <el-icon v-if="row.number>0" style="font-size: 9px"><Plus /></el-icon>
+            <el-icon v-if="row.number<0" style="font-size: 9px">
+              <Minus/>
+            </el-icon>
+            <el-icon v-if="row.number>0" style="font-size: 9px">
+              <Plus/>
+            </el-icon>
             <span>
               <template v-if="row.number!=0">
-                {{Math.abs(row.number)}}{{row.packagingUnit}}
+                {{ Math.abs(row.number) }}{{ row.packagingUnit }}
               </template>
             </span>
           </template>
@@ -74,7 +78,7 @@
 </template>
 <script setup lang="ts">
 import {ref, computed, onMounted} from 'vue'
-import { ElInput, ElTable, ElTableColumn, ElPagination } from 'element-plus'
+import {ElInput, ElTable, ElTableColumn, ElPagination} from 'element-plus'
 import {post} from "@/utils/request.ts";
 import {Minus, Plus} from "@element-plus/icons-vue";
 
@@ -82,15 +86,15 @@ import {Minus, Plus} from "@element-plus/icons-vue";
 const tableData = ref([])
 
 // 搜索相关
-const searchInfo=ref<any>({
-})
-const searchStatus=ref<any>({
-})
+const searchInfo = ref<any>({})
+const searchStatus = ref<any>({})
+
 interface TypeMapping {
   [key: number]: string;
 }
+
 // 定义 type 与 typeName 的映射关系
-const socialTypeMapping:  TypeMapping = {
+const socialTypeMapping: TypeMapping = {
   101: '调拨入库',
   102: '调拨出库',
   103: '盘盈',
@@ -109,20 +113,21 @@ const uploadStatus = {
 
 // 分页相关
 const currentPage = ref(1)
-const pageSize = ref(10)
-const total= ref(0)
-onMounted(()=>{
+const pageSize = ref(20)
+const total = ref(0)
+onMounted(() => {
   init()
 })
-let init = ()=>{
+let init = () => {
   const query = {
-    page: 1,
-    pageSize: 20,
-    socialType:searchInfo.value.socialType||null,
-    uploadStatus:searchStatus.value.uploadStatus ||null,
+    pageNum: currentPage.value,
+    pageSize: pageSize.value,
+    socialType: searchInfo.value.socialType || null,
+    uploadStatus: searchStatus.value.uploadStatus || null,
   }
-  post("social/upload/get3503List",{query: query}).then((res:any)=>{
+  post("social/upload/get3503List", {query: query}).then((res: any) => {
     tableData.value = res.list
+    total.value = res.total_count
   })
 }
 let changePage = (value: number) => {
@@ -131,26 +136,27 @@ let changePage = (value: number) => {
     pageNum: value,
     pageSize: pageSize.value,
   }
-  post("social/upload/get3503List",{query: query}).then((res:any)=>{
+  post("social/upload/get3503List", {query: query}).then((res: any) => {
     tableData.value = res.list
     total.value = res.total_count
   })
 }
-let change_search=()=>{
+let change_search = () => {
   init()
 }
 // 转成YYYY-MM-DD格式
-const formatDate = (isoStr:any) => {
-  if (!isoStr){
+const formatDate = (isoStr: any) => {
+  if (!isoStr) {
     return "";
   }
   const date = new Date(isoStr);
-  return `${date.getFullYear()}-${(date.getMonth()+1).toString().padStart(2,'0')}-${date.getDate().toString().padStart(2,'0')}`;
+  return `${date.getFullYear()}-${(date.getMonth() + 1).toString().padStart(2, '0')}-${date.getDate().toString().padStart(2, '0')}`;
 }
 </script>
 
 <style scoped lang="scss">
 @use "@/assets/scss/base.scss";
+
 .container {
   height: 100%;
   display: flex;
@@ -159,19 +165,22 @@ const formatDate = (isoStr:any) => {
   .top {
     height: 60px;
   }
+
   .content {
     flex: 1;
     min-height: 0;
   }
+
   .bottom {
     height: 60px;
     display: flex;
     align-items: center;
-    background: base.$background-color-base;
+    justify-content: flex-end;
 
   }
 }
-:deep(.el-select__wrapper){
+
+:deep(.el-select__wrapper) {
   height: 42px;
 }
 </style>
\ No newline at end of file
diff --git a/src/components/social/inventoryUp/List_3505.vue b/src/components/social/inventoryUp/List_3505.vue
index 4f4d5ed..3612aac 100644
--- a/src/components/social/inventoryUp/List_3505.vue
+++ b/src/components/social/inventoryUp/List_3505.vue
@@ -8,7 +8,7 @@ import {Search} from "@element-plus/icons-vue";
 const tableData = ref([])
 // 分页相关
 const currentPage = ref(1)
-const pageSize = ref(10)
+const pageSize = ref(20)
 const total = ref(0)
 // 查询条件
 const code = ref('')
@@ -17,12 +17,13 @@ onMounted(() => {
 })
 let init = () => {
   const query = {
-    page: 1,
-    pageSize: 20,
+    pageNum: currentPage.value,
+    pageSize: pageSize.value,
     code: code.value
   }
   post("social/upload/get3505List", {query: query}).then((res: any) => {
     tableData.value = res.list
+    total.value = res.total_count
   })
 }
 let changePage = (value: number) => {
@@ -129,7 +130,7 @@ const formatDate = (isoStr: any) => {
     height: 60px;
     display: flex;
     align-items: center;
-    background: base.$background-color-base;
+    justify-content: flex-end;
   }
 }
 
diff --git a/src/views/inventory/check.vue b/src/views/inventory/check.vue
index 7136159..a09b573 100644
--- a/src/views/inventory/check.vue
+++ b/src/views/inventory/check.vue
@@ -104,7 +104,7 @@ const tableData = ref([])
 const getCheck = () => {
   const query = {
     pageNum: page.value,
-    pageSize: 20,
+    pageSize: pageSize.value,
     ...searchModel.value,
   }
   post("inventory/check/list", {query: query}).then(
diff --git a/src/views/inventory/goods.vue b/src/views/inventory/goods.vue
index 08b4b27..c3ff002 100644
--- a/src/views/inventory/goods.vue
+++ b/src/views/inventory/goods.vue
@@ -19,7 +19,8 @@
               </el-input>
             </el-form-item>
             <el-form-item>
-              <el-cascader :collapse-tags="true" :props="props" style="width: 100px" :options="allCateList" :show-all-levels="false"
+              <el-cascader :collapse-tags="true" :props="props" style="width: 100px" :options="allCateList"
+                           :show-all-levels="false"
                            v-model="searchModel.cateId" clearable/>
             </el-form-item>
             <el-form-item>
@@ -184,8 +185,8 @@
         <el-pagination
             background
             layout="prev, pager, next"
+            :current-page="pageNum"
             :page-size="pageSize"
-            :current-page="page"
             :total="total"
             @current-change="changePage"
         />
@@ -272,7 +273,7 @@ const searchGoods = () => {
     maxInterestRate: parseFloat(searchModel.value.maxInterestRate) || null, // 转换为数字并处理空值
     interestRateIntervalList: [] as { min: number; max: number }[], // 显式声明类型
     inventoryNumber: inventoryNumber.value ? 0 : '',
-    saleStatus: status.value ? status.value: null,
+    saleStatus: status.value ? status.value : null,
   }
   searchModel.value.curProfitCate.forEach((item) => {
     for (const cate of profitCategory) {
@@ -308,7 +309,7 @@ onMounted(() => {
 })
 let init = () => {
   const query = {
-    pageNum: page.value,// 当前页码
+    pageNum: pageNum.value,// 当前页码
     pageSize: pageSize.value,// 每页显示条数
   }
   post("goods/goods/searchDetail", {query: query}).then((res: any) => {
@@ -325,20 +326,12 @@ let open_edit = (type: number, id: number) => {
   });
 }
 //分页
-let content: any = ref(null);
-let pageSize = ref(20)
 let total = ref(0)
-let page = ref(1)
+let pageNum = ref(1)
+const pageSize= ref(20)
 let changePage = (value: number) => {
-  page.value = value
-  const query = {
-    pageNum: value,
-    pageSize: pageSize.value,
-  }
-  post("goods/goods/searchDetail", {query: query}).then((res: any) => {
-    tableData.value = res.list
-    total.value = res.total_count
-  })
+  pageNum.value = value
+  init()
 }
 
 interface CateOption {
@@ -426,7 +419,7 @@ const getStatisticsData = () => {
     statisticsData.value = res
   })
 }
-const props = { multiple: true }
+const props = {multiple: true}
 </script>
 <style scoped lang="scss">
 .v-enter-active,
@@ -475,11 +468,13 @@ const props = { multiple: true }
       }
     }
   }
+
   .content_goods {
     width: 100%;
     flex: 1;
     min-height: 0;
   }
+
   .bottom {
     width: 100%;
     height: 60px;
@@ -501,9 +496,11 @@ const props = { multiple: true }
 .tags {
   margin-left: 5px;
 }
-:deep(.el-input__inner){
+
+:deep(.el-input__inner) {
   height: 42px;
 }
+
 :deep(.el-cascader .el-input) {
   height: 42px;
 }
@@ -526,6 +523,7 @@ const props = { multiple: true }
     align-items: center;
     margin-left: 24px;
     cursor: pointer;
+
     &:hover {
       background: #4D6DE4;
       color: #fff;
diff --git a/src/views/member/index.vue b/src/views/member/index.vue
index c7ec9d0..69e7869 100644
--- a/src/views/member/index.vue
+++ b/src/views/member/index.vue
@@ -141,8 +141,9 @@
                 <el-pagination
                     background
                     layout="prev, pager, next"
+                    :current-page="pageNum"
+                    :page-size="20"
                     :total="total"
-                    :page-size="pageSize"
                     @current-change="handleCurrentChange"
                 >
                 </el-pagination>
@@ -308,12 +309,13 @@ const tableData = ref([])
 const orderDetailRef = ref<any>();
 const getChargeList = (id: any) => {
   const query = {
-    page: page.value,
-    pageSize: pageSize.value,
+    pageNum: pageNum.value,
+    pageSize: 20,
     patientId: id
   }
   post('charge/list', {query}).then((res: any) => {
     tableData.value = res.list
+    total.value = res.total_count
   })
 }
 const openDetail = (row: any, column: any, event: Event) => {
@@ -368,10 +370,9 @@ const searchVip = () => {
 };
 // 分页
 const total = ref(0)
-const pageSize = ref(10)
-const page = ref(1)
+const pageNum = ref(1)
 const handleCurrentChange = (val: number) => {
-  page.value = val
+  pageNum.value = val
   getChargeList(listItem.value.id)
 };
 const levelEditRef = ref();
diff --git a/src/views/social/directory.vue b/src/views/social/directory.vue
index 5b1e6fa..85dee81 100644
--- a/src/views/social/directory.vue
+++ b/src/views/social/directory.vue
@@ -253,7 +253,7 @@ function get_data_list() {
   post("social/directory/get_doc_list", {
     type: current_tab.value,
     page: current_page.value,
-    size: rows - 2,
+    size: 30,
     search_keyword: search_keyword.value
   }).then((res: any) => {
     isDownLoading.value = false;