Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web

src/components/charge/ChargeQueue.vue

@@ -18,7 +18,7 @@
       />
     </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 }})
@@ -50,8 +50,8 @@
           <!--         <el-button type="success" @click="addChargeOrder" size="small">+收费</el-button>-->
         </div>
         <div class="list" v-loading="loading">
-          <el-scrollbar>
+          <ul style="height: 100%">
-            <ul>
+            <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 ? '未收' : '已收' }}</span>
               </li>
-            </ul>
             </el-scrollbar>
+          </ul>
+
         </div>
       </div>
     </template>
@@ -200,10 +201,12 @@ const selected= ref(false)
     height: 74px;
     width: 100%;
     display: flex;
+
     .search-input {
       flex: 1;
       min-width: 0;
     }
+
     .add {
       width: 128px;
       height: 42px;
@@ -215,6 +218,7 @@ const selected= ref(false)
       margin-left: 16px;
       cursor: pointer;
       color: #fff;
+
       &:hover {
         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;

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);
+width_rem.value=(_width.value/16).toFixed(2);
-let height_rem=(_height.value/16).toFixed(2);
+height_rem.value=(_height.value/16).toFixed(2);
-
 
 </script>
-
 <template>
   <teleport to="body">
     <transition name="el-fade-in">

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>("")

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,7 @@
         <el-pagination
             background
             layout="prev, pager, next"
-            :page-size="pageSize"
+            :page-count="pageNum"
-            :current-page="page"
             :total="total"
             @current-change="changePage"
         />
@@ -308,8 +308,8 @@ onMounted(() => {
 })
 let init = () => {
   const query = {
-    pageNum: page.value,// 当前页码
+    pageNum: pageNum.value,// 当前页码
-    pageSize: pageSize.value,// 每页显示条数
+    pageSize: 1,// 每页显示条数
   }
   post("goods/goods/searchDetail", {query: query}).then((res: any) => {
     tableData.value = res.list
@@ -325,20 +325,11 @@ 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)
 let changePage = (value: number) => {
-  page.value = value
+  pageNum.value = value
-  const query = {
+  init()
-    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 {
@@ -475,11 +466,13 @@ const props = { multiple: true }
       }
     }
   }
+
   .content_goods {
     width: 100%;
     flex: 1;
     min-height: 0;
   }
+
   .bottom {
     width: 100%;
     height: 60px;
@@ -501,9 +494,11 @@ const props = { multiple: true }
 .tags {
   margin-left: 5px;
 }
+
 :deep(.el-input__inner) {
   height: 42px;
 }
+
 :deep(.el-cascader .el-input) {
   height: 42px;
 }
@@ -526,6 +521,7 @@ const props = { multiple: true }
     align-items: center;
     margin-left: 24px;
     cursor: pointer;
+
     &:hover {
       background: #4D6DE4;
       color: #fff;

src/views/member/index.vue

@@ -142,7 +142,7 @@
                     background
                     layout="prev, pager, next"
                     :total="total"
-                    :page-size="pageSize"
+                    :page-count="pageNum"
                     @current-change="handleCurrentChange"
                 >
                 </el-pagination>
@@ -308,12 +308,13 @@ const tableData = ref([])
 const orderDetailRef = ref<any>();
 const getChargeList = (id: any) => {
   const query = {
-    page: page.value,
+    pageNum: pageNum.value,
-    pageSize: pageSize.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 +369,9 @@ const searchVip = () => {
 };
 // 分页
 const total = ref(0)
-const pageSize = ref(10)
+const pageNum = ref(1)
-const page = ref(1)
 const handleCurrentChange = (val: number) => {
-  page.value = val
+  pageNum.value = val
   getChargeList(listItem.value.id)
 };
 const levelEditRef = ref();

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;