Skip to content

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

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	src/router/index.js
parent b23d0d10
Show whitespace changes
Inline Side-by-side
Showing with 51 additions and 38 deletions
src/views/equipment-management/equipment-management/equipment-add.vue
View file @ 252d448b
......@@ -379,7 +379,7 @@ export default {
{ type: 'number', validator: this.validUseNum, trigger: 'change' }
],
address: [
{ required: true, message: '请输入服务地址', trigger: 'blur' }
{ required: true, message: '请输入详细地址地址(街道、楼牌号等)', trigger: 'blur' }
],
'useTime.ams': [
{ required: true, validator: this.validateMorningStart, trigger: 'change' }
......
src/views/equipment-management/equipment-management/equipment-detail.vue
View file @ 252d448b
......@@ -26,10 +26,10 @@
<el-form-item :label="userType === '00' ?'平台自有设备':'医院自有设备'" prop="isPrivate">
<el-select v-model="form.isPrivate" disabled style="width: 250px">
<el-option
v-for="index in optionss"
v-for="(item, index) in optionss"
:key="index"
:label="index.label"
:value="index.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
......@@ -69,6 +69,7 @@
<el-cascader
ref="serviceArea"
v-model="form.selectedOptions"
disabled
size="large"
:options="cityOptions"
placeholder="暂无数据"
......@@ -180,7 +181,7 @@
/>
</el-form-item>
</el-col>
<e-col :span="8">
<el-col :span="8">
<el-form-item label="下午开始时间">
<el-time-select
v-model="form.useTime.pme"
......@@ -198,7 +199,7 @@
}"
/>
</el-form-item>
</e-col>
</el-col>
</el-row>
<!-- 6-->
<el-row>
......@@ -335,9 +336,9 @@
/>
</el-select>
</el-form-item>
<el-form-item v-if="hpshow" label="医院自有设备" prop="deviceName">
<el-form-item v-if="hpshow" label="医院自有设备">
<el-select v-model="form.isPrivate"disabled style="width: 250px" placeholder="请选择医院自有设备">
<el-select v-model="form.isPrivate" disabled style="width: 250px" placeholder="请选择医院自有设备">
<el-option
v-for="(item ,index) in optionss"
:key="index"
......@@ -381,7 +382,7 @@
<el-form-item label="服务地点" prop="selectedOptions">
<el-cascader
ref="serviceArea"
v-model="selectedOptions"
v-model="form.selectedOptions"
size="large"
:options="cityOptions"
placeholder="请选择服务地点"
......@@ -650,7 +651,7 @@ export default {
cityOptions: regionData,
// 存储省市区选中的地址码
selectedOptions: [],
// selectedOptions: [],
// 地址码对用的文字
addtions: {
names: ''
......@@ -702,9 +703,13 @@ export default {
deviceType: [
{ required: true, message: '请选择设备类型', trigger: 'change' }
],
addressCode: [
{ required: true, message: '请选择服务地点', trigger: 'change,blur' }
selectedOptions: [
// { required: true, message: '请选择服务地点', trigger: 'blur' }
{ required: true, validator: this.validaddress, trigger: 'blur' }
],
// addressCode: [
// { required: true, message: '请选择服务地点', trigger: 'change,blur' }
// ],
address: [
{ required: true, message: '请输入服务地址', trigger: 'blur' }
],
......@@ -861,7 +866,7 @@ export default {
},
// 权重不能为0
validWeigh(rule, value, callback) {
console.log('value', value)
// console.log('value', value)
if (value > 0) {
callback()
} else {
......@@ -870,22 +875,30 @@ export default {
},
// 单位时段服务数不能为0
validUseNum(rule, value, callback) {
console.log('value', value)
// console.log('value', value)
if (value > 0) {
callback()
} else {
callback(new Error('单位时段服务数不能为0'))
}
},
validaddress(rule, value, callback) {
console.log('validaddress', this.form.selectedOptions)
if (this.form.selectedOptions.length>0) {
callback()
} else {
callback(new Error('请选择服务地点'))
}
},
// 四个时间的表单校验
validateMorningStart(rule, value, callback) {
// // TODO: please clear this log
const morningEnd = this.form.useTime.ame
console.log('value', value)
console.log('morningEnd', morningEnd)
console.log('this.form.useTime.ame', this.form.useTime.ame)
console.log('this.form.useTime.pms', this.form.useTime.pms)
console.log('his.form.useTime.pme', this.form.useTime.pme)
// console.log('value', value)
// console.log('morningEnd', morningEnd)
// console.log('this.form.useTime.ame', this.form.useTime.ame)
// console.log('this.form.useTime.pms', this.form.useTime.pms)
// console.log('his.form.useTime.pme', this.form.useTime.pme)
// if (isEmpty(value) && isEmpty(this.form.useTime.ams) || isEmpty(this.form.useTime.ame))
if (isEmpty(value) && isEmpty(this.form.useTime.ame) && isEmpty(this.form.useTime.pms) && isEmpty(this.form.useTime.pme)) {
console.log('上午开始时间第一层报错')
......@@ -943,16 +956,16 @@ export default {
},
// 选择地址
handleChangeAddress(value) {
this.selectedOptions = value
console.log('地区码', this.selectedOptions)
this.form.selectedOptions = value
console.log('地区码', this.form.selectedOptions)
var name = ''
this.selectedOptions.map(item => name += CodeToText[item] + '') // 将省市区三个拼接一起
this.form.selectedOptions.map(item => name += CodeToText[item] + '') // 将省市区三个拼接一起
this.addtions.names = name
console.log(this.addtions.names)
// 运用了CodeToText把编码转成了中文
this.addForm.province = CodeToText[this.selectedOptions[0]]
this.addForm.county = CodeToText[this.selectedOptions[1]]
this.addForm.area = CodeToText[this.selectedOptions[2]]
this.addForm.province = CodeToText[ this.form.selectedOptions[0]]
this.addForm.county = CodeToText[ this.form.selectedOptions[1]]
this.addForm.area = CodeToText[ this.form.selectedOptions[2]]
if (this.addForm.county === '市辖区' || this.addForm.county === '县') {
this.city = this.addForm.province
} else {
......@@ -964,9 +977,9 @@ export default {
// 提交
submitForm() {
const form = deepClone(this.form)
console.log('selectedOptions', this.selectedOptions)
if (this.selectedOptions != null) {
form.addressCode = this.selectedOptions.join(',')
console.log('selectedOptions', form.selectedOptions)
if (form.selectedOptions != null) {
form.addressCode = form.selectedOptions.join(',')
}
if (this.addtions.names != null) {
form.addressText = this.addtions.names
......@@ -1022,15 +1035,13 @@ export default {
handleUpdate() {
getDevice(this.id).then(response => {
this.form = response.data
if (this.selectedOptions != null && this.selectedOptions !== '') {
this.selectedOptions = response.data.addressCode.split(',')
console.log(':fsdfsddddddddd???????', response.data.addressCode)
console.log('详细个bbbbb', this.selectedOptions)
console.log('详细个ccccccccccc', this.form.selectedOptions)
}
if (this.form.serviceArea != null && this.form.serviceArea !== '') {
// if (this.form.selectedOptions != null && this.form.selectedOptions !== '') {
this.form.selectedOptions = response.data.addressCode.split(',')
//
// }
// if (this.form.serviceArea != null && this.form.serviceArea !== '') {
this.form.serviceArea = response.data.serviceArea.split(',')
}
// }
if (this.form.checkType != null && this.form.checkType !== '') {
this.form.checkType = response.data.checkType.split(',')
}
......@@ -1039,7 +1050,9 @@ export default {
this.form.useTime = JSON.parse(response.data.useTime)
}
// this.checkType = response.data.checkType.split(',')
console.log(':fsdfsddddddddd???????', response.data.addressCode)
console.log('详细个bbbbb', this.selectedOptions)
console.log('详细个ccccccccccc', this.form.selectedOptions)
console.log('详情数据---', this.form)
// this.serviceAreaS = this.form.serviceArea.split(';')
// this.serviceArea = []
......
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