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/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

@@ -1743,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 }
       }
       )
     }
@@ -1947,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)
@@ -1976,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)