Skip to content

P
pet-business-web
Commit c83ee6c7 authored by 小费同学阿's avatar 小费同学阿 💬
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents af841ae8 b19ff9a3
Hide whitespace changes
Inline Side-by-side
Showing with 66 additions and 36 deletions
src/assets/styles/element-ui.scss
View file @ c83ee6c7
......@@ -626,3 +626,6 @@ input::-webkit-input-placeholder {
color: #333;
cursor: not-allowed;
}
.el-table {
cursor: pointer;
}
src/components/imageCropper/index.vue
View file @ c83ee6c7
......@@ -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
View file @ c83ee6c7
......@@ -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
View file @ c83ee6c7
......@@ -708,7 +708,10 @@ export default {
],
queryParams: {
id: null
id: null,
orderByColumn: 'c.check_start_time',
isAsc: ' desc'
},
props: { multiple: true },
cityOptions: regionData,
......@@ -760,7 +763,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
View file @ c83ee6c7
......@@ -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
View file @ c83ee6c7
......@@ -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)
......
src/views/service-management/medical-record-management/check-item.vue
View file @ c83ee6c7
......@@ -197,7 +197,7 @@
</el-row>
<!-- 第三行:描述 -->
<el-row :gutter="41">
<el-col :span="24" style="margin-left: inherit !important;">
<el-col :span="24" style="margin-left: 0rem !important;">
<el-form-item
:ref="'settingList.'+index+'.content'"
label="描述"
......
src/views/service-management/treatment-management/treatment-detail.vue
View file @ c83ee6c7
......@@ -416,14 +416,14 @@
</el-form>
<div style="margin: 10px 0 30px 28px;">
<el-button style="width: 98px;height: 32px;" icon="el-icon-back" class="resetBtn" @click="goBack">返 回</el-button>
<el-button style="width: 5.8rem;height: 1.9rem;" icon="el-icon-back" class="resetBtn" @click="goBack">返 回</el-button>
</div>
<!-- 分配诊室对话框 -->
<el-dialog
title="分配诊室"
:visible.sync="open"
width="950px"
width="61rem"
append-to-body
:close-on-press-escape="false"
:close-on-click-modal="false"
......@@ -541,7 +541,7 @@
:picker-options="pickerOptions"
:disabled-date="disabledDate"
placeholder="请选择治疗日期"
style="width: 190px;"
style="width: 11.8rem;"
/>
</el-form-item>
</el-col>
......@@ -552,7 +552,7 @@
clearable
placeholder="请选择治疗操作人"
value-key="id"
style="width: 190px;"
style="width: 11.8rem;"
@change="getuserName"
>
<el-option
......@@ -578,7 +578,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="治疗时长" prop="duration">
<el-select v-model="reservationForm.duration" style="width: 190px;" placeholder="请选择治疗时长" @change="calculateEndTime">
<el-select v-model="reservationForm.duration" style="width: 11.8rem;" placeholder="请选择治疗时长" @change="calculateEndTime">
<el-option
v-for="option in durationOptions"
:key="option"
......@@ -590,15 +590,15 @@
</el-col>
<el-col :span="8">
<el-form-item label="结束时间">
<el-input v-model=" reservationForm.eTime" :disabled="true" style="width: 190px;" />
<el-input v-model=" reservationForm.eTime" :disabled="true" style="width: 11.8rem;" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<div style="padding-top: 20px;text-align: right">
<el-button style="width: 98px;height: 32px;" class="resetBtn" @click="cancel">返 回
<el-button style="width: 5.8rem;height: 1.9rem;" class="resetBtn" @click="cancel">返 回
</el-button>
<el-button style="width: 98px;height: 32px;" class="queryBtn" @click="submitForm">
<el-button style="width: 5.8rem;height: 1.9rem;" class="queryBtn" @click="submitForm">
提交
</el-button>
</div>
......
src/views/service-management/treatment-management/treatment-item.vue
View file @ c83ee6c7
......@@ -170,7 +170,7 @@
</el-row>
<!-- 第三行:描述 -->
<el-row :gutter="41">
<el-col :span="24" style="margin-left: inherit !important;">
<el-col :span="24" style="margin-left: 0rem !important;">
<el-form-item
:ref="'settingList.'+index+'.content'"
label="描述"
......
src/views/service-management/treatment-management/treatment-management.vue
View file @ c83ee6c7
......@@ -236,7 +236,7 @@
<el-dialog
title="分配诊室"
:visible.sync="open"
width="1000px"
width="61rem"
append-to-body
:close-on-press-escape="false"
:close-on-click-modal="false"
......@@ -354,7 +354,7 @@
:picker-options="pickerOptions"
:disabled-date="disabledDate"
placeholder="请选择治疗日期"
style="width: 190px;"
style="width: 11.8rem;"
/>
</el-form-item>
</el-col>
......@@ -365,7 +365,7 @@
clearable
placeholder="请选择治疗负责人"
value-key="id"
style="width: 190px;"
style="width: 11.8rem;"
@change="getuserName"
>
<el-option
......@@ -391,7 +391,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="治疗时长" prop="duration">
<el-select v-model="reservationForm.duration" style="width: 190px;" placeholder="请选择治疗时长" @change="calculateEndTime">
<el-select v-model="reservationForm.duration" style="width: 11.8rem;" placeholder="请选择治疗时长" @change="calculateEndTime">
<el-option
v-for="option in durationOptions"
:key="option"
......@@ -403,15 +403,15 @@
</el-col>
<el-col :span="8">
<el-form-item label="结束时间">
<el-input v-model=" reservationForm.eTime" :disabled="true" style="width: 190px;" />
<el-input v-model=" reservationForm.eTime" :disabled="true" style="width: 11.8rem;" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<div style="padding-top: 20px;text-align: right">
<el-button style="width: 98px;height: 32px;" class="resetBtn" @click="cancel">返 回
<el-button style="width: 5.8rem;height: 1.9rem;" class="resetBtn" @click="cancel">返 回
</el-button>
<el-button style="width: 98px;height: 32px;" class="queryBtn" @click="submitForm">
<el-button style="width: 5.8rem;height: 1.9rem;" class="queryBtn" @click="submitForm">
提交
</el-button>
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment