Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
aixianling
2021-12-24 16:27:33 +08:00

View File

@@ -271,11 +271,12 @@ export default {
if (e.type == 'onOff') { //开关
this.formData[e.fieldDbName] = 0
}
if (e.type == 'area') { //地区
this.formData[e.fieldDbName+'_name'] = this.user.areaName
}
})
if (e.type == 'area') { //开关
this.formData[e.fieldDbName+'_name'] = this.user.areaName
}
})
this.$forceUpdate()
this.pageShow = true
}
@@ -288,7 +289,6 @@ export default {
item.map((e) => {
if(e.type == 'checkbox') { //多选
var list = this.$dict.getDict(e.dict)
console.log(list)
list.map((items) => {
items.checked = false
})
@@ -297,7 +297,7 @@ export default {
if (e.type == 'onOff') { //开关
this.formData[e.fieldDbName] = 0
}
if (e.type == 'area') { //开关
if (e.type == 'area') { //地区
this.formData[e.fieldDbName+'_name'] = this.user.areaName
}
})