Merge branch 'master' of https://172.16.32.165/lighter/vue-intergration-platform

src/components/medical-insurance/patient-overview/Index.vue

@@ -7,7 +7,7 @@
     <el-select v-model="currentMedType" clearable style="width: 90px" @change="handleMedTypeChange">
       <el-option v-for="item in trueMedTypes" :key="item.code" :label="item.name" :value="item.code"></el-option>
     </el-select>
-    <el-select v-model="currentStatus" clearable style="width: 90px">
+    <el-select v-if="showStatus" v-model="currentStatus" clearable style="width: 90px">
       <el-option :value="0" label="未登记"></el-option>
       <el-option :value="1" label="已登记"></el-option>
     </el-select>
@@ -38,13 +38,13 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column align="center" label="状态" props="status" width="45">
+      <el-table-column v-if="showStatus" align="center" label="状态" props="status" width="45">
         <template #default="scope">
           <span v-html="getStatusFlag(scope.row.status)"></span>
         </template>
       </el-table-column>
     </el-table>
-    <el-pagination :hide-on-single-page="false" :page-size="17" :total="cptOverviews.length" layout="prev, pager, next"
+    <el-pagination :hide-on-single-page="false" :page-size="17" :total="cptOverviews.length" layout="pager"
                    small @current-change="handleCurrentPageChange">
     </el-pagination>
   </div>
@@ -72,6 +72,10 @@ export default {
     subtractHeight: {
       type: Number,
       default: 100
+    },
+    showStatus: {
+      type: Boolean,
+      default: true
     }
   },
   emits: [],

src/layout/index.vue

@@ -74,7 +74,7 @@ onMounted(() => {
 
 
 .layout_aside {
-  margin: 7px 0 9px 16px;
+  margin: 7px 4px 6px 6px;
   //height: calc(100vh - 32px);
   box-shadow: 0 0 12px rgba(0, 0, 0, .12);;
   border-radius: 4px;