Merge remote-tracking branch 'origin/master'

src/plugins/download.js

@@ -36,9 +36,9 @@ export default {
       const isBlob = blobValidate(res.data)
       if (isBlob) {
         const blob = new Blob([res.data])
-        const url = res.config['url']
-        const keyword = '-'
-        const index = url.indexOf(keyword, url.indexOf(keyword) + 1)
+        const url = decodeURIComponent(res.config['url'])
+        const keyword = '/tmt-pic/business/'
+        const index = url.indexOf(keyword)
         let result = ''
         if (index !== -1) {
           result = url.substring(index + keyword.length)

src/views/service-management/hospitalization-management/components/assign-wards.vue

@@ -118,11 +118,11 @@
     </div>
     <!--分页-->
     <pagination
-      v-show="total>8"
+      v-show="total>6"
+      :page-sizes="[6]"
       :limit.sync="queryParams.pageSize"
       :page.sync="queryParams.pageNum"
       :total="total"
-      :page-sizes="[8]"
       @pagination="getWardList()"
     />
 
@@ -190,7 +190,7 @@ export default {
       // 搜索病房表单参数
       queryParams: {
         pageNum: 1,
-        pageSize: 8,
+        pageSize: 6,
         chooseStatus: ''
       },
       wardList: [],

src/views/service-management/hospitalization-management/components/handling-admissions.vue

@@ -151,10 +151,10 @@
     <!--分页-->
     <pagination
       v-show="total>6"
+      :page-sizes="[6]"
       :limit.sync="queryParams.pageSize"
       :page.sync="queryParams.pageNum"
       :total="total"
-      :page-sizes="[6]"
       @pagination="getWardList()"
     />
 

src/views/service-management/hospitalization-management/hospitalization-management.vue

@@ -208,7 +208,7 @@
           <span>{{ parseTime(scope.row.dischargeDate, '{y}/{m}/{d}') || '-' }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" class-name="small-padding fixed-width" fixed="right" align="center" min-width="180px">
+      <el-table-column label="操作" class-name="small-padding fixed-width" fixed="right" align="left" min-width="180px">
         <template slot-scope="scope">
           <el-button
             v-hasPermi="['business:hospital:query']"
@@ -243,16 +243,6 @@
             type="warning"
             @click="handleDischargeMe(scope.row)"
           ><svg-icon icon-class="liebiao_icon_bianji" />办理出院</el-button>
-          <el-button
-            v-else-if="scope.row.status==='4'"
-            style="visibility: hidden"
-            icon="el-icon-paperclip"
-            plain
-            size="mini"
-            class="el-button--warning--solid--four"
-            type="warning"
-            disabled
-          >导出明细</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -430,6 +420,7 @@ export default {
         this.admissionsShow = true
         this.inHospitalInfo = res.data
         this.diseaseLevel = res.data.diseaseLevel
+        this.$refs.admissions.queryParams.pageSize = 6
         if (this.diseaseLevel === '1') {
           this.$refs.admissions.queryParams.wardType = '2'
           this.$refs.admissions.getWardList()