修改 分页及门诊病历title

src/components/m-pagination/index.vue

@@ -7,11 +7,12 @@
     </div>
     <el-pagination
       background
-      layout="prev, pager, next, slot"
+      :layout="layout"
       :total="paginationData.total"
       :page-size="paginationData.pageSize"
       :current-page.sync="paginationData.currentPage"
       @current-change="currentPageChange"
+      @size-change="handleSizeChange"
     >
       <div class="jump-input">
         <span>第</span>
@@ -29,9 +30,9 @@ export default {
   data() {
     return {
       paginationData: {
-        total: 100,
+        total: 0,
         currentPage: 1,
-        pageSize: 20,
+        pageSize: 10,
       },
       inputPage: 1,
     };
@@ -41,6 +42,12 @@ export default {
       type: Object,
       default: null,
     },
+    layout: {
+      type: String,
+      default() {
+        return 'prev, pager, next, slot'
+      }
+    }
   },
   computed: {
     jumpFlag() {
@@ -52,6 +59,10 @@ export default {
       this.paginationData.currentPage = current;
       this.$emit('pageChangeEvent', this.paginationData);
     },
+    handleSizeChange(size) {
+      this.paginationData.pageSize = size;
+      this.$emit('sizeChange', size);
+    },
     jumpPage() {
       // 判断是否是数字
       let reg = /^[0-9]+.?[0-9]*$/;

src/views/allcase/caseNumber.vue

@@ -49,7 +49,7 @@
         <el-table-column prop="ICD9_NAME" label="主要手术"></el-table-column>
       </el-table>
       <!-- 分页控制 -->
-      <mPagination v-if="tableData && tableData.length !== 0" :data="paginationData" @pageChangeEvent="pageHasChanged"></mPagination>
+      <mPagination v-if="tableData && tableData.length !== 0" layout="sizes, prev, pager, next, slot" :data="paginationData" @sizeChange="handleSizeChange" @pageChangeEvent="pageHasChanged"></mPagination>
     </div>
   </div>
 </template>
@@ -116,6 +116,11 @@ export default {
     pageHasChanged() {
       this.funQuery();
     },
+    handleSizeChange(size) {
+      this.paginationData.currentPage = 1
+      this.paginationData.pageSize = size
+      this.funQuery();
+    },
     selectInfo() {
       this.$axios.post('/selectInfo').then(res => {
         this.departmentList = res.data.department;

src/views/outpatient/case/index.vue

@@ -126,6 +126,10 @@
                 </span>
               </template>
             </el-table-column>
+            <el-table-column
+              prop="xm"
+              label="姓名">
+            </el-table-column>
             <el-table-column
               prop="nl"
               label="年龄">
@@ -138,6 +142,10 @@
               prop="ks"
               label="科室">
             </el-table-column>
+            <el-table-column
+              prop="SFZH"
+              label="身份证号">
+            </el-table-column>
             <el-table-column
               prop="CJSJ"
               label="就诊时间">

src/views/outpatient/control/defectNumber.vue

@@ -1,13 +1,14 @@
 <template>
   <div class="dashboard-container">
     <div class="tableBox">
-      <div style="overflow: hidden;">
+      <div style="overflow: hidden; margin-bottom: 16px;">
         <el-button @click="toBack" style="float: right;">返回</el-button>
       </div>
-      <div class="block">
-        <div class="blockCon">
+      <el-form :inline="true" :model="formData" class="demo-form-inline">
+        <el-form-item label="">
           <el-date-picker v-model="formData.startTime" class="selects" type="date" format="yyyy年MM月dd日" value-format="yyyyMMdd" placeholder="就诊时间-开始" style="width: 180px;"></el-date-picker>
-          <span class="kong"></span>
+        </el-form-item>
+        <el-form-item label="">
           <el-date-picker
             v-model="formData.endTime"
             type="date"
@@ -17,44 +18,53 @@
             placeholder="就诊时间-结束"
             style="width: 180px;"
           ></el-date-picker>
-          <span class="kong"></span>
+        </el-form-item>
+        <el-form-item label="">
           <el-select v-model="formData.dep_id" class="selects" filterable clearable placeholder="科室" style="width: 180px;">
             <el-option v-for="(item, index) in departmentList" :label="item.name" :value="item.id" :key="index"></el-option>
           </el-select>
-          <span class="kong"></span>
+        </el-form-item>
+        <el-form-item label="">
           <el-input v-model="formData.sfzh" placeholder="身份证号" style="width: 180px;"></el-input>
-          <span class="kong"></span>
+        </el-form-item>
+        <el-form-item label="">
           <el-input v-model="formData.mzh" placeholder="门诊号" style="width: 180px;"></el-input>
-          <span class="kong"></span>
+        </el-form-item>
+        <el-form-item label="">
           <el-select v-model="formData.doctor_id" class="selects" filterable clearable placeholder="医生签名" style="width: 180px;">
             <el-option v-for="(item, index) in doctors" :label="item.name" :value="item.id" :key="index"></el-option>
           </el-select>
-          <span class="kong"></span>
+        </el-form-item>
+        <el-form-item>
           <el-button class="sc" @click="funQuery">查询</el-button>
+        </el-form-item>
+        <el-form-item>
           <el-button type="primary" plain @click="onReset">重置条件</el-button>
-          <el-button @click="onExport" type="primary" plain style="position: absolute; right: 35px;">导出Excel</el-button>
-        </div>
+        </el-form-item>
+      </el-form>
+      <div>
+        <el-button @click="onExport" type="primary" plain style="float: right; margin-bottom: 16px;">导出Excel</el-button>
+        <el-table :data="tableData" style="width: 100%">
+          <el-table-column type="index" label="序号"></el-table-column>
+          <el-table-column prop="jzsj" label="就诊时间"></el-table-column>
+          <el-table-column prop="" label="门诊号">
+            <template slot-scope="scope">
+              <span class="blue" @click="funGoto(scope.row.BLBH)">
+                {{ scope.row.mzh }}
+              </span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="xm" label="患者姓名"></el-table-column>
+          <el-table-column prop="dep_name" label="科室"></el-table-column>
+          <el-table-column prop="xb" label="性别"></el-table-column>
+          <el-table-column prop="nl" label="年龄"></el-table-column>
+          <el-table-column prop="cbzd" label="初步诊断"></el-table-column>
+          <el-table-column prop="SFZH" label="身份证号"></el-table-column>
+          <el-table-column prop="SXYS_NAME" label="医生签名"></el-table-column>
+        </el-table>
       </div>
-      <el-table :data="tableData" style="width: 100%">
-        <el-table-column type="index" label="序号"></el-table-column>
-        <el-table-column prop="jzsj" label="就诊时间"></el-table-column>
-        <el-table-column prop="" label="门诊号">
-          <template slot-scope="scope">
-            <span class="blue" @click="funGoto(scope.row.BLBH)">
-              {{ scope.row.mzh }}
-            </span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="xm" label="患者姓名"></el-table-column>
-        <el-table-column prop="dep_name" label="科室"></el-table-column>
-        <el-table-column prop="xb" label="性别"></el-table-column>
-        <el-table-column prop="nl" label="年龄"></el-table-column>
-        <el-table-column prop="cbzd" label="初步诊断"></el-table-column>
-        <el-table-column prop="SFZH" label="身份证号"></el-table-column>
-        <el-table-column prop="SXYS_NAME" label="医生签名"></el-table-column>
-      </el-table>
       <!-- 分页控制 -->
-      <mPagination v-if="tableData && tableData.length !== 0" :data="paginationData" @pageChangeEvent="pageHasChanged"></mPagination>
+      <mPagination v-if="tableData && tableData.length !== 0" layout="sizes, prev, pager, next, slot" :data="paginationData" @pageChangeEvent="pageHasChanged" @sizeChange="handleSizeChange"></mPagination>
     </div>
   </div>
 </template>
@@ -187,13 +197,18 @@ export default {
     pageHasChanged() {
       this.funQuery();
     },
+    handleSizeChange(size) {
+      this.paginationData.currentPage = 1
+      this.paginationData.pageSize = size
+      this.funQuery();
+    },
     funQuery() {
       //查询
       let pramse = {
         start_time: this.formData.startTime || '',
         end_time: this.formData.endTime || '',
         page: this.paginationData.currentPage,
-        limit: this.paginationData.pageSize,
+        page_size: this.paginationData.pageSize,
         is_error: this.$route.query.is_error
       };
       if (this.rule_id) {

src/views/outpatient/control/detail.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="bcjl">
     <div class="content-box">
-      <div class="title">{{ data.title }}</div>
+      <div class="title">{{ data.title }}<span class="subtitle">{{ data.subtitle }}</span></div>
       <div class="info-header mb40">
         <el-row :gutter="32">
           <el-col :span="8" class="mb20">
@@ -150,6 +150,12 @@ export default {
     color: #2c3240;
     text-align: center;
     margin: 20px;
+    position: relative;
+    .subtitle {
+      position: absolute;
+      right: 300px;
+      line-height: 36px;
+    }
   }
   .mb10 {
     margin-bottom: 10px;