Skip to content

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

代码规范修复

parent 152acfbe
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 34 deletions
.husky/pre-commit
View file @ 54f93ce7
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"
npm run lint
src/views/article-management/article-insert.vue
View file @ 54f93ce7
......@@ -39,10 +39,10 @@
<div style="padding-right: 15px;">
<el-select v-model="form.articleStatus">
<el-option
v-for="({value, label}, index) in statusList"
:key="index"
:label="label"
:value="value"
v-for="item in statusList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</div>
......
src/views/article-management/article-management.vue
View file @ 54f93ce7
......@@ -255,7 +255,6 @@
<script>
import { listArticle, delArticle, addArticle, updateArticle, listAllArticle } from '@/api/business/article'
import { parseTime } from '../../utils/ruoyi'
import fa from 'element-ui/src/locale/lang/fa'
import moment from 'moment'
export default {
......
src/views/equipment-management/equipment-management/equipment-detail.vue
View file @ 54f93ce7
......@@ -24,7 +24,7 @@
</el-col>
<el-col :span="8">
<el-form-item v-if="isShow" label="平台自有设备">
<el-select v-model="form.isPrivate" disabled style="width: 250px" placeholder="请选择平台自有设备" disabled>
<el-select v-model="form.isPrivate" disabled style="width: 250px" placeholder="请选择平台自有设备">
<el-option
v-for="(item, index) in optionsp"
:key="index"
......@@ -35,7 +35,7 @@
</el-form-item>
<el-form-item v-if="hpshow" label="医院自有设备">
<el-select v-model="form.isPrivate" disabled style="width: 250px" placeholder="请选择医院自有设备" disabled>
<el-select v-model="form.isPrivate" disabled style="width: 250px" placeholder="请选择医院自有设备">
<el-option
v-for="(item ,index) in optionsh"
:key="index"
......@@ -583,7 +583,7 @@
<el-row>
<el-col>
<el-form-item label="支持服务地区" prop="serviceArea">
<el-select v-model="form.serviceArea" placeholder="请选择" style="width: 300px"multiple collapse-tags clearable>
<el-select v-model="form.serviceArea" placeholder="请选择" style="width: 300px" multiple collapse-tags clearable>
<el-option
v-for="dictServiceArea in dict.type.service_area"
:key="dictServiceArea.label"
......@@ -598,7 +598,7 @@
<el-row>
<el-col>
<el-form-item label="支持检查项目" prop="checkType">
<el-select v-model="form.checkType" multiple placeholder="请选择" style="width: 300px" multiple collapse-tags clearable>
<el-select v-model="form.checkType" multiple placeholder="请选择" style="width: 300px" collapse-tags clearable>
<el-option
v-for="(item,index) in dict.type.exam_type"
:key="index.label"
......
src/views/equipment-management/equipment-management/equipment-management.vue
View file @ 54f93ce7
......@@ -248,8 +248,8 @@
</template>
<script>
import { regionData, CodeToText } from 'element-china-area-data'
import { listDevice, getDevice, delDevice, listDeviceAll } from '@/api/business/device'
import { regionData } from 'element-china-area-data'
import { listDevice, delDevice, listDeviceAll } from '@/api/business/device'
import { getInfo } from '@/api/login'
import { parseTime } from '@/utils/ruoyi'
......@@ -675,7 +675,7 @@ export default {
/**
* 如果当前没有选择任何table项 则反选不生效
*/
if (notIncludeIds != null && notIncludeIds != '') {
if (notIncludeIds != null && notIncludeIds !== '') {
const { data } = await listDeviceAll({ notIncludeIds })
console.log('data', data)
this.effectTableSelect(data)
......
src/views/service-management/registration-queue/components/choose-pet.vue
View file @ 54f93ce7
......@@ -66,7 +66,7 @@
prop="petBreed"
>
<template slot-scope="scope">
{{scope.row.petBreed}}/{{scope.row.petChildBreed}}
{{ scope.row.petBreed }}/{{ scope.row.petChildBreed }}
</template>
</el-table-column>
<el-table-column align="center" label="宠物性别" min-width="60" prop="petSex" show-overflow-tooltip>
......
src/views/service-management/registration-queue/components/prescribing-modle.vue
View file @ 54f93ce7
......@@ -48,7 +48,7 @@
<el-col :span="8">
<el-form-item label="宠物品种" prop="petBreed" class="petBreed">
<el-input v-model="registerForm.petBreed" disabled />
<el-input v-model="registerForm.petChildBreed" class="petChildBreed" disabled />
<el-input v-model="registerForm.petChildBreed" class="petChildBreed" disabled />
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -149,10 +149,10 @@
style="width: 100%"
>
<el-option
v-for="(item, index) in dict.type.pet_sex"
:key="index"
:label="item.label"
:value="item.value"
v-for="items in dict.type.pet_sex"
:key="items.value"
:label="items.label"
:value="items.value"
/>
</el-select>
</el-form-item>
......@@ -195,8 +195,8 @@
@change="getCheckItemOptions"
>
<el-option
v-for="(item, index) in dict.type.check_type"
:key="index"
v-for="item in dict.type.check_type"
:key="item.value"
:label="item.label"
:value="item.value"
/>
......@@ -213,8 +213,8 @@
@change="setCheckItemsName(singleItem,checkItemOptions)"
>
<el-option
v-for="(item, index) in checkItemOptions"
:key="index"
v-for="item in checkItemOptions"
:key="item.value"
:label="item.label"
:value="item.value"
/>
......@@ -241,8 +241,8 @@
@change="setTreatItemsName(singleItem,treatItemOptions)"
>
<el-option
v-for="(item, index) in treatItemOptions"
:key="index"
v-for="item in treatItemOptions"
:key="item.value"
:label="item.label"
:value="item.value"
/>
......@@ -388,6 +388,10 @@ export default {
}
}
},
computed: {
...mapGetters(['deptId', 'name'])
},
watch: {
registerForm(val) {
if (val.checkManageBos.length > 0) {
......@@ -398,9 +402,6 @@ export default {
}
}
},
computed: {
...mapGetters(['deptId', 'name'])
},
created() {
},
......
src/views/service-management/registration-queue/registration-detail.vue
View file @ 54f93ce7
......@@ -63,7 +63,7 @@ color: #333333;"
<!--宠物品种-->
<el-form-item label="宠物品种" prop="petBreed" class="petBreed">
<el-input v-model="detailInfo.petBreed" disabled />
<el-input class="petChildBreed" v-model="detailInfo.petChildBreed" disabled />
<el-input v-model="detailInfo.petChildBreed" class="petChildBreed" disabled />
</el-form-item>
</el-col>
</el-row>
......@@ -247,6 +247,7 @@ color: #333333;"
<el-select v-model="detailInfo.petOwnerBo.status" disabled>
<el-option
v-for="({value, label}) in statusList"
:key="label"
:label="label"
:value="value"
/>
......@@ -286,6 +287,7 @@ color: #333333;"
<el-select v-model="detailInfo.type" disabled>
<el-option
v-for="({value, label}) in typeList"
:key="label"
:label="label"
:value="value"
/>
......@@ -310,6 +312,7 @@ color: #333333;"
<el-select v-model="detailInfo.firstVisit" disabled>
<el-option
v-for="({value, label}) in firstVisitList"
:key="label"
:label="label"
:value="value"
/>
......@@ -352,6 +355,7 @@ color: #333333;"
<el-select v-model="detailInfo.payStatus" disabled>
<el-option
v-for="({value, label}) in payStatusList"
:key="label"
:label="label"
:value="value"
/>
......
src/views/service-management/treatment-management/treatment-management.vue
View file @ 54f93ce7
......@@ -197,7 +197,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="诊室">
<el-select v-model="allocationForm.consultRoomIdList" clearable multiple collapse-tags placeholder="请选择诊室" @change="allocationFormChangeName" >
<el-select v-model="allocationForm.consultRoomIdList" clearable multiple collapse-tags placeholder="请选择诊室" @change="allocationFormChangeName">
<el-option
v-for="item in consultingName"
:key="item.id"
......@@ -254,7 +254,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="诊室" prop="consultRoomId">
<el-select v-model="reservationForm.consultRoomName" clearable placeholder="请选择诊室" value-key="id" @change="getconsultingName" style="width: 200px">
<el-select v-model="reservationForm.consultRoomName" clearable placeholder="请选择诊室" value-key="id" style="width: 200px" @change="getconsultingName">
<el-option
v-for="item in consultingName"
:key="item.id"
......@@ -283,8 +283,8 @@
<el-col :span="12">
<el-form-item label="开始时间" prop="sTime">
<el-time-select
style="width: 200px"
v-model="appointmentRoom.sTime"
style="width: 200px"
is-range
placeholder="请选择治疗开始时间"
format="HH:mm"
......@@ -301,8 +301,8 @@
<el-col :span="12">
<el-form-item label="结束时间" prop="eTime">
<el-time-select
style="width: 200px"
v-model="appointmentRoom.eTime"
style="width: 200px"
is-range
placeholder="请选择治疗结束时间"
format="HH:mm"
......
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