1、无法将人员打回bug修复

2、form表单校验后无法重新提交bug修复
3、页面丢失信息bug修复
4、导出excel格式修改
pull/11/head
liujun 2024-03-22 22:24:15 +08:00
parent 6ded3c4e5b
commit 9964e443a9
3 changed files with 24 additions and 13 deletions

View File

@ -173,7 +173,8 @@ export default {
} else { } else {
this.isShow = false this.isShow = false
} }
} else { }
if (this.info.FLOWS_TYPE === '1') {
this.isShow = true this.isShow = true
if (this.info.FLOWS_STEP === 2 || this.info.FLOWS_STEP === 3) { if (this.info.FLOWS_STEP === 2 || this.info.FLOWS_STEP === 3) {
await this.getDepartmentTree() await this.getDepartmentTree()
@ -186,6 +187,15 @@ export default {
this.corpFlag = true this.corpFlag = true
} }
} }
if (this.info.FLOWS_TYPE === '2') {
if (this.info.FLOWS_STEP === 1) {
this.isShow = true
await this.getDepartmentTree()
this.corpFlag = false
} else {
this.isShow = false
}
}
this.loading = false this.loading = false
}, },
getMenu() { getMenu() {

View File

@ -435,6 +435,12 @@ export default {
submitForm() { submitForm() {
this.$refs.form.validate(valid => { this.$refs.form.validate(valid => {
if (valid) { if (valid) {
if (this.form.MAIN_DEPARTMENT.indexOf('0') > -1 && this.form.MAIN_DEPARTMENT.length > 1) {
this.listLoading = false
this.submitButtonLoading = false
this.$message.error('主管部门选无时不能选择其他部门')
return
}
this.listLoading = true this.listLoading = true
this.submitButtonLoading = true this.submitButtonLoading = true
if (this.form.POSSESSION && this.form.POSSESSION.length > 0) { if (this.form.POSSESSION && this.form.POSSESSION.length > 0) {
@ -452,12 +458,6 @@ export default {
this.form.MANAGER_DEPARTMENT_ID = this.form.MANAGER_DEPARTMENT_ID.join(',') this.form.MANAGER_DEPARTMENT_ID = this.form.MANAGER_DEPARTMENT_ID.join(',')
} }
this.form.CORP_TYPE = JSON.stringify(this.form.CORP_TYPE) this.form.CORP_TYPE = JSON.stringify(this.form.CORP_TYPE)
if (this.form.MAIN_DEPARTMENT.indexOf('0') > -1 && this.form.MAIN_DEPARTMENT.length > 1) {
this.listLoading = false
this.buttonLoading = false
this.$message.error('主管部门选无时不能选择其他部门')
return
}
this.form.MAIN_DEPARTMENT = JSON.stringify(this.form.MAIN_DEPARTMENT) this.form.MAIN_DEPARTMENT = JSON.stringify(this.form.MAIN_DEPARTMENT)
requestFN( requestFN(
'/relevantunits/saveCorpInfo', '/relevantunits/saveCorpInfo',

View File

@ -560,6 +560,12 @@ export default {
if (valid) { if (valid) {
this.listLoading = true this.listLoading = true
this.buttonLoading = true this.buttonLoading = true
if (this.form.MAIN_DEPARTMENT.indexOf('0') > -1 && this.form.MAIN_DEPARTMENT.length > 1) {
this.listLoading = false
this.submitButtonLoading = false
this.$message.error('主管部门选无时不能选择其他部门')
return
}
if (this.form.POSSESSION && this.form.POSSESSION.length > 0) { if (this.form.POSSESSION && this.form.POSSESSION.length > 0) {
this.form.PROVINCE = this.form.POSSESSION[0] || '' this.form.PROVINCE = this.form.POSSESSION[0] || ''
this.form.CITY = this.form.POSSESSION[1] || '' this.form.CITY = this.form.POSSESSION[1] || ''
@ -573,12 +579,7 @@ export default {
if (this.form.COMPETENT_DEPT_ID) { if (this.form.COMPETENT_DEPT_ID) {
this.form.COMPETENT_DEPT_ID = this.form.COMPETENT_DEPT_ID.join(',') this.form.COMPETENT_DEPT_ID = this.form.COMPETENT_DEPT_ID.join(',')
} }
if (this.form.MAIN_DEPARTMENT.indexOf('0') > -1 && this.form.MAIN_DEPARTMENT.length > 1) { this.form.MAIN_DEPARTMENT = JSON.stringify(this.form.MAIN_DEPARTMENT)
this.listLoading = false
this.buttonLoading = false
this.$message.error('主管部门选无时不能选择其他部门')
return
}
if (this.form.MANAGER_DEPARTMENT_ID) { if (this.form.MANAGER_DEPARTMENT_ID) {
this.form.MANAGER_DEPARTMENT_ID = JSON.stringify(this.form.MANAGER_DEPARTMENT_ID) this.form.MANAGER_DEPARTMENT_ID = JSON.stringify(this.form.MANAGER_DEPARTMENT_ID)
} }