Merge remote-tracking branch 'origin/master'

src/assets/styles/element-ui.scss

@@ -300,8 +300,8 @@ input::-webkit-input-placeholder {
 
 .small-padding {
   .cell {
-    padding-left: 5px;
-    padding-right: 5px;
+    padding-left: 0.6rem;
+    padding-right: 0.3125rem;
   }
 }
 

src/components/imageCropper/index.vue

@@ -67,12 +67,14 @@ export default {
   },
   methods: {
     onCancel(type) {
-      if (type === 'cancle') {
-        this.$refs.imageCropper.getCropBlob((blob) => {
-          this.$emit('cancel', blob)
-        })
-      } else {
-        this.$emit('cancel', 'cancle')
+      if (this.visible) {
+        if (type === 'cancle') {
+          this.$refs.imageCropper.getCropBlob((blob) => {
+            this.$emit('cancel', blob)
+          })
+        } else {
+          this.$emit('cancel', 'cancle')
+        }
       }
       this.loading = false
     },

src/views/document-management/entry-contract/entry-contract.vue

@@ -243,7 +243,7 @@ export default {
 <style scoped lang="scss">
 .contract-container {
   width: 1720px;
-  height: 680px;
+  min-height: 680px;
   //margin: 0 0 0 15px;
   padding: 10px 0 80px 0;
   background-color: #FFFFFF;

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

@@ -387,7 +387,8 @@ export default {
         ],
 
         head: [
-          { min: 2, max: 20, message: '仅支持2~20位字符', trigger: 'blur' }
+          { min: 2, max: 20, message: '仅支持2~20位字符', trigger: 'blur' },
+          { pattern: /^[\a-\z\A-\Z\u4e00-\u9fe5\·]+$/, message: '仅支持中文、英文和·', trigger: 'blur' }
         ],
         phone: [
           {

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

@@ -760,7 +760,8 @@ export default {
         ],
 
         head: [
-          { min: 2, max: 20, message: '仅支持2~20位字符', trigger: 'blur' }
+          { min: 2, max: 20, message: '仅支持2~20位字符', trigger: 'blur' },
+          { pattern: /^[\a-\z\A-\Z\u4e00-\u9fe5\·]+$/, message: '仅支持中文、英文和·', trigger: 'blur' }
         ],
         phone: [
           {

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

@@ -138,7 +138,7 @@
       @select="selectChange"
       @select-all="selectChange"
     >
-      <el-table-column type="selection" width="47" align="center"  />
+      <el-table-column type="selection" width="47" align="center" />
       <el-table-column align="left" label="序号" min-width="60" show-overflow-tooltip prop="index">
         <template slot-scope="scope">
           <span>{{ scope.$index + 1 }}</span>
@@ -280,6 +280,7 @@ import { listDevice, delDevice } from '@/api/business/device'
 import { getInfo } from '@/api/login'
 import { parseTime } from '@/utils/ruoyi'
 import { mapGetters } from 'vuex'
+import { listItem } from '@/api/business/item'
 
 export default {
   name: 'EquipmentManagement',
@@ -516,9 +517,9 @@ export default {
         }
         if (this.userType === '00') {
           this.serviceShow = false
-          this.itemType = 3
+          this.itemType = 2
         }
-        // this.getItemByType()
+        this.getItemByType()
       })
     },
     // 显示两位数字
@@ -540,6 +541,14 @@ export default {
         return '• 设备下架'
       }
     },
+    // 获取检查项目下拉框
+    getItemByType() {
+      listItem({ itemType: this.itemType }).then(res => {
+        console.log('检查项目', res)
+        this.checkItemOptions = res.rows
+        console.log('xdddd', this.checkItemOptions)
+      })
+    },
 
     // 选择排序规则
     handleSort(val) {
@@ -741,9 +750,17 @@ export default {
     handleExport() {
       if (this.ids.length !== 0) {
         const exportTable = {}
+        if (this.queryParams.orderByColumn === null) {
+          exportTable.orderByColumn = 'weight'
+          exportTable.isAsc = 'desc'
+        } else {
+          exportTable.orderByColumn = this.queryParams.orderByColumn
+          exportTable.isAsc = this.queryParams.isAsc
+        }
         exportTable.deviceIdList = this.ids
         this.download('business/device/export', exportTable, `设备管理-${this.exportFormatTime(new Date())}.xlsx`).then(res => {
           this.$refs.table.clearSelection()
+          this.ids = []
         })
       } else {
         this.$modal.msgWarning('请选择至少一条数据导出')

src/views/medical-record-management/medical-edit.vue

@@ -507,7 +507,7 @@ color: #333333;"
             :inline-message="true"
             label-width="0"
           >
-            <el-table :data="stockDispenseOutboundList" :header-cell-style="{ background:'#F4F4F4'}">
+            <el-table style="cursor: pointer;" :data="stockDispenseOutboundList" :header-cell-style="{ background:'#F4F4F4'}">
               <el-table-column align="left" label="药品名称" prop="drugId">
                 <template slot-scope="scope">
                   <el-form-item
@@ -705,6 +705,7 @@ color: #333333;"
             label-width="0"
           >
             <el-table
+              style="cursor: pointer;"
               :data="checkManageBos"
               :header-cell-style="{ background:'#F4F4F4'}"
             >
@@ -906,6 +907,7 @@ color: #333333;"
             label-width="0"
           >
             <el-table
+              style="cursor: pointer;"
               :data="treatManageBo"
               :header-cell-style="{ background:'#F4F4F4'}"
             >
@@ -1094,6 +1096,7 @@ color: #333333;"
             label-width="0"
           >
             <el-table
+              style="cursor: pointer;"
               :data="petInHospitalList"
               :header-cell-style="{ background:'#F4F4F4'}"
             >
@@ -1225,7 +1228,7 @@ color: #333333;"
               </el-table-column>
             </el-table>
           </el-form>
-          <el-table v-else :data="petInHospitalList" :header-cell-style="{ background:'#F4F4F4'}">
+          <el-table v-else style="cursor: pointer;" :data="petInHospitalList" :header-cell-style="{ background:'#F4F4F4'}">
             <el-table-column align="left" label="病房类型" prop="wardType">
               <template slot-scope="scope">
                 <dict-tag :options="dict.type.ward_type" :value="scope.row.wardType" />
@@ -1266,7 +1269,7 @@ color: #333333;"
         </div>
         <!-- 内部信息 -->
         <div class="table-content">
-          <el-table :data="paymentList" :header-cell-style="{ background:'#F4F4F4'}">
+          <el-table style="cursor: pointer;" :data="paymentList" :header-cell-style="{ background:'#F4F4F4'}">
             <el-table-column align="left" label="收费项" prop="feeItems">
               <template slot-scope="scope">
                 {{ scope.row.feeItems || '-' }}
@@ -1740,9 +1743,10 @@ export default {
       }
     },
     drugOptionsShow() {
+      //  disabled: !this.stockDispenseOutboundList.every(drug => drug.drugId !== item.drugId)
       console.log('drugListShow', this.stockDispenseOutboundList, this.drugOptions)
       return this.drugOptions.map(item => {
-        return { ...item, disabled: !this.stockDispenseOutboundList.every(drug => drug.drugId !== item.drugId) }
+        return { ...item, disabled: false }
       }
       )
     }
@@ -1944,12 +1948,13 @@ export default {
       console.log('finishSetDrugOthers', rowData)
     },
     changeTreatItemOptionsShow(type, row) {
+      // !this.treatManageBo.every(treat => {
+      //   return treat.treatItemsId !== item.value
+      // })
       this.treatItemOptionsShow = this.treatItemOptions.filter(item => item.type === type).map(item => {
         return {
           ...item,
-          disabled: !this.treatManageBo.every(treat => {
-            return treat.treatItemsId !== item.value
-          })
+          disabled: false
         }
       })
       console.log('this.treatItemOptionsQQQQQQQQQQQQQQQ', this.treatItemOptionsShow, this.treatManageBo)
@@ -1973,15 +1978,16 @@ export default {
     getCheckItemOptions(checkType, row) {
       return new Promise(resolve => {
         console.log('getCheckItemOptions', checkType, row)
+        // disabled: !this.checkManageBos.every(check => {
+        //   return check.checkItemsId !== item.id.toString()
+        // })
         listByType({ itemType: checkType }).then(res => {
           this.checkItemOptions = res.rows.map(item => {
             return {
               label: item.name,
               value: item.id.toString(),
               payAmount: item.price,
-              disabled: !this.checkManageBos.every(check => {
-                return check.checkItemsId !== item.id.toString()
-              })
+              disabled: false
             }
           })
           console.log('checkItemOptions!!!!!!!!!!!!!', this.checkItemOptions)

src/views/medical-record-management/medical-record-management.vue

@@ -118,6 +118,7 @@
         <el-table
           ref="table"
           v-loading="loading"
+          style="cursor: pointer;"
           :data="recordList"
           :header-cell-style="{background:'#F4F4F4'}"
           @select="selectChange"

src/views/medical-record-management/reservation-equipment.vue

@@ -118,7 +118,7 @@
             </el-button>
           </el-form-item>
         </el-form>
-        <el-table :data="equipmentList" :header-cell-style="{ background:'#E8E9E8'}" border>
+        <el-table style="cursor: pointer;" :data="equipmentList" :header-cell-style="{ background:'#E8E9E8'}" border>
           <el-table-column align="center" label="设备名称" prop="deviceName" />
           <el-table-column align="center" label="检查日期" prop="checkDate" />
           <el-table-column align="center" label="检查时段" prop="checkTime" />

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

@@ -46,6 +46,7 @@
       <!-- 列表区-->
       <el-table
         ref="table"
+        style="cursor: pointer;"
         :data="wardList"
         :header-cell-style="{ background:'#E8E9E8' }"
         :row-class-name="highlightRow"

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

@@ -82,6 +82,7 @@
     <div style="padding: 0 20px">
       <!-- 列表区-->
       <el-table
+        style="cursor: pointer;"
         ref="table"
         :data="wardList"
         :header-cell-style="{ background:'#E8E9E8' }"

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

@@ -332,7 +332,7 @@
             </div>
 
             <div style="padding: 20px;">
-              <el-table :data="hosDetailBos">
+              <el-table :data="hosDetailBos" style="cursor: pointer;" >
                 <el-table-column label="病房类型" align="left" prop="wardType">
                   <template slot-scope="scope">
                     <dict-tag v-if="scope.row.wardType" :options="dict.type.ward_type" :value="scope.row.wardType" />
@@ -354,11 +354,11 @@
                   <template slot-scope="scope">
                     <div v-if="detailInfo.status<4">
                       <span v-if="scope.row.status === '3'" style="color:#ff9d4e ">已转出</span>
-                      <span v-else-if="scope.row.status === '2'" style="color: #5bb647">住院中</span>
+                      <span v-else-if="scope.row.status === '2'" style="color:#3490CE">住院中</span>
                       <span v-else>-</span>
                     </div>
                     <div v-else>
-                      <span style="color:#DB4747 ">已出院</span>
+                      <span style="color:#000000">已出院</span>
                     </div>
                   </template>
                 </el-table-column>
@@ -377,7 +377,7 @@
           </div>
 
           <div style="padding: 30px 20px 30px 20px;">
-            <el-table :data="finTradeHis">
+            <el-table :data="finTradeHis" style="cursor: pointer;" >
               <el-table-column label="时间" align="left" prop="createTime" />
               <el-table-column label="金额" align="left" prop="paymentAmount">
                 <template slot-scope="scope">

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

@@ -49,12 +49,12 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-select v-model="sortedColumn" clearable value-key="id" placeholder="请选择排序方式" @change="handleSort">
+        <el-select v-model="sortedColumn" clearable  placeholder="请选择排序方式" @change="handleSort">
           <el-option
-            v-for="item in sortedList"
-            :key="item.id"
+            v-for="(item,index) in sortedList"
+            :key="index"
             :label="item.sortedColumn"
-            :value="item"
+            :value="item.id"
           />
         </el-select>
       </el-form-item>
@@ -105,6 +105,7 @@
 
     <el-table
       ref="table"
+      style="cursor: pointer;"
       v-loading="loading"
       :data="hospitalList"
       :row-key="getRowKeys"
@@ -415,9 +416,9 @@ export default {
     },
     // 选择排序规则
     handleSort(val) {
-      this.queryParams.sort = val.nameColumn
-      this.queryParams.isAsc = val.collation
-      this.sortedColumn = val.sortedColumn
+      console.log(this.sortedList[val])
+      this.queryParams.sort = val
+      // this.sortedColumn = val.sortedColumn
     },
     // 去详情页
     handleDetails(row) {

src/views/service-management/medical-record-management/medical-record-management.vue

@@ -134,6 +134,7 @@
 
     <el-table
       ref="table"
+      style="cursor: pointer;"
       v-loading="loading"
       :data="manageList"
       :row-key="getRowKeys"

src/views/service-management/registration-queue/components/choose-pet.vue

@@ -51,6 +51,7 @@
     <el-table
       ref="table"
       v-loading="loading"
+      style="cursor: pointer;"
       row-key="petBo.petsId"
       :data="petsList"
       :header-cell-style="{background:'#F4F4F4'}"

src/views/service-management/registration-queue/components/register-modle.vue

@@ -32,6 +32,7 @@
     <!-- 列表区-->
     <el-table
       ref="table"
+      style="cursor: pointer;"
       :data="petsList"
       :header-cell-class-name="cellClass"
       :header-cell-style="{background:'#F4F4F4'}"

src/views/service-management/registration-queue/registration-queue.vue

@@ -123,13 +123,14 @@
       <el-table
         ref="table"
         v-loading="loading"
+        style="cursor: pointer;"
         :header-cell-style="{background:'#F4F4F4'}"
         :data="registerList"
         @select="selectChange"
         @select-all="selectChange"
       >
         <el-table-column align="center" type="selection" width="55" />
-        <el-table-column align="left" label="序号" min-width="60" show-overflow-tooltip prop="index" >
+        <el-table-column align="left" label="序号" min-width="60" show-overflow-tooltip prop="index">
           <template slot-scope="scope">
             <span>{{ scope.$index + 1 }}</span>
           </template>

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

@@ -104,6 +104,7 @@
 
     <el-table
       ref="table"
+      style="cursor: pointer;"
       v-loading="loading"
       :data="treatmentList"
       :row-key="getRowKeys"