|
@@ -25,14 +25,14 @@
|
|
|
@input="data => employee = data"
|
|
@input="data => employee = data"
|
|
|
/>
|
|
/>
|
|
|
</el-tab-pane>
|
|
</el-tab-pane>
|
|
|
- <!-- <el-tab-pane label="扩展属性" name="ext-attr">
|
|
|
|
|
|
|
+ <el-tab-pane label="扩展属性" name="ext-attr">
|
|
|
<ext-attr
|
|
<ext-attr
|
|
|
ref="attrInfo"
|
|
ref="attrInfo"
|
|
|
:readonly="readonly"
|
|
:readonly="readonly"
|
|
|
:data="employee.attrItemList"
|
|
:data="employee.attrItemList"
|
|
|
@input="data => employee.attrItemList = data"
|
|
@input="data => employee.attrItemList = data"
|
|
|
/>
|
|
/>
|
|
|
- </el-tab-pane> -->
|
|
|
|
|
|
|
+ </el-tab-pane>
|
|
|
<el-tab-pane
|
|
<el-tab-pane
|
|
|
v-if="!infoIncludes('org-info')"
|
|
v-if="!infoIncludes('org-info')"
|
|
|
label="组织信息"
|
|
label="组织信息"
|
|
@@ -221,17 +221,17 @@
|
|
|
return true
|
|
return true
|
|
|
},
|
|
},
|
|
|
saveData() {
|
|
saveData() {
|
|
|
- // const attrValidator = this.$refs['attrInfo'] ? this.$refs['attrInfo'].callback() : null
|
|
|
|
|
|
|
+ const attrValidator = this.$refs['attrInfo'] ? this.$refs['attrInfo'].callback() : null
|
|
|
const vo = this.formatSubmitData()
|
|
const vo = this.formatSubmitData()
|
|
|
if (!this.$utils.isEmpty(this.formId) && !this.ceroParams) {
|
|
if (!this.$utils.isEmpty(this.formId) && !this.ceroParams) {
|
|
|
delete vo.partyEmployeePo.password
|
|
delete vo.partyEmployeePo.password
|
|
|
}
|
|
}
|
|
|
this.dialogLoading = true
|
|
this.dialogLoading = true
|
|
|
- // if (!attrValidator) {
|
|
|
|
|
- // ActionUtils.warning('请检查表单数据是否填写正确')
|
|
|
|
|
- // this.dialogLoading = false
|
|
|
|
|
- // return
|
|
|
|
|
- // }
|
|
|
|
|
|
|
+ if (!attrValidator) {
|
|
|
|
|
+ ActionUtils.warning('请检查扩展属性是否填写正确')
|
|
|
|
|
+ this.dialogLoading = false
|
|
|
|
|
+ return
|
|
|
|
|
+ }
|
|
|
const { mobile = '' } = vo.user || {}
|
|
const { mobile = '' } = vo.user || {}
|
|
|
if (mobile && !this.checkPhone(mobile)) {
|
|
if (mobile && !this.checkPhone(mobile)) {
|
|
|
ActionUtils.warning('请输入正确的手机号')
|
|
ActionUtils.warning('请输入正确的手机号')
|
|
@@ -263,7 +263,7 @@
|
|
|
this.closeDialog()
|
|
this.closeDialog()
|
|
|
} else {
|
|
} else {
|
|
|
this.init()
|
|
this.init()
|
|
|
- // this.$refs.attrInfo.clearData()
|
|
|
|
|
|
|
+ this.$refs.attrInfo.clearData()
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
)
|
|
)
|
|
@@ -298,7 +298,7 @@
|
|
|
if (this.$utils.isEmpty(this.formId)) {
|
|
if (this.$utils.isEmpty(this.formId)) {
|
|
|
// 清空拓展属性数据
|
|
// 清空拓展属性数据
|
|
|
this.$nextTick(() => {
|
|
this.$nextTick(() => {
|
|
|
- // this.$refs.attrInfo.clearData()
|
|
|
|
|
|
|
+ this.$refs.attrInfo.clearData()
|
|
|
})
|
|
})
|
|
|
return
|
|
return
|
|
|
}
|
|
}
|
|
@@ -312,9 +312,9 @@
|
|
|
this.employee.posItemList = response.variables.partyPositions || []
|
|
this.employee.posItemList = response.variables.partyPositions || []
|
|
|
this.employee.roleItemList = response.variables.partyRoles || []
|
|
this.employee.roleItemList = response.variables.partyRoles || []
|
|
|
this.employee.userGroupItemList = response.variables.partyGroups || []
|
|
this.employee.userGroupItemList = response.variables.partyGroups || []
|
|
|
- // this.$nextTick(() => {
|
|
|
|
|
- // this.$refs.attrInfo.loadAttrData()
|
|
|
|
|
- // })
|
|
|
|
|
|
|
+ this.$nextTick(() => {
|
|
|
|
|
+ this.$refs.attrInfo.loadAttrData()
|
|
|
|
|
+ })
|
|
|
}).catch(() => {
|
|
}).catch(() => {
|
|
|
this.dialogLoading = false
|
|
this.dialogLoading = false
|
|
|
})
|
|
})
|