6 changed files with 63 additions and 64 deletions
--- a/src/components/charge/ChargeQueue.vue
+++ b/src/components/charge/ChargeQueue.vue
@ -18,27 +18,27 @@
      />
    </template>
    <template #default>
-      <div class="container" style="display: flex;flex-direction: column;height: 100%">
+      <div class="container">
        <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">
-          <ul style="height: 100%">
-            <el-scrollbar style="height: 100%">
+          <el-scrollbar>
+            <ul>
              <li class="list-item" :class="curItem.id == item.id ? 'active' : ''"
                  v-for="(item, index) in ChargeQueueList"
                  :key="index" @click="clickItem(item)">
@ -69,9 +69,8 @@
              </span>
                <span :class="[item.status == 0 ?'status-active':'']">{{ item.status == 0 ? '未收' : '已收' }}</span>
              </li>
-            </el-scrollbar>
-          </ul>
-
+            </ul>
+          </el-scrollbar>
        </div>
      </div>
    </template>
@ -83,7 +82,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";

@ -135,7 +134,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([
@ -178,7 +177,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)
@ -188,7 +187,7 @@ const searchInput = (v: any) => {
  query.value.keyword = v
  init()
 }
-const selected = ref(false)
+const selected= ref(false)
 </script>
 <style scoped lang="scss">
 .container {
@ -201,13 +200,11 @@ 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;
@ -218,9 +215,8 @@ const selected = ref(false)
      margin-left: 16px;
      cursor: pointer;
      color: #fff;
-
      &:hover {
-        background: rgba(#4D6DE4, 0.5);
+        background: rgba(#4D6DE4,0.5);
      }
    }
  }
@ -327,6 +323,7 @@ const selected = ref(false)
  padding: 0 18px;

  span {
+    width: 66px;
    cursor: pointer;
    text-align: center;
  }
@ -337,7 +334,6 @@ const selected = ref(false)
    padding-bottom: 10px;
  }
 }
-
 .date-btn {
  width: 98px;
  height: 32px;
--- a/src/components/common/Mask.vue
+++ b/src/components/common/Mask.vue
@ -7,8 +7,6 @@ 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,
@ -34,15 +32,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}
+    }
 );
-width_rem.value=(_width.value/16).toFixed(2);
-height_rem.value=(_height.value/16).toFixed(2);
+let width_rem=(_width.value/16).toFixed(2);
+let height_rem=(_height.value/16).toFixed(2);
+

 </script>
+
 <template>
  <teleport to="body">
    <transition name="el-fade-in">
--- 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;height: 100%;display: flex;flex-direction: column">
+      <div style="padding:0 24px">
        <el-form
            v-loading="loading"
            :model="edit_data"
@ -128,8 +128,9 @@
        <h5 v-if="!isShowCard" style="margin:24px 0;font-size: 16px">险种列表</h5>
        <el-table
            :data="tableData"
-            style="width: 100%;flex: 1"
+            style="width: 100%;"
            v-if="!isShowCard"
+            height="160"
        >
          <el-table-column label="险种类型" prop="insutype">
            <template #default="scope">
@ -310,7 +311,6 @@ 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,12 +337,13 @@ 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>("")
--- a/src/views/inventory/goods.vue
+++ b/src/views/inventory/goods.vue
@ -19,8 +19,7 @@
              </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>
@ -185,7 +184,8 @@
        <el-pagination
            background
            layout="prev, pager, next"
-            :page-count="pageNum"
+            :page-size="pageSize"
+            :current-page="page"
            :total="total"
            @current-change="changePage"
        />
@ -272,7 +272,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,8 +308,8 @@ onMounted(() => {
 })
 let init = () => {
  const query = {
-    pageNum: pageNum.value,// 当前页码
-    pageSize: 1,// 每页显示条数
+    pageNum: page.value,// 当前页码
+    pageSize: pageSize.value,// 每页显示条数
  }
  post("goods/goods/searchDetail", {query: query}).then((res: any) => {
    tableData.value = res.list
@ -325,11 +325,20 @@ let open_edit = (type: number, id: number) => {
  });
 }
 //分页
+let content: any = ref(null);
+let pageSize = ref(20)
 let total = ref(0)
-let pageNum = ref(1)
+let page = ref(1)
 let changePage = (value: number) => {
-  pageNum.value = value
-  init()
+  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
+  })
 }

 interface CateOption {
@ -417,7 +426,7 @@ const getStatisticsData = () => {
    statisticsData.value = res
  })
 }
-const props = {multiple: true}
+const props = { multiple: true }
 </script>
 <style scoped lang="scss">
 .v-enter-active,
@ -466,13 +475,11 @@ const props = {multiple: true}
      }
    }
  }
-
  .content_goods {
    width: 100%;
    flex: 1;
    min-height: 0;
  }
-
  .bottom {
    width: 100%;
    height: 60px;
@ -494,11 +501,9 @@ 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;
 }
@ -521,7 +526,6 @@ const props = {multiple: true}
    align-items: center;
    margin-left: 24px;
    cursor: pointer;
-
    &:hover {
      background: #4D6DE4;
      color: #fff;
--- a/src/views/member/index.vue
+++ b/src/views/member/index.vue
@ -142,7 +142,7 @@
                    background
                    layout="prev, pager, next"
                    :total="total"
-                    :page-count="pageNum"
+                    :page-size="pageSize"
                    @current-change="handleCurrentChange"
                >
                </el-pagination>
@ -308,13 +308,12 @@ const tableData = ref([])
 const orderDetailRef = ref<any>();
 const getChargeList = (id: any) => {
  const query = {
-    pageNum: pageNum.value,
-    pageSize: 20,
+    page: page.value,
+    pageSize: pageSize.value,
    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) => {
@ -369,9 +368,10 @@ const searchVip = () => {
 };
 // 分页
 const total = ref(0)
-const pageNum = ref(1)
+const pageSize = ref(10)
+const page = ref(1)
 const handleCurrentChange = (val: number) => {
-  pageNum.value = val
+  page.value = val
  getChargeList(listItem.value.id)
 };
 const levelEditRef = ref();
--- 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: 30,
+    size: rows - 2,
    search_keyword: search_keyword.value
  }).then((res: any) => {
    isDownLoading.value = false;