Merge remote-tracking branch 'origin/master'

src/components/InputTips/InputTips.vue

@@ -2,8 +2,8 @@
   <el-tooltip :content="text" placement="top-start" :disabled="tipDisabled">
     <el-input
       v-model="text"
-      readonly="true"
-      disabled="true"
+      readonly
+      disabled
       :style="{width: width}"
       @mouseover.native="inputOnMouseOver($event)"
     />

src/components/imageCropper/index.vue

@@ -16,9 +16,11 @@
         :auto-crop-height="autoCropHeight"
         :auto-crop="true"
         :fixed="false"
-        :fixed-box="false"
+        :fixed-box="true"
         :output-size="1"
         output-type="png"
+        :centerBox="true"
+        :canScale="true"
       />
       <template #footer>
         <span class="dialog-footer">

src/router/index.js

@@ -120,10 +120,10 @@ export const constantRoutes = [
 
       },
       {
-        path: 'equipment-edit',
+        path: 'equipment-detail',
         props: true,
         component: () => import('@/views/equipment-management/equipment-management/equipment-detail'),
-        name: 'EquipmentEdit',
+        name: 'EquipmentDetail',
         meta: { title: '设备详情' }
       },
       {

src/views/data-statistics/hospital-data-statistics/hospital-data-statistics.vue

@@ -510,7 +510,14 @@ export default {
     },
     handleSortChange(column) {
       console.log('更换排序', column)
-      this.queryParams.orderByColumn = column.prop// 查询字段是表格中字段名字
+      // 查询字段是表格中字段名字
+      if (column.prop.orderByColumn === 'hospitalName' ||
+        column.prop.orderByColumn === 'hospitalAddress' ||
+        column.prop.orderByColumn === 'contactPerson') {
+        this.queryParams.orderByColumn = column.prop + 'Sort'
+      } else {
+        this.queryParams.orderByColumn = column.prop
+      }
       this.queryParams.isAsc = column.order// 动态取值排序顺序
       this.$refs.hospitalList.clearSort()
       this.getHospitalList()

src/views/data-statistics/service-statistics/service-statistics.vue

@@ -993,7 +993,11 @@ export default {
     },
     handleSortChangeForPlatform(column) {
       console.log('更换排序', column)
+      if (column.prop === 'checkItemsName') {
+        this.queryOrder.orderByColumn = column.prop + 'sort' // 查询字段是表格中字段名字
+      } else {
         this.queryOrder.orderByColumn = column.prop// 查询字段是表格中字段名字
+      }
       this.queryOrder.isAsc = column.order// 动态取值排序顺序
       this.$refs.orderTable.clearSort()
       this.getOrderList()

src/views/equipment-management/equipment-management/equipment-management.vue

@@ -223,7 +223,7 @@
             icon="el-icon-document"
             class="el-button--success--solid"
             plain
-            @click="detailsDevice(scope.row.id)"
+            @click="detailsDevice(scope.row)"
           >详情
           </el-button>
           <el-button
@@ -603,12 +603,13 @@ export default {
       })
     },
     /** 跳转到详情页*/
-    detailsDevice(id) {
+    detailsDevice(data) {
       this.$router.push({
-        name: 'EquipmentEdit',
+        name: 'EquipmentDetail',
         query: {
           identify: '2',
-          id: id
+          id: data.id,
+          isPrivate: data.isPrivate
         }
       })
     },
@@ -619,11 +620,11 @@ export default {
       })
     },
     // 点击检查项目
-    handlecheck() {
-      this.$router.push({
-        name: 'EquipmentCheck'
-      })
-    },
+    // handlecheck() {
+    //   this.$router.push({
+    //     name: 'EquipmentCheck'
+    //   })
+    // },
 
     /**
      * 全部选择

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

@@ -233,15 +233,15 @@
             type="warning"
             @click="handleDischargeMe(scope.row)"
           >办理出院</el-button>
-<!--          <el-button-->
-<!--            v-else-if="scope.row.status==='4'"-->
-<!--            icon="el-icon-paperclip"-->
-<!--            plain-->
-<!--            size="mini"-->
-<!--            class="el-button&#45;&#45;warning&#45;&#45;solid&#45;&#45;four"-->
-<!--            type="warning"-->
-<!--            disabled-->
-<!--          >导出明细</el-button>-->
+          <!--          <el-button-->
+          <!--            v-else-if="scope.row.status==='4'"-->
+          <!--            icon="el-icon-paperclip"-->
+          <!--            plain-->
+          <!--            size="mini"-->
+          <!--            class="el-button&#45;&#45;warning&#45;&#45;solid&#45;&#45;four"-->
+          <!--            type="warning"-->
+          <!--            disabled-->
+          <!--          >导出明细</el-button>-->
         </template>
       </el-table-column>
     </el-table>

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

@@ -230,7 +230,7 @@
     <el-dialog
       title="分配诊室"
       :visible.sync="open"
-      width="950px"
+      width="1000px"
       append-to-body
       :close-on-press-escape="false"
       :close-on-click-modal="false"
@@ -277,7 +277,7 @@
       </el-form>
       <el-table
         :data="appointmentRoomList"
-        style="width: 100%"
+        style="width: 100%;padding-left: 22px;"
         :header-cell-style="{background:'#F4F4F4'}"
       >
         <el-table-column prop="consulting_name" align="left" label="诊室名称" :show-overflow-tooltip="true">
@@ -318,7 +318,7 @@
         <div class="tip1" />
         <div style="padding-top: 3px;padding-left: 18px;font-size: 16px;font-weight: bold;color: #333333;">添加预约</div>
       </div>
-      <el-form ref="useRecordForm" :model="reservationForm" :rules="useRecordrules" label-width="auto">
+      <el-form ref="useRecordForm" :model="reservationForm" :rules="useRecordrules" label-width="6.5rem">
         <el-row>
           <el-col :span="8">
             <el-form-item label="诊室" prop="consultRoomName">
@@ -709,7 +709,7 @@ export default {
     rest() {
       this.treatStartTime = ''
       this.reservationForm.consultRoomName = ''
-      this.appointmentRoomList = []
+      // this.appointmentRoomList = []
       // 预约诊室
       // 添加预约表单参数
       this.reservationForm = {
@@ -733,7 +733,7 @@ export default {
       // 分配诊室搜索预约记录
       this.allocationForm = {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 5,
         consultRoomIdList: '',
         useDate: ''
       }