Skip to content

P
pet-business-web
Commit 3f96c2bd authored by 王飞龙's avatar 王飞龙
Browse files
Options

bug修改

parent 56f6920b
Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 101 deletions
src/router/index.js
View file @ 3f96c2bd
...@@ -120,10 +120,10 @@ export const constantRoutes = [ ...@@ -120,10 +120,10 @@ export const constantRoutes = [
}, },
{ {
path: 'equipment-edit', path: 'equipment-detail',
props: true, props: true,
component: () => import('@/views/equipment-management/equipment-management/equipment-detail'), component: () => import('@/views/equipment-management/equipment-management/equipment-detail'),
name: 'EquipmentEdit', name: 'EquipmentDetail',
meta: { title: '设备详情' } meta: { title: '设备详情' }
}, },
{ {
......
src/views/data-statistics/pet-data-statistics/pet-data-statistics.vue
View file @ 3f96c2bd
...@@ -127,17 +127,17 @@ ...@@ -127,17 +127,17 @@
<overlong-tool :text="(item.ownerId || '-') + ' (' + item.nickname + ')'" :max="30" /> <overlong-tool :text="(item.ownerId || '-') + ' (' + item.nickname + ')'" :max="30" />
</div> </div>
<div style="display: flex"> <div style="display: flex">
<div class="progressWidth"> <div class="progressWidth">
<el-progress <el-progress
:percentage="item.money/petOwnerConsumeRank[0].money*100" :percentage="item.money/petOwnerConsumeRank[0].money*100"
:stroke-width="9" :stroke-width="9"
:show-text="false" :show-text="false"
class="consumeRankProgress" class="consumeRankProgress"
/> />
</div> </div>
<div class="consumeRankFont"> <div class="consumeRankFont">
{{ moneyFormat(item.money) }} 元 {{ moneyFormat(item.money) }} 元
</div> </div>
</div> </div>
</div> </div>
</div> </div>
......
src/views/equipment-management/equipment-management/equipment-detail.vue
View file @ 3f96c2bd
...@@ -77,26 +77,7 @@ ...@@ -77,26 +77,7 @@
<el-col :span="16"> <el-col :span="16">
<el-form-item label="服务地点"> <el-form-item label="服务地点">
<InputTips :text="form.selectedOptions" class="inputWidth" /> <InputTips :text="form.addressText" width="18.75rem" />
<!-- <el-cascader-->
<!-- ref="serviceArea"-->
<!-- v-model="form.selectedOptions"-->
<!-- size="large"-->
<!-- :options="areaOptions"-->
<!-- placeholder="-"-->
<!-- expand-trigger="hover"-->
<!-- clearable-->
<!-- class="overflow-hidden"-->
<!-- @change="handleChangeCascader"-->
<!-- @mouseover.native="showTooltip = true"-->
<!-- @mouseout.native="showTooltip = false"-->
<!-- >-->
<!-- <template #suffix>-->
<!-- <el-tooltip placement="top" content="这是提示内容" :disabled="!showTooltip" :offset="[0, 8]">-->
<!-- <i class="el-icon-question" />-->
<!-- </el-tooltip>-->
<!-- </template>-->
<!-- </el-cascader>-->
</el-form-item> </el-form-item>
<el-form-item prop="address"> <el-form-item prop="address">
<el-input <el-input
...@@ -274,7 +255,7 @@ ...@@ -274,7 +255,7 @@
<el-col> <el-col>
<el-form-item label="支持服务地区"> <el-form-item label="支持服务地区">
<el-input <el-input
v-model.trim="form.serviceAreaText" v-model="form.serviceAreaText"
type="textarea" type="textarea"
class="remark_with" class="remark_with"
:row="4" :row="4"
...@@ -289,10 +270,9 @@ ...@@ -289,10 +270,9 @@
<el-col> <el-col>
<el-form-item label="支持检查项目"> <el-form-item label="支持检查项目">
<el-input <el-input
v-model.trim="form.checkTypeText" v-model="form.checkTypeText"
type="textarea" type="textarea"
class="remark_with" class="remark_with"
pacehpl
:row="4" :row="4"
placeholder="-" placeholder="-"
disabled disabled
...@@ -597,27 +577,6 @@ ...@@ -597,27 +577,6 @@
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
<!-- 8-->
<el-row>
<el-col>
<el-form-item label="支持服务地区" prop="serviceArea">
<el-cascader
v-model="form.serviceArea"
size="large"
:options="areaOptions"
:props="props"
:disabled="serviceAreaShow"
placeholder="请选择支持服务地区"
collapse-tags
expand-trigger="hover"
clearable
class="inputWidth"
@change="handleChangeServiceArea"
/>
</el-form-item>
</el-col>
</el-row>
<!-- 9-->
<el-row> <el-row>
<el-col> <el-col>
<el-form-item label="支持检查项目" prop="checkType"> <el-form-item label="支持检查项目" prop="checkType">
...@@ -653,7 +612,7 @@ import { getInfo } from '@/api/login' ...@@ -653,7 +612,7 @@ import { getInfo } from '@/api/login'
import { listCheckManage } from '@/api/business/manage' import { listCheckManage } from '@/api/business/manage'
import { isEmpty, parseTime } from '@/utils/ruoyi' import { isEmpty, parseTime } from '@/utils/ruoyi'
import { deepClone } from '@/utils' import { deepClone } from '@/utils'
import { listAllByType, listItemByType } from '@/api/business/item' import { listItemByType } from '@/api/business/item'
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import { signHospitalMessage } from '@/api/business/hospital' import { signHospitalMessage } from '@/api/business/hospital'
import InputTips from '@/components/InputTips/InputTips.vue' import InputTips from '@/components/InputTips/InputTips.vue'
...@@ -664,9 +623,9 @@ export default { ...@@ -664,9 +623,9 @@ export default {
data() { data() {
return { return {
// 日期格式 // 日期格式
// replace(time) { replace(time) {
// return parseTime(time, '{y}/{m}/{d}') return parseTime(time, '{y}/{m}/{d}')
// }, },
// 检查类型 // 检查类型
// checkType: [], // checkType: [],
// 地址列表 // 地址列表
...@@ -851,7 +810,6 @@ export default { ...@@ -851,7 +810,6 @@ export default {
}, },
created() { created() {
this.$route.meta.title = '2222' this.$route.meta.title = '2222'
console.log('當前router', this.$route)
this.id = this.$route.query.id this.id = this.$route.query.id
this.identify = this.$route.query.identify this.identify = this.$route.query.identify
this.form.isPrivate = this.$route.query.isPrivate this.form.isPrivate = this.$route.query.isPrivate
...@@ -897,7 +855,7 @@ export default { ...@@ -897,7 +855,7 @@ export default {
this.itemType = 3 this.itemType = 3
} }
this.getItemByType() this.getItemByType()
this.getAllByType() // this.getAllByType()
console.log('登陆人', res) console.log('登陆人', res)
}) })
...@@ -975,7 +933,6 @@ export default { ...@@ -975,7 +933,6 @@ export default {
}, },
// 四个时间的表单校验 // 四个时间的表单校验
validateMorningStart(rule, value, callback) { validateMorningStart(rule, value, callback) {
// // TODO: please clear this log
const morningEnd = this.form.useTime.ame const morningEnd = this.form.useTime.ame
if (isEmpty(value) && isEmpty(this.form.useTime.ame) && isEmpty(this.form.useTime.pms) && isEmpty(this.form.useTime.pme)) { if (isEmpty(value) && isEmpty(this.form.useTime.ame) && isEmpty(this.form.useTime.pms) && isEmpty(this.form.useTime.pme)) {
console.log('上午开始时间第一层报错') console.log('上午开始时间第一层报错')
...@@ -1048,22 +1005,22 @@ export default { ...@@ -1048,22 +1005,22 @@ export default {
console.log(' this.checkTypeText', this.form.checkTypeText) console.log(' this.checkTypeText', this.form.checkTypeText)
}) })
}, },
getAllByType() { // getAllByType() {
listAllByType({ itemType: this.itemType }).then(res => { // listAllByType({ itemType: this.itemType }).then(res => {
console.log('检查全部项目', res) // console.log('检查全部项目', res)
this.checkItemOptions = res.rows // this.checkItemOptions = res.rows
// console.log('xdddd', this.checkItemOptions) // // console.log('xdddd', this.checkItemOptions)
const result = [] // const result = []
const ids = [... this.form.checkType] // const ids = [... this.form.checkType]
for (let i = 0; i < this.checkItemOptions.length; i++) { // for (let i = 0; i < this.checkItemOptions.length; i++) {
if (ids.includes(parseInt(this.checkItemOptions[i].id))) { // if (ids.includes(parseInt(this.checkItemOptions[i].id))) {
result.push(this.checkItemOptions[i].name) // result.push(this.checkItemOptions[i].name)
} // }
} // }
// this.form.checkTypeText = result // // this.form.checkTypeText = result
// console.log(' this.checkTypeText', this.form.checkTypeText) // // console.log(' this.checkTypeText', this.form.checkTypeText)
}) // })
}, // },
// 获取地址数据 // 获取地址数据
getAreaData() { getAreaData() {
getAreTreeStructure().then(response => { getAreTreeStructure().then(response => {
...@@ -1071,7 +1028,7 @@ export default { ...@@ -1071,7 +1028,7 @@ export default {
if (response.code === 200) { if (response.code === 200) {
this.removeEmptyChildren(response.data) this.removeEmptyChildren(response.data)
this.areaOptions = response.data this.areaOptions = response.data
console.log(' this.form.serviceArea', this.form.serviceArea) console.log('这是我要遍历的this.form.serviceArea', this.form.serviceArea)
const valueGroups = this.form.serviceArea const valueGroups = this.form.serviceArea
const labelList = [] const labelList = []
...@@ -1110,7 +1067,6 @@ export default { ...@@ -1110,7 +1067,6 @@ export default {
} }
this.form.serviceAreaText = labelList this.form.serviceAreaText = labelList
console.log(labelList)
console.log('----------------------------------------111111111111', labelList) console.log('----------------------------------------111111111111', labelList)
console.log(' this.areaOptions', this.areaOptions) console.log(' this.areaOptions', this.areaOptions)
} }
...@@ -1230,7 +1186,7 @@ export default { ...@@ -1230,7 +1186,7 @@ export default {
console.log('查询是否为医院设备', this.form.isPrivate) console.log('查询是否为医院设备', this.form.isPrivate)
this.form.selectedOptions = response.data.addressCode.split(',').map(Number) this.form.selectedOptions = response.data.addressCode.split(',').map(Number)
console.log('地址编码-------------', this.form.selectedOptions) console.log('地址编码-------------', this.form.selectedOptions)
this.getAreNameById(this.form.selectedOptions) // this.getAreNameById(this.form.selectedOptions)
// if (this.form.isPrivate === '1') { // if (this.form.isPrivate === '1') {
// signHospitalMessage().then(response => { // signHospitalMessage().then(response => {
// console.log('查到医院信息', response) // console.log('查到医院信息', response)
......
src/views/equipment-management/equipment-management/equipment-management.vue
View file @ 3f96c2bd
...@@ -223,7 +223,7 @@ ...@@ -223,7 +223,7 @@
icon="el-icon-document" icon="el-icon-document"
class="el-button--success--solid" class="el-button--success--solid"
plain plain
@click="detailsDevice(scope.row.id)" @click="detailsDevice(scope.row)"
>详情 >详情
</el-button> </el-button>
<el-button <el-button
...@@ -603,12 +603,13 @@ export default { ...@@ -603,12 +603,13 @@ export default {
}) })
}, },
/** 跳转到详情页*/ /** 跳转到详情页*/
detailsDevice(id) { detailsDevice(data) {
this.$router.push({ this.$router.push({
name: 'EquipmentEdit', name: 'EquipmentDetail',
query: { query: {
identify: '2', identify: '2',
id: id id: data.id,
isPrivate: data.isPrivate
} }
}) })
}, },
...@@ -619,11 +620,11 @@ export default { ...@@ -619,11 +620,11 @@ export default {
}) })
}, },
// 点击检查项目 // 点击检查项目
handlecheck() { // handlecheck() {
this.$router.push({ // this.$router.push({
name: 'EquipmentCheck' // name: 'EquipmentCheck'
}) // })
}, // },
/** /**
* 全部选择 * 全部选择
......
src/views/service-management/hospitalization-management/hospitalization-management.vue
View file @ 3f96c2bd
...@@ -233,15 +233,15 @@ ...@@ -233,15 +233,15 @@
type="warning" type="warning"
@click="handleDischargeMe(scope.row)" @click="handleDischargeMe(scope.row)"
>办理出院</el-button> >办理出院</el-button>
<!-- <el-button--> <!-- <el-button-->
<!-- v-else-if="scope.row.status==='4'"--> <!-- v-else-if="scope.row.status==='4'"-->
<!-- icon="el-icon-paperclip"--> <!-- icon="el-icon-paperclip"-->
<!-- plain--> <!-- plain-->
<!-- size="mini"--> <!-- size="mini"-->
<!-- class="el-button&#45;&#45;warning&#45;&#45;solid&#45;&#45;four"--> <!-- class="el-button&#45;&#45;warning&#45;&#45;solid&#45;&#45;four"-->
<!-- type="warning"--> <!-- type="warning"-->
<!-- disabled--> <!-- disabled-->
<!-- >导出明细</el-button>--> <!-- >导出明细</el-button>-->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
......
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